CmdPal: Bump version to 0.5 (#41442)

title

.github/actions/spell-check/expect.txt

@@ -1025,6 +1025,8 @@ MYICON
 NAMECHANGE
 namespaceanddescendants
 nao
+Navigatable
+NavigatablePage
 NCACTIVATE
 ncc
 NCCALCSIZE

.github/actions/spell-check/patterns.txt

@@ -260,7 +260,3 @@ Process Process
 # ZoomIt menu items with accelerator keys
 E&xit
 St&yle
-
-# This matches a relative clause where the relative pronoun "that" is omitted.
-# Example: "Gets or sets the window the TitleBar should configure."
-\bthe\s+\w+\s+the\b

src/common/ManagedCommon/Logger.cs

@@ -32,8 +32,17 @@ namespace ManagedCommon
         /// <param name="isLocalLow">If the process using Logger is a low-privilege process.</param>
         public static void InitializeLogger(string applicationLogPath, bool isLocalLow = false)
         {
-            string versionedPath = LogDirectoryPath(applicationLogPath, isLocalLow);
-            string basePath = Path.GetDirectoryName(versionedPath);
+            string basePath;
+            if (isLocalLow)
+            {
+                basePath = Environment.GetEnvironmentVariable("userprofile") + "\\appdata\\LocalLow\\Microsoft\\PowerToys" + applicationLogPath;
+            }
+            else
+            {
+                basePath = Constants.AppDataPath() + applicationLogPath;
+            }
+
+            string versionedPath = Path.Combine(basePath, Version);
 
             if (!Directory.Exists(versionedPath))
             {
@@ -50,22 +59,6 @@ namespace ManagedCommon
             Task.Run(() => DeleteOldVersionLogFolders(basePath, versionedPath));
         }
 
-        public static string LogDirectoryPath(string applicationLogPath, bool isLocalLow = false)
-        {
-            string basePath;
-            if (isLocalLow)
-            {
-                basePath = Environment.GetEnvironmentVariable("userprofile") + "\\appdata\\LocalLow\\Microsoft\\PowerToys" + applicationLogPath;
-            }
-            else
-            {
-                basePath = Constants.AppDataPath() + applicationLogPath;
-            }
-
-            string versionedPath = Path.Combine(basePath, Version);
-            return versionedPath;
-        }
-
         /// <summary>
         /// Deletes old version log folders, keeping only the current version's folder.
         /// </summary>

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/FallbackLogItem.cs

@@ -2,7 +2,6 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using ManagedCommon;
 using Microsoft.CmdPal.UI.ViewModels.Commands;
 using Microsoft.CmdPal.UI.ViewModels.Properties;
 using Microsoft.CommandPalette.Extensions.Toolkit;
@@ -20,10 +19,6 @@ internal sealed partial class FallbackLogItem : FallbackCommandItem
         Title = string.Empty;
         _logMessagesPage.Name = string.Empty;
         Subtitle = Properties.Resources.builtin_log_subtitle;
-
-        var logPath = Logger.LogDirectoryPath("\\CmdPal\\Logs\\");
-        var openLogCommand = new OpenFileCommand(logPath) { Name = Resources.builtin_log_folder_command_name };
-        MoreCommands = [new CommandContextItem(openLogCommand)];
     }
 
     public override void UpdateQuery(string query)

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/MainListPage.cs

@@ -27,9 +27,7 @@ public partial class MainListPage : DynamicListPage,
     private readonly IServiceProvider _serviceProvider;
 
     private readonly TopLevelCommandManager _tlcManager;
-    private IEnumerable<Scored<IListItem>>? _filteredItems;
-    private IEnumerable<Scored<IListItem>>? _filteredApps;
-    private IEnumerable<IListItem>? _allApps;
+    private IEnumerable<IListItem>? _filteredItems;
     private bool _includeApps;
     private bool _filteredItemsIncludesApps;
 
@@ -85,7 +83,7 @@ public partial class MainListPage : DynamicListPage,
         }
         else
         {
-            RaiseItemsChanged();
+            RaiseItemsChanged(_tlcManager.TopLevelCommands.Count);
         }
     }
 
@@ -150,13 +148,7 @@ public partial class MainListPage : DynamicListPage,
         {
             lock (_tlcManager.TopLevelCommands)
             {
-                var items = Enumerable.Empty<Scored<IListItem>>()
-                                .Concat(_filteredItems is not null ? _filteredItems : [])
-                                .Concat(_filteredApps is not null ? _filteredApps : [])
-                                .OrderByDescending(o => o.Score)
-                                .Select(s => s.Item)
-                                .ToArray();
-                return items;
+                return _filteredItems?.ToArray() ?? [];
             }
         }
     }
@@ -175,8 +167,6 @@ public partial class MainListPage : DynamicListPage,
                     {
                         _filteredItemsIncludesApps = _includeApps;
                         _filteredItems = null;
-                        _filteredApps = null;
-                        _allApps = null;
                     }
                 }
 
@@ -194,8 +184,6 @@ public partial class MainListPage : DynamicListPage,
             {
                 _filteredItemsIncludesApps = _includeApps;
                 _filteredItems = null;
-                _filteredApps = null;
-                _allApps = null;
                 RaiseItemsChanged(commands.Count);
                 return;
             }
@@ -205,49 +193,35 @@ public partial class MainListPage : DynamicListPage,
             if (!newSearch.StartsWith(oldSearch, StringComparison.CurrentCultureIgnoreCase))
             {
                 _filteredItems = null;
-                _filteredApps = null;
-                _allApps = null;
             }
 
             // If the internal state has changed, reset _filteredItems to reset the list.
             if (_filteredItemsIncludesApps != _includeApps)
             {
                 _filteredItems = null;
-                _filteredApps = null;
-                _allApps = null;
             }
 
-            var newFilteredItems = _filteredItems?.Select(s => s.Item);
-
             // If we don't have any previous filter results to work with, start
             // with a list of all our commands & apps.
-            if (newFilteredItems is null && _filteredApps is null)
+            if (_filteredItems is null)
             {
-                newFilteredItems = commands;
+                _filteredItems = commands;
                 _filteredItemsIncludesApps = _includeApps;
-
                 if (_includeApps)
                 {
-                    _allApps = AllAppsCommandProvider.Page.GetItems();
+                    IEnumerable<IListItem> apps = AllAppsCommandProvider.Page.GetItems();
+                    var appIds = apps.Select(app => app.Command.Id).ToArray();
+
+                    // Remove any top level pinned apps and use the apps from AllAppsCommandProvider.Page.GetItems()
+                    // since they contain details.
+                    _filteredItems = _filteredItems.Where(item => item.Command is not AppCommand);
+                    _filteredItems = _filteredItems.Concat(apps);
                 }
             }
 
             // Produce a list of everything that matches the current filter.
-            _filteredItems = ListHelpers.FilterListWithScores<IListItem>(newFilteredItems ?? [], SearchText, ScoreTopLevelItem);
-
-            // Produce a list of filtered apps with the appropriate limit
-            if (_allApps is not null)
-            {
-                _filteredApps = ListHelpers.FilterListWithScores<IListItem>(_allApps, SearchText, ScoreTopLevelItem);
-
-                var appResultLimit = AllAppsCommandProvider.TopLevelResultLimit;
-                if (appResultLimit >= 0)
-                {
-                    _filteredApps = _filteredApps.Take(appResultLimit);
-                }
-            }
-
-            RaiseItemsChanged();
+            _filteredItems = ListHelpers.FilterList<IListItem>(_filteredItems, SearchText, ScoreTopLevelItem);
+            RaiseItemsChanged(_filteredItems.Count());
         }
     }
 

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Models/ExtensionWrapper.cs

@@ -126,10 +126,6 @@ public class ExtensionWrapper : IExtensionWrapper
                                 // We'll just return out nothing.
                                 return;
                             }
-                            else if (hr.Value != 0)
-                            {
-                                Logger.LogError($"Failed to find {ExtensionDisplayName}: {hr.Value}");
-                            }
 
                             // Marshal.ThrowExceptionForHR(hr);
                             _extensionObject = MarshalInterface<IExtension>.FromAbi((nint)extensionPtr);

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Properties/Resources.Designer.cs

@@ -285,15 +285,6 @@ namespace Microsoft.CmdPal.UI.ViewModels.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to View log folder.
-        /// </summary>
-        public static string builtin_log_folder_command_name {
-            get {
-                return ResourceManager.GetString("builtin_log_folder_command_name", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to View log.
         /// </summary>

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Properties/Resources.resx

@@ -135,9 +135,6 @@
   <data name="builtin_log_title" xml:space="preserve">
     <value>View log</value>
   </data>
-  <data name="builtin_log_folder_command_name" xml:space="preserve">
-    <value>View log folder</value>
-  </data>
   <data name="builtin_reload_subtitle" xml:space="preserve">
     <value>Reload Command Palette extensions</value>
   </data>

src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw

@@ -438,7 +438,7 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
   <data name="NavigationPaneClosed" xml:space="preserve">
     <value>Navigation pane closed</value>
   </data>
-  <data name="NavigationPaneOpened" xml:space="preserve">
+  <data name="NavigationPageOpened" xml:space="preserve">
     <value>Navigation page opened</value>
   </data>
 </root>

src/modules/cmdpal/custom.props

@@ -5,7 +5,7 @@
     <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
     <XesBaseYearForStoreVersion>2025</XesBaseYearForStoreVersion>
     <VersionMajor>0</VersionMajor>
-    <VersionMinor>4</VersionMinor>
+    <VersionMinor>5</VersionMinor>
     <VersionInfoProductName>Microsoft Command Palette</VersionInfoProductName>
   </PropertyGroup>
 </Project>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AllAppsCommandProvider.cs

@@ -3,7 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
+using Microsoft.CmdPal.Ext.Apps.Programs;
 using Microsoft.CmdPal.Ext.Apps.Properties;
 using Microsoft.CmdPal.Ext.Apps.State;
 using Microsoft.CommandPalette.Extensions;
@@ -43,28 +45,6 @@ public partial class AllAppsCommandProvider : CommandProvider
         PinnedAppsManager.Instance.PinStateChanged += OnPinStateChanged;
     }
 
-    public static int TopLevelResultLimit
-    {
-        get
-        {
-            var limitSetting = AllAppsSettings.Instance.SearchResultLimit;
-
-            if (limitSetting is null)
-            {
-                return -1;
-            }
-
-            var quantity = -1;
-
-            if (int.TryParse(limitSetting, out var result))
-            {
-                quantity = result;
-            }
-
-            return quantity;
-        }
-    }
-
     public override ICommandItem[] TopLevelCommands() => [_listItem, .._page.GetPinnedApps()];
 
     public ICommandItem? LookupApp(string displayName)

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AllAppsSettings.cs

@@ -20,16 +20,6 @@ public class AllAppsSettings : JsonSettingsManager, ISettingsInterface
 
     private static string Experimental(string propertyName) => $"{_namespace}.experimental.{propertyName}";
 
-    private static readonly List<ChoiceSetSetting.Choice> _searchResultLimitChoices =
-    [
-        new ChoiceSetSetting.Choice(Resources.limit_none, "-1"),
-        new ChoiceSetSetting.Choice(Resources.limit_0, "0"),
-        new ChoiceSetSetting.Choice(Resources.limit_1, "1"),
-        new ChoiceSetSetting.Choice(Resources.limit_5, "5"),
-        new ChoiceSetSetting.Choice(Resources.limit_10, "10"),
-        new ChoiceSetSetting.Choice(Resources.limit_20, "20"),
-    ];
-
 #pragma warning disable SA1401 // Fields should be private
     internal static AllAppsSettings Instance = new();
 #pragma warning restore SA1401 // Fields should be private
@@ -52,14 +42,6 @@ public class AllAppsSettings : JsonSettingsManager, ISettingsInterface
 
     public bool EnablePathEnvironmentVariableSource => _enablePathEnvironmentVariableSource.Value;
 
-    private readonly ChoiceSetSetting _searchResultLimitSource = new(
-        Namespaced(nameof(SearchResultLimit)),
-        Resources.limit_fallback_results_source,
-        Resources.limit_fallback_results_source_description,
-        _searchResultLimitChoices);
-
-    public string SearchResultLimit => _searchResultLimitSource.Value ?? string.Empty;
-
     private readonly ToggleSetting _enableStartMenuSource = new(
         Namespaced(nameof(EnableStartMenuSource)),
         Resources.enable_start_menu_source,
@@ -105,7 +87,6 @@ public class AllAppsSettings : JsonSettingsManager, ISettingsInterface
         Settings.Add(_enableDesktopSource);
         Settings.Add(_enableRegistrySource);
         Settings.Add(_enablePathEnvironmentVariableSource);
-        Settings.Add(_searchResultLimitSource);
 
         // Load settings from file upon initialization
         LoadSettings();

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Commands/CopyPathCommand.cs

@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Globalization;
+using System.Text;
+using ManagedCommon;
+using Microsoft.CmdPal.Ext.Apps.Properties;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+
+namespace Microsoft.CmdPal.Ext.Apps.Commands;
+
+internal sealed partial class CopyPathCommand : InvokableCommand
+{
+    private readonly string _target;
+
+    public CopyPathCommand(string target)
+    {
+        Name = Resources.copy_path;
+        Icon = Icons.CopyIcon;
+
+        _target = target;
+    }
+
+    private static readonly CompositeFormat CopyFailedFormat = CompositeFormat.Parse(Resources.copy_failed);
+
+    public override CommandResult Invoke()
+    {
+        try
+        {
+            ClipboardHelper.SetText(_target);
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError("Copy failed: " + ex.Message);
+            return CommandResult.ShowToast(
+                new ToastArgs
+                {
+                    Message = string.Format(CultureInfo.CurrentCulture, CopyFailedFormat, ex.Message),
+                    Result = CommandResult.KeepOpen(),
+                });
+        }
+
+        return CommandResult.ShowToast(Resources.copied_to_clipboard);
+    }
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/UWPApplication.cs

@@ -95,7 +95,7 @@ public class UWPApplication : IUWPApplication
 
         commands.Add(
             new CommandContextItem(
-                new CopyTextCommand(Location) { Name = Resources.copy_path })
+                new Commands.CopyPathCommand(Location))
             {
                 RequestedShortcut = KeyChordHelpers.FromModifiers(ctrl: true, shift: true, vkey: VirtualKey.C),
             });

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/Win32Program.cs

@@ -202,7 +202,7 @@ public class Win32Program : IProgram
         }
 
         commands.Add(new CommandContextItem(
-                    new CopyTextCommand(FullPath) { Name = Resources.copy_path })
+                    new Commands.CopyPathCommand(FullPath))
         {
             RequestedShortcut = KeyChordHelpers.FromModifiers(ctrl: true, shift: true, vkey: VirtualKey.C),
         });

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Properties/Resources.Designer.cs

@@ -78,6 +78,24 @@ namespace Microsoft.CmdPal.Ext.Apps.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Copied to clipboard!.
+        /// </summary>
+        internal static string copied_to_clipboard {
+            get {
+                return ResourceManager.GetString("copied_to_clipboard", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Copy failed ({0}). Please try again..
+        /// </summary>
+        internal static string copy_failed {
+            get {
+                return ResourceManager.GetString("copy_failed", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Copy path.
         /// </summary>
@@ -159,78 +177,6 @@ namespace Microsoft.CmdPal.Ext.Apps.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to 0.
-        /// </summary>
-        internal static string limit_0 {
-            get {
-                return ResourceManager.GetString("limit_0", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 1.
-        /// </summary>
-        internal static string limit_1 {
-            get {
-                return ResourceManager.GetString("limit_1", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 10.
-        /// </summary>
-        internal static string limit_10 {
-            get {
-                return ResourceManager.GetString("limit_10", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 20.
-        /// </summary>
-        internal static string limit_20 {
-            get {
-                return ResourceManager.GetString("limit_20", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 5.
-        /// </summary>
-        internal static string limit_5 {
-            get {
-                return ResourceManager.GetString("limit_5", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Limit the number of applications returned from the top level.
-        /// </summary>
-        internal static string limit_fallback_results_source {
-            get {
-                return ResourceManager.GetString("limit_fallback_results_source", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Limit fallback results to n apps.
-        /// </summary>
-        internal static string limit_fallback_results_source_description {
-            get {
-                return ResourceManager.GetString("limit_fallback_results_source_description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to None.
-        /// </summary>
-        internal static string limit_none {
-            get {
-                return ResourceManager.GetString("limit_none", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Open containing folder.
         /// </summary>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Properties/Resources.resx

@@ -172,6 +172,13 @@
   <data name="run_as_different_user" xml:space="preserve">
     <value>Run as different user</value>
   </data>
+  <data name="copy_failed" xml:space="preserve">
+    <value>Copy failed ({0}). Please try again.</value>
+    <comment>{0} is the error message</comment>
+  </data>
+  <data name="copied_to_clipboard" xml:space="preserve">
+    <value>Copied to clipboard!</value>
+  </data>
   <data name="enable_start_menu_source" xml:space="preserve">
     <value>Include apps found in the Start Menu</value>
   </data>
@@ -198,28 +205,4 @@
   <data name="unpin_app" xml:space="preserve">
     <value>Unpin</value>
   </data>
-  <data name="limit_1" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="limit_5" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="limit_10" xml:space="preserve">
-    <value>10</value>
-  </data>
-  <data name="limit_20" xml:space="preserve">
-    <value>20</value>
-  </data>
-  <data name="limit_fallback_results_source" xml:space="preserve">
-    <value>Limit the number of applications returned from the top level</value>
-  </data>
-  <data name="limit_fallback_results_source_description" xml:space="preserve">
-    <value>Limit fallback results to n apps</value>
-  </data>
-  <data name="limit_0" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="limit_none" xml:space="preserve">
-    <value>Unlimited</value>
-  </data>
-</root>
+</root>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsSettings/Commands/CopySettingCommand.cs

@@ -0,0 +1,39 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Resources;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.CmdPal.Ext.WindowsSettings.Classes;
+using Microsoft.CmdPal.Ext.WindowsSettings.Properties;
+using Microsoft.CommandPalette.Extensions;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+using Windows.ApplicationModel.DataTransfer;
+using Windows.Networking.NetworkOperators;
+using Windows.UI;
+
+namespace Microsoft.CmdPal.Ext.WindowsSettings.Commands;
+
+internal sealed partial class CopySettingCommand : InvokableCommand
+{
+    private readonly WindowsSetting _entry;
+
+    internal CopySettingCommand(WindowsSetting entry)
+    {
+        Name = Resources.CopyCommand;
+        Icon = Icons.CopyIcon;
+        _entry = entry;
+    }
+
+    public override CommandResult Invoke()
+    {
+        ClipboardHelper.SetText(_entry.Command);
+
+        return CommandResult.Dismiss();
+    }
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsSettings/Helpers/ContextMenuHelper.cs

@@ -23,7 +23,7 @@ internal static class ContextMenuHelper
     {
         var list = new List<CommandContextItem>(1)
         {
-            new(new CopyTextCommand(entry.Command) { Name = Resources.CopyCommand }),
+            new(new CopySettingCommand(entry)),
         };
 
         return list;

src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/ListHelpers.cs

@@ -43,18 +43,13 @@ public partial class ListHelpers
     }
 
     public static IEnumerable<T> FilterList<T>(IEnumerable<T> items, string query, Func<string, T, int> scoreFunction)
-    {
-        return FilterListWithScores<T>(items, query, scoreFunction)
-                .Select(score => score.Item);
-    }
-
-    public static IEnumerable<Scored<T>> FilterListWithScores<T>(IEnumerable<T> items, string query, Func<string, T, int> scoreFunction)
     {
         var scores = items
             .Select(li => new Scored<T>() { Item = li, Score = scoreFunction(query, li) })
             .Where(score => score.Score > 0)
             .OrderByDescending(score => score.Score);
-        return scores;
+        return scores
+            .Select(score => score.Item);
     }
 
     /// <summary>

src/modules/fancyzones/FancyZones.UITests/DragWindowTests.cs

@@ -372,17 +372,20 @@ namespace UITests_FancyZones
         // launch FancyZones settings page
         private void LaunchFancyZones()
         {
-            this.Find<NavigationViewItem>(By.AccessibilityId("WindowingAndLayoutsNavItem")).Click();
+            if (this.FindAll<NavigationViewItem>("FancyZones").Count == 0)
+            {
+                this.Find<NavigationViewItem>("Windowing & Layouts").Click();
+            }
 
-            this.Find<NavigationViewItem>(By.AccessibilityId("FancyZonesNavItem")).Click();
-            this.Find<ToggleSwitch>(By.AccessibilityId("EnableFancyZonesToggleSwitch")).Toggle(true);
+            this.Find<NavigationViewItem>("FancyZones").Click();
+            this.Find<ToggleSwitch>("Enable FancyZones").Toggle(true);
 
             this.Session.SetMainWindowSize(WindowSize.Large);
             Find<Element>(By.AccessibilityId("HeaderPresenter")).Click();
             this.Scroll(6, "Down"); // Pull the settings page up to make sure the settings are visible
             ZoneBehaviourSettings(TestContext.TestName);
 
-            this.Find<Microsoft.PowerToys.UITest.Button>(By.AccessibilityId("LaunchLayoutEditorButton")).Click(false, 500, 10000);
+            this.Find<Microsoft.PowerToys.UITest.Button>("Launch layout editor").Click(false, 500, 10000);
             this.Session.Attach(PowerToysModule.FancyZone);
 
             // pipeline machine may have an unstable delays, causing the custom layout to be unavailable as we set. then A retry is required.
@@ -400,7 +403,7 @@ namespace UITests_FancyZones
                 this.Find<Microsoft.PowerToys.UITest.Button>("Close").Click();
                 this.Session.Attach(PowerToysModule.PowerToysSettings);
                 SetupCustomLayouts();
-                this.Find<Microsoft.PowerToys.UITest.Button>(By.AccessibilityId("LaunchLayoutEditorButton")).Click(false, 5000, 5000);
+                this.Find<Microsoft.PowerToys.UITest.Button>("Launch layout editor").Click(false, 5000, 5000);
                 this.Session.Attach(PowerToysModule.FancyZone);
                 this.Find<Microsoft.PowerToys.UITest.Button>("Maximize").Click();
 

src/settings-ui/Settings.UI/Helpers/NavigatablePage.cs

@@ -14,14 +14,14 @@ using Windows.UI;
 
 namespace Microsoft.PowerToys.Settings.UI.Helpers;
 
-public abstract partial class NavigablePage : Page
+public abstract partial class NavigatablePage : Page
 {
     private const int ExpandWaitDuration = 500;
     private const int AnimationDuration = 1850;
 
     private NavigationParams _pendingNavigationParams;
 
-    public NavigablePage()
+    public NavigatablePage()
     {
         Loaded += OnPageLoaded;
     }

src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml

@@ -1,4 +1,4 @@
-<local:NavigablePage
+<local:NavigatablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.AdvancedPastePage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -12,7 +12,7 @@
     x:Name="RootPage"
     AutomationProperties.LandmarkType="Main"
     mc:Ignorable="d">
-    <local:NavigablePage.Resources>
+    <local:NavigatablePage.Resources>
         <ResourceDictionary>
             <ResourceDictionary.ThemeDictionaries>
                 <ResourceDictionary x:Key="Default">
@@ -38,7 +38,7 @@
                 </StackPanel>
             </DataTemplate>
         </ResourceDictionary>
-    </local:NavigablePage.Resources>
+    </local:NavigatablePage.Resources>
     <Grid>
         <controls:SettingsPageControl x:Uid="AdvancedPaste" ModuleImageSource="ms-appx:///Assets/Settings/Modules/AdvancedPaste.png">
             <controls:SettingsPageControl.ModuleContent>
@@ -425,4 +425,4 @@
             </StackPanel>
         </ContentDialog>
     </Grid>
-</local:NavigablePage>
+</local:NavigatablePage>

src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml.cs

@@ -15,7 +15,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class AdvancedPastePage : NavigablePage, IRefreshablePage
+    public sealed partial class AdvancedPastePage : NavigatablePage, IRefreshablePage
     {
         private AdvancedPasteViewModel ViewModel { get; set; }
 

src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml

@@ -1,4 +1,4 @@
-<local:NavigablePage
+<local:NavigatablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.AlwaysOnTopPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -136,4 +136,4 @@
             <controls:PageLink x:Uid="LearnMore_AlwaysOnTop" Link="https://aka.ms/PowerToysOverview_AlwaysOnTop" />
         </controls:SettingsPageControl.PrimaryLinks>
     </controls:SettingsPageControl>
-</local:NavigablePage>
+</local:NavigatablePage>

src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml.cs

@@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class AlwaysOnTopPage : NavigablePage, IRefreshablePage
+    public sealed partial class AlwaysOnTopPage : NavigatablePage, IRefreshablePage
     {
         private AlwaysOnTopViewModel ViewModel { get; set; }
 

src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml

@@ -1,4 +1,4 @@
-<local:NavigablePage
+<local:NavigatablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.AwakePage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -14,9 +14,9 @@
     AutomationProperties.LandmarkType="Main"
     mc:Ignorable="d">
 
-    <local:NavigablePage.Resources>
+    <local:NavigatablePage.Resources>
         <converters:AwakeModeToIntConverter x:Key="AwakeModeToIntConverter" />
-    </local:NavigablePage.Resources>
+    </local:NavigatablePage.Resources>
 
     <controls:SettingsPageControl
         x:Uid="Awake"
@@ -119,4 +119,4 @@
             <controls:PageLink x:Uid="SecondaryLink_Awake" Link="https://awake.den.dev" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
-</local:NavigablePage>
+</local:NavigatablePage>

src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml.cs

@@ -17,7 +17,7 @@ using PowerToys.GPOWrapper;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class AwakePage : NavigablePage, IRefreshablePage
+    public sealed partial class AwakePage : NavigatablePage, IRefreshablePage
     {
         private readonly string _appName = "Awake";
         private readonly SettingsUtils _settingsUtils;

src/settings-ui/Settings.UI/SettingsXAML/Views/CmdNotFoundPage.xaml

@@ -1,4 +1,4 @@
-<local:NavigablePage
+<local:NavigatablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.CmdNotFoundPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -170,4 +170,4 @@
             <controls:PageLink x:Uid="LearnMore_CmdNotFound" Link="https://aka.ms/PowerToysOverview_CmdNotFound" />
         </controls:SettingsPageControl.PrimaryLinks>
     </controls:SettingsPageControl>
-</local:NavigablePage>
+</local:NavigatablePage>

src/settings-ui/Settings.UI/SettingsXAML/Views/CmdNotFoundPage.xaml.cs

@@ -8,7 +8,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class CmdNotFoundPage : NavigablePage
+    public sealed partial class CmdNotFoundPage : NavigatablePage
     {
         private CmdNotFoundViewModel ViewModel { get; set; }
 

src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml

@@ -1,4 +1,4 @@
-<local:NavigablePage
+<local:NavigatablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.CmdPalPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -52,4 +52,4 @@
             <controls:PageLink x:Uid="LearnMore_CmdPal" Link="https://aka.ms/PowerToysOverview_CmdPal" />
         </controls:SettingsPageControl.PrimaryLinks>
     </controls:SettingsPageControl>
-</local:NavigablePage>
+</local:NavigatablePage>

src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml.cs

@@ -13,7 +13,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class CmdPalPage : NavigablePage, IRefreshablePage
+    public sealed partial class CmdPalPage : NavigatablePage, IRefreshablePage
     {
         private CmdPalViewModel ViewModel { get; set; }
 

src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml

@@ -1,4 +1,4 @@
-<local:NavigablePage
+<local:NavigatablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.ColorPickerPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -232,4 +232,4 @@
             <controls:PageLink Link="https://medium.com/@Niels9001/a-fluent-color-meter-for-powertoys-20407ededf0c" Text="Niels Laute's UX concept" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
-</local:NavigablePage>
+</local:NavigatablePage>

src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml.cs

@@ -15,7 +15,7 @@ using Microsoft.Windows.ApplicationModel.Resources;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class ColorPickerPage : NavigablePage, IRefreshablePage
+    public sealed partial class ColorPickerPage : NavigatablePage, IRefreshablePage
     {
         public ColorPickerViewModel ViewModel { get; set; }
 

src/settings-ui/Settings.UI/SettingsXAML/Views/CropAndLockPage.xaml

@@ -1,4 +1,4 @@
-<local:NavigablePage
+<local:NavigatablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.CropAndLockPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -66,4 +66,4 @@
             <controls:PageLink Link="https://github.com/kevinguo305" Text="Kevin Guo" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
-</local:NavigablePage>
+</local:NavigatablePage>

src/settings-ui/Settings.UI/SettingsXAML/Views/CropAndLockPage.xaml.cs

@@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class CropAndLockPage : NavigablePage, IRefreshablePage
+    public sealed partial class CropAndLockPage : NavigatablePage, IRefreshablePage
     {
         private CropAndLockViewModel ViewModel { get; set; }
 

src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml

@@ -1,4 +1,4 @@
-<local:NavigablePage
+<local:NavigatablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.DashboardPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -14,7 +14,7 @@
     AutomationProperties.LandmarkType="Main"
     DataContext="DashboardViewModel"
     mc:Ignorable="d">
-    <local:NavigablePage.Resources>
+    <local:NavigatablePage.Resources>
         <converters:ModuleItemTemplateSelector
             x:Key="ModuleItemTemplateSelector"
             ActivationTemplate="{StaticResource ModuleItemActivationTemplate}"
@@ -74,7 +74,7 @@
                     TextWrapping="WrapWholeWords" />
             </Grid>
         </DataTemplate>
-    </local:NavigablePage.Resources>
+    </local:NavigatablePage.Resources>
     <Grid Margin="16,0,0,0" RowSpacing="12">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
@@ -363,4 +363,4 @@
             </VisualStateGroup>
         </VisualStateManager.VisualStateGroups>
     </Grid>
-</local:NavigablePage>
+</local:NavigatablePage>

src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml.cs

@@ -20,7 +20,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
     /// <summary>
     /// Dashboard Settings Page.
     /// </summary>
-    public sealed partial class DashboardPage : NavigablePage, IRefreshablePage
+    public sealed partial class DashboardPage : NavigatablePage, IRefreshablePage
     {
         /// <summary>
         /// Gets or sets view model.

src/settings-ui/Settings.UI/SettingsXAML/Views/EnvironmentVariablesPage.xaml

@@ -1,4 +1,4 @@
-<local:NavigablePage
+<local:NavigatablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.EnvironmentVariablesPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -53,4 +53,4 @@
             <controls:PageLink x:Uid="LearnMore_EnvironmentVariables" Link="https://aka.ms/PowerToysOverview_EnvironmentVariables" />
         </controls:SettingsPageControl.PrimaryLinks>
     </controls:SettingsPageControl>
-</local:NavigablePage>
+</local:NavigatablePage>

src/settings-ui/Settings.UI/SettingsXAML/Views/EnvironmentVariablesPage.xaml.cs

@@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class EnvironmentVariablesPage : NavigablePage, IRefreshablePage
+    public sealed partial class EnvironmentVariablesPage : NavigatablePage, IRefreshablePage
     {
         private EnvironmentVariablesViewModel ViewModel { get; }
 

src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml

@@ -1,4 +1,4 @@
-<local:NavigablePage
+<local:NavigatablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.FancyZonesPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -19,11 +19,7 @@
                     x:Uid="FancyZones_EnableToggleControl_HeaderText"
                     HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FancyZones.png}"
                     IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                    <ToggleSwitch
-                        x:Name="EnableFancyZonesToggleSwitch"
-                        x:Uid="ToggleSwitch"
-                        AutomationProperties.AutomationId="EnableFancyZonesToggleSwitch"
-                        IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                    <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
                 </tkcontrols:SettingsCard>
                 <InfoBar
                     x:Uid="GPO_SettingIsManaged"
@@ -315,4 +311,4 @@
             <controls:PageLink x:Uid="LearnMore_FancyZones" Link="https://aka.ms/PowerToysOverview_FancyZones" />
         </controls:SettingsPageControl.PrimaryLinks>
     </controls:SettingsPageControl>
-</local:NavigablePage>
+</local:NavigatablePage>

src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml.cs

@@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class FancyZonesPage : NavigablePage, IRefreshablePage
+    public sealed partial class FancyZonesPage : NavigatablePage, IRefreshablePage
     {
         private FancyZonesViewModel ViewModel { get; set; }
 

src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml

@@ -1,4 +1,4 @@
-<local:NavigablePage
+<local:NavigatablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.FileLocksmithPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -53,4 +53,4 @@
             <controls:PageLink x:Uid="LearnMore_FileLocksmith" Link="https://aka.ms/PowerToysOverview_FileLocksmith" />
         </controls:SettingsPageControl.PrimaryLinks>
     </controls:SettingsPageControl>
-</local:NavigablePage>
+</local:NavigatablePage>

src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml.cs

@@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class FileLocksmithPage : NavigablePage, IRefreshablePage
+    public sealed partial class FileLocksmithPage : NavigatablePage, IRefreshablePage
     {
         private FileLocksmithViewModel ViewModel { get; set; }
 

src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml

@@ -1,4 +1,4 @@
-<local:NavigablePage
+<local:NavigatablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.GeneralPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -12,10 +12,10 @@
     AutomationProperties.LandmarkType="Main"
     mc:Ignorable="d">
 
-    <local:NavigablePage.Resources>
+    <local:NavigatablePage.Resources>
         <converters:UpdateStateToBoolConverter x:Key="UpdateStateToBoolConverter" />
         <converters:StringToInfoBarSeverityConverter x:Key="StringToInfoBarSeverityConverter" />
-    </local:NavigablePage.Resources>
+    </local:NavigatablePage.Resources>
 
     <controls:SettingsPageControl x:Uid="General" ModuleImageSource="ms-appx:///Assets/Settings/Modules/PT.png">
         <controls:SettingsPageControl.ModuleContent>
@@ -517,4 +517,4 @@
             <controls:PageLink x:Uid="OpenSource_Notice" Link="https://github.com/microsoft/PowerToys/blob/main/NOTICE.md" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
-</local:NavigablePage>
+</local:NavigatablePage>

src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml.cs

@@ -19,7 +19,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
     /// <summary>
     /// General Settings Page.
     /// </summary>
-    public sealed partial class GeneralPage : NavigablePage, IRefreshablePage
+    public sealed partial class GeneralPage : NavigatablePage, IRefreshablePage
     {
         private static DateTime OkToHideBackupAndRestoreMessageTime { get; set; }
 

src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml

@@ -1,4 +1,4 @@
-<local:NavigablePage
+<local:NavigatablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.HostsPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -86,4 +86,4 @@
             <controls:PageLink x:Uid="LearnMore_Hosts" Link="https://aka.ms/PowerToysOverview_HostsFileEditor" />
         </controls:SettingsPageControl.PrimaryLinks>
     </controls:SettingsPageControl>
-</local:NavigablePage>
+</local:NavigatablePage>

src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml.cs

@@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class HostsPage : NavigablePage, IRefreshablePage
+    public sealed partial class HostsPage : NavigatablePage, IRefreshablePage
     {
         private HostsViewModel ViewModel { get; }
 

src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml

@@ -1,4 +1,4 @@
-<local:NavigablePage
+<local:NavigatablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.ImageResizerPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -14,7 +14,7 @@
     x:Name="RootPage"
     AutomationProperties.LandmarkType="Main"
     mc:Ignorable="d">
-    <local:NavigablePage.Resources>
+    <local:NavigatablePage.Resources>
         <converters:ImageResizerFitToStringConverter x:Key="ImageResizerFitToStringConverter" />
         <converters:ImageResizerFitToIntConverter x:Key="ImageResizerFitToIntConverter" />
         <converters:ImageResizerUnitToStringConverter x:Key="ImageResizerUnitToStringConverter" />
@@ -27,7 +27,7 @@
             x:Key="BoolToComboBoxIndexConverter"
             FalseValue="1"
             TrueValue="0" />
-    </local:NavigablePage.Resources>
+    </local:NavigatablePage.Resources>
     <controls:SettingsPageControl x:Uid="ImageResizer" ModuleImageSource="ms-appx:///Assets/Settings/Modules/ImageResizer.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}">
@@ -303,4 +303,4 @@
             <controls:PageLink Link="https://github.com/bricelam/ImageResizer/" Text="Brice Lambson's ImageResizer" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
-</local:NavigablePage>
+</local:NavigatablePage>

src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml.cs

@@ -14,7 +14,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class ImageResizerPage : NavigablePage, IRefreshablePage
+    public sealed partial class ImageResizerPage : NavigatablePage, IRefreshablePage
     {
         public ImageResizerViewModel ViewModel { get; set; }
 

src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml

@@ -1,4 +1,4 @@
-<local:NavigablePage
+<local:NavigatablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.KeyboardManagerPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -13,7 +13,7 @@
     AutomationProperties.LandmarkType="Main"
     mc:Ignorable="d">
 
-    <local:NavigablePage.Resources>
+    <local:NavigatablePage.Resources>
         <tkconverters:CollectionVisibilityConverter x:Key="CollectionVisibilityConverter" />
         <Style x:Name="KeysListViewContainerStyle" TargetType="ListViewItem">
             <Setter Property="IsTabStop" Value="False" />
@@ -51,7 +51,7 @@
                 Height="56">
 
         </DataTemplate>-->
-    </local:NavigablePage.Resources>
+    </local:NavigatablePage.Resources>
 
     <controls:SettingsPageControl x:Uid="KeyboardManager" ModuleImageSource="ms-appx:///Assets/Settings/Modules/KBM.png">
         <controls:SettingsPageControl.ModuleContent>
@@ -235,4 +235,4 @@
             <controls:PageLink x:Uid="LearnMore_KBM" Link="https://aka.ms/PowerToysOverview_KeyboardManager" />
         </controls:SettingsPageControl.PrimaryLinks>
     </controls:SettingsPageControl>
-</local:NavigablePage>
+</local:NavigatablePage>

src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml.cs

@@ -18,7 +18,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
     /// <summary>
     /// An empty page that can be used on its own or navigated to within a Frame.
     /// </summary>
-    public sealed partial class KeyboardManagerPage : NavigablePage, IRefreshablePage
+    public sealed partial class KeyboardManagerPage : NavigatablePage, IRefreshablePage
     {
         private const string PowerToyName = "Keyboard Manager";
 

src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml

@@ -1,4 +1,4 @@
-<local:NavigablePage
+<local:NavigatablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.MeasureToolPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -108,4 +108,4 @@
             <controls:PageLink x:Uid="Attribution_Rooler" Link="https://github.com/peteblois/rooler" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
-</local:NavigablePage>
+</local:NavigatablePage>

src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml.cs

@@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class MeasureToolPage : NavigablePage, IRefreshablePage
+    public sealed partial class MeasureToolPage : NavigatablePage, IRefreshablePage
     {
         private MeasureToolViewModel ViewModel { get; set; }
 

src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml

@@ -1,4 +1,4 @@
-<local:NavigablePage
+<local:NavigatablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.MouseUtilsPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -13,13 +13,13 @@
     xmlns:ui="using:CommunityToolkit.WinUI"
     AutomationProperties.LandmarkType="Main"
     mc:Ignorable="d">
-    <local:NavigablePage.Resources>
+    <local:NavigatablePage.Resources>
         <converters:IndexBitFieldToVisibilityConverter x:Key="IndexBitFieldToVisibilityConverter" />
         <tkconverters:BoolToVisibilityConverter
             x:Key="BoolToInvertedVisibilityConverter"
             FalseValue="Visible"
             TrueValue="Collapsed" />
-    </local:NavigablePage.Resources>
+    </local:NavigatablePage.Resources>
     <controls:SettingsPageControl x:Uid="MouseUtils" ModuleImageSource="ms-appx:///Assets/Settings/Modules/MouseUtils.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
@@ -423,4 +423,4 @@
             <controls:PageLink Link="https://michael-clayton.com/projects/fancymouse" Text="Michael Clayton's Mouse Jump (FancyMouse)" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
-</local:NavigablePage>
+</local:NavigatablePage>

src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml.cs

@@ -12,7 +12,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class MouseUtilsPage : NavigablePage, IRefreshablePage
+    public sealed partial class MouseUtilsPage : NavigatablePage, IRefreshablePage
     {
         private MouseUtilsViewModel ViewModel { get; set; }
 

src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml

@@ -1,4 +1,4 @@
-<local:NavigablePage
+<local:NavigatablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.MouseWithoutBordersPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -11,13 +11,13 @@
     xmlns:ui="using:CommunityToolkit.WinUI"
     AutomationProperties.LandmarkType="Main"
     mc:Ignorable="d">
-    <local:NavigablePage.Resources>
+    <local:NavigatablePage.Resources>
         <converters:BoolToVisibilityConverter x:Key="negativeBoolToVisibilityConverter" />
         <converters:BoolToObjectConverter
             x:Key="OneRowMatrixBoolToNumberOfRowsConverter"
             FalseValue="2"
             TrueValue="4" />
-    </local:NavigablePage.Resources>
+    </local:NavigatablePage.Resources>
     <controls:SettingsPageControl x:Uid="MouseWithoutBorders" ModuleImageSource="ms-appx:///Assets/Settings/Modules/MouseWithoutBorders.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel Orientation="Vertical">
@@ -524,4 +524,4 @@
             <controls:PageLink Link="https://github.com/microsoft/PowerToys/blob/main/COMMUNITY.md#mouse-without-borders-original-contributors" Text="Truong Do (Đỗ Đức Trường) and other original contributors" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
-</local:NavigablePage>
+</local:NavigatablePage>

src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml.cs

@@ -21,7 +21,7 @@ using static Microsoft.PowerToys.Settings.UI.ViewModels.MouseWithoutBordersViewM
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class MouseWithoutBordersPage : NavigablePage, IRefreshablePage
+    public sealed partial class MouseWithoutBordersPage : NavigatablePage, IRefreshablePage
     {
         private const string MouseWithoutBordersDragDropCheckString = "MWB Device Drag Drop";
 

src/settings-ui/Settings.UI/SettingsXAML/Views/NewPlusPage.xaml

@@ -1,4 +1,4 @@
-<helper:NavigablePage
+<helper:NavigatablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.NewPlusPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -215,4 +215,4 @@
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
 
-</helper:NavigablePage>
+</helper:NavigatablePage>

src/settings-ui/Settings.UI/SettingsXAML/Views/NewPlusPage.xaml.cs

@@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class NewPlusPage : NavigablePage, IRefreshablePage
+    public sealed partial class NewPlusPage : NavigatablePage, IRefreshablePage
     {
         private NewPlusViewModel ViewModel { get; set; }
 

src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml

@@ -1,4 +1,4 @@
-<local:NavigablePage
+<local:NavigatablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.PeekPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -104,4 +104,4 @@
             <controls:PageLink x:Uid="LearnMore_Peek" Link="https://aka.ms/PowerToysOverview_Peek" />
         </controls:SettingsPageControl.PrimaryLinks>
     </controls:SettingsPageControl>
-</local:NavigablePage>
+</local:NavigatablePage>

src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml.cs

@@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class PeekPage : NavigablePage, IRefreshablePage
+    public sealed partial class PeekPage : NavigatablePage, IRefreshablePage
     {
         private PeekViewModel ViewModel { get; set; }
 

src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml

@@ -1,4 +1,4 @@
-<local:NavigablePage
+<local:NavigatablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.PowerAccentPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -11,7 +11,7 @@
     xmlns:ui="using:CommunityToolkit.WinUI"
     AutomationProperties.LandmarkType="Main"
     mc:Ignorable="d">
-    <local:NavigablePage.Resources>
+    <local:NavigatablePage.Resources>
         <CollectionViewSource
             x:Name="LanguagesCustomViewSource"
             IsSourceGrouped="True"
@@ -19,7 +19,7 @@
         <DataTemplate x:Key="LanguageViewTemplate" x:DataType="Lib:PowerAccentLanguageModel">
             <TextBlock Text="{x:Bind Language}" />
         </DataTemplate>
-    </local:NavigablePage.Resources>
+    </local:NavigatablePage.Resources>
 
     <controls:SettingsPageControl
         x:Uid="QuickAccent"
@@ -241,4 +241,4 @@
             <controls:PageLink Link="https://github.com/damienleroy/PowerAccent" Text="Damien Leroy's PowerAccent" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
-</local:NavigablePage>
+</local:NavigatablePage>

src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml.cs

@@ -11,7 +11,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class PowerAccentPage : NavigablePage, IRefreshablePage
+    public sealed partial class PowerAccentPage : NavigatablePage, IRefreshablePage
     {
         private PowerAccentViewModel ViewModel { get; set; }
 

src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml

@@ -1,4 +1,4 @@
-<local:NavigablePage
+<local:NavigatablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.PowerLauncherPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -15,7 +15,7 @@
     AutomationProperties.LandmarkType="Main"
     mc:Ignorable="d">
 
-    <local:NavigablePage.Resources>
+    <local:NavigatablePage.Resources>
         <Style x:Key="OptionSeparator" TargetType="Rectangle">
             <Setter Property="Height" Value="1" />
             <Setter Property="HorizontalAlignment" Value="Stretch" />
@@ -304,7 +304,7 @@
         <DataTemplate x:Key="EmptyTemplate" x:DataType="viewModels:PluginAdditionalOptionViewModel">
             <StackPanel HorizontalAlignment="Stretch" Orientation="Vertical" />
         </DataTemplate>
-    </local:NavigablePage.Resources>
+    </local:NavigatablePage.Resources>
 
     <controls:SettingsPageControl x:Uid="PowerLauncher" ModuleImageSource="ms-appx:///Assets/Settings/Modules/Run.png">
         <controls:SettingsPageControl.ModuleContent>
@@ -816,4 +816,4 @@
             <controls:PageLink Link="https://github.com/betsegaw/windowwalker/" Text="Beta Tadele's Window Walker" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
-</local:NavigablePage>
+</local:NavigatablePage>

src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml.cs

@@ -15,7 +15,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class PowerLauncherPage : NavigablePage, IRefreshablePage
+    public sealed partial class PowerLauncherPage : NavigatablePage, IRefreshablePage
     {
         public PowerLauncherViewModel ViewModel { get; set; }
 

src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml

@@ -1,4 +1,4 @@
-<local:NavigablePage
+<local:NavigatablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.PowerOcrPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -79,4 +79,4 @@
             <controls:PageLink Link="https://github.com/TheJoeFin/Text-Grab" Text="Based upon Joseph Finney's Text Grab" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
-</local:NavigablePage>
+</local:NavigatablePage>

src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml.cs

@@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class PowerOcrPage : NavigablePage, IRefreshablePage
+    public sealed partial class PowerOcrPage : NavigatablePage, IRefreshablePage
     {
         private PowerOcrViewModel ViewModel { get; set; }
 

src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml

@@ -1,4 +1,4 @@
-<local:NavigablePage
+<local:NavigatablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.PowerPreviewPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -289,4 +289,4 @@
             <controls:PageLink Link="https://www.pedrolamas.com" Text="Pedro Lamas's work on G-Code, Binary G-Code, STL, and QOI" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
-</local:NavigablePage>
+</local:NavigatablePage>

src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml.cs

@@ -12,7 +12,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
     /// <summary>
     /// An empty page that can be used on its own or navigated to within a Frame.
     /// </summary>
-    public sealed partial class PowerPreviewPage : NavigablePage
+    public sealed partial class PowerPreviewPage : NavigatablePage
     {
         public PowerPreviewViewModel ViewModel { get; set; }
 

src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml

@@ -1,4 +1,4 @@
-<local:NavigablePage
+<local:NavigatablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.PowerRenamePage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -100,4 +100,4 @@
             <controls:PageLink Link="https://github.com/chrdavis/SmartRename" Text="Chris Davis's SmartRenamer" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
-</local:NavigablePage>
+</local:NavigatablePage>

src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml.cs

@@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class PowerRenamePage : NavigablePage, IRefreshablePage
+    public sealed partial class PowerRenamePage : NavigatablePage, IRefreshablePage
     {
         private PowerRenameViewModel ViewModel { get; set; }
 

src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml

@@ -1,4 +1,4 @@
-<local:NavigablePage
+<local:NavigatablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.RegistryPreviewPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -57,4 +57,4 @@
             <controls:PageLink x:Uid="LearnMore_RegistryPreview" Link="https://aka.ms/PowerToysOverview_RegistryPreview" />
         </controls:SettingsPageControl.PrimaryLinks>
     </controls:SettingsPageControl>
-</local:NavigablePage>
+</local:NavigatablePage>

src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml.cs

@@ -8,7 +8,7 @@ using Microsoft.PowerToys.Settings.UI.ViewModels;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class RegistryPreviewPage : NavigablePage, IRefreshablePage
+    public sealed partial class RegistryPreviewPage : NavigatablePage, IRefreshablePage
     {
         private RegistryPreviewViewModel ViewModel { get; set; }
 

src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml

@@ -146,17 +146,11 @@
             </NavigationView.Resources>
             <NavigationView.MenuItems>
                 <NavigationViewItem
-                    x:Name="DashboardNavigationItem"
                     x:Uid="Shell_Dashboard"
                     helpers:NavHelper.NavigateTo="views:DashboardPage"
-                    AutomationProperties.AutomationId="DashboardNavItem"
                     Icon="{ui:FontIcon Glyph=&#xE80F;}" />
 
-                <NavigationViewItem
-                    x:Name="GeneralNavigationItem"
-                    x:Uid="Shell_General"
-                    helpers:NavHelper.NavigateTo="views:GeneralPage"
-                    AutomationProperties.AutomationId="GeneralNavItem">
+                <NavigationViewItem x:Uid="Shell_General" helpers:NavHelper.NavigateTo="views:GeneralPage">
                     <NavigationViewItem.Icon>
                         <AnimatedIcon>
                             <AnimatedIcon.Source>
@@ -172,220 +166,156 @@
 
                 <!--  System Tools  -->
                 <NavigationViewItem
-                    x:Name="SystemToolsNavigationItem"
                     x:Uid="Shell_TopLevelSystemTools"
-                    AutomationProperties.AutomationId="SystemToolsNavItem"
                     Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/SystemTools.png}"
                     SelectsOnInvoked="False">
                     <NavigationViewItem.MenuItems>
                         <NavigationViewItem
-                            x:Name="AdvancedPasteNavigationItem"
                             x:Uid="Shell_AdvancedPaste"
                             helpers:NavHelper.NavigateTo="views:AdvancedPastePage"
-                            AutomationProperties.AutomationId="AdvancedPasteNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/AdvancedPaste.png}" />
                         <NavigationViewItem
-                            x:Name="AwakeNavigationItem"
                             x:Uid="Shell_Awake"
                             helpers:NavHelper.NavigateTo="views:AwakePage"
-                            AutomationProperties.AutomationId="AwakeNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Awake.png}" />
                         <NavigationViewItem
-                            x:Name="CmdPalNavigationItem"
                             x:Uid="Shell_CmdPal"
                             helpers:NavHelper.NavigateTo="views:CmdPalPage"
-                            AutomationProperties.AutomationId="CmdPalNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CmdPal.png}" />
                         <NavigationViewItem
-                            x:Name="ColorPickerNavigationItem"
                             x:Uid="Shell_ColorPicker"
                             helpers:NavHelper.NavigateTo="views:ColorPickerPage"
-                            AutomationProperties.AutomationId="ColorPickerNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ColorPicker.png}" />
                         <NavigationViewItem
-                            x:Name="PowerLauncherNavigationItem"
                             x:Uid="Shell_PowerLauncher"
                             helpers:NavHelper.NavigateTo="views:PowerLauncherPage"
-                            AutomationProperties.AutomationId="PowerLauncherNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PowerToysRun.png}" />
                         <NavigationViewItem
-                            x:Name="MeasureToolNavigationItem"
                             x:Uid="Shell_MeasureTool"
                             helpers:NavHelper.NavigateTo="views:MeasureToolPage"
-                            AutomationProperties.AutomationId="MeasureToolNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ScreenRuler.png}" />
                         <NavigationViewItem
-                            x:Name="ShortcutGuideNavigationItem"
                             x:Uid="Shell_ShortcutGuide"
                             helpers:NavHelper.NavigateTo="views:ShortcutGuidePage"
-                            AutomationProperties.AutomationId="ShortcutGuideNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ShortcutGuide.png}" />
                         <NavigationViewItem
-                            x:Name="TextExtractorNavigationItem"
                             x:Uid="Shell_TextExtractor"
                             helpers:NavHelper.NavigateTo="views:PowerOcrPage"
-                            AutomationProperties.AutomationId="TextExtractorNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/TextExtractor.png}" />
                         <NavigationViewItem
-                            x:Name="ZoomItNavigationItem"
                             x:Uid="Shell_ZoomIt"
                             helpers:NavHelper.NavigateTo="views:ZoomItPage"
-                            AutomationProperties.AutomationId="ZoomItNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ZoomIt.png}" />
                     </NavigationViewItem.MenuItems>
                 </NavigationViewItem>
 
                 <!--  Windowing & Layouts  -->
                 <NavigationViewItem
-                    x:Name="WindowingAndLayoutsNavigationItem"
                     x:Uid="Shell_TopLevelWindowsAndLayouts "
-                    AutomationProperties.AutomationId="WindowingAndLayoutsNavItem"
                     Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/WindowingAndLayouts.png}"
                     SelectsOnInvoked="False">
                     <NavigationViewItem.MenuItems>
                         <NavigationViewItem
-                            x:Name="AlwaysOnTopNavigationItem"
                             x:Uid="Shell_AlwaysOnTop"
                             helpers:NavHelper.NavigateTo="views:AlwaysOnTopPage"
-                            AutomationProperties.AutomationId="AlwaysOnTopNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/AlwaysOnTop.png}" />
                         <NavigationViewItem
-                            x:Name="CropAndLockNavigationItem"
                             x:Uid="Shell_CropAndLock"
                             helpers:NavHelper.NavigateTo="views:CropAndLockPage"
-                            AutomationProperties.AutomationId="CropAndLockNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CropAndLock.png}" />
                         <NavigationViewItem
-                            x:Name="FancyZonesNavigationItem"
                             x:Uid="Shell_FancyZones"
                             helpers:NavHelper.NavigateTo="views:FancyZonesPage"
-                            AutomationProperties.AutomationId="FancyZonesNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FancyZones.png}" />
                         <NavigationViewItem
-                            x:Name="WorkspacesNavigationItem"
                             x:Uid="Shell_Workspaces"
                             helpers:NavHelper.NavigateTo="views:WorkspacesPage"
-                            AutomationProperties.AutomationId="WorkspacesNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Workspaces.png}" />
                     </NavigationViewItem.MenuItems>
                 </NavigationViewItem>
 
                 <!--  Input / Output  -->
                 <NavigationViewItem
-                    x:Name="InputOutputNavigationItem"
                     x:Uid="Shell_TopLevelInputOutput"
-                    AutomationProperties.AutomationId="InputOutputNavItem"
                     Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/InputOutput.png}"
                     SelectsOnInvoked="False">
                     <NavigationViewItem.MenuItems>
                         <NavigationViewItem
-                            x:Name="KeyboardManagerNavigationItem"
                             x:Uid="Shell_KeyboardManager"
                             helpers:NavHelper.NavigateTo="views:KeyboardManagerPage"
-                            AutomationProperties.AutomationId="KeyboardManagerNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/KeyboardManager.png}" />
                         <!--  Find my mouse  -->
                         <!--  Mouse Highlighter  -->
                         <NavigationViewItem
-                            x:Name="MouseUtilitiesNavigationItem"
                             x:Uid="Shell_MouseUtilities"
                             helpers:NavHelper.NavigateTo="views:MouseUtilsPage"
-                            AutomationProperties.AutomationId="MouseUtilitiesNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseUtils.png}" />
                         <NavigationViewItem
-                            x:Name="MouseWithoutBordersNavigationItem"
                             x:Uid="Shell_MouseWithoutBorders"
                             helpers:NavHelper.NavigateTo="views:MouseWithoutBordersPage"
-                            AutomationProperties.AutomationId="MouseWithoutBordersNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseWithoutBorders.png}" />
                         <NavigationViewItem
-                            x:Name="QuickAccentNavigationItem"
                             x:Uid="Shell_QuickAccent"
                             helpers:NavHelper.NavigateTo="views:PowerAccentPage"
-                            AutomationProperties.AutomationId="QuickAccentNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/QuickAccent.png}" />
                     </NavigationViewItem.MenuItems>
                 </NavigationViewItem>
 
                 <!--  File Management  -->
                 <NavigationViewItem
-                    x:Name="FileManagementNavigationItem"
                     x:Uid="Shell_TopLevelFileManagement"
-                    AutomationProperties.AutomationId="FileManagementNavItem"
                     Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FileManagement.png}"
                     SelectsOnInvoked="False">
                     <NavigationViewItem.MenuItems>
                         <NavigationViewItem
-                            x:Name="PowerPreviewNavigationItem"
                             x:Uid="Shell_PowerPreview"
                             helpers:NavHelper.NavigateTo="views:PowerPreviewPage"
-                            AutomationProperties.AutomationId="PowerPreviewNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FileExplorerPreview.png}" />
                         <!--  File Explorer Thumbnails  -->
                         <NavigationViewItem
-                            x:Name="FileLocksmithNavigationItem"
                             x:Uid="Shell_FileLocksmith"
                             helpers:NavHelper.NavigateTo="views:FileLocksmithPage"
-                            AutomationProperties.AutomationId="FileLocksmithNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FileLocksmith.png}" />
                         <NavigationViewItem
-                            x:Name="ImageResizerNavigationItem"
                             x:Uid="Shell_ImageResizer"
                             helpers:NavHelper.NavigateTo="views:ImageResizerPage"
-                            AutomationProperties.AutomationId="ImageResizerNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ImageResizer.png}" />
                         <NavigationViewItem
-                            x:Name="NewPlusNavigationItem"
                             x:Uid="NewPlus_Product_Name"
                             helpers:NavHelper.NavigateTo="views:NewPlusPage"
-                            AutomationProperties.AutomationId="NewPlusNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/NewPlus.png}" />
                         <NavigationViewItem
-                            x:Name="PeekNavigationItem"
                             x:Uid="Shell_Peek"
                             helpers:NavHelper.NavigateTo="views:PeekPage"
-                            AutomationProperties.AutomationId="PeekNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Peek.png}" />
                         <NavigationViewItem
-                            x:Name="PowerRenameNavigationItem"
                             x:Uid="Shell_PowerRename"
                             helpers:NavHelper.NavigateTo="views:PowerRenamePage"
-                            AutomationProperties.AutomationId="PowerRenameNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PowerRename.png}" />
                     </NavigationViewItem.MenuItems>
                 </NavigationViewItem>
 
                 <!--  Advanced  -->
                 <NavigationViewItem
-                    x:Name="AdvancedNavigationItem"
                     x:Uid="Shell_TopLevelAdvanced"
-                    AutomationProperties.AutomationId="AdvancedNavItem"
                     Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Advanced.png}"
                     SelectsOnInvoked="False">
                     <NavigationViewItem.MenuItems>
                         <NavigationViewItem
-                            x:Name="CmdNotFoundNavigationItem"
                             x:Uid="Shell_CmdNotFound"
                             helpers:NavHelper.NavigateTo="views:CmdNotFoundPage"
-                            AutomationProperties.AutomationId="CmdNotFoundNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CommandNotFound.png}" />
                         <NavigationViewItem
-                            x:Name="EnvironmentVariablesNavigationItem"
                             x:Uid="Shell_EnvironmentVariables"
                             helpers:NavHelper.NavigateTo="views:EnvironmentVariablesPage"
-                            AutomationProperties.AutomationId="EnvironmentVariablesNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/EnvironmentVariables.png}" />
                         <NavigationViewItem
-                            x:Name="HostsNavigationItem"
                             x:Uid="Shell_Hosts"
                             helpers:NavHelper.NavigateTo="views:HostsPage"
-                            AutomationProperties.AutomationId="HostsNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Hosts.png}" />
                         <NavigationViewItem
-                            x:Name="RegistryPreviewNavigationItem"
                             x:Uid="Shell_RegistryPreview"
                             helpers:NavHelper.NavigateTo="views:RegistryPreviewPage"
-                            AutomationProperties.AutomationId="RegistryPreviewNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/RegistryPreview.png}" />
                     </NavigationViewItem.MenuItems>
                 </NavigationViewItem>
@@ -393,27 +323,19 @@
             <NavigationView.PaneFooter>
                 <StackPanel Orientation="Vertical">
                     <NavigationViewItem
-                        x:Name="OOBENavigationItem"
                         x:Uid="OOBE_NavViewItem"
-                        AutomationProperties.AutomationId="OOBENavItem"
                         Icon="{ui:FontIcon Glyph=&#xF133;}"
                         Tapped="OOBEItem_Tapped" />
                     <NavigationViewItem
-                        x:Name="WhatIsNewNavigationItem"
                         x:Uid="WhatIsNew_NavViewItem"
-                        AutomationProperties.AutomationId="WhatIsNewNavItem"
                         Icon="{ui:FontIcon Glyph=&#xE789;}"
                         Tapped="WhatIsNewItem_Tapped" />
                     <NavigationViewItem
-                        x:Name="FeedbackNavigationItem"
                         x:Uid="Feedback_NavViewItem"
-                        AutomationProperties.AutomationId="FeedbackNavItem"
                         Icon="{ui:FontIcon Glyph=&#xED15;}"
                         Tapped="FeedbackItem_Tapped" />
                     <NavigationViewItem
-                        x:Name="CloseNavigationItem"
                         x:Uid="Close_NavViewItem"
-                        AutomationProperties.AutomationId="CloseNavItem"
                         Icon="{ui:FontIcon Glyph=&#xE7E8;}"
                         Tapped="Close_Tapped"
                         Visibility="{x:Bind ViewModel.ShowCloseMenu, Mode=OneWay}" />

src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml

@@ -1,4 +1,4 @@
-<local:NavigablePage
+<local:NavigatablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.ShortcutGuidePage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -136,4 +136,4 @@
             <controls:PageLink x:Uid="LearnMore_ShortcutGuide" Link="https://aka.ms/PowerToysOverview_ShortcutGuide" />
         </controls:SettingsPageControl.PrimaryLinks>
     </controls:SettingsPageControl>
-</local:NavigablePage>
+</local:NavigatablePage>

src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml.cs

@@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class ShortcutGuidePage : NavigablePage, IRefreshablePage
+    public sealed partial class ShortcutGuidePage : NavigatablePage, IRefreshablePage
     {
         private ShortcutGuideViewModel ViewModel { get; set; }
 

src/settings-ui/Settings.UI/SettingsXAML/Views/WorkspacesPage.xaml

@@ -1,4 +1,4 @@
-<local:NavigablePage
+<local:NavigatablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.WorkspacesPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -57,4 +57,4 @@
             <controls:PageLink x:Uid="LearnMore_Workspaces" Link="https://aka.ms/PowerToysOverview_Workspaces" />
         </controls:SettingsPageControl.PrimaryLinks>
     </controls:SettingsPageControl>
-</local:NavigablePage>
+</local:NavigatablePage>

src/settings-ui/Settings.UI/SettingsXAML/Views/WorkspacesPage.xaml.cs

@@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class WorkspacesPage : NavigablePage, IRefreshablePage
+    public sealed partial class WorkspacesPage : NavigatablePage, IRefreshablePage
     {
         private WorkspacesViewModel ViewModel { get; set; }
 

src/settings-ui/Settings.UI/SettingsXAML/Views/ZoomItPage.xaml

@@ -1,4 +1,4 @@
-<local:NavigablePage
+<local:NavigatablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.ZoomItPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -12,10 +12,10 @@
     AutomationProperties.LandmarkType="Main"
     mc:Ignorable="d">
 
-    <local:NavigablePage.Resources>
+    <local:NavigatablePage.Resources>
         <converters:ZoomItInitialZoomConverter x:Key="ZoomItInitialZoomConverter" />
         <converters:ZoomItTypeSpeedSliderConverter x:Key="ZoomItTypeSpeedSliderConverter" />
-    </local:NavigablePage.Resources>
+    </local:NavigatablePage.Resources>
 
     <controls:SettingsPageControl
         x:Uid="ZoomIt"
@@ -275,4 +275,4 @@
             <controls:PageLink Link="https://learn.microsoft.com/en-us/sysinternals/downloads/zoomit" Text="Sysinternals Zoomit by Mark Russinovich, Alex Mihaiuc, John Stephens" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
-</local:NavigablePage>
+</local:NavigatablePage>

src/settings-ui/Settings.UI/SettingsXAML/Views/ZoomItPage.xaml.cs

@@ -12,7 +12,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class ZoomItPage : NavigablePage, IRefreshablePage
+    public sealed partial class ZoomItPage : NavigatablePage, IRefreshablePage
     {
         private ZoomItViewModel ViewModel { get; set; }
 

tools/BugReportTool/BugReportTool/ProcessesList.cpp

@@ -51,5 +51,4 @@ std::vector<std::wstring> processes =
     L"PowerToys.WorkspacesWindowArranger.exe",
     L"PowerToys.WorkspacesEditor.exe",
     L"PowerToys.ZoomIt.exe",
-    L"Microsoft.CmdPal.UI.exe",
 };