diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/Community/SettingsControls/SettingsCard/SettingsCard.xaml b/source/iNKORE.UI.WPF.Modern.Controls/Controls/Community/SettingsControls/SettingsCard/SettingsCard.xaml
index f37718d0..ee325ca3 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/Community/SettingsControls/SettingsCard/SettingsCard.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/Community/SettingsControls/SettingsCard/SettingsCard.xaml
@@ -78,7 +78,7 @@
                             </ResourceDictionary>
 
                         </ControlTemplate.Resources>
-                        <ui:ElevationBorder x:Name="PART_RootBorder"
+                        <Border x:Name="PART_RootBorder"
                                MinWidth="{TemplateBinding MinWidth}"
                                MinHeight="{TemplateBinding MinHeight}"
                                MaxWidth="{TemplateBinding MaxWidth}"
@@ -88,7 +88,8 @@
                                Background="{TemplateBinding Background}"
                                BorderBrush="{TemplateBinding BorderBrush}"
                                BorderThickness="{TemplateBinding BorderThickness}"
-                               CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}">
+                               CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}"
+                               ui:FocusVisualHelper.IsTemplateFocusTarget="True">
                             <VisualStateManager.VisualStateGroups>
                                 <VisualStateGroup x:Name="CommonStates">
                                     <ui:VisualStateGroupListener.Listener>
@@ -382,7 +383,7 @@
                                           ToolTipService.ToolTip="{TemplateBinding ActionIconToolTip}" />
                                 </Viewbox>
                             </Grid>
-                        </ui:ElevationBorder>
+                        </Border>
 
 
                         <ControlTemplate.Triggers>
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/Community/SettingsControls/SettingsExpander/SettingsExpander.xaml b/source/iNKORE.UI.WPF.Modern.Controls/Controls/Community/SettingsControls/SettingsExpander/SettingsExpander.xaml
index 7de30115..64b4440b 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/Community/SettingsControls/SettingsExpander/SettingsExpander.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/Community/SettingsControls/SettingsExpander/SettingsExpander.xaml
@@ -59,7 +59,8 @@
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
-                        SnapsToDevicePixels="True">
+                        SnapsToDevicePixels="True"
+                        ui:FocusVisualHelper.IsTemplateFocusTarget="True">
                         <Border
                             x:Name="Border"
                             Padding="{TemplateBinding Padding}"
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/CommandBar/CommandBar.xaml b/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/CommandBar/CommandBar.xaml
index 7a21957e..be234527 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/CommandBar/CommandBar.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/CommandBar/CommandBar.xaml
@@ -48,6 +48,7 @@
                                     -->
                                     <ContentControl
                                         x:Name="ContentControl"
+                                        Margin="{TemplateBinding Padding}"
                                         HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                         VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                         HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -76,14 +77,15 @@
                                     IsChecked="{Binding Path=IsOverflowOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
                                     IsEnabled="{TemplateBinding HasOverflowItems}"
                                     Style="{DynamicResource EllipsisButton}"
+                                    ui:FocusVisualHelper.IsTemplateFocusTarget="True"
                                     Visibility="{TemplateBinding EffectiveOverflowButtonVisibility}">
                                     <ui:FontIcon
                                         x:Name="EllipsisIcon"
                                         Height="{DynamicResource AppBarExpandButtonCircleDiameter}"
                                         VerticalAlignment="Center"
-                                        FontFamily="{DynamicResource FluentSystemIcons}"
+                                        FontFamily="{DynamicResource SymbolThemeFontFamily}"
                                         FontSize="20"
-                                        Glyph="&#xE826;" />
+                                        Glyph="&#xE712;" />
                                 </ToggleButton>
                                 <Rectangle
                                     x:Name="HighContrastBorder"
@@ -129,6 +131,7 @@
                                             </primitives:CommandBarOverflowPresenter.Resources>
                                             <primitives:CommandBarOverflowPanel
                                                 x:Name="PART_ToolBarOverflowPanel"
+                                                Margin="{DynamicResource CommandBarOverflowPresenterMargin}"
                                                 FocusVisualStyle="{x:Null}"
                                                 Focusable="true"
                                                 KeyboardNavigation.DirectionalNavigation="Cycle"
@@ -210,7 +213,6 @@
                         SnapsToDevicePixels="True">
                         <Border Padding="{TemplateBinding Padding}" CornerRadius="{TemplateBinding CornerRadius}">
                             <ui:ScrollViewerEx
-                                Padding="{DynamicResource CommandBarOverflowPresenterMargin}"
                                 Content="{TemplateBinding Content}"
                                 HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/HyperlinkButton/HyperlinkButton.xaml b/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/HyperlinkButton/HyperlinkButton.xaml
index 59c384b8..1dcb44b0 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/HyperlinkButton/HyperlinkButton.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/HyperlinkButton/HyperlinkButton.xaml
@@ -30,6 +30,7 @@
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}"
+                        ui:FocusVisualHelper.IsTemplateFocusTarget="True"
                         SnapsToDevicePixels="True">
                         <Border
                             x:Name="Border"
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/RadioMenuItem/RadioMenuItem.xaml b/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/RadioMenuItem/RadioMenuItem.xaml
index c3722ec6..ff075e68 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/RadioMenuItem/RadioMenuItem.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/RadioMenuItem/RadioMenuItem.xaml
@@ -14,6 +14,7 @@
         <Setter Property="BorderThickness" Value="{DynamicResource MenuFlyoutItemRevealBorderThickness}" />
         <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForeground}" />
         <Setter Property="Padding" Value="{DynamicResource MenuFlyoutItemThemePadding}" />
+        <Setter Property="ui:ControlHelper.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/TimePicker/TimePicker.xaml b/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/TimePicker/TimePicker.xaml
index e5050ad5..42f580fb 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/TimePicker/TimePicker.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/TimePicker/TimePicker.xaml
@@ -80,9 +80,9 @@
         <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
         <Setter Property="FocusVisualStyle" Value="{DynamicResource {x:Static SystemParameters.FocusVisualStyleKey}}" />
         <Setter Property="UseSystemFocusVisuals" Value="{DynamicResource UseSystemFocusVisuals}" />
-        <Setter Property="ui:FocusVisualHelper.FocusVisualMargin" Value="0,0,0,5" />
         <Setter Property="ui:ControlHelper.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="VerticalAlignment" Value="Stretch" />
+        <Setter Property="MaxHeight" Value="{DynamicResource LoopingSelectorMaxHeight}"/>
         <Setter Property="ItemsPanel">
             <Setter.Value>
                 <ItemsPanelTemplate>
@@ -99,7 +99,7 @@
                             Focusable="false"
                             HorizontalScrollBarVisibility="Disabled"
                             VerticalScrollBarVisibility="Hidden">
-                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Margin="0,-3,0,0"/>
                         </ScrollViewer>
                         <RepeatButton
                             x:Name="UpButton"
@@ -394,7 +394,7 @@
                                                 Grid.ColumnSpan="7"
                                                 Height="{DynamicResource TimePickerFlyoutPresenterHighlightHeight}"
                                                 IsHitTestVisible="False"
-                                                Margin="4,6,4,0"
+                                                Margin="4,2,4,2"
                                                 VerticalAlignment="Center"
                                                 BorderThickness="0"
                                                 CornerRadius="{TemplateBinding CornerRadius}"
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/ToggleSwitch/ToggleSwitch.xaml b/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/ToggleSwitch/ToggleSwitch.xaml
index 5711a05f..da8b0ffd 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/ToggleSwitch/ToggleSwitch.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/ToggleSwitch/ToggleSwitch.xaml
@@ -32,6 +32,7 @@
         <Setter Property="MinWidth" Value="{DynamicResource ToggleSwitchThemeMinWidth}" />
         <Setter Property="FocusVisualStyle" Value="{DynamicResource {x:Static SystemParameters.FocusVisualStyleKey}}" />
         <Setter Property="ui:FocusVisualHelper.FocusVisualMargin" Value="-7,-3,-7,-3" />
+        <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="local:ToggleSwitch">
@@ -123,6 +124,8 @@
                                 Visibility="Collapsed" />
                             <Grid
                                 Grid.Row="1"
+                                ui:FocusVisualHelper.IsTemplateFocusTarget="True"
+                                ui:ControlHelper.CornerRadius="{TemplateBinding CornerRadius}" 
                                 HorizontalAlignment="Left"
                                 VerticalAlignment="Top">
 
@@ -144,7 +147,6 @@
                                     Grid.RowSpan="3"
                                     Grid.ColumnSpan="5"
                                     Margin="0,5"
-                                    ui:FocusVisualHelper.IsTemplateFocusTarget="True"
                                     Background="{DynamicResource ToggleSwitchContainerBackground}"
                                     CornerRadius="{TemplateBinding CornerRadius}" />
                                 <ui:ContentPresenterEx
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/Controls/ControlExample.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/Controls/ControlExample.xaml
index 6f8d9b39..6ae737a9 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/Controls/ControlExample.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/Controls/ControlExample.xaml
@@ -13,6 +13,7 @@
     <sys:Double x:Key="ExampleMaxWidth">1000</sys:Double>
 
     <Style TargetType="local:ControlExample">
+        <Setter Property="IsTabStop" Value="False"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="local:ControlExample">
@@ -37,7 +38,6 @@
                             <Run>
                                 This sample requires a later version of Windows to be fully functional. Learn more about version adaptive apps:
                             </Run>
-                            <Hyperlink NavigateUri="https://docs.microsoft.com/windows/uwp/debug-test-perf/version-adaptive-apps">https://docs.microsoft.com/windows/uwp/debug-test-perf/version-adaptive-apps</Hyperlink>
                         </TextBlock>
 
                         <Border Grid.Row="2" CornerRadius="8">
diff --git a/source/iNKORE.UI.WPF.Modern/Controls/Helpers/CalendarHelper.cs b/source/iNKORE.UI.WPF.Modern/Controls/Helpers/CalendarHelper.cs
index 49ba66db..43d77046 100644
--- a/source/iNKORE.UI.WPF.Modern/Controls/Helpers/CalendarHelper.cs
+++ b/source/iNKORE.UI.WPF.Modern/Controls/Helpers/CalendarHelper.cs
@@ -1,7 +1,12 @@
-using System.Windows;
+using System;
+using System.Globalization;
+using System.Reflection;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
+using System.Windows.Data;
 using System.Windows.Input;
+using Calendar = System.Windows.Controls.Calendar;
 
 namespace iNKORE.UI.WPF.Modern.Controls.Helpers
 {
@@ -52,5 +57,210 @@ private static void OnCalendarGotMouseCapture(object sender, MouseEventArgs e)
                 }
             }
         }
+    
+        #region CalendarKeyboardBehaviorOverride
+
+        public static bool GetKeyboardBehaviorOverride(Calendar calendar) =>
+            (bool)calendar.GetValue(KeyboardBehaviorOverrideProperty);
+
+        public static void SetKeyboardBehaviorOverride(Calendar calendar, bool value) =>
+            calendar.SetValue(KeyboardBehaviorOverrideProperty, value);
+
+        public static readonly DependencyProperty KeyboardBehaviorOverrideProperty =
+            DependencyProperty.RegisterAttached(
+                "KeyboardBehaviorOverride",
+                typeof(bool),
+                typeof(CalendarHelper),
+                new PropertyMetadata(OnKeyboardBehaviorOverrideChanged));
+
+        private static void OnKeyboardBehaviorOverrideChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is not Calendar calendar)
+            {
+                return;
+            }
+
+            if (e.NewValue is true)
+            {
+                calendar.PreviewKeyDown += OnHandleChangeFocusByKeys;
+            }
+            else
+            {
+                calendar.PreviewKeyDown -= OnHandleChangeFocusByKeys;
+            }
+        }
+
+        private static void OnHandleChangeFocusByKeys(object sender, KeyEventArgs e)
+        {
+            if (sender is not Calendar calendar ||
+                (Keyboard.Modifiers & ModifierKeys.Control) is ModifierKeys.Control)
+            {
+                return;
+            }
+
+            if ((Keyboard.Modifiers & ModifierKeys.Shift) is ModifierKeys.Shift && e.Key is not Key.Tab)
+            {
+                e.Handled = true;
+                return;
+            }
+
+            DateTime? focusTarget;
+            switch (calendar.DisplayMode)
+            {
+                case CalendarMode.Month:
+                    int? change = e.Key switch
+                    {
+                        Key.Up => -7,
+                        Key.Down => 7,
+                        Key.Left => -1,
+                        Key.Right => 1,
+                        _ => null
+                    };
+
+                    if (change is null)
+                    {
+                        return;
+                    }
+
+                    var currentDate = typeof(Calendar).GetProperty("CurrentDate",
+                                BindingFlags.NonPublic | BindingFlags.Instance)!
+                            .GetValue(calendar)
+                        as DateTime?;
+
+                    focusTarget = GetNonBlackoutTarget(calendar, currentDate?.AddDays(change.Value));
+
+                    break;
+
+                case CalendarMode.Year:
+                    if (GetChangeForYearOrDecadeView(e.Key) is not { } monthChange)
+                    {
+                        return;
+                    }
+
+                    focusTarget = calendar.DisplayDate.AddMonths(monthChange);
+                    break;
+                case CalendarMode.Decade:
+                    if (GetChangeForYearOrDecadeView(e.Key) is not { } yearChange)
+                    {
+                        return;
+                    }
+
+                    focusTarget = calendar.DisplayDate.AddYears(yearChange);
+                    break;
+                default:
+                    return;
+            }
+
+            typeof(Calendar).GetMethod("MoveDisplayTo", BindingFlags.NonPublic | BindingFlags.Instance)!
+                .Invoke(calendar,
+                    [focusTarget]);
+
+            e.Handled = true;
+
+            static int? GetChangeForYearOrDecadeView(Key key) => key switch
+            {
+                Key.Up => -4,
+                Key.Down => 4,
+                Key.Left => -1,
+                Key.Right => 1,
+                _ => null
+            };
+
+            static DateTime? GetNonBlackoutTarget(Calendar calendar, DateTime? targetFocus)
+            {
+                var blackoutDates =
+                    typeof(Calendar).GetField("_blackoutDates", BindingFlags.NonPublic | BindingFlags.Instance)!
+                            .GetValue(calendar)
+                        as CalendarBlackoutDatesCollection;
+
+                var toSelectDate =
+                    typeof(CalendarBlackoutDatesCollection).GetMethod("GetNonBlackoutDate",
+                            BindingFlags.NonPublic | BindingFlags.Instance)!
+                        .Invoke(blackoutDates, [targetFocus, -1]) as DateTime?;
+                return toSelectDate;
+            }
+        }
+
+        private static DateTime? GetCurrentFocusedDate() =>
+            (Keyboard.FocusedElement as FrameworkElement)?.DataContext as DateTime?;
+
+        #endregion
+
+        #region ContainsToday
+
+        public static CalendarMode? GetCalendarDisplayMode(DependencyObject obj) => (CalendarMode?)obj.GetValue(CalendarDisplayModeProperty);
+
+        public static void SetCalendarDisplayMode(DependencyObject obj, CalendarMode? value) => obj.SetValue(CalendarDisplayModeProperty, value);
+
+        public static readonly DependencyProperty CalendarDisplayModeProperty =
+            DependencyProperty.RegisterAttached(
+                "CalendarDisplayMode",
+                typeof(CalendarMode?),
+                typeof(CalendarHelper),
+                new PropertyMetadata(null, OnContainsTodayNeedsUpdate));
+
+        public static object GetContextDate(DependencyObject obj) => obj.GetValue(ContextDateProperty);
+
+        public static void SetContextDate(DependencyObject obj, object value) => obj.SetValue(ContextDateProperty, value);
+
+        public static readonly DependencyProperty ContextDateProperty =
+            DependencyProperty.RegisterAttached(
+                "ContextDate",
+                typeof(object),
+                typeof(CalendarHelper),
+                new PropertyMetadata(null, OnContainsTodayNeedsUpdate));
+
+        public static bool GetIsContainsTodayActive(DependencyObject obj) => (bool)obj.GetValue(IsContainsTodayActiveProperty);
+
+        public static void SetIsContainsTodayActive(DependencyObject obj, bool value) => obj.SetValue(IsContainsTodayActiveProperty, value);
+
+        public static readonly DependencyProperty IsContainsTodayActiveProperty =
+            DependencyProperty.RegisterAttached(
+                "IsContainsTodayActive",
+                typeof(bool),
+                typeof(CalendarHelper),
+                new PropertyMetadata(true, OnContainsTodayNeedsUpdate));
+
+        private static void OnContainsTodayNeedsUpdate(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            UpdateContainsTodayActive(d);
+        }
+
+        private static void UpdateContainsTodayActive(DependencyObject d)
+        {
+            var mode = GetCalendarDisplayMode(d);
+            var contextDate = GetContextDate(d) as DateTime?;
+
+            if (!mode.HasValue || !contextDate.HasValue)
+            {
+                SetContainsToday(d, false);
+                return;
+            }
+
+            var containsTodayActive = mode.Value switch
+            {
+                CalendarMode.Year => contextDate.Value.Year == DateTime.Today.Year &&
+                                     contextDate.Value.Month == DateTime.Today.Month,
+                CalendarMode.Decade => contextDate.Value.Year == DateTime.Today.Year,
+                _ => false
+            };
+
+            SetContainsToday(d, containsTodayActive);
+        }
+
+        public static bool GetContainsToday(DependencyObject obj) =>
+            (bool)obj.GetValue(ContainsTodayProperty);
+
+        public static void SetContainsToday(DependencyObject obj, bool value) =>
+            obj.SetValue(ContainsTodayProperty, value);
+
+        public static readonly DependencyProperty ContainsTodayProperty =
+            DependencyProperty.RegisterAttached(
+                "ContainsToday",
+                typeof(bool),
+                typeof(CalendarHelper),
+                new PropertyMetadata(false));
+
+        #endregion
     }
 }
diff --git a/source/iNKORE.UI.WPF.Modern/Controls/Helpers/FocusVisualHelper.cs b/source/iNKORE.UI.WPF.Modern/Controls/Helpers/FocusVisualHelper.cs
index a63041cd..da4aa5bb 100644
--- a/source/iNKORE.UI.WPF.Modern/Controls/Helpers/FocusVisualHelper.cs
+++ b/source/iNKORE.UI.WPF.Modern/Controls/Helpers/FocusVisualHelper.cs
@@ -10,6 +10,7 @@
 using System.Windows.Controls;
 using System.Windows.Documents;
 using System.Windows.Media;
+using iNKORE.UI.WPF.Helpers;
 
 namespace iNKORE.UI.WPF.Modern.Controls.Helpers
 {
@@ -163,6 +164,20 @@ public static void SetFocusVisualSecondaryThickness(FrameworkElement element, Th
 
         #endregion
 
+        #region FocusVisualPrimaryCornerRadius
+
+        public static CornerRadius GetFocusVisualPrimaryCornerRadius(FrameworkElement element) => (CornerRadius)element.GetValue(FocusVisualPrimaryCornerRadiusProperty);
+        private static void SetFocusVisualPrimaryCornerRadius(FrameworkElement element, CornerRadius value) => element.SetValue(FocusVisualPrimaryCornerRadiusProperty, value);
+
+        public static readonly DependencyProperty FocusVisualPrimaryCornerRadiusProperty =
+            DependencyProperty.RegisterAttached(
+                "FocusVisualPrimaryCornerRadius",
+                typeof(CornerRadius),
+                typeof(FocusVisualHelper),
+                new FrameworkPropertyMetadata(new CornerRadius(0)));
+
+        #endregion
+        
         #region FocusVisualMargin
 
         /// <summary>
@@ -393,7 +408,7 @@ static void ShowFocusVisual(Control control, FrameworkElement target)
             {
                 HideFocusVisual();
 
-                AdornerLayer adornerlayer = AdornerLayer.GetAdornerLayer(target);
+                AdornerLayer adornerlayer = GetAdornerLayer(target);
                 if (adornerlayer == null)
                     return;
 
@@ -414,6 +429,17 @@ static void ShowFocusVisual(Control control, FrameworkElement target)
                 }
             }
 
+            static AdornerLayer? GetAdornerLayer(FrameworkElement element)
+            {
+                var scrollPresenter = element.FindAscendant<ScrollContentPresenter>();
+                if (scrollPresenter?.Parent is AdornerDecorator adornerDecorator)
+                {
+                    return adornerDecorator.AdornerLayer;
+                }
+
+                return AdornerLayer.GetAdornerLayer(element);
+            }
+
             static void OnControlIsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
             {
                 ((Control)sender).IsVisibleChanged -= OnControlIsVisibleChanged;
@@ -483,11 +509,13 @@ private static void OnFocusVisualIsVisibleChanged(object sender, DependencyPrope
                     }
                     else
                     {
+                        var focusVisualMargin = GetFocusVisualMargin(focusedElement);
+                        ApplyCornerRadiusToFocusVisual(focusVisual, focusedElement, focusVisualMargin);
                         TransferValue(focusedElement, focusVisual, FocusVisualPrimaryBrushProperty);
                         TransferValue(focusedElement, focusVisual, FocusVisualPrimaryThicknessProperty);
                         TransferValue(focusedElement, focusVisual, FocusVisualSecondaryBrushProperty);
                         TransferValue(focusedElement, focusVisual, FocusVisualSecondaryThicknessProperty);
-                        focusVisual.Margin = GetFocusVisualMargin(focusedElement);
+                        focusVisual.Margin = focusVisualMargin;
                     }
 
                     SetFocusedElement(focusVisual, focusedElement);
@@ -510,6 +538,39 @@ private static void OnFocusVisualIsVisibleChanged(object sender, DependencyPrope
             }
         }
 
+        private static void ApplyCornerRadiusToFocusVisual(Control focusVisual, FrameworkElement focusedElement, Thickness focusVisualMargin)
+        {
+            var cornerRadius = GetCornerRadiusForFocusedElement(focusedElement);
+            if (cornerRadius is CornerRadius focusedCornerRadius && focusedCornerRadius != default)
+            {
+                var focusVisualCornerRadius = new CornerRadius(
+                    GetSumIfSourceIsNonZero(focusedCornerRadius.TopLeft, -(focusVisualMargin.Left + focusVisualMargin.Top) / 2),
+                    GetSumIfSourceIsNonZero(focusedCornerRadius.TopRight, -(focusVisualMargin.Right + focusVisualMargin.Top) / 2),
+                    GetSumIfSourceIsNonZero(focusedCornerRadius.BottomLeft, -(focusVisualMargin.Left + focusVisualMargin.Bottom) / 2),
+                    GetSumIfSourceIsNonZero(focusedCornerRadius.BottomRight, -(focusVisualMargin.Right + focusVisualMargin.Bottom) / 2));
+
+                ControlHelper.SetCornerRadius(focusVisual, focusVisualCornerRadius);
+                var topLeftRadius = GetSumIfSourceIsNonZero(focusVisualCornerRadius.TopLeft, GetFocusVisualSecondaryThickness(focusedElement).Left);
+                var topRightRadius = GetSumIfSourceIsNonZero(focusVisualCornerRadius.TopRight, GetFocusVisualSecondaryThickness(focusedElement).Right);
+                var bottomRightRadius = GetSumIfSourceIsNonZero(focusVisualCornerRadius.BottomLeft, GetFocusVisualSecondaryThickness(focusedElement).Left);
+                var bottomLeftRadius = GetSumIfSourceIsNonZero(focusVisualCornerRadius.BottomRight, GetFocusVisualSecondaryThickness(focusedElement).Right);
+
+                SetFocusVisualPrimaryCornerRadius(focusVisual, new CornerRadius(topLeftRadius, topRightRadius, bottomRightRadius, bottomLeftRadius));
+            }
+        }
+
+        private static CornerRadius? GetCornerRadiusForFocusedElement(FrameworkElement focusedElement)
+        {
+            var cornerRadiusTarget = focusedElement.GetValue(TemplateFocusTargetProperty) as FrameworkElement;
+            cornerRadiusTarget ??= focusedElement;
+            return cornerRadiusTarget switch
+            {
+                var _ when cornerRadiusTarget.GetValue(Border.CornerRadiusProperty) is CornerRadius borderResult && borderResult != default => borderResult,
+                var _ when cornerRadiusTarget.GetValue(ControlHelper.CornerRadiusProperty) is CornerRadius controlResult => controlResult,
+                _ => null
+            };
+        }
+
         private static void TransferValue(DependencyObject source, DependencyObject target, DependencyProperty dp)
         {
             if (!source.HasDefaultValue(dp))
@@ -518,6 +579,12 @@ private static void TransferValue(DependencyObject source, DependencyObject targ
             }
         }
 
+        private static double GetSumIfSourceIsNonZero(double source, double adjustment) => source switch
+        {
+            0 => 0,
+            _ => source + adjustment
+        };
+
         private sealed class FocusVisualAdorner : Adorner
         {
             public FocusVisualAdorner(Control focusedElement, UIElement adornedElement, Style focusVisualStyle) : base(adornedElement)
@@ -531,13 +598,18 @@ public FocusVisualAdorner(Control focusedElement, UIElement adornedElement, Styl
                 Control control = new Control();
                 SetIsSystemFocusVisual(control, false);
                 control.Style = focusVisualStyle;
-                control.Margin = GetFocusVisualMargin(focusedElement);
+                
+                var focusVisualMargin = GetFocusVisualMargin(focusedElement);
+                control.Margin = focusVisualMargin;
+
+                ApplyCornerRadiusToFocusVisual(control, focusedElement, focusVisualMargin);
+
                 TransferValue(focusedElement, control, FocusVisualPrimaryBrushProperty);
                 TransferValue(focusedElement, control, FocusVisualPrimaryThicknessProperty);
                 TransferValue(focusedElement, control, FocusVisualSecondaryBrushProperty);
                 TransferValue(focusedElement, control, FocusVisualSecondaryThicknessProperty);
                 _adorderChild = control;
-                IsClipEnabled = true;
+                IsClipEnabled = false;
                 IsHitTestVisible = false;
                 IsEnabled = false;
                 AddVisualChild(_adorderChild);
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Controls/Calendar.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Controls/Calendar.xaml
index e651478e..2afbaab4 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/Controls/Calendar.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/Controls/Calendar.xaml
@@ -17,6 +17,33 @@
         </ResourceDictionary>
     </ResourceDictionary.MergedDictionaries>
 
+    <Style x:Key="EllipticalFocusStyle" BasedOn="{StaticResource {x:Static SystemParameters.FocusVisualStyleKey}}">
+        <Setter Property="Control.Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Grid>
+                        <Grid.Width>
+                            <MultiBinding Converter="{StaticResource RoundMathConverter}">
+                                <Binding Path="ActualWidth" RelativeSource="{RelativeSource TemplatedParent}" />
+                                <Binding Path="ActualHeight" RelativeSource="{RelativeSource TemplatedParent}" />
+                            </MultiBinding>
+                        </Grid.Width>
+                        <Grid.Height>
+                            <MultiBinding Converter="{StaticResource RoundMathConverter}">
+                                <Binding Path="ActualWidth" RelativeSource="{RelativeSource TemplatedParent}" />
+                                <Binding Path="ActualHeight" RelativeSource="{RelativeSource TemplatedParent}" />
+                            </MultiBinding>
+                        </Grid.Height>
+                        <Ellipse Stroke="{TemplateBinding chelper:FocusVisualHelper.FocusVisualSecondaryBrush}"
+                                 StrokeThickness="1" />
+                        <Ellipse Stroke="{TemplateBinding chelper:FocusVisualHelper.FocusVisualPrimaryBrush}"
+                                 StrokeThickness="2" />
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    
     <Style x:Key="DefaultCalendarItemStyle" TargetType="CalendarItem">
         <Setter Property="OverridesDefaultStyle" Value="True" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
@@ -38,7 +65,7 @@
                             <TextBlock Style="{StaticResource WeekDayNameStyle}" Text="{Binding}" />
                         </DataTemplate>
                     </ControlTemplate.Resources>
-                    <Grid x:Name="PART_Root" SnapsToDevicePixels="True">
+                    <Grid x:Name="PART_Root" SnapsToDevicePixels="True" KeyboardNavigation.TabNavigation="Local">
                         <Grid.Resources>
                             <Style
                                 x:Key="HeaderNavigationButtonStyle"
@@ -168,25 +195,25 @@
                                         <ColumnDefinition Width="Auto" />
                                     </Grid.ColumnDefinitions>
                                     <Button
+                                        KeyboardNavigation.TabIndex="0"
                                         x:Name="PART_HeaderButton"
                                         HorizontalContentAlignment="Left"
-                                        Focusable="False"
                                         Style="{StaticResource HeaderNavigationButtonStyle}" />
                                     <Button
                                         x:Name="PART_PreviousButton"
+                                        KeyboardNavigation.TabIndex="1"
                                         Grid.Column="1"
                                         Margin="{DynamicResource CalendarViewNavigationPreviousButtonMargin}"
                                         HorizontalContentAlignment="Center"
                                         Content="&#xE2BC;"
-                                        Focusable="False"
                                         Style="{StaticResource NavigationButtonStyle}" />
                                     <Button
                                         x:Name="PART_NextButton"
+                                        KeyboardNavigation.TabIndex="2"
                                         Grid.Column="2"
                                         Margin="{DynamicResource CalendarViewNavigationNextButtonMargin}"
                                         HorizontalContentAlignment="Center"
                                         Content="&#xF260;"
-                                        Focusable="False"
                                         Style="{StaticResource NavigationButtonStyle}" />
                                 </Grid>
                                 <Border
@@ -207,7 +234,10 @@
                                         x:Name="PART_MonthView"
                                         RenderTransformOrigin="0.5,0.5"
                                         TextElement.Foreground="{DynamicResource CalendarViewCalendarItemForeground}"
-                                        Visibility="Visible">
+                                        Visibility="Visible"
+                                        KeyboardNavigation.TabNavigation="Once"
+                                        KeyboardNavigation.TabIndex="3"
+                                        Margin="3,0">
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition Width="*" />
                                             <ColumnDefinition Width="*" />
@@ -233,7 +263,9 @@
                                     <Grid
                                         x:Name="PART_YearView"
                                         RenderTransformOrigin="0.5,0.5"
-                                        Visibility="Hidden">
+                                        Visibility="Collapsed"
+                                        KeyboardNavigation.TabNavigation="Once"
+                                        KeyboardNavigation.TabIndex="3">
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition Width="*" />
                                             <ColumnDefinition Width="*" />
@@ -273,6 +305,9 @@
                                         <BooleanAnimationUsingKeyFrames Storyboard.TargetName="PART_MonthView" Storyboard.TargetProperty="IsEnabled">
                                             <DiscreteBooleanKeyFrame KeyTime="0:0:0" Value="False" />
                                         </BooleanAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_MonthView" Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Hidden}" />
+                                        </ObjectAnimationUsingKeyFrames>
                                         <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_MonthView" Storyboard.TargetProperty="Opacity">
                                             <DiscreteDoubleKeyFrame KeyTime="0:0:0" Value="0" />
                                         </DoubleAnimationUsingKeyFrames>
@@ -293,6 +328,9 @@
                                                     KeyTime="0:0:0.150"
                                                     Value="0" />
                                             </DoubleAnimationUsingKeyFrames>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_MonthView" Storyboard.TargetProperty="Visibility">
+                                                <DiscreteObjectKeyFrame KeyTime="0:0:0.150" Value="{x:Static Visibility.Hidden}" />
+                                            </ObjectAnimationUsingKeyFrames>
                                             <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_YearView" Storyboard.TargetProperty="Opacity">
                                                 <DiscreteDoubleKeyFrame KeyTime="0" Value="0" />
                                                 <DiscreteDoubleKeyFrame KeyTime="0:0:0.150" Value="0" />
@@ -348,7 +386,7 @@
                                             <BooleanAnimationUsingKeyFrames Storyboard.TargetName="PART_YearView" Storyboard.TargetProperty="IsHitTestVisible">
                                                 <DiscreteBooleanKeyFrame KeyTime="0" Value="False" />
                                             </BooleanAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YearView" Storyboard.TargetProperty="Visibility">
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_MonthView" Storyboard.TargetProperty="Visibility">
                                                 <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Visible}" />
                                             </ObjectAnimationUsingKeyFrames>
                                             <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_YearView" Storyboard.TargetProperty="Opacity">
@@ -426,6 +464,9 @@
                                             <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_MonthView" Storyboard.TargetProperty="Opacity">
                                                 <DiscreteDoubleKeyFrame KeyTime="0" Value="0" />
                                             </DoubleAnimationUsingKeyFrames>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_MonthView" Storyboard.TargetProperty="Visibility">
+                                                <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Hidden}" />
+                                            </ObjectAnimationUsingKeyFrames>
                                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YearView" Storyboard.TargetProperty="Visibility">
                                                 <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Visible}" />
                                             </ObjectAnimationUsingKeyFrames>
@@ -498,6 +539,9 @@
                                             <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_MonthView" Storyboard.TargetProperty="Opacity">
                                                 <DiscreteDoubleKeyFrame KeyTime="0" Value="0" />
                                             </DoubleAnimationUsingKeyFrames>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_MonthView" Storyboard.TargetProperty="Visibility">
+                                                <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Hidden}" />
+                                            </ObjectAnimationUsingKeyFrames>
                                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YearView" Storyboard.TargetProperty="Visibility">
                                                 <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Visible}" />
                                             </ObjectAnimationUsingKeyFrames>
@@ -588,9 +632,9 @@
         <Setter Property="FontSize" Value="{DynamicResource CalendarViewDayItemFontSize}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource {x:Static SystemParameters.FocusVisualStyleKey}}" />
+        <Setter Property="FocusVisualStyle" Value="{StaticResource EllipticalFocusStyle}"/>
         <Setter Property="chelper:FocusVisualHelper.UseSystemFocusVisuals" Value="True" />
-        <Setter Property="chelper:FocusVisualHelper.FocusVisualMargin" Value="-2" />
+        <Setter Property="chelper:FocusVisualHelper.FocusVisualMargin" Value="-4,-3.5,-3.5,-3" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="CalendarDayButton">
@@ -649,6 +693,8 @@
                         </Trigger>
                         <!--  Selected  -->
                         <Trigger Property="IsSelected" Value="True">
+                            <Setter Property="IsTabStop" Value="True" />
+                            <Setter Property="TabIndex" Value="4" />
                             <Setter TargetName="NormalText" Property="Foreground" Value="{DynamicResource CalendarViewSelectedForeground}" />
                             <Setter TargetName="HighlightBorder" Property="Stroke" Value="{DynamicResource CalendarViewSelectedBorderBrush}" />
                         </Trigger>
@@ -701,6 +747,10 @@
                             <Setter TargetName="NormalText" Property="FontWeight" Value="{DynamicResource CalendarViewTodayFontWeight}" />
                             <Setter TargetName="NormalText" Property="Foreground" Value="{DynamicResource CalendarViewTodayForeground}" />
                         </Trigger>
+                        <Trigger Property="IsToday" Value="True">
+                            <Setter Property="IsTabStop" Value="True" />
+                            <Setter Property="TabIndex" Value="5" />
+                        </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsBlackedOut" Value="True" />
@@ -767,9 +817,12 @@
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource {x:Static SystemParameters.FocusVisualStyleKey}}" />
+        <Setter Property="FocusVisualStyle" Value="{StaticResource EllipticalFocusStyle}"/>
+        <Setter Property="chelper:CalendarHelper.CalendarDisplayMode" Value="{Binding RelativeSource={RelativeSource AncestorType=Calendar}, Path=DisplayMode, Mode=OneWay}" />
+        <Setter Property="chelper:CalendarHelper.IsContainsTodayActive" Value="{Binding RelativeSource={RelativeSource AncestorType=Calendar}, Path=IsTodayHighlighted, Mode=OneWay}" />
+        <Setter Property="chelper:CalendarHelper.ContextDate" Value="{Binding }" />
         <Setter Property="chelper:FocusVisualHelper.UseSystemFocusVisuals" Value="True" />
-        <Setter Property="chelper:FocusVisualHelper.FocusVisualMargin" Value="-2" />
+        <Setter Property="chelper:FocusVisualHelper.FocusVisualMargin" Value="-4,-3.5,-3.5,-3" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="CalendarButton">
@@ -818,28 +871,39 @@
                             <Setter TargetName="NormalText" Property="Foreground" Value="{DynamicResource CalendarViewDisabledForeground}" />
                         </Trigger>
                         <!--  Selected  -->
-                        <Trigger Property="HasSelectedDays" Value="True">
+                        <Trigger Property="chelper:CalendarHelper.ContainsToday" Value="True">
+                            <Setter Property="IsTabStop" Value="True" />
+                            <Setter Property="TabIndex" Value="4" />
+                        </Trigger>
+                        <MultiTrigger >
+                            <MultiTrigger.Conditions>
+                                <Condition Property="chelper:CalendarHelper.ContainsToday" Value="True"/>
+                                <Condition Property="chelper:CalendarHelper.IsContainsTodayActive" Value="True"/>
+                            </MultiTrigger.Conditions>
                             <Setter TargetName="Background" Property="Fill" Value="{DynamicResource CalendarViewTodayBackground}" />
                             <Setter TargetName="NormalText" Property="FontWeight" Value="{DynamicResource CalendarViewTodayFontWeight}" />
                             <Setter TargetName="NormalText" Property="Foreground" Value="{DynamicResource CalendarViewTodayForeground}" />
-                        </Trigger>
+                        </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="HasSelectedDays" Value="True" />
+                                <Condition Property="chelper:CalendarHelper.ContainsToday" Value="True"/>
+                                <Condition Property="chelper:CalendarHelper.IsContainsTodayActive" Value="True"/>
                                 <Condition Property="IsMouseOver" Value="True" />
                             </MultiTrigger.Conditions>
                             <Setter TargetName="Background" Property="Fill" Value="{DynamicResource CalendarViewTodayHoverBackground}" />
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="HasSelectedDays" Value="True" />
+                                <Condition Property="chelper:CalendarHelper.ContainsToday" Value="True"/>
+                                <Condition Property="chelper:CalendarHelper.IsContainsTodayActive" Value="True"/>
                                 <Condition Property="IsPressed" Value="True" />
                             </MultiTrigger.Conditions>
                             <Setter TargetName="Background" Property="Fill" Value="{DynamicResource CalendarViewTodayPressedBackground}" />
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="HasSelectedDays" Value="True" />
+                                <Condition Property="chelper:CalendarHelper.ContainsToday" Value="True"/>
+                                <Condition Property="chelper:CalendarHelper.IsContainsTodayActive" Value="True"/>
                                 <Condition Property="IsEnabled" Value="False" />
                             </MultiTrigger.Conditions>
                             <Setter TargetName="Background" Property="Fill" Value="{DynamicResource CalendarViewTodayDisabledBackground}" />
@@ -885,6 +949,7 @@
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="chelper:ControlHelper.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="chelper:CalendarHelper.AutoReleaseMouseCapture" Value="True" />
+        <Setter Property="chelper:CalendarHelper.KeyboardBehaviorOverride" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Calendar">
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Controls/ComboBox.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Controls/ComboBox.xaml
index c5fd4b5f..d2cc1a55 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/Controls/ComboBox.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/Controls/ComboBox.xaml
@@ -396,7 +396,7 @@
                             Background="{DynamicResource ComboBoxBackgroundFocused}"
                             BorderBrush="{DynamicResource ComboBoxBackgroundBorderBrushFocused}"
                             BorderThickness="{DynamicResource ComboBoxBackgroundBorderThicknessFocused}"
-                            CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
+                            CornerRadius="{DynamicResource ComboBoxHiglightBorderCornerRadius}"
                             Opacity="0" />
                         <local:ElevationBorder
                             x:Name="Background"
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Controls/CommandBar.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Controls/CommandBar.xaml
index 22ebcc38..eab6f0c8 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/Controls/CommandBar.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/Controls/CommandBar.xaml
@@ -43,6 +43,7 @@
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
+                        chelper:FocusVisualHelper.IsTemplateFocusTarget="True"
                         SnapsToDevicePixels="True">
                         <local:ContentPresenterEx
                             x:Name="ContentPresenter"
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Controls/Expander.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Controls/Expander.xaml
index 982068de..ba451c38 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/Controls/Expander.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/Controls/Expander.xaml
@@ -39,6 +39,7 @@
                         Background="{TemplateBinding Background}"
                         BorderBrush="{DynamicResource ExpanderHeaderBorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
+                        chelper:FocusVisualHelper.IsTemplateFocusTarget="True"
                         CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}">
                         <Grid SnapsToDevicePixels="False">
                             <Grid.ColumnDefinitions>
@@ -559,6 +560,7 @@
                             IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
                             IsEnabled="{TemplateBinding IsEnabled}"
                             Style="{DynamicResource ExpanderCardHeaderDownStyle}"
+                            chelper:FocusVisualHelper.IsTemplateFocusTarget="True"
                             Tag="{TemplateBinding chelper:ControlHelper.CornerRadius}" />
                         <!--  The clip is a composition clip applied in code  -->
                         <Border x:Name="ExpanderContentClip" DockPanel.Dock="Bottom">
@@ -907,6 +909,7 @@
     </Style>
 
     <Style x:Key="DefaultExpanderStyle" TargetType="Expander">
+        <Setter Property="IsTabStop" Value="False"/>
         <Setter Property="OverridesDefaultStyle" Value="True" />
         <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
         <Setter Property="Background" Value="Transparent" />
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Controls/MenuItem.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Controls/MenuItem.xaml
index 1046cadf..b2c51751 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/Controls/MenuItem.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/Controls/MenuItem.xaml
@@ -168,6 +168,7 @@
             BorderBrush="{TemplateBinding BorderBrush}"
             BorderThickness="{TemplateBinding BorderThickness}"
             CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
+            chelper:FocusVisualHelper.IsTemplateFocusTarget="{Binding RelativeSource={RelativeSource AncestorType=ContextMenu}, Path=IsVisible, Mode=OneWay, TargetNullValue=False}"
             SnapsToDevicePixels="true">
             <Grid x:Name="AnimationRoot">
                 <Grid.ColumnDefinitions>
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Controls/NavigationBackButton.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Controls/NavigationBackButton.xaml
index 1f1fe25a..9189f681 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/Controls/NavigationBackButton.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/Controls/NavigationBackButton.xaml
@@ -37,6 +37,7 @@
                         x:Name="RootGrid"
                         Background="{TemplateBinding Background}"
                         CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
+                        chelper:FocusVisualHelper.IsTemplateFocusTarget="True"
                         SnapsToDevicePixels="True">
                         <local:FontIcon
                             x:Name="Content"
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Controls/NavigationView.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Controls/NavigationView.xaml
index 17e73117..f996dee4 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/Controls/NavigationView.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/Controls/NavigationView.xaml
@@ -40,6 +40,7 @@
                         HorizontalAlignment="Stretch"
                         Background="{TemplateBinding Background}"
                         CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
+                        chelper:FocusVisualHelper.IsTemplateFocusTarget="True"
                         SnapsToDevicePixels="True">
                         <Grid>
                             <Grid.ColumnDefinitions>
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Controls/RadioButton.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Controls/RadioButton.xaml
index 3d4ac863..998a7bed 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/Controls/RadioButton.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/Controls/RadioButton.xaml
@@ -36,6 +36,7 @@
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
+                        chelper:FocusVisualHelper.IsTemplateFocusTarget="True"
                         SnapsToDevicePixels="True">
                         <Grid>
                             <Grid.ColumnDefinitions>
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Controls/ScrollViewer.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Controls/ScrollViewer.xaml
index 01f4c5b2..7df17912 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/Controls/ScrollViewer.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/Controls/ScrollViewer.xaml
@@ -44,18 +44,21 @@
                                 <RowDefinition Height="*" />
                                 <RowDefinition Height="Auto" />
                             </Grid.RowDefinitions>
-                            <ScrollContentPresenter
-                                x:Name="PART_ScrollContentPresenter"
-                                Grid.Row="0"
-                                Grid.RowSpan="2"
-                                Grid.Column="0"
-                                Grid.ColumnSpan="2"
-                                Margin="{TemplateBinding Padding}"
-                                CanContentScroll="{TemplateBinding CanContentScroll}"
-                                CanHorizontallyScroll="False"
-                                CanVerticallyScroll="False"
-                                Content="{TemplateBinding Content}"
-                                ContentTemplate="{TemplateBinding ContentTemplate}" />
+                            
+                            <AdornerDecorator Grid.Row="0"
+                                              Grid.RowSpan="2"
+                                              Grid.Column="0"
+                                              Grid.ColumnSpan="2">
+                                <ScrollContentPresenter
+                                    x:Name="PART_ScrollContentPresenter"
+                                    Margin="{TemplateBinding Padding}"
+                                    CanContentScroll="{TemplateBinding CanContentScroll}"
+                                    CanHorizontallyScroll="False"
+                                    CanVerticallyScroll="False"
+                                    Content="{TemplateBinding Content}"
+                                    ContentTemplate="{TemplateBinding ContentTemplate}" />
+                            </AdornerDecorator>
+                            
                             <ScrollBar
                                 x:Name="PART_VerticalScrollBar"
                                 Grid.Row="0"
@@ -196,14 +199,17 @@
                                 Grid.Column="0"
                                 Grid.ColumnSpan="2"
                                 Padding="{TemplateBinding Padding}">
-                                <ScrollContentPresenter
-                                    x:Name="PART_ScrollContentPresenter"
-                                    Margin="{TemplateBinding chelper:TextControlContentHostHelper.ContentPresenterMargin}"
-                                    CanContentScroll="{TemplateBinding CanContentScroll}"
-                                    CanHorizontallyScroll="False"
-                                    CanVerticallyScroll="False"
-                                    Content="{TemplateBinding Content}"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}" />
+
+                                <AdornerDecorator>
+                                    <ScrollContentPresenter
+                                        x:Name="PART_ScrollContentPresenter"
+                                        Margin="{TemplateBinding chelper:TextControlContentHostHelper.ContentPresenterMargin}"
+                                        CanContentScroll="{TemplateBinding CanContentScroll}"
+                                        CanHorizontallyScroll="False"
+                                        CanVerticallyScroll="False"
+                                        Content="{TemplateBinding Content}"
+                                        ContentTemplate="{TemplateBinding ContentTemplate}" />
+                                </AdornerDecorator>
                             </Border>
                             <ScrollBar
                                 x:Name="PART_VerticalScrollBar"
@@ -235,10 +241,12 @@
 
     <ControlTemplate x:Key="ScrollViewerScrollBarlessTemplate" TargetType="ScrollViewer">
         <Grid Background="{TemplateBinding Background}">
-            <ScrollContentPresenter
+            <AdornerDecorator>
+                <ScrollContentPresenter
                 x:Name="ScrollContentPresenter"
                 Margin="{TemplateBinding Padding}"
                 ContentTemplate="{TemplateBinding ContentTemplate}" />
+            </AdornerDecorator>
         </Grid>
     </ControlTemplate>
 
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Controls/TreeView.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Controls/TreeView.xaml
index 65a1308f..a94a8117 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/Controls/TreeView.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/Controls/TreeView.xaml
@@ -42,6 +42,7 @@
         <Setter Property="chelper:ControlHelper.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="FocusVisualStyle" Value="{DynamicResource {x:Static SystemParameters.FocusVisualStyleKey}}" />
         <Setter Property="chelper:FocusVisualHelper.UseSystemFocusVisuals" Value="{DynamicResource UseSystemFocusVisuals}" />
+        <Setter Property="chelper:FocusVisualHelper.FocusVisualMargin" Value="0,-1,0,-1" />
         <Setter Property="chelper:TreeViewItemHelper.IsEnabled" Value="True" />
         <Setter Property="chelper:TreeViewItemHelper.GlyphBrush" Value="{DynamicResource TreeViewItemForeground}" />
         <Setter Property="Template">
@@ -53,6 +54,9 @@
                             <RowDefinition />
                         </Grid.RowDefinitions>
                         <Border
+                            chelper:FocusVisualHelper.IsTemplateFocusTarget="True" 
+                            CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}">
+                            <Border
                             x:Name="ContentPresenterGrid"
                             Margin="{DynamicResource TreeViewItemPresenterMargin}"
                             Padding="{DynamicResource TreeViewItemPresenterPadding}"
@@ -164,6 +168,7 @@
                                 </Border>
                             </Grid>
                         </Border>
+                        </Border>
                         <ItemsPresenter x:Name="ItemsHost" Grid.Row="1" />
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
@@ -325,6 +330,7 @@
     <Style BasedOn="{StaticResource DefaultTreeViewItemStyle}" TargetType="TreeViewItem" />
 
     <Style x:Key="DefaultTreeViewStyle" TargetType="TreeView">
+        <Setter Property="IsTabStop" Value="False" />
         <Setter Property="OverridesDefaultStyle" Value="True" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Generic.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Generic.xaml
index d0b3f35e..09fd36e4 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/Generic.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/Generic.xaml
@@ -4,6 +4,7 @@
                     xmlns:common="clr-namespace:iNKORE.UI.WPF.Modern.Common"
                     xmlns:converters="clr-namespace:iNKORE.UI.WPF.Modern.Common.Converters"
                     xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
+                    xmlns:helpers="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Helpers"
                     xmlns:primitives="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Primitives">
 
     <ResourceDictionary.MergedDictionaries>
@@ -27,6 +28,7 @@
 
     <Style TargetType="ui:ElevationBorder">
         <Setter Property="Focusable" Value="False"/>
+        <Setter Property="helpers:FocusVisualHelper.UseSystemFocusVisuals" Value="{DynamicResource UseSystemFocusVisuals}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ui:ElevationBorder">
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Schemes/Dark.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Schemes/Dark.xaml
index 989c4765..09aabfd9 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/Schemes/Dark.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/Schemes/Dark.xaml
@@ -2666,7 +2666,7 @@
 
     <Thickness x:Key="TreeViewItemBorderThemeThickness">0</Thickness>
     <Thickness x:Key="TreeViewItemPresenterMargin">4,2</Thickness>
-    <Thickness x:Key="TreeViewItemPresenterPadding">0,3,0,3</Thickness>
+    <Thickness x:Key="TreeViewItemPresenterPadding">0,5,0,5</Thickness>
     <Thickness x:Key="TreeViewItemMultiSelectSelectedItemBorderMargin">0</Thickness>
     <sys:Double x:Key="TreeViewItemMinHeight">28</sys:Double>
     <sys:Double x:Key="TreeViewItemMultiSelectCheckBoxMinHeight">28</sys:Double>
@@ -2702,15 +2702,18 @@
                     <Border
                         BorderBrush="{TemplateBinding chelper:FocusVisualHelper.FocusVisualPrimaryBrush}"
                         BorderThickness="{TemplateBinding chelper:FocusVisualHelper.FocusVisualPrimaryThickness}"
-                        SnapsToDevicePixels="True">
-                        <Border BorderBrush="{TemplateBinding chelper:FocusVisualHelper.FocusVisualSecondaryBrush}" BorderThickness="{TemplateBinding chelper:FocusVisualHelper.FocusVisualSecondaryThickness}" />
+                        SnapsToDevicePixels="True"
+                        CornerRadius="{TemplateBinding chelper:FocusVisualHelper.FocusVisualPrimaryCornerRadius}">
+                        <Border CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
+                                BorderBrush="{TemplateBinding chelper:FocusVisualHelper.FocusVisualSecondaryBrush}" 
+                                BorderThickness="{TemplateBinding chelper:FocusVisualHelper.FocusVisualSecondaryThickness}" />
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style x:Key="{x:Static SystemParameters.FocusVisualStyleKey}" BasedOn="{m:StaticColor HighVisibilityFocusVisual}" />
+    <Style x:Key="{x:Static SystemParameters.FocusVisualStyleKey}" BasedOn="{StaticResource HighVisibilityFocusVisual}" />
 
     
     <!--Resources for SettingsCard-->
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Schemes/HighContrast.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Schemes/HighContrast.xaml
index d1999fa8..033f5985 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/Schemes/HighContrast.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/Schemes/HighContrast.xaml
@@ -2563,7 +2563,7 @@
 
     <Thickness x:Key="TreeViewItemBorderThemeThickness">1</Thickness>
     <Thickness x:Key="TreeViewItemPresenterMargin">4,2</Thickness>
-    <Thickness x:Key="TreeViewItemPresenterPadding">0,3,0,3</Thickness>
+    <Thickness x:Key="TreeViewItemPresenterPadding">0,5,0,5</Thickness>
     <Thickness x:Key="TreeViewItemMultiSelectSelectedItemBorderMargin">1</Thickness>
     <sys:Double x:Key="TreeViewItemMinHeight">28</sys:Double>
     <sys:Double x:Key="TreeViewItemMultiSelectCheckBoxMinHeight">28</sys:Double>
@@ -2643,16 +2643,19 @@
             <Setter.Value>
                 <ControlTemplate>
                     <Border
-                        BorderBrush="{m:StaticColor SystemControlFocusVisualPrimaryBrush}"
-                        BorderThickness="2"
-                        SnapsToDevicePixels="True">
-                        <Border BorderBrush="{m:StaticColor SystemControlFocusVisualSecondaryBrush}" BorderThickness="1" />
+                        BorderBrush="{TemplateBinding chelper:FocusVisualHelper.FocusVisualPrimaryBrush}"
+                        BorderThickness="{TemplateBinding chelper:FocusVisualHelper.FocusVisualPrimaryThickness}"
+                        SnapsToDevicePixels="True"
+                        CornerRadius="{TemplateBinding chelper:FocusVisualHelper.FocusVisualPrimaryCornerRadius}">
+                        <Border CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
+                                BorderBrush="{TemplateBinding chelper:FocusVisualHelper.FocusVisualSecondaryBrush}" 
+                                BorderThickness="{TemplateBinding chelper:FocusVisualHelper.FocusVisualSecondaryThickness}" />
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style x:Key="{x:Static SystemParameters.FocusVisualStyleKey}" BasedOn="{m:StaticColor HighVisibilityFocusVisual}" />
+    <Style x:Key="{x:Static SystemParameters.FocusVisualStyleKey}" BasedOn="{StaticResource HighVisibilityFocusVisual}" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Schemes/Light.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Schemes/Light.xaml
index 9927217e..bff6a903 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/Schemes/Light.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/Schemes/Light.xaml
@@ -2682,7 +2682,7 @@
 
     <Thickness x:Key="TreeViewItemBorderThemeThickness">0</Thickness>
     <Thickness x:Key="TreeViewItemPresenterMargin">4,2</Thickness>
-    <Thickness x:Key="TreeViewItemPresenterPadding">0,3,0,3</Thickness>
+    <Thickness x:Key="TreeViewItemPresenterPadding">0,5,0,5</Thickness>
     <Thickness x:Key="TreeViewItemMultiSelectSelectedItemBorderMargin">0</Thickness>
     <sys:Double x:Key="TreeViewItemMinHeight">28</sys:Double>
     <sys:Double x:Key="TreeViewItemMultiSelectCheckBoxMinHeight">28</sys:Double>
@@ -2763,15 +2763,18 @@
                     <Border
                         BorderBrush="{TemplateBinding chelper:FocusVisualHelper.FocusVisualPrimaryBrush}"
                         BorderThickness="{TemplateBinding chelper:FocusVisualHelper.FocusVisualPrimaryThickness}"
-                        SnapsToDevicePixels="True">
-                        <Border BorderBrush="{TemplateBinding chelper:FocusVisualHelper.FocusVisualSecondaryBrush}" BorderThickness="{TemplateBinding chelper:FocusVisualHelper.FocusVisualSecondaryThickness}" />
+                        SnapsToDevicePixels="True"
+                        CornerRadius="{TemplateBinding chelper:FocusVisualHelper.FocusVisualPrimaryCornerRadius}">
+                        <Border CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
+                                BorderBrush="{TemplateBinding chelper:FocusVisualHelper.FocusVisualSecondaryBrush}" 
+                                BorderThickness="{TemplateBinding chelper:FocusVisualHelper.FocusVisualSecondaryThickness}" />
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style x:Key="{x:Static SystemParameters.FocusVisualStyleKey}" BasedOn="{m:StaticColor HighVisibilityFocusVisual}" />
+    <Style x:Key="{x:Static SystemParameters.FocusVisualStyleKey}" BasedOn="{StaticResource HighVisibilityFocusVisual}" />
     
     <!--Project Badge-->
     <Color x:Key="BrandAccentLight">#947EEC</Color>
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/ThemeResources.xaml b/source/iNKORE.UI.WPF.Modern/Themes/ThemeResources.xaml
index f0fd67cf..75e00474 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/ThemeResources.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/ThemeResources.xaml
@@ -549,6 +549,7 @@
     <!--  Resources for LoopingSelector  -->
     <sys:Double x:Key="LoopingSelectorUpDownButtonHeight">34</sys:Double>
     <sys:Double x:Key="LoopingSelectorUpDownButtonScalePressed">0.875</sys:Double>
+    <sys:Double x:Key="LoopingSelectorMaxHeight">354</sys:Double>
 
     <Thickness x:Key="LoopingSelectorItemMargin">4,2,4,2</Thickness>
     <Thickness x:Key="LoopingSelectorUpDownButtonMargin">0</Thickness>