diff --git a/Screenbox/Controls/CustomNavigationView.cs b/Screenbox/Controls/CustomNavigationView.cs
deleted file mode 100644
index 16bafd21a..000000000
--- a/Screenbox/Controls/CustomNavigationView.cs
+++ /dev/null
@@ -1,207 +0,0 @@
-#nullable enable
-
-using CommunityToolkit.WinUI;
-using CommunityToolkit.WinUI.Animations;
-using System;
-using System.Numerics;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Input;
-using NavigationView = Microsoft.UI.Xaml.Controls.NavigationView;
-using NavigationViewDisplayMode = Microsoft.UI.Xaml.Controls.NavigationViewDisplayMode;
-
-namespace Screenbox.Controls
-{
-    public sealed class CustomNavigationView : NavigationView
-    {
-        public static readonly DependencyProperty OverlayContentProperty = DependencyProperty.Register(
-            nameof(OverlayContent),
-            typeof(UIElement),
-            typeof(CustomNavigationView),
-            new PropertyMetadata(null, OnOverlayContentChanged));
-
-        public static readonly DependencyProperty OverlayZIndexProperty = DependencyProperty.Register(
-            nameof(OverlayZIndex),
-            typeof(int),
-            typeof(CustomNavigationView),
-            new PropertyMetadata(0, OnOverlayZIndexChanged));
-
-        public static readonly DependencyProperty ContentVisibilityProperty = DependencyProperty.Register(
-            nameof(ContentVisibility),
-            typeof(Visibility),
-            typeof(CustomNavigationView),
-            new PropertyMetadata(Visibility.Visible, OnContentVisibilityChanged));
-
-        /// <summary>
-        /// Visibility of everything except the overlay element.
-        /// </summary>
-        public Visibility ContentVisibility
-        {
-            get => (Visibility)GetValue(ContentVisibilityProperty);
-            set => SetValue(ContentVisibilityProperty, value);
-        }
-
-        /// <summary>
-        /// Canvas.ZIndex of the overlay element. Set a value above 1 to render on top of the nav pane. Default is 0.
-        /// </summary>
-        public int OverlayZIndex
-        {
-            get => (int)GetValue(OverlayZIndexProperty);
-            set => SetValue(OverlayZIndexProperty, value);
-        }
-
-        /// <summary>
-        /// Content of the overlay element that has the same level with the nav pane.
-        /// </summary>
-        public UIElement? OverlayContent
-        {
-            get => (UIElement?)GetValue(OverlayContentProperty);
-            set => SetValue(OverlayContentProperty, value);
-        }
-
-        private readonly Border _overlayRoot;
-        private Border? _contentBackground;
-        private SplitView? _splitView;
-        private Grid? _paneToggleButtonGrid;
-        private Grid? _contentGrid;
-        private Grid? _paneContentGrid;
-
-        public CustomNavigationView()
-        {
-            Loaded += OnLoaded;
-
-            Border overlayRoot = new()
-            {
-                Name = "OverlayRoot"
-            };
-            overlayRoot.Tapped += OverlayRootOnTapped;
-            overlayRoot.SetValue(Grid.ColumnProperty, 0);
-            overlayRoot.SetValue(Grid.ColumnSpanProperty, 2);
-            _overlayRoot = overlayRoot;
-        }
-
-        protected override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-            _splitView = (SplitView?)GetTemplateChild("RootSplitView");
-            _paneToggleButtonGrid = (Grid?)GetTemplateChild("PaneToggleButtonGrid");
-            _contentGrid = (Grid?)GetTemplateChild("ContentGrid");
-            _paneContentGrid = (Grid?)GetTemplateChild("PaneContentGrid");
-            Grid? shadowCaster = (Grid?)GetTemplateChild("ShadowCaster");
-            if (shadowCaster != null)
-            {
-                shadowCaster.Translation = new Vector3(0, 0, 32);
-            }
-
-            SetContentVisibility(ContentVisibility);
-
-            // Set implicit animations to play when ContentVisibility changes
-            _paneToggleButtonGrid?.SetValue(Implicit.ShowAnimationsProperty, GetShowAnimations());
-            _paneToggleButtonGrid?.SetValue(Implicit.HideAnimationsProperty, GetHideAnimations());
-            _contentGrid?.SetValue(Implicit.ShowAnimationsProperty, GetShowAnimations());
-            _contentGrid?.SetValue(Implicit.HideAnimationsProperty, GetHideAnimations());
-
-            // Don't set implicit animations on _paneContentGrid because of conflict with base NavView
-            // _paneContentGrid?.SetValue(Implicit.ShowAnimationsProperty, GetShowAnimations());
-            // _paneContentGrid?.SetValue(Implicit.HideAnimationsProperty, GetHideAnimations());
-        }
-
-        protected override void OnKeyDown(KeyRoutedEventArgs e)
-        {
-            if (ContentVisibility == Visibility.Visible)
-            {
-                base.OnKeyDown(e);
-            }
-        }
-
-        private void OnLoaded(object sender, RoutedEventArgs e)
-        {
-            if (_splitView?.FindDescendant<Grid>() is { } splitViewGrid)
-            {
-                splitViewGrid.Children.Add(_overlayRoot);
-            }
-
-            if (_splitView?.FindDescendant<Border>(b => b.Name == "ContentBackground") is { } contentBackground)
-            {
-                _contentBackground = contentBackground;
-                contentBackground.SetValue(Implicit.ShowAnimationsProperty, GetShowAnimations());
-                contentBackground.SetValue(Implicit.HideAnimationsProperty, GetHideAnimations());
-            }
-        }
-
-        private void OverlayRootOnTapped(object sender, TappedRoutedEventArgs e)
-        {
-            if (DisplayMode != NavigationViewDisplayMode.Expanded && IsPaneOpen)
-            {
-                IsPaneOpen = false;
-            }
-        }
-
-        private void SetContentVisibility(Visibility visibility)
-        {
-            if (_paneToggleButtonGrid != null)
-            {
-                _paneToggleButtonGrid.Visibility = visibility;
-            }
-
-            if (_contentGrid != null)
-            {
-                _contentGrid.Visibility = visibility;
-            }
-
-            if (_paneContentGrid != null)
-            {
-                _paneContentGrid.Visibility = visibility;
-            }
-
-            if (_contentBackground != null)
-            {
-                _contentBackground.Visibility = visibility;
-            }
-        }
-
-        private static void OnContentVisibilityChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            CustomNavigationView view = (CustomNavigationView)d;
-            view.SetContentVisibility((Visibility)e.NewValue);
-        }
-
-        private static void OnOverlayContentChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            CustomNavigationView view = (CustomNavigationView)d;
-            view._overlayRoot.Child = (UIElement)e.NewValue;
-        }
-
-        private static void OnOverlayZIndexChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            CustomNavigationView view = (CustomNavigationView)d;
-            Canvas.SetZIndex(view._overlayRoot, (int)e.NewValue);
-        }
-
-        private static ImplicitAnimationSet GetShowAnimations()
-        {
-            return new ImplicitAnimationSet
-            {
-                new OpacityAnimation
-                {
-                    Duration = TimeSpan.FromSeconds(0.3),
-                    From = 0,
-                    To = 1
-                }
-            };
-        }
-
-        private static ImplicitAnimationSet GetHideAnimations()
-        {
-            return new ImplicitAnimationSet
-            {
-                new OpacityAnimation
-                {
-                    Duration = TimeSpan.FromSeconds(0.3),
-                    From = 1,
-                    To = 0
-                }
-            };
-        }
-    }
-}
diff --git a/Screenbox/Controls/Interactions/NavigationViewKeyboardBehavior.cs b/Screenbox/Controls/Interactions/NavigationViewKeyboardBehavior.cs
deleted file mode 100644
index 690376a66..000000000
--- a/Screenbox/Controls/Interactions/NavigationViewKeyboardBehavior.cs
+++ /dev/null
@@ -1,239 +0,0 @@
-using CommunityToolkit.WinUI;
-using CommunityToolkit.WinUI.Behaviors;
-using Windows.System;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Input;
-
-namespace Screenbox.Controls.Interactions;
-
-/// <summary>
-/// A behavior that improves the keyboard interaction of the <see cref="Microsoft.UI.Xaml.Controls.NavigationView"/> built-in elements.
-/// </summary>
-internal class NavigationViewKeyboardBehavior : BehaviorBase<Microsoft.UI.Xaml.Controls.NavigationView>
-{
-    ///// <summary>
-    ///// Identifies the <see cref="BackButtonAccessKey"/> dependency property.
-    ///// </summary>
-    //public static readonly DependencyProperty BackButtonAccessKeyProperty = DependencyProperty.Register(
-    //    nameof(BackButtonAccessKey), typeof(string), typeof(NavigationViewKeyboardBehavior), new PropertyMetadata(null));
-
-    ///// <summary>
-    ///// Gets or sets the access key of the back button.
-    ///// </summary>
-    //public string BackButtonAccessKey
-    //{
-    //    get => (string)GetValue(BackButtonAccessKeyProperty);
-    //    set => SetValue(BackButtonAccessKeyProperty, value);
-    //}
-
-    ///// <summary>
-    ///// Identifies the <see cref="BackButtonKeyTipPlacementMode"/> dependency property.
-    ///// </summary>
-    //public static readonly DependencyProperty BackButtonKeyTipPlacementModeProperty = DependencyProperty.Register(
-    //    nameof(BackButtonKeyTipPlacementMode), typeof(KeyTipPlacementMode), typeof(NavigationViewKeyboardBehavior), new PropertyMetadata(default(KeyTipPlacementMode)));
-
-    ///// <summary>
-    ///// Gets or sets where the key tip is placed in relation to the boundary of the back button.
-    ///// </summary>
-    //public KeyTipPlacementMode BackButtonKeyTipPlacementMode
-    //{
-    //    get => (KeyTipPlacementMode)GetValue(BackButtonKeyTipPlacementModeProperty);
-    //    set => SetValue(BackButtonKeyTipPlacementModeProperty, value);
-    //}
-
-    ///// <summary>
-    ///// Identifies the <see cref="CloseButtonAccessKey"/> dependency property.
-    ///// </summary>
-    //public static readonly DependencyProperty CloseButtonAccessKeyProperty = DependencyProperty.Register(
-    //    nameof(CloseButtonAccessKey), typeof(string), typeof(NavigationViewKeyboardBehavior), new PropertyMetadata(null));
-
-    ///// <summary>
-    ///// Gets or sets the access key of the close button.
-    ///// </summary>
-    //public string CloseButtonAccessKey
-    //{
-    //    get => (string)GetValue(CloseButtonAccessKeyProperty);
-    //    set => SetValue(CloseButtonAccessKeyProperty, value);
-    //}
-
-    ///// <summary>
-    ///// Identifies the <see cref="CloseButtonKeyTipPlacementMode"/> dependency property.
-    ///// </summary>
-    //public static readonly DependencyProperty CloseButtonKeyTipPlacementModeProperty = DependencyProperty.Register(
-    //    nameof(CloseButtonKeyTipPlacementMode), typeof(KeyTipPlacementMode), typeof(NavigationViewKeyboardBehavior), new PropertyMetadata(default(KeyTipPlacementMode)));
-
-    ///// <summary>
-    ///// Gets or sets where the key tip is placed in relation to the boundary of the close button.
-    ///// </summary>
-    //public KeyTipPlacementMode CloseButtonKeyTipPlacementMode
-    //{
-    //    get => (KeyTipPlacementMode)GetValue(CloseButtonKeyTipPlacementModeProperty);
-    //    set => SetValue(CloseButtonKeyTipPlacementModeProperty, value);
-    //}
-
-    ///// <summary>
-    ///// Identifies the <see cref="TogglePaneButtonAccessKey"/> dependency property.
-    ///// </summary>
-    //public static readonly DependencyProperty TogglePaneButtonAccessKeyProperty = DependencyProperty.Register(
-    //    nameof(TogglePaneButtonAccessKey), typeof(string), typeof(NavigationViewKeyboardBehavior), new PropertyMetadata(null));
-
-    ///// <summary>
-    ///// Gets or sets the access key of the menu toggle button.
-    ///// </summary>
-    //public string TogglePaneButtonAccessKey
-    //{
-    //    get => (string)GetValue(TogglePaneButtonAccessKeyProperty);
-    //    set => SetValue(TogglePaneButtonAccessKeyProperty, value);
-    //}
-
-    ///// <summary>
-    ///// Identifies the <see cref="TogglePaneButtonKeyTipPlacementMode"/> dependency property.
-    ///// </summary>
-    //public static readonly DependencyProperty TogglePaneButtonKeyTipPlacementModeProperty = DependencyProperty.Register(
-    //    nameof(TogglePaneButtonKeyTipPlacementMode), typeof(KeyTipPlacementMode), typeof(NavigationViewKeyboardBehavior), new PropertyMetadata(default(KeyTipPlacementMode)));
-
-    ///// <summary>
-    ///// Gets or sets where the key tip is placed in relation to the boundary of the menu toggle button.
-    ///// </summary>
-    //public KeyTipPlacementMode TogglePaneButtonKeyTipPlacementMode
-    //{
-    //    get => (KeyTipPlacementMode)GetValue(TogglePaneButtonKeyTipPlacementModeProperty);
-    //    set => SetValue(TogglePaneButtonKeyTipPlacementModeProperty, value);
-    //}
-
-    ///// <summary>
-    ///// Identifies the <see cref="TogglePaneButtonKeyboardAcceleratorKey"/> dependency property.
-    ///// </summary>
-    //public static readonly DependencyProperty TogglePaneButtonKeyboardAcceleratorKeyProperty = DependencyProperty.Register(
-    //    nameof(TogglePaneButtonKeyboardAcceleratorKey), typeof(VirtualKey), typeof(NavigationViewKeyboardBehavior), new PropertyMetadata(null));
-
-    ///// <summary>
-    ///// Gets or sets the virtual key for the keyboard accelerator of the menu toggle button.
-    ///// </summary>
-    //public VirtualKey TogglePaneButtonKeyboardAcceleratorKey
-    //{
-    //    get => (VirtualKey)GetValue(TogglePaneButtonKeyboardAcceleratorKeyProperty);
-    //    set => SetValue(TogglePaneButtonKeyboardAcceleratorKeyProperty, value);
-    //}
-
-    ///// <summary>
-    ///// Identifies the <see cref="TogglePaneButtonKeyboardAcceleratorModifiers"/> dependency property.
-    ///// </summary>
-    //public static readonly DependencyProperty TogglePaneButtonKeyboardAcceleratorModifiersProperty = DependencyProperty.Register(
-    //    nameof(TogglePaneButtonKeyboardAcceleratorModifiers), typeof(VirtualKeyModifiers), typeof(NavigationViewKeyboardBehavior), new PropertyMetadata(null));
-
-    ///// <summary>
-    ///// Gets or sets the virtual key to modify another keypress for the keyboard accelerator of the menu toggle button.
-    ///// </summary>
-    //public VirtualKeyModifiers TogglePaneButtonKeyboardAcceleratorModifiers
-    //{
-    //    get => (VirtualKeyModifiers)GetValue(TogglePaneButtonKeyboardAcceleratorModifiersProperty);
-    //    set => SetValue(TogglePaneButtonKeyboardAcceleratorModifiersProperty, value);
-    //}
-
-    ///// <summary>
-    ///// Identifies the <see cref="PaneAutoSuggestButtonAccessKey"/> dependency property.
-    ///// </summary>
-    //public static readonly DependencyProperty PaneAutoSuggestButtonAccessKeyProperty = DependencyProperty.Register(
-    //    nameof(PaneAutoSuggestButtonAccessKey), typeof(string), typeof(NavigationViewKeyboardBehavior), new PropertyMetadata(null));
-
-    ///// <summary>
-    ///// Gets or sets the access key of the auto-suggest button.
-    ///// </summary>
-    //public string PaneAutoSuggestButtonAccessKey
-    //{
-    //    get => (string)GetValue(PaneAutoSuggestButtonAccessKeyProperty);
-    //    set => SetValue(PaneAutoSuggestButtonAccessKeyProperty, value);
-    //}
-
-    ///// <summary>
-    ///// Identifies the <see cref="PaneAutoSuggestButtonKeyTipPlacementMode"/> dependency property.
-    ///// </summary>
-    //public static readonly DependencyProperty PaneAutoSuggestButtonKeyTipPlacementModeProperty = DependencyProperty.Register(
-    //    nameof(PaneAutoSuggestButtonKeyTipPlacementMode), typeof(KeyTipPlacementMode), typeof(NavigationViewKeyboardBehavior), new PropertyMetadata(default(KeyTipPlacementMode)));
-
-    ///// <summary>
-    ///// Gets or sets where the key tip is placed in relation to the boundary of the auto-suggest button.
-    ///// </summary>
-    //public KeyTipPlacementMode PaneAutoSuggestButtonKeyTipPlacementMode
-    //{
-    //    get => (KeyTipPlacementMode)GetValue(PaneAutoSuggestButtonKeyTipPlacementModeProperty);
-    //    set => SetValue(PaneAutoSuggestButtonKeyTipPlacementModeProperty, value);
-    //}
-
-    ///// <summary>
-    ///// Identifies the <see cref="PaneAutoSuggestButtonKeyboardAcceleratorKey"/> dependency property.
-    ///// </summary>
-    //public static readonly DependencyProperty PaneAutoSuggestButtonKeyboardAcceleratorKeyProperty = DependencyProperty.Register(
-    //    nameof(PaneAutoSuggestButtonKeyboardAcceleratorKey), typeof(VirtualKey), typeof(NavigationViewKeyboardBehavior), new PropertyMetadata(null));
-
-    ///// <summary>
-    ///// Gets or sets the virtual key for the keyboard accelerator of the auto-suggest button.
-    ///// </summary>
-    //public VirtualKey PaneAutoSuggestButtonKeyboardAcceleratorKey
-    //{
-    //    get => (VirtualKey)GetValue(PaneAutoSuggestButtonKeyboardAcceleratorKeyProperty);
-    //    set => SetValue(PaneAutoSuggestButtonKeyboardAcceleratorKeyProperty, value);
-    //}
-
-    ///// <summary>
-    ///// Identifies the <see cref="PaneAutoSuggestButtonKeyboardAcceleratorModifiers"/> dependency property.
-    ///// </summary>
-    //public static readonly DependencyProperty PaneAutoSuggestButtonKeyboardAcceleratorModifiersProperty = DependencyProperty.Register(
-    //    nameof(PaneAutoSuggestButtonKeyboardAcceleratorModifiers), typeof(VirtualKeyModifiers), typeof(NavigationViewKeyboardBehavior), new PropertyMetadata(null));
-
-    ///// <summary>
-    ///// Gets or sets the virtual key to modify another keypress for the keyboard accelerator of the auto-suggest button.
-    ///// </summary>
-    //public VirtualKeyModifiers PaneAutoSuggestButtonKeyboardAcceleratorModifiers
-    //{
-    //    get => (VirtualKeyModifiers)GetValue(PaneAutoSuggestButtonKeyboardAcceleratorModifiersProperty);
-    //    set => SetValue(PaneAutoSuggestButtonKeyboardAcceleratorModifiersProperty, value);
-    //}
-
-    private readonly string _backButtonAccessKey = Strings.KeyboardResources.NavigationBackButtonKey;
-    private readonly string _closeButtonAccessKey = Strings.KeyboardResources.NavigationCloseButtonKey;
-    private readonly string _togglePaneButtonAccessKey = Strings.KeyboardResources.NavigationTogglePaneButtonKey;
-    private readonly string _paneAutoSuggestButtonAccessKey = Strings.KeyboardResources.NavigationPaneAutoSuggestButtonKey;
-
-    private const KeyTipPlacementMode RightAccessKeyPlacement = KeyTipPlacementMode.Right;
-    private const KeyTipPlacementMode BottomAccessKeyPlacement = KeyTipPlacementMode.Bottom;
-
-    private const VirtualKey TogglePaneKeyboardAcceleratorKey = VirtualKey.E;
-    private const VirtualKey PaneAutoSuggestKeyboardAcceleratorKey = VirtualKey.F;
-    private const VirtualKeyModifiers CtrlKeyboardAcceleratorModifier = VirtualKeyModifiers.Control;
-
-    protected override void OnAssociatedObjectLoaded()
-    {
-        base.OnAssociatedObjectLoaded();
-
-        if (AssociatedObject.FindDescendant<Button>(bb => bb.Name == "NavigationViewBackButton") is { } navigationViewBackButton)
-        {
-            navigationViewBackButton.AccessKey = _backButtonAccessKey;
-            navigationViewBackButton.KeyTipPlacementMode = RightAccessKeyPlacement;
-        }
-
-        if (AssociatedObject.FindDescendant<Button>(cb => cb.Name == "NavigationViewCloseButton") is { } navigationViewCloseButton)
-        {
-            navigationViewCloseButton.AccessKey = _closeButtonAccessKey;
-            navigationViewCloseButton.KeyTipPlacementMode = BottomAccessKeyPlacement;
-        }
-
-        if (AssociatedObject.FindDescendant<Button>(pb => pb.Name == "TogglePaneButton") is { } togglePaneButton)
-        {
-            togglePaneButton.AccessKey = _togglePaneButtonAccessKey;
-            togglePaneButton.KeyTipPlacementMode = RightAccessKeyPlacement;
-
-            togglePaneButton.KeyboardAccelerators.Add(new KeyboardAccelerator() { Modifiers = CtrlKeyboardAcceleratorModifier, Key = TogglePaneKeyboardAcceleratorKey });
-        }
-
-        if (AssociatedObject.FindDescendant<Button>(sb => sb.Name == "PaneAutoSuggestButton") is { } paneAutoSuggestButton)
-        {
-            paneAutoSuggestButton.AccessKey = _paneAutoSuggestButtonAccessKey;
-            paneAutoSuggestButton.KeyTipPlacementMode = RightAccessKeyPlacement;
-
-            paneAutoSuggestButton.KeyboardAccelerators.Add(new KeyboardAccelerator() { Modifiers = CtrlKeyboardAcceleratorModifier, Key = PaneAutoSuggestKeyboardAcceleratorKey });
-        }
-    }
-}
diff --git a/Screenbox/Controls/NavigationViewEx.Properties.cs b/Screenbox/Controls/NavigationViewEx.Properties.cs
new file mode 100644
index 000000000..4afdc389d
--- /dev/null
+++ b/Screenbox/Controls/NavigationViewEx.Properties.cs
@@ -0,0 +1,324 @@
+#nullable enable
+
+using System.Collections.Generic;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Input;
+
+namespace Screenbox.Controls;
+
+public sealed partial class NavigationViewEx
+{
+    /// <summary>
+    /// Identifies the <see cref="Overlay"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty OverlayProperty = DependencyProperty.Register(
+        nameof(Overlay), typeof(UIElement), typeof(NavigationViewEx), new PropertyMetadata(null, OnOverlayPropertyChanged));
+
+    /// <summary>
+    /// Gets or sets the content to be displayed as an overlay. By default, the overlay appears
+    /// between the <see cref="Windows.UI.Xaml.Controls.SplitView"/> pane and the content area, but its order can be adjusted.
+    /// </summary>
+    public UIElement? Overlay
+    {
+        get => (UIElement?)GetValue(OverlayProperty);
+        set => SetValue(OverlayProperty, value);
+    }
+
+    /// <summary>
+    /// Identifies the <see cref="OverlayZIndex"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty OverlayZIndexProperty = DependencyProperty.Register(
+        nameof(OverlayZIndex), typeof(int), typeof(NavigationViewEx), new PropertyMetadata(0, OnOverlayZIndexPropertyChanged));
+
+    /// <summary>
+    /// Gets or sets the Z-order of the overlay element.
+    /// </summary>
+    /// <value>The ZIndex value in the range ±1,000,000. The default is 0.</value>
+    /// <remarks>
+    /// Values above 1 will render the element above the navigation pane,
+    /// and values below -1 renders the element below the main content.
+    /// </remarks>
+    public int OverlayZIndex
+    {
+        get => (int)GetValue(OverlayZIndexProperty);
+        set => SetValue(OverlayZIndexProperty, value);
+    }
+
+    /// <summary>
+    /// Identifies the <see cref="ContentVisibility"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty ContentVisibilityProperty = DependencyProperty.Register(
+        nameof(ContentVisibility), typeof(Visibility), typeof(NavigationViewEx), new PropertyMetadata(Visibility.Visible, OnContentVisibilityPropertyChanged));
+
+    /// <summary>
+    /// Gets or sets the visibility of everything except the overlay element.
+    /// </summary>
+    public Visibility ContentVisibility
+    {
+        get => (Visibility)GetValue(ContentVisibilityProperty);
+        set => SetValue(ContentVisibilityProperty, value);
+    }
+
+    /// <summary>
+    /// Identifies the <see cref="BackButtonAccessKey"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty BackButtonAccessKeyProperty = DependencyProperty.Register(
+        nameof(BackButtonAccessKey), typeof(string), typeof(NavigationViewEx), new PropertyMetadata(null));
+
+    /// <summary>
+    /// Gets or sets the access key (mnemonic) for the back button.
+    /// </summary>
+    public string? BackButtonAccessKey
+    {
+        get => (string?)GetValue(BackButtonAccessKeyProperty);
+        set => SetValue(BackButtonAccessKeyProperty, value);
+    }
+
+    /// <summary>
+    /// Identifies the <see cref="BackButtonKeyboardAccelerators"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty BackButtonKeyboardAcceleratorsProperty = DependencyProperty.Register(
+        nameof(BackButtonKeyboardAccelerators), typeof(IList<KeyboardAccelerator>), typeof(NavigationViewEx), new PropertyMetadata(new List<KeyboardAccelerator>()));
+
+    /// <summary>
+    /// Gets or sets the collection of keyboard combinations for the back button.
+    /// </summary>
+    public IList<KeyboardAccelerator>? BackButtonKeyboardAccelerators
+    {
+        get => (IList<KeyboardAccelerator>?)GetValue(BackButtonKeyboardAcceleratorsProperty);
+        set => SetValue(BackButtonKeyboardAcceleratorsProperty, value);
+    }
+
+    /// <summary>
+    /// Identifies the <see cref="BackButtonStyle"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty BackButtonStyleProperty = DependencyProperty.Register(
+        nameof(BackButtonStyle), typeof(Style), typeof(NavigationViewEx), new PropertyMetadata(null, OnBackButtonStylePropertyChanged));
+
+    /// <summary>
+    /// Gets or sets the style that defines the look of the back button.
+    /// </summary>
+    public Style? BackButtonStyle
+    {
+        get => (Style?)GetValue(BackButtonStyleProperty);
+        set => SetValue(BackButtonStyleProperty, value);
+    }
+
+    /// <summary>
+    /// Identifies the <see cref="CloseButtonAccessKey"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty CloseButtonAccessKeyProperty = DependencyProperty.Register(
+        nameof(CloseButtonAccessKey), typeof(string), typeof(NavigationViewEx), new PropertyMetadata(null));
+
+    /// <summary>
+    /// Gets or sets the access key (mnemonic) for the close button.
+    /// </summary>
+    public string? CloseButtonAccessKey
+    {
+        get => (string?)GetValue(CloseButtonAccessKeyProperty);
+        set => SetValue(CloseButtonAccessKeyProperty, value);
+    }
+
+    /// <summary>
+    /// Identifies the <see cref="CloseButtonKeyboardAccelerators"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty CloseButtonKeyboardAcceleratorsProperty = DependencyProperty.Register(
+        nameof(CloseButtonKeyboardAccelerators), typeof(IList<KeyboardAccelerator>), typeof(NavigationViewEx), new PropertyMetadata(new List<KeyboardAccelerator>()));
+
+    /// <summary>
+    /// Gets or sets the collection of keyboard combinations for the close button.
+    /// </summary>
+    public IList<KeyboardAccelerator>? CloseButtonKeyboardAccelerators
+    {
+        get => (IList<KeyboardAccelerator>?)GetValue(CloseButtonKeyboardAcceleratorsProperty);
+        set => SetValue(CloseButtonKeyboardAcceleratorsProperty, value);
+    }
+
+    /// <summary>
+    /// Identifies the <see cref="PaneToggleButtonAccessKey"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty PaneToggleButtonAccessKeyProperty = DependencyProperty.Register(
+        nameof(PaneToggleButtonAccessKey), typeof(string), typeof(NavigationViewEx), new PropertyMetadata(null));
+
+    /// <summary>
+    /// Gets or sets the access key (mnemonic) for the menu toggle button.
+    /// </summary>
+    public string? PaneToggleButtonAccessKey
+    {
+        get => (string?)GetValue(PaneToggleButtonAccessKeyProperty);
+        set => SetValue(PaneToggleButtonAccessKeyProperty, value);
+    }
+
+    /// <summary>
+    /// Identifies the <see cref="PaneToggleButtonKeyboardAccelerators"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty PaneToggleButtonKeyboardAcceleratorsProperty = DependencyProperty.Register(
+        nameof(PaneToggleButtonKeyboardAccelerators), typeof(IList<KeyboardAccelerator>), typeof(NavigationViewEx), new PropertyMetadata(new List<KeyboardAccelerator>()));
+
+    /// <summary>
+    /// Gets or sets the collection of keyboard combinations for the menu toggle button.
+    /// </summary>
+    public IList<KeyboardAccelerator>? PaneToggleButtonKeyboardAccelerators
+    {
+        get => (IList<KeyboardAccelerator>?)GetValue(PaneToggleButtonKeyboardAcceleratorsProperty);
+        set => SetValue(PaneToggleButtonKeyboardAcceleratorsProperty, value);
+    }
+
+    /// <summary>
+    /// Identifies the <see cref="PaneSearchButtonAccessKey"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty PaneSearchButtonAccessKeyProperty = DependencyProperty.Register(
+        nameof(PaneSearchButtonAccessKey), typeof(string), typeof(NavigationViewEx), new PropertyMetadata(null));
+
+    /// <summary>
+    /// Gets or sets the access key (mnemonic) for the search button.
+    /// </summary>
+    public string? PaneSearchButtonAccessKey
+    {
+        get => (string?)GetValue(PaneSearchButtonAccessKeyProperty);
+        set => SetValue(PaneSearchButtonAccessKeyProperty, value);
+    }
+
+    /// <summary>
+    /// Identifies the <see cref="PaneSearchButtonKeyboardAccelerators"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty PaneSearchButtonKeyboardAcceleratorsProperty = DependencyProperty.Register(
+        nameof(PaneSearchButtonKeyboardAccelerators), typeof(IList<KeyboardAccelerator>), typeof(NavigationViewEx), new PropertyMetadata(new List<KeyboardAccelerator>()));
+
+    /// <summary>
+    /// Gets or sets the collection of keyboard combinations for the search button.
+    /// </summary>
+    public IList<KeyboardAccelerator>? PaneSearchButtonKeyboardAccelerators
+    {
+        get => (IList<KeyboardAccelerator>?)GetValue(PaneSearchButtonKeyboardAcceleratorsProperty);
+        set => SetValue(PaneSearchButtonKeyboardAcceleratorsProperty, value);
+    }
+
+    /// <summary>
+    /// Identifies the <see cref="PaneSearchButtonStyle"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty PaneSearchButtonStyleProperty = DependencyProperty.Register(
+        nameof(PaneSearchButtonStyle), typeof(Style), typeof(NavigationViewEx), new PropertyMetadata(null, OnPaneSearchButtonStylePropertyChanged));
+
+    /// <summary>
+    /// Gets or sets the style that defines the look of the search button.
+    /// </summary>
+    public Style? PaneSearchButtonStyle
+    {
+        get => (Style?)GetValue(PaneSearchButtonStyleProperty);
+        set => SetValue(PaneSearchButtonStyleProperty, value);
+    }
+
+    /// <summary>
+    /// Identifies the <see cref="SettingsItemAccessKey"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty SettingsItemAccessKeyProperty = DependencyProperty.Register(
+        nameof(SettingsItemAccessKey), typeof(string), typeof(NavigationViewEx), new PropertyMetadata(null));
+
+    /// <summary>
+    /// Gets or sets the access key (mnemonic) for the settings navigation view item.
+    /// </summary>
+    public string? SettingsItemAccessKey
+    {
+        get => (string?)GetValue(SettingsItemAccessKeyProperty);
+        set => SetValue(SettingsItemAccessKeyProperty, value);
+    }
+
+    /// <summary>
+    /// Identifies the <see cref="SettingsItemKeyboardAccelerators"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty SettingsItemKeyboardAcceleratorsProperty = DependencyProperty.Register(
+        nameof(SettingsItemKeyboardAccelerators), typeof(IList<KeyboardAccelerator>), typeof(NavigationViewEx), new PropertyMetadata(new List<KeyboardAccelerator>()));
+
+    /// <summary>
+    /// Gets or sets the collection of keyboard combinations for the settings navigation view item.
+    /// </summary>
+    public IList<KeyboardAccelerator>? SettingsItemKeyboardAccelerators
+    {
+        get => (IList<KeyboardAccelerator>?)GetValue(SettingsItemKeyboardAcceleratorsProperty);
+        set => SetValue(SettingsItemKeyboardAcceleratorsProperty, value);
+    }
+
+    /// <summary>
+    /// Identifies the <see cref="SettingsItemStyle"/> dependency property.
+    /// </summary>
+    public static readonly DependencyProperty SettingsItemStyleProperty = DependencyProperty.Register(
+        nameof(SettingsItemStyle), typeof(Style), typeof(NavigationViewEx), new PropertyMetadata(null, OnSettingsItemStylePropertyChanged));
+
+    /// <summary>
+    /// Gets or sets the style that defines the look of the settings navigation view item.
+    /// </summary>
+    public Style? SettingsItemStyle
+    {
+        get => (Style?)GetValue(SettingsItemStyleProperty);
+        set => SetValue(SettingsItemStyleProperty, value);
+    }
+
+    private static void OnOverlayPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var owner = (NavigationViewEx)d;
+        owner.OnOverlayChanged((UIElement?)e.OldValue, (UIElement?)e.NewValue);
+    }
+
+    private static void OnOverlayZIndexPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var owner = (NavigationViewEx)d;
+        owner.OnOverlayZIndexChanged((int)e.OldValue, (int)e.NewValue);
+    }
+
+    private static void OnContentVisibilityPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var owner = (NavigationViewEx)d;
+        owner.OnContentVisibilityChanged((Visibility)e.OldValue, (Visibility)e.NewValue);
+    }
+
+    private static void OnBackButtonStylePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var owner = (NavigationViewEx)d;
+        owner.OnBackButtonStyleChanged((Style?)e.OldValue, (Style?)e.NewValue);
+    }
+
+    private static void OnPaneSearchButtonStylePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var owner = (NavigationViewEx)d;
+        owner.OnPaneSearchButtonStyleChanged((Style?)e.OldValue, (Style?)e.NewValue);
+    }
+
+    private static void OnSettingsItemStylePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var owner = (NavigationViewEx)d;
+        owner.OnSettingsItemStyleChanged((Style?)e.OldValue, (Style?)e.NewValue);
+    }
+
+    private void OnOverlayChanged(UIElement? oldValue, UIElement? newValue)
+    {
+        UpdateOverlay();
+    }
+
+    private void OnOverlayZIndexChanged(int oldValue, int newValue)
+    {
+        UpdateOverlayZIndex(newValue);
+    }
+
+    private void OnContentVisibilityChanged(Visibility oldValue, Visibility newValue)
+    {
+        UpdateContentVisibility(newValue);
+        UpdateOverlayLayout();
+    }
+
+    private void OnBackButtonStyleChanged(Style? oldValue, Style? newValue)
+    {
+        UpdateBackButtonStyle();
+        UpdateCloseButtonStyle();
+    }
+
+    private void OnPaneSearchButtonStyleChanged(Style? oldValue, Style? newValue)
+    {
+        UpdatePaneSearchButtonStyle();
+    }
+
+    private void OnSettingsItemStyleChanged(Style? oldValue, Style? newValue)
+    {
+        UpdateSettingsItemStyle();
+    }
+}
diff --git a/Screenbox/Controls/NavigationViewEx.cs b/Screenbox/Controls/NavigationViewEx.cs
new file mode 100644
index 000000000..be31bcb5a
--- /dev/null
+++ b/Screenbox/Controls/NavigationViewEx.cs
@@ -0,0 +1,526 @@
+#nullable enable
+
+using System;
+using System.Numerics;
+using CommunityToolkit.WinUI;
+using CommunityToolkit.WinUI.Animations;
+using Windows.System;
+using Windows.UI;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Media.Animation;
+using Windows.UI.Xaml.Shapes;
+
+using NavigationView = Microsoft.UI.Xaml.Controls.NavigationView;
+using NavigationViewDisplayMode = Microsoft.UI.Xaml.Controls.NavigationViewDisplayMode;
+using NavigationViewDisplayModeChangedEventArgs = Microsoft.UI.Xaml.Controls.NavigationViewDisplayModeChangedEventArgs;
+using NavigationViewItem = Microsoft.UI.Xaml.Controls.NavigationViewItem;
+using NavigationViewPaneClosingEventArgs = Microsoft.UI.Xaml.Controls.NavigationViewPaneClosingEventArgs;
+
+namespace Screenbox.Controls;
+
+/// <summary>
+/// Represents a custom navigation view that extends the functionality of the <see cref="NavigationView"/> control.
+/// </summary>
+/// <remarks>
+/// <para>The <see cref="NavigationViewEx"/> provides additional features such customizable access keys,
+/// keyboard accelerators, and styles for the buttons that are built-in to NavigationView.</para>
+/// It also supports rendering an overlay with configurable z-order and a <see cref="UIElement"/> as its content,
+/// while allowing the navigation pane and main content visibility to be changed independently of the overlay.
+/// <para>Key features include:</para>
+/// <list type="bullet">
+/// <item><description><strong>Overlay:</strong> Display custom content above the main content without obscuring the pane. The layer order can be changed.</description></item>
+/// <item><description><strong>Styling:</strong> Apply custom styles to built-in buttons.</description></item>
+/// <item><description><strong>Accessibility:</strong> Configure built-in buttons access keys and keyboard accelerators.</description></item>
+/// <item><description><strong>Motion:</strong> Fluid animations for content when visibility changes.</description></item>
+/// </list>
+/// </remarks>
+/// <example>
+/// This example shows how to create a simple NavigationView with an overlay,
+/// including some of its new capabilities.
+/// <code>
+/// &lt;controls:NavigationViewEx BackButtonAccessKey="B"
+///                            CloseButtonStyle="{StaticResource AccentButtonStyle}"
+///                            OverlayZIndex="2"&gt;
+///     &lt;controls:NavigationViewEx.PaneToggleButtonKeyboardAccelerators&gt;
+///         &lt;KeyboardAccelerator Key="T" Modifiers="Control" /&gt;
+///     &lt;/controls:NavigationViewEx.PaneToggleButtonKeyboardAccelerators&gt;
+/// 
+///     &lt;controls:NavigationViewEx.Overlay&gt;
+///         &lt;Border Background="Red" Height="200" /&gt;
+///     &lt;/controls:NavigationViewEx.Overlay&gt;
+/// &lt;/controls:NavigationViewEx&gt;
+/// </code>
+/// </example>
+public sealed partial class NavigationViewEx : NavigationView
+{
+    private const string TogglePaneButtonName = "TogglePaneButton";
+    private const string RootSplitViewName = "RootSplitView";
+    private const string PaneContentGridName = "PaneContentGrid";
+    private const string ContentGridName = "ContentGrid";
+    private const string SearchButtonName = "PaneAutoSuggestButton";
+    private const string PaneToggleButtonGridName = "PaneToggleButtonGrid";
+    private const string NavViewBackButton = "NavigationViewBackButton";
+    private const string NavViewCloseButton = "NavigationViewCloseButton";
+    private const string NavViewSettingsItem = "SettingsItem";
+
+    private const string ShadowCaster = "ShadowCaster";
+
+    private static readonly ImplicitAnimationSet _slowFadeInAnimationSet = new()
+    {
+       new OpacityAnimation { To = 1, Duration = TimeSpan.FromMilliseconds(250), EasingType = EasingType.Linear }
+    };
+    private static readonly ImplicitAnimationSet _slowFadeOutAnimationSet = new()
+    {
+        new OpacityAnimation { To = 0, Duration = TimeSpan.FromMilliseconds(250), EasingType = EasingType.Linear }
+    };
+    private static readonly ImplicitAnimationSet _paneShowAnimationSet = new()
+    {
+       new TranslationAnimation { From = "-48,0,0", To = "0,0,0", Duration = TimeSpan.FromMilliseconds(167), EasingMode = EasingMode.EaseOut },
+    };
+    private static readonly ImplicitAnimationSet _contentShowAnimationSet = new()
+    {
+        new OpacityAnimation { To = 1, Duration = TimeSpan.FromMilliseconds(250), EasingType = EasingType.Linear },
+        new TranslationAnimation { To = "0,0,0", Duration = TimeSpan.FromMilliseconds(400), EasingMode = EasingMode.EaseOut }
+    };
+    private static readonly ImplicitAnimationSet _contentHideAnimationSet = new()
+    {
+        new OpacityAnimation { To = 0, Duration = TimeSpan.FromMilliseconds(167), EasingType = EasingType.Linear },
+        new TranslationAnimation { To = "0,-400,0", Duration = TimeSpan.FromMilliseconds(250), EasingMode = EasingMode.EaseIn }
+    };
+
+    private Grid? _overlayRoot;
+    private Border? _overlayChildBorder;
+    private Rectangle? _overlayChildRectangle;
+    private Border? _contentBackground;
+    private SplitView? _splitView;
+    private Grid? _paneToggleButtonGrid;
+    private Grid? _contentGrid;
+    private Grid? _paneContentGrid;
+    private Button? _paneToggleButton;
+    private Button? _paneSearchButton;
+    private Button? _backButton;
+    private Button? _closeButton;
+    private NavigationViewItem? _settingsItem;
+
+    public NavigationViewEx()
+    {
+        Loaded += OnLoaded;
+        Unloaded += OnUnloaded;
+        DisplayModeChanged += OnDisplayModeChanged;
+        PaneOpening += OnPaneOpening;
+        PaneClosing += OnPaneClosing;
+    }
+
+    protected override void OnApplyTemplate()
+    {
+        base.OnApplyTemplate();
+
+        _splitView = (SplitView?)GetTemplateChild(RootSplitViewName);
+
+        if (GetTemplateChild(TogglePaneButtonName) is Button paneToggleButton)
+        {
+            _paneToggleButton = paneToggleButton;
+
+            if (!string.IsNullOrEmpty(PaneToggleButtonAccessKey))
+            {
+                paneToggleButton.AccessKey = PaneToggleButtonAccessKey;
+            }
+
+            if (PaneToggleButtonKeyboardAccelerators != null)
+            {
+                var defaultKeyboardAccelerator = new KeyboardAccelerator
+                {
+                    Key = VirtualKey.Back,
+                    Modifiers = VirtualKeyModifiers.Windows
+                };
+
+                // Remove the default (Windows + Back) key combination and restore it after the user-defined keyboard accelerators.
+                // https://github.com/microsoft/microsoft-ui-xaml/blob/v2.8.7/dev/NavigationView/NavigationView.cpp#L407-L413
+                paneToggleButton.KeyboardAccelerators.Clear();
+
+                foreach (var item in PaneToggleButtonKeyboardAccelerators)
+                {
+                    paneToggleButton.KeyboardAccelerators.Add(item);
+                }
+
+                paneToggleButton.KeyboardAccelerators.Add(defaultKeyboardAccelerator);
+            }
+        }
+
+        if (GetTemplateChild(SearchButtonName) is Button paneSearchButton)
+        {
+            _paneSearchButton = paneSearchButton;
+
+            UpdatePaneSearchButtonStyle();
+
+            if (!string.IsNullOrEmpty(PaneSearchButtonAccessKey))
+            {
+                paneSearchButton.AccessKey = PaneSearchButtonAccessKey;
+            }
+
+            if (PaneSearchButtonKeyboardAccelerators != null)
+            {
+                foreach (var item in PaneSearchButtonKeyboardAccelerators)
+                {
+                    paneSearchButton.KeyboardAccelerators.Add(item);
+                    // TODO: Consolidate and add the same shortcuts to AutoSuggestBox.
+                }
+            }
+        }
+
+        if (GetTemplateChild(NavViewBackButton) is Button backButton)
+        {
+            _backButton = backButton;
+
+            UpdateBackButtonStyle();
+
+            if (!string.IsNullOrEmpty(BackButtonAccessKey))
+            {
+                backButton.AccessKey = BackButtonAccessKey;
+            }
+
+            if (BackButtonKeyboardAccelerators != null)
+            {
+                foreach (var item in BackButtonKeyboardAccelerators)
+                {
+                    backButton.KeyboardAccelerators.Add(item);
+                }
+            }
+        }
+
+        if (GetTemplateChild(NavViewCloseButton) is Button closeButton)
+        {
+            _closeButton = closeButton;
+
+            UpdateCloseButtonStyle();
+
+            if (!string.IsNullOrEmpty(CloseButtonAccessKey))
+            {
+                closeButton.AccessKey = CloseButtonAccessKey;
+            }
+
+            if (CloseButtonKeyboardAccelerators != null)
+            {
+                foreach (var item in CloseButtonKeyboardAccelerators)
+                {
+                    closeButton.KeyboardAccelerators.Add(item);
+                }
+            }
+        }
+
+        if (GetTemplateChild(PaneContentGridName) is Grid paneContentGrid)
+        {
+            _paneContentGrid = paneContentGrid;
+
+            // Set implicit animation to play when the SplitView pane visibility changes.
+            Implicit.SetShowAnimations(paneContentGrid, _paneShowAnimationSet);
+            // Do not use HideAnimations, it causes the AutoSuggestBox to flicker for a few frames.
+        }
+
+        if (GetTemplateChild(PaneToggleButtonGridName) is Grid paneToggleButtonGrid)
+        {
+            _paneToggleButtonGrid = paneToggleButtonGrid;
+
+            // Set implicit animations to play when ContentVisibility changes.
+            Implicit.SetShowAnimations(paneToggleButtonGrid, _slowFadeInAnimationSet);
+            Implicit.SetHideAnimations(paneToggleButtonGrid, _slowFadeOutAnimationSet);
+        }
+
+        if (GetTemplateChild(ContentGridName) is Grid contentGrid)
+        {
+            _contentGrid = contentGrid;
+
+            // Set implicit animations to play when ContentVisibility changes.
+            Implicit.SetShowAnimations(contentGrid, _contentShowAnimationSet);
+            Implicit.SetHideAnimations(contentGrid, _contentHideAnimationSet);
+        }
+
+        if (GetTemplateChild(ShadowCaster) is Grid shadowCaster)
+        {
+            shadowCaster.Translation = new Vector3(0, 0, 32);
+        }
+
+        UpdateOverlay();
+        UpdateContentVisibility(ContentVisibility);
+    }
+
+    protected override void OnKeyDown(KeyRoutedEventArgs e)
+    {
+        if (ContentVisibility == Visibility.Visible)
+        {
+            // Invoke the search experience with the gamepad Y button.
+            // https://learn.microsoft.com/en-us/windows/apps/design/devices/designing-for-tv#search-experience
+            // https://learn.microsoft.com/en-us/windows/apps/design/input/gamepad-and-remote-interactions#accelerator-support
+            if (e.Key == VirtualKey.GamepadY && _paneSearchButton != null)
+            {
+                if (!IsPaneOpen)
+                {
+                    IsPaneOpen = true;
+                }
+
+                var autoSuggestBox = AutoSuggestBox;
+                if (autoSuggestBox != null)
+                {
+                    autoSuggestBox.Focus(FocusState.Programmatic);
+                }
+
+                e.Handled = true;
+                return;
+            }
+
+            base.OnKeyDown(e);
+        }
+    }
+
+    private void OnLoaded(object sender, RoutedEventArgs e)
+    {
+        if (Overlay != null && _splitView?.FindDescendant<Grid>() is { } splitViewGrid)
+        {
+            splitViewGrid.Children.Add(_overlayRoot);
+        }
+
+        if (_splitView?.FindDescendant<Border>(b => b.Name == "ContentBackground") is { } contentBackground)
+        {
+            _contentBackground = contentBackground;
+            contentBackground.SetValue(Implicit.ShowAnimationsProperty, _slowFadeInAnimationSet);
+            contentBackground.SetValue(Implicit.HideAnimationsProperty, _slowFadeOutAnimationSet);
+        }
+
+        if (IsSettingsVisible && _splitView?.FindDescendant<NavigationViewItem>(s => s.Name == NavViewSettingsItem) is NavigationViewItem settingsItem)
+        {
+            _settingsItem = settingsItem;
+
+            UpdateSettingsItemStyle();
+
+            if (!string.IsNullOrEmpty(SettingsItemAccessKey))
+            {
+                settingsItem.AccessKey = SettingsItemAccessKey;
+            }
+
+            if (SettingsItemKeyboardAccelerators != null)
+            {
+                foreach (var item in SettingsItemKeyboardAccelerators)
+                {
+                    settingsItem.KeyboardAccelerators.Add(item);
+                }
+            }
+        }
+    }
+
+    private void OnUnloaded(object sender, RoutedEventArgs e)
+    {
+        Loaded -= OnLoaded;
+        Unloaded -= OnUnloaded;
+        DisplayModeChanged -= OnDisplayModeChanged;
+        PaneOpening -= OnPaneOpening;
+        PaneClosing -= OnPaneClosing;
+
+        if (_overlayChildRectangle != null)
+        {
+            _overlayChildRectangle.Tapped -= OverlayLightDismissLayer_OnTapped;
+        }
+    }
+
+    private void OnDisplayModeChanged(NavigationView sender, NavigationViewDisplayModeChangedEventArgs args)
+    {
+        UpdateOverlayLayout();
+    }
+
+    private void OnPaneOpening(NavigationView sender, object args)
+    {
+        UpdateOverlayLayout();
+    }
+
+    private void OnPaneClosing(NavigationView sender, NavigationViewPaneClosingEventArgs args)
+    {
+        UpdateOverlayLayout();
+    }
+
+    private void OverlayLightDismissLayer_OnTapped(object sender, TappedRoutedEventArgs e)
+    {
+        if (DisplayMode != NavigationViewDisplayMode.Expanded && IsPaneOpen)
+        {
+            IsPaneOpen = false;
+        }
+    }
+
+    private void UpdateContentVisibility(Visibility visibility)
+    {
+        if (_paneToggleButtonGrid != null)
+        {
+            _paneToggleButtonGrid.Visibility = visibility;
+        }
+
+        if (_contentGrid != null)
+        {
+            _contentGrid.Visibility = visibility;
+        }
+
+        if (_paneContentGrid != null)
+        {
+            _paneContentGrid.Visibility = visibility;
+        }
+
+        if (_contentBackground != null)
+        {
+            _contentBackground.Visibility = visibility;
+        }
+    }
+
+    private void UpdateOverlay()
+    {
+        if (Overlay == null) return;
+
+        if (_overlayRoot == null)
+        {
+            var overlayRoot = new Grid { Name = "OverlayRoot" };
+            Grid.SetColumnSpan(overlayRoot, 2);
+
+            _overlayRoot = overlayRoot;
+
+            var overlayBorder = new Border();
+            _overlayChildBorder = overlayBorder;
+
+            var rect = new Rectangle
+            {
+                Name = "LightDismissLayer",
+                Fill = new SolidColorBrush(Colors.Transparent),
+                Visibility = Visibility.Collapsed
+            };
+            rect.Tapped += OverlayLightDismissLayer_OnTapped;
+
+            _overlayChildRectangle = rect;
+        }
+
+        if (_overlayChildBorder != null)
+        {
+            _overlayChildBorder.Child = Overlay;
+        }
+
+        _overlayRoot.Children.Clear();
+        _overlayRoot.Children.Add(_overlayChildBorder);
+        _overlayRoot.Children.Add(_overlayChildRectangle);
+        UpdateOverlayLayout();
+    }
+
+    private void UpdateOverlayZIndex(int index)
+    {
+        if (_overlayRoot != null)
+        {
+            Canvas.SetZIndex(_overlayRoot, index);
+        }
+    }
+
+    private void UpdateOverlayLayout()
+    {
+        if (_overlayRoot == null) return;
+
+        // Applies layout logic consistent with other SplitView content grids.
+        if (ContentVisibility == Visibility.Collapsed)
+        {
+            Grid.SetColumn(_overlayRoot, 0);
+            Grid.SetColumnSpan(_overlayRoot, 2);
+            return;
+        }
+
+        switch (DisplayMode)
+        {
+            case NavigationViewDisplayMode.Expanded:
+            case NavigationViewDisplayMode.Compact:
+                Grid.SetColumn(_overlayRoot, 1);
+                Grid.SetColumnSpan(_overlayRoot, 1);
+                break;
+            case NavigationViewDisplayMode.Minimal:
+            default:
+                Grid.SetColumn(_overlayRoot, 0);
+                Grid.SetColumnSpan(_overlayRoot, 2);
+                break;
+        }
+
+        UpdateOverlayLightDismissLayerFill();
+        UpdateOverlayLightDismissLayerVisibility();
+    }
+
+    private void UpdateOverlayLightDismissLayerFill()
+    {
+        if (_overlayChildRectangle == null) return;
+
+        if (_splitView != null)
+        {
+            // We use the ContentGrid LightDismissLayer rectangle fill to avoid tracking
+            // LightDismissOverlayMode, theme and high contrast changes ourselves.
+            if (_splitView?.FindDescendant<Rectangle>(r => r.Name == "LightDismissLayer") is Rectangle contentRootRect)
+            {
+                _overlayChildRectangle.Fill = contentRootRect.Fill;
+            }
+
+            //var dismissOverlayBrush = Application.Current.Resources["SplitViewLightDismissOverlayBackground"] as SolidColorBrush; // SystemControlPageBackgroundMediumAltMediumBrush
+
+            //_overlayChildRectangle.Fill = _splitView.LightDismissOverlayMode switch
+            //{
+            //    LightDismissOverlayMode.On => dismissOverlayBrush,
+            //    LightDismissOverlayMode.Auto => DeviceInfoHelper.IsXbox
+            //                        ? dismissOverlayBrush
+            //                        : new SolidColorBrush(Colors.Transparent),
+            //    _ => new SolidColorBrush(Colors.Transparent),
+            //};
+        }
+    }
+
+    private void UpdateOverlayLightDismissLayerVisibility()
+    {
+        if (_overlayChildRectangle != null)
+        {
+            bool isLayerVisible = DisplayMode != NavigationViewDisplayMode.Expanded && IsPaneOpen;
+
+            _overlayChildRectangle.Visibility = isLayerVisible ? Visibility.Visible : Visibility.Collapsed;
+        }
+    }
+
+    private void UpdateBackButtonStyle()
+    {
+        if (_backButton != null)
+        {
+            if (BackButtonStyle != null)
+            {
+                _backButton.Style = BackButtonStyle;
+            }
+        }
+    }
+
+    private void UpdateCloseButtonStyle()
+    {
+        if (_closeButton != null)
+        {
+            if (BackButtonStyle != null)
+            {
+                _closeButton.Style = BackButtonStyle;
+            }
+        }
+    }
+
+    private void UpdatePaneSearchButtonStyle()
+    {
+        if (_paneSearchButton != null)
+        {
+            if (PaneSearchButtonStyle != null)
+            {
+                _paneSearchButton.Style = PaneSearchButtonStyle;
+            }
+        }
+    }
+
+    private void UpdateSettingsItemStyle()
+    {
+        if (_settingsItem != null)
+        {
+            if (SettingsItemStyle != null)
+            {
+                _settingsItem.Style = SettingsItemStyle;
+            }
+        }
+    }
+}
diff --git a/Screenbox/Pages/MainPage.xaml b/Screenbox/Pages/MainPage.xaml
index 716730ce1..291b0491b 100644
--- a/Screenbox/Pages/MainPage.xaml
+++ b/Screenbox/Pages/MainPage.xaml
@@ -4,7 +4,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:animatedVisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
     xmlns:appModel="using:Windows.ApplicationModel"
-    xmlns:contract13NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,13)"
     xmlns:controls="using:Screenbox.Controls"
     xmlns:converters="using:Screenbox.Converters"
     xmlns:ctAnimations="using:CommunityToolkit.WinUI.Animations"
@@ -22,25 +21,10 @@
 
     <Page.Resources>
         <ResourceDictionary>
-            <ResourceDictionary.ThemeDictionaries>
-                <ResourceDictionary x:Key="Default">
-                    <!--  Add acrylic to the minimal/overlay pane and compact/expanded pane (Windows 10 only)  -->
-                    <StaticResource x:Key="NavigationViewDefaultPaneBackground" ResourceKey="AcrylicInAppFillColorBaseBrush" />
-                    <contract13NotPresent:StaticResource x:Key="NavigationViewExpandedPaneBackground" ResourceKey="SystemControlAcrylicWindowBrush" />
-                </ResourceDictionary>
-                <ResourceDictionary x:Key="Light">
-                    <StaticResource x:Key="NavigationViewDefaultPaneBackground" ResourceKey="AcrylicInAppFillColorBaseBrush" />
-                    <contract13NotPresent:StaticResource x:Key="NavigationViewExpandedPaneBackground" ResourceKey="SystemControlAcrylicWindowBrush" />
-                </ResourceDictionary>
-                <ResourceDictionary x:Key="HighContrast">
-                    <StaticResource x:Key="NavigationViewDefaultPaneBackground" ResourceKey="SystemColorWindowColorBrush" />
-                    <contract13NotPresent:StaticResource x:Key="NavigationViewExpandedPaneBackground" ResourceKey="SystemColorWindowColorBrush" />
-                </ResourceDictionary>
-            </ResourceDictionary.ThemeDictionaries>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="ms-appx:///Styles/NavigationView.xaml" />
+            </ResourceDictionary.MergedDictionaries>
 
-            <Thickness x:Key="NavigationViewContentGridBorderThickness">1,0,0,0</Thickness>
-            <Thickness x:Key="NavigationViewMinimalContentGridBorderThickness">0,0,0,0</Thickness>
-            <CornerRadius x:Key="NavigationViewContentGridCornerRadius">0,0,0,0</CornerRadius>
             <Thickness x:Key="AppTitleMarginExpanded">48,0,0,0</Thickness>
             <Thickness x:Key="AppTitleMarginCompact">76,0,0,0</Thickness>
             <Thickness x:Key="AppTitleMarginMinimal">100,0,0,0</Thickness>
@@ -49,82 +33,6 @@
 
             <converters:SearchItemGlyphConverter x:Name="SearchItemGlyphConverter" />
 
-            <!--  NavigationView compact pane search button with an animated icon, padding, common state brushes, and no pointer animations to match other pane buttons  -->
-            <Style x:Key="NavigationViewPaneSearchButtonStyle" TargetType="Button">
-                <Setter Property="Background" Value="{ThemeResource NavigationViewItemBackground}" />
-                <Setter Property="Foreground" Value="{ThemeResource NavigationViewItemForeground}" />
-                <Setter Property="BorderThickness" Value="{ThemeResource NavigationViewToggleBorderThickness}" />
-                <Setter Property="Height" Value="36" />
-                <Setter Property="Padding" Value="{ThemeResource NavigationViewItemButtonMargin}" />
-                <Setter Property="HorizontalAlignment" Value="Center" />
-                <Setter Property="FontFamily" Value="{StaticResource SymbolThemeFontFamily}" />
-                <Setter Property="FontSize" Value="16" />
-                <Setter Property="Content" Value="&#xE721;" />
-                <Setter Property="FocusVisualMargin" Value="-4,0" />
-                <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="Button">
-                            <!--  To ensure the animated icon faces the same direction as the find symbol, lock the flow direction and mirror the icon  -->
-                            <Grid
-                                x:Name="RootGrid"
-                                Width="{TemplateBinding Width}"
-                                Height="{TemplateBinding Height}"
-                                Padding="{TemplateBinding Padding}"
-                                HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                                Background="{TemplateBinding Background}"
-                                CornerRadius="{TemplateBinding CornerRadius}"
-                                FlowDirection="RightToLeft">
-                                <!--  Increase the icon size slightly because the find animated visual has more padding than the symbol  -->
-                                <muxc:AnimatedIcon
-                                    x:Name="Icon"
-                                    Width="20"
-                                    Height="20"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    muxc:AnimatedIcon.State="Normal"
-                                    AutomationProperties.AccessibilityView="Raw"
-                                    Foreground="{TemplateBinding Foreground}"
-                                    MirroredWhenRightToLeft="True">
-                                    <animatedVisuals:AnimatedFindVisualSource />
-                                    <muxc:AnimatedIcon.FallbackIconSource>
-                                        <muxc:FontIconSource FontSize="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=FontSize}" Glyph="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content}" />
-                                    </muxc:AnimatedIcon.FallbackIconSource>
-                                </muxc:AnimatedIcon>
-
-                                <VisualStateManager.VisualStateGroups>
-                                    <VisualStateGroup x:Name="CommonStates">
-                                        <VisualState x:Name="Normal" />
-
-                                        <VisualState x:Name="PointerOver">
-                                            <VisualState.Setters>
-                                                <Setter Target="RootGrid.Background" Value="{ThemeResource NavigationViewButtonBackgroundPointerOver}" />
-                                                <Setter Target="Icon.Foreground" Value="{ThemeResource NavigationViewButtonForegroundPointerOver}" />
-                                                <Setter Target="Icon.(muxc:AnimatedIcon.State)" Value="PointerOver" />
-                                            </VisualState.Setters>
-                                        </VisualState>
-
-                                        <VisualState x:Name="Pressed">
-                                            <VisualState.Setters>
-                                                <Setter Target="RootGrid.Background" Value="{ThemeResource NavigationViewButtonBackgroundPressed}" />
-                                                <Setter Target="Icon.Foreground" Value="{ThemeResource NavigationViewButtonForegroundPressed}" />
-                                                <Setter Target="Icon.(muxc:AnimatedIcon.State)" Value="Pressed" />
-                                            </VisualState.Setters>
-                                        </VisualState>
-
-                                        <VisualState x:Name="Disabled">
-                                            <VisualState.Setters>
-                                                <Setter Target="RootGrid.Background" Value="{ThemeResource NavigationViewButtonBackgroundDisabled}" />
-                                            </VisualState.Setters>
-                                        </VisualState>
-                                    </VisualStateGroup>
-                                </VisualStateManager.VisualStateGroups>
-                            </Grid>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
-
             <DataTemplate x:Key="SearchAutoSuggestBoxItemTemplate">
                 <StackPanel Orientation="Horizontal">
                     <FontIcon FontSize="{StaticResource StandardIconFontSize}" Glyph="{Binding Converter={StaticResource SearchItemGlyphConverter}}" />
@@ -184,11 +92,12 @@
             </StackPanel>
         </Grid>
 
-        <controls:CustomNavigationView
+        <controls:NavigationViewEx
             x:Name="NavView"
             AllowDrop="True"
+            BackButtonAccessKey="{x:Bind strings:KeyboardResources.NavigationBackButtonKey}"
             BackRequested="NavView_BackRequested"
-            Canvas.ZIndex="0"
+            CloseButtonAccessKey="{x:Bind strings:KeyboardResources.NavigationCloseButtonKey}"
             CompactModeThresholdWidth="701"
             DisplayModeChanged="NavView_OnDisplayModeChanged"
             DragOver="NavView_DragOver"
@@ -199,7 +108,16 @@
             IsTitleBarAutoPaddingEnabled="False"
             PaneClosing="NavView_OnPaneClosing"
             PaneOpening="NavView_OnPaneOpening"
+            PaneSearchButtonAccessKey="{x:Bind strings:KeyboardResources.NavigationPaneAutoSuggestButtonKey}"
+            PaneSearchButtonStyle="{StaticResource AnimatedNavigationViewPaneSearchButtonStyle}"
+            PaneToggleButtonAccessKey="{x:Bind strings:KeyboardResources.NavigationTogglePaneButtonKey}"
             SelectionChanged="NavView_SelectionChanged">
+            <controls:NavigationViewEx.PaneToggleButtonKeyboardAccelerators>
+                <KeyboardAccelerator Key="E" Modifiers="Control" />
+            </controls:NavigationViewEx.PaneToggleButtonKeyboardAccelerators>
+            <controls:NavigationViewEx.PaneSearchButtonKeyboardAccelerators>
+                <KeyboardAccelerator Key="F" Modifiers="Control" />
+            </controls:NavigationViewEx.PaneSearchButtonKeyboardAccelerators>
             <muxc:NavigationView.MenuItems>
                 <muxc:NavigationViewItem
                     controls:AcceleratorService.ToolTip="{x:Bind HomeNavItemText.Text}"
@@ -286,6 +204,7 @@
                     <TextBlock x:Name="SettingsNavItemText" Text="{strings:Resources Key=Settings}" />
                 </muxc:NavigationViewItem>
             </muxc:NavigationView.FooterMenuItems>
+
             <muxc:NavigationView.AutoSuggestBox>
                 <AutoSuggestBox
                     x:Name="NavViewSearchBox"
@@ -309,11 +228,10 @@
                     </AutoSuggestBox.KeyboardAccelerators>
                 </AutoSuggestBox>
             </muxc:NavigationView.AutoSuggestBox>
-            <controls:CustomNavigationView.OverlayContent>
-                <Grid x:Name="OverlayGrid">
-                    <Frame x:Name="PlayerFrame" />
-                </Grid>
-            </controls:CustomNavigationView.OverlayContent>
+
+            <controls:NavigationViewEx.Overlay>
+                <Frame x:Name="PlayerFrame" />
+            </controls:NavigationViewEx.Overlay>
 
             <Grid x:Name="ContentGrid" Padding="0,48,0,0">
                 <Frame
@@ -328,11 +246,7 @@
                     HorizontalAlignment="Right"
                     VerticalAlignment="Bottom" />
             </Grid>
-
-            <interactivity:Interaction.Behaviors>
-                <interactions:NavigationViewKeyboardBehavior />
-            </interactivity:Interaction.Behaviors>
-        </controls:CustomNavigationView>
+        </controls:NavigationViewEx>
 
         <!--  Critical error  -->
         <controls:ErrorInfo
@@ -382,22 +296,16 @@
             </VisualStateGroup>
 
             <VisualStateGroup x:Name="NavigationViewStates">
-                <VisualState x:Name="Expanded">
-                    <VisualState.Setters>
-                        <Setter Target="OverlayGrid.Margin" Value="{x:Bind ToLeftOnlyMargin(NavView.OpenPaneLength)}" />
-                    </VisualState.Setters>
-                </VisualState>
+                <VisualState x:Name="Expanded" />
                 <VisualState x:Name="Compact">
                     <VisualState.Setters>
                         <Setter Target="AppTitle.Margin" Value="{StaticResource AppTitleMarginCompact}" />
-                        <Setter Target="OverlayGrid.Margin" Value="{x:Bind ToLeftOnlyMargin(NavView.CompactPaneLength)}" />
                     </VisualState.Setters>
                 </VisualState>
                 <VisualState x:Name="Minimal">
                     <VisualState.Setters>
                         <Setter Target="TitleBarElement.Margin" Value="84,0,0,0" />
                         <Setter Target="AppTitle.Margin" Value="{StaticResource AppTitleMarginMinimal}" />
-                        <Setter Target="OverlayGrid.Margin" Value="0" />
                     </VisualState.Setters>
                 </VisualState>
                 <VisualState x:Name="Hidden">
@@ -405,17 +313,14 @@
                         <Setter Target="AppTitleBar.Visibility" Value="Collapsed" />
                         <Setter Target="NavView.ContentVisibility" Value="Collapsed" />
                         <Setter Target="NavView.OverlayZIndex" Value="2" />
-                        <Setter Target="OverlayGrid.Margin" Value="0" />
                     </VisualState.Setters>
                 </VisualState>
 
                 <VisualStateGroup.Transitions>
                     <VisualTransition From="Compact" To="Expanded">
                         <Storyboard>
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OverlayGrid" Storyboard.TargetProperty="Margin">
-                                <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Bind ToLeftOnlyMargin(NavView.OpenPaneLength)}" />
-                            </ObjectAnimationUsingKeyFrames>
-                            <RepositionThemeAnimation FromHorizontalOffset="-272" TargetName="OverlayGrid" />
+                            <!--  -272 offset is derived from subtracting CompactPaneLength from OpenPaneLength (48 - 320)  -->
+                            <RepositionThemeAnimation FromHorizontalOffset="-272" TargetName="PlayerFrame" />
                             <RepositionThemeAnimation FromHorizontalOffset="16" TargetName="AppTitle" />
                             <DoubleAnimation
                                 Storyboard.TargetName="HomeNavItemText"
@@ -458,37 +363,33 @@
 
                     <VisualTransition From="Expanded" To="Compact">
                         <Storyboard>
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OverlayGrid" Storyboard.TargetProperty="Margin">
-                                <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Bind ToLeftOnlyMargin(NavView.CompactPaneLength)}" />
-                            </ObjectAnimationUsingKeyFrames>
                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="AppTitle" Storyboard.TargetProperty="Margin">
                                 <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppTitleMarginCompact}" />
                             </ObjectAnimationUsingKeyFrames>
-                            <RepositionThemeAnimation FromHorizontalOffset="272" TargetName="OverlayGrid" />
+                            <!--  272 offset is derived from subtracting OpenPaneLength from CompactPaneLength (320 - 48)  -->
+                            <RepositionThemeAnimation FromHorizontalOffset="272" TargetName="PlayerFrame" />
                             <RepositionThemeAnimation FromHorizontalOffset="-16" TargetName="AppTitle" />
                         </Storyboard>
                     </VisualTransition>
 
                     <VisualTransition From="Compact" To="Minimal">
                         <Storyboard>
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OverlayGrid" Storyboard.TargetProperty="Margin">
-                                <DiscreteObjectKeyFrame KeyTime="0" Value="0" />
-                            </ObjectAnimationUsingKeyFrames>
                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="AppTitle" Storyboard.TargetProperty="Margin">
                                 <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppTitleMarginMinimal}" />
                             </ObjectAnimationUsingKeyFrames>
+                            <!--  48 offset is derived from adding CompactPaneLength (48)  -->
+                            <RepositionThemeAnimation FromHorizontalOffset="48" TargetName="PlayerFrame" />
                             <RepositionThemeAnimation FromHorizontalOffset="-24" TargetName="AppTitle" />
                         </Storyboard>
                     </VisualTransition>
 
                     <VisualTransition From="Minimal" To="Compact">
                         <Storyboard>
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OverlayGrid" Storyboard.TargetProperty="Margin">
-                                <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Bind ToLeftOnlyMargin(NavView.CompactPaneLength)}" />
-                            </ObjectAnimationUsingKeyFrames>
                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="AppTitle" Storyboard.TargetProperty="Margin">
                                 <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppTitleMarginCompact}" />
                             </ObjectAnimationUsingKeyFrames>
+                            <!--  -48 offset is derived from subtracting CompactPaneLength (48)  -->
+                            <RepositionThemeAnimation FromHorizontalOffset="-48" TargetName="PlayerFrame" />
                             <RepositionThemeAnimation FromHorizontalOffset="24" TargetName="AppTitle" />
                         </Storyboard>
                     </VisualTransition>
diff --git a/Screenbox/Pages/MainPage.xaml.cs b/Screenbox/Pages/MainPage.xaml.cs
index 154d9886a..4e517a2cf 100644
--- a/Screenbox/Pages/MainPage.xaml.cs
+++ b/Screenbox/Pages/MainPage.xaml.cs
@@ -94,12 +94,6 @@ protected override void OnKeyDown(KeyRoutedEventArgs e)
         {
             base.OnKeyDown(e);
             ViewModel.ProcessGamepadKeyDown(e);
-
-            if (e.Key == VirtualKey.GamepadY)
-            {
-                NavViewSearchBox.Focus(FocusState.Programmatic);
-                e.Handled = true;
-            }
         }
 
         public void GoBack()
@@ -325,11 +319,6 @@ private void NavView_OnPaneClosing(muxc.NavigationView sender, object args)
             UpdateNavigationViewState(sender.DisplayMode, sender.IsPaneOpen);
         }
 
-        private Thickness ToLeftOnlyMargin(double value)
-        {
-            return new Thickness(value, 0, 0, 0);
-        }
-
         private Thickness GetBackgroundMargin(muxc.NavigationViewDisplayMode mode, bool isPaneOpen)
         {
             return mode switch
diff --git a/Screenbox/Screenbox.csproj b/Screenbox/Screenbox.csproj
index fb0e72c58..90bb8e66c 100644
--- a/Screenbox/Screenbox.csproj
+++ b/Screenbox/Screenbox.csproj
@@ -162,7 +162,6 @@
     <Compile Include="Controls\CommonGridViewItem.xaml.cs">
       <DependentUpon>CommonGridViewItem.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\CustomNavigationView.cs" />
     <Compile Include="Controls\CustomSlider.cs" />
     <Compile Include="Controls\ErrorInfo.xaml.cs">
       <DependentUpon>ErrorInfo.xaml</DependentUpon>
@@ -177,7 +176,6 @@
     <Compile Include="Controls\Interactions\ListViewContextTriggerBehavior.cs" />
     <Compile Include="Controls\Interactions\ListViewContextRequestedEventArgs.cs" />
     <Compile Include="Controls\Interactions\MediaListViewItemBehavior.cs" />
-    <Compile Include="Controls\Interactions\NavigationViewKeyboardBehavior.cs" />
     <Compile Include="Controls\Interactions\OverflowTextToolTipBehavior.cs" />
     <Compile Include="Controls\Interactions\SettingsExpanderXYNavigationBehavior.cs" />
     <Compile Include="Controls\Interactions\SplitButtonXYNavigationBehavior.cs" />
@@ -191,6 +189,8 @@
     <Compile Include="Controls\MediaListViewItem.xaml.cs">
       <DependentUpon>MediaListViewItem.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Controls\NavigationViewEx.cs" />
+    <Compile Include="Controls\NavigationViewEx.Properties.cs" />
     <Compile Include="Controls\NotificationView.xaml.cs">
       <DependentUpon>NotificationView.xaml</DependentUpon>
     </Compile>
@@ -722,6 +722,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Styles\NavigationView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Styles\Progress.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/Screenbox/Styles/NavigationView.xaml b/Screenbox/Styles/NavigationView.xaml
new file mode 100644
index 000000000..01e9e85b6
--- /dev/null
+++ b/Screenbox/Styles/NavigationView.xaml
@@ -0,0 +1,105 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:animatedVisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
+    xmlns:contract13NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,13)"
+    xmlns:muxc="using:Microsoft.UI.Xaml.Controls">
+
+    <ResourceDictionary.ThemeDictionaries>
+        <ResourceDictionary x:Key="Default">
+            <!--  Add in-app acrylic to the minimal/overlay pane  -->
+            <StaticResource x:Key="NavigationViewDefaultPaneBackground" ResourceKey="AcrylicInAppFillColorBaseBrush" />
+            <!--  Add background acrylic to the compact/expanded pane (Windows 10 only)  -->
+            <contract13NotPresent:StaticResource x:Key="NavigationViewExpandedPaneBackground" ResourceKey="SystemControlAcrylicWindowBrush" />
+        </ResourceDictionary>
+        <ResourceDictionary x:Key="Light">
+            <StaticResource x:Key="NavigationViewDefaultPaneBackground" ResourceKey="AcrylicInAppFillColorBaseBrush" />
+            <contract13NotPresent:StaticResource x:Key="NavigationViewExpandedPaneBackground" ResourceKey="SystemControlAcrylicWindowBrush" />
+        </ResourceDictionary>
+        <ResourceDictionary x:Key="HighContrast">
+            <StaticResource x:Key="NavigationViewDefaultPaneBackground" ResourceKey="SystemColorWindowColorBrush" />
+            <contract13NotPresent:StaticResource x:Key="NavigationViewExpandedPaneBackground" ResourceKey="SystemColorWindowColorBrush" />
+        </ResourceDictionary>
+    </ResourceDictionary.ThemeDictionaries>
+
+    <!--  Top border and TopLeft corner radius removed to adhere to the 'Custom T' design pattern for seamless top edge integration.  -->
+    <Thickness x:Key="NavigationViewContentGridBorderThickness">1,0,0,0</Thickness>
+    <Thickness x:Key="NavigationViewMinimalContentGridBorderThickness">0,0,0,0</Thickness>
+    <CornerRadius x:Key="NavigationViewContentGridCornerRadius">0,0,0,0</CornerRadius>
+
+    <!--  NavigationView pane search button with animated icon, and padding, visual state brushes and no pointer animations to match with other pane buttons.  -->
+    <Style x:Key="AnimatedNavigationViewPaneSearchButtonStyle" TargetType="Button">
+        <Setter Property="Background" Value="{ThemeResource NavigationViewItemBackground}" />
+        <Setter Property="Foreground" Value="{ThemeResource NavigationViewItemForeground}" />
+        <Setter Property="BorderThickness" Value="{ThemeResource NavigationViewToggleBorderThickness}" />
+        <Setter Property="Height" Value="36" />
+        <Setter Property="Padding" Value="{ThemeResource NavigationViewItemButtonMargin}" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="FontFamily" Value="{StaticResource SymbolThemeFontFamily}" />
+        <Setter Property="FontSize" Value="16" />
+        <Setter Property="Content" Value="&#xE721;" />
+        <Setter Property="FocusVisualMargin" Value="-4,0" />
+        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <!--  Ensure the same handedness as Find icon by mirroring the animated icon and pinning FlowDirection.  -->
+                    <Grid
+                        x:Name="RootGrid"
+                        Width="{TemplateBinding Width}"
+                        Height="{TemplateBinding Height}"
+                        Padding="{TemplateBinding Padding}"
+                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                        Background="{TemplateBinding Background}"
+                        CornerRadius="{TemplateBinding CornerRadius}"
+                        FlowDirection="RightToLeft">
+                        <!--  Slightly larger size to compensate for the animated visual extra padding compared to the Find icon.  -->
+                        <muxc:AnimatedIcon
+                            x:Name="Icon"
+                            Width="20"
+                            Height="20"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            muxc:AnimatedIcon.State="Normal"
+                            AutomationProperties.AccessibilityView="Raw"
+                            Foreground="{TemplateBinding Foreground}"
+                            MirroredWhenRightToLeft="True">
+                            <animatedVisuals:AnimatedFindVisualSource />
+                            <muxc:AnimatedIcon.FallbackIconSource>
+                                <muxc:FontIconSource FontSize="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=FontSize}" Glyph="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content}" />
+                            </muxc:AnimatedIcon.FallbackIconSource>
+                        </muxc:AnimatedIcon>
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+
+                                <VisualState x:Name="PointerOver">
+                                    <VisualState.Setters>
+                                        <Setter Target="RootGrid.Background" Value="{ThemeResource NavigationViewButtonBackgroundPointerOver}" />
+                                        <Setter Target="Icon.Foreground" Value="{ThemeResource NavigationViewButtonForegroundPointerOver}" />
+                                        <Setter Target="Icon.(muxc:AnimatedIcon.State)" Value="PointerOver" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                                <VisualState x:Name="Pressed">
+                                    <VisualState.Setters>
+                                        <Setter Target="RootGrid.Background" Value="{ThemeResource NavigationViewButtonBackgroundPressed}" />
+                                        <Setter Target="Icon.Foreground" Value="{ThemeResource NavigationViewButtonForegroundPressed}" />
+                                        <Setter Target="Icon.(muxc:AnimatedIcon.State)" Value="Pressed" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                                <VisualState x:Name="Disabled">
+                                    <VisualState.Setters>
+                                        <Setter Target="RootGrid.Background" Value="{ThemeResource NavigationViewButtonBackgroundDisabled}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>