Settings UI: Fix spelling error and make spell checker happy (#41403)

## Summary of the Pull Request - Renames `NavigatablePage` to `NavigablePage` to fix a spelling error. - Reverts related entries in `exclude.txt` that triggered a forbidden pattern error in the spell checker. - The spell checker does not allow PascalCase words like `NavigatablePage` in `exclude.txt` because of its automatic casing rules. Regression: #41285 --------- Co-authored-by: vanzue <vanzue@outlook.com>
2025-12-16 03:37:59 +01:00 · 2025-08-27 05:29:14 +02:00
parent e8e1431e15
commit 3ebf0f741a
61 changed files with 115 additions and 113 deletions
--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
@@ -1025,8 +1025,6 @@ MYICON
 NAMECHANGE
 namespaceanddescendants
 nao
-Navigatable
-NavigatablePage
 NCACTIVATE
 ncc
 NCCALCSIZE
--- a/.github/actions/spell-check/patterns.txt
+++ b/.github/actions/spell-check/patterns.txt
@@ -260,3 +260,7 @@ 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
--- a/src/settings-ui/Settings.UI/Helpers/NavigatablePage.cs
+++ b/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 NavigatablePage : Page
+public abstract partial class NavigablePage : Page
 {
    private const int ExpandWaitDuration = 500;
    private const int AnimationDuration = 2000;

    private NavigationParams _pendingNavigationParams;

-    public NavigatablePage()
+    public NavigablePage()
    {
        Loaded += OnPageLoaded;
    }
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
    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:NavigatablePage.Resources>
+    <local:NavigablePage.Resources>
        <ResourceDictionary>
            <ResourceDictionary.ThemeDictionaries>
                <ResourceDictionary x:Key="Default">
@@ -38,7 +38,7 @@
                </StackPanel>
            </DataTemplate>
        </ResourceDictionary>
-    </local:NavigatablePage.Resources>
+    </local:NavigablePage.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:NavigatablePage>
+</local:NavigablePage>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml.cs
+++ b/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 : NavigatablePage, IRefreshablePage
+    public sealed partial class AdvancedPastePage : NavigablePage, IRefreshablePage
    {
        private AdvancedPasteViewModel ViewModel { get; set; }

--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
    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:NavigatablePage>
+</local:NavigablePage>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml.cs
+++ b/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 : NavigatablePage, IRefreshablePage
+    public sealed partial class AlwaysOnTopPage : NavigablePage, IRefreshablePage
    {
        private AlwaysOnTopViewModel ViewModel { get; set; }

--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
    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:NavigatablePage.Resources>
+    <local:NavigablePage.Resources>
        <converters:AwakeModeToIntConverter x:Key="AwakeModeToIntConverter" />
-    </local:NavigatablePage.Resources>
+    </local:NavigablePage.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:NavigatablePage>
+</local:NavigablePage>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml.cs
+++ b/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 : NavigatablePage, IRefreshablePage
+    public sealed partial class AwakePage : NavigablePage, IRefreshablePage
    {
        private readonly string _appName = "Awake";
        private readonly SettingsUtils _settingsUtils;
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdNotFoundPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdNotFoundPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
    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:NavigatablePage>
+</local:NavigablePage>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdNotFoundPage.xaml.cs
+++ b/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 : NavigatablePage
+    public sealed partial class CmdNotFoundPage : NavigablePage
    {
        private CmdNotFoundViewModel ViewModel { get; set; }

--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
    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:NavigatablePage>
+</local:NavigablePage>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml.cs
+++ b/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 : NavigatablePage, IRefreshablePage
+    public sealed partial class CmdPalPage : NavigablePage, IRefreshablePage
    {
        private CmdPalViewModel ViewModel { get; set; }

--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
    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:NavigatablePage>
+</local:NavigablePage>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml.cs
+++ b/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 : NavigatablePage, IRefreshablePage
+    public sealed partial class ColorPickerPage : NavigablePage, IRefreshablePage
    {
        public ColorPickerViewModel ViewModel { get; set; }

--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/CropAndLockPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/CropAndLockPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
    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:NavigatablePage>
+</local:NavigablePage>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/CropAndLockPage.xaml.cs
+++ b/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 : NavigatablePage, IRefreshablePage
+    public sealed partial class CropAndLockPage : NavigablePage, IRefreshablePage
    {
        private CropAndLockViewModel ViewModel { get; set; }

--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
    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:NavigatablePage.Resources>
+    <local:NavigablePage.Resources>
        <converters:ModuleItemTemplateSelector
            x:Key="ModuleItemTemplateSelector"
            ActivationTemplate="{StaticResource ModuleItemActivationTemplate}"
@@ -74,7 +74,7 @@
                    TextWrapping="WrapWholeWords" />
            </Grid>
        </DataTemplate>
-    </local:NavigatablePage.Resources>
+    </local:NavigablePage.Resources>
    <Grid Margin="16,0,0,0" RowSpacing="12">
        <Grid.RowDefinitions>
            <RowDefinition Height="Auto" />
@@ -363,4 +363,4 @@
            </VisualStateGroup>
        </VisualStateManager.VisualStateGroups>
    </Grid>
-</local:NavigatablePage>
+</local:NavigablePage>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml.cs
+++ b/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 : NavigatablePage, IRefreshablePage
+    public sealed partial class DashboardPage : NavigablePage, IRefreshablePage
    {
        /// <summary>
        /// Gets or sets view model.
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/EnvironmentVariablesPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/EnvironmentVariablesPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
    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:NavigatablePage>
+</local:NavigablePage>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/EnvironmentVariablesPage.xaml.cs
+++ b/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 : NavigatablePage, IRefreshablePage
+    public sealed partial class EnvironmentVariablesPage : NavigablePage, IRefreshablePage
    {
        private EnvironmentVariablesViewModel ViewModel { get; }

--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
    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"
@@ -299,4 +299,4 @@
            <controls:PageLink x:Uid="LearnMore_FancyZones" Link="https://aka.ms/PowerToysOverview_FancyZones" />
        </controls:SettingsPageControl.PrimaryLinks>
    </controls:SettingsPageControl>
-</local:NavigatablePage>
+</local:NavigablePage>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml.cs
+++ b/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 : NavigatablePage, IRefreshablePage
+    public sealed partial class FancyZonesPage : NavigablePage, IRefreshablePage
    {
        private FancyZonesViewModel ViewModel { get; set; }

--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
    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:NavigatablePage>
+</local:NavigablePage>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml.cs
+++ b/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 : NavigatablePage, IRefreshablePage
+    public sealed partial class FileLocksmithPage : NavigablePage, IRefreshablePage
    {
        private FileLocksmithViewModel ViewModel { get; set; }

--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
    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:NavigatablePage.Resources>
+    <local:NavigablePage.Resources>
        <converters:UpdateStateToBoolConverter x:Key="UpdateStateToBoolConverter" />
        <converters:StringToInfoBarSeverityConverter x:Key="StringToInfoBarSeverityConverter" />
-    </local:NavigatablePage.Resources>
+    </local:NavigablePage.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:NavigatablePage>
+</local:NavigablePage>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml.cs
+++ b/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 : NavigatablePage, IRefreshablePage
+    public sealed partial class GeneralPage : NavigablePage, IRefreshablePage
    {
        private static DateTime OkToHideBackupAndRestoreMessageTime { get; set; }

--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
    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:NavigatablePage>
+</local:NavigablePage>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml.cs
+++ b/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 : NavigatablePage, IRefreshablePage
+    public sealed partial class HostsPage : NavigablePage, IRefreshablePage
    {
        private HostsViewModel ViewModel { get; }

--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
    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:NavigatablePage.Resources>
+    <local:NavigablePage.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:NavigatablePage.Resources>
+    </local:NavigablePage.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:NavigatablePage>
+</local:NavigablePage>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml.cs
+++ b/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 : NavigatablePage, IRefreshablePage
+    public sealed partial class ImageResizerPage : NavigablePage, IRefreshablePage
    {
        public ImageResizerViewModel ViewModel { get; set; }

--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
    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:NavigatablePage.Resources>
+    <local:NavigablePage.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:NavigatablePage.Resources>
+    </local:NavigablePage.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:NavigatablePage>
+</local:NavigablePage>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml.cs
+++ b/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 : NavigatablePage, IRefreshablePage
+    public sealed partial class KeyboardManagerPage : NavigablePage, IRefreshablePage
    {
        private const string PowerToyName = "Keyboard Manager";

--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
    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:NavigatablePage>
+</local:NavigablePage>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml.cs
+++ b/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 : NavigatablePage, IRefreshablePage
+    public sealed partial class MeasureToolPage : NavigablePage, IRefreshablePage
    {
        private MeasureToolViewModel ViewModel { get; set; }

--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
    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:NavigatablePage.Resources>
+    <local:NavigablePage.Resources>
        <converters:IndexBitFieldToVisibilityConverter x:Key="IndexBitFieldToVisibilityConverter" />
        <tkconverters:BoolToVisibilityConverter
            x:Key="BoolToInvertedVisibilityConverter"
            FalseValue="Visible"
            TrueValue="Collapsed" />
-    </local:NavigatablePage.Resources>
+    </local:NavigablePage.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:NavigatablePage>
+</local:NavigablePage>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml.cs
+++ b/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 : NavigatablePage, IRefreshablePage
+    public sealed partial class MouseUtilsPage : NavigablePage, IRefreshablePage
    {
        private MouseUtilsViewModel ViewModel { get; set; }

--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
    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:NavigatablePage.Resources>
+    <local:NavigablePage.Resources>
        <converters:BoolToVisibilityConverter x:Key="negativeBoolToVisibilityConverter" />
        <converters:BoolToObjectConverter
            x:Key="OneRowMatrixBoolToNumberOfRowsConverter"
            FalseValue="2"
            TrueValue="4" />
-    </local:NavigatablePage.Resources>
+    </local:NavigablePage.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:NavigatablePage>
+</local:NavigablePage>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml.cs
+++ b/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 : NavigatablePage, IRefreshablePage
+    public sealed partial class MouseWithoutBordersPage : NavigablePage, IRefreshablePage
    {
        private const string MouseWithoutBordersDragDropCheckString = "MWB Device Drag Drop";

--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/NewPlusPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/NewPlusPage.xaml
@@ -1,4 +1,4 @@
-<helper:NavigatablePage
+<helper:NavigablePage
    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:NavigatablePage>
+</helper:NavigablePage>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/NewPlusPage.xaml.cs
+++ b/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 : NavigatablePage, IRefreshablePage
+    public sealed partial class NewPlusPage : NavigablePage, IRefreshablePage
    {
        private NewPlusViewModel ViewModel { get; set; }

--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
    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:NavigatablePage>
+</local:NavigablePage>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml.cs
+++ b/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 : NavigatablePage, IRefreshablePage
+    public sealed partial class PeekPage : NavigablePage, IRefreshablePage
    {
        private PeekViewModel ViewModel { get; set; }

--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
    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:NavigatablePage.Resources>
+    <local:NavigablePage.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:NavigatablePage.Resources>
+    </local:NavigablePage.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:NavigatablePage>
+</local:NavigablePage>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml.cs
+++ b/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 : NavigatablePage, IRefreshablePage
+    public sealed partial class PowerAccentPage : NavigablePage, IRefreshablePage
    {
        private PowerAccentViewModel ViewModel { get; set; }

--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
    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:NavigatablePage.Resources>
+    <local:NavigablePage.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:NavigatablePage.Resources>
+    </local:NavigablePage.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:NavigatablePage>
+</local:NavigablePage>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml.cs
+++ b/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 : NavigatablePage, IRefreshablePage
+    public sealed partial class PowerLauncherPage : NavigablePage, IRefreshablePage
    {
        public PowerLauncherViewModel ViewModel { get; set; }

--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
    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:NavigatablePage>
+</local:NavigablePage>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml.cs
+++ b/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 : NavigatablePage, IRefreshablePage
+    public sealed partial class PowerOcrPage : NavigablePage, IRefreshablePage
    {
        private PowerOcrViewModel ViewModel { get; set; }

--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
    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:NavigatablePage>
+</local:NavigablePage>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml.cs
+++ b/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 : NavigatablePage
+    public sealed partial class PowerPreviewPage : NavigablePage
    {
        public PowerPreviewViewModel ViewModel { get; set; }

--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
    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:NavigatablePage>
+</local:NavigablePage>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml.cs
+++ b/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 : NavigatablePage, IRefreshablePage
+    public sealed partial class PowerRenamePage : NavigablePage, IRefreshablePage
    {
        private PowerRenameViewModel ViewModel { get; set; }

--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
    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:NavigatablePage>
+</local:NavigablePage>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml.cs
+++ b/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 : NavigatablePage, IRefreshablePage
+    public sealed partial class RegistryPreviewPage : NavigablePage, IRefreshablePage
    {
        private RegistryPreviewViewModel ViewModel { get; set; }

--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
    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:NavigatablePage>
+</local:NavigablePage>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml.cs
+++ b/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 : NavigatablePage, IRefreshablePage
+    public sealed partial class ShortcutGuidePage : NavigablePage, IRefreshablePage
    {
        private ShortcutGuideViewModel ViewModel { get; set; }

--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/WorkspacesPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/WorkspacesPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
    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:NavigatablePage>
+</local:NavigablePage>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/WorkspacesPage.xaml.cs
+++ b/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 : NavigatablePage, IRefreshablePage
+    public sealed partial class WorkspacesPage : NavigablePage, IRefreshablePage
    {
        private WorkspacesViewModel ViewModel { get; set; }

--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ZoomItPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ZoomItPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
    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:NavigatablePage.Resources>
+    <local:NavigablePage.Resources>
        <converters:ZoomItInitialZoomConverter x:Key="ZoomItInitialZoomConverter" />
        <converters:ZoomItTypeSpeedSliderConverter x:Key="ZoomItTypeSpeedSliderConverter" />
-    </local:NavigatablePage.Resources>
+    </local:NavigablePage.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:NavigatablePage>
+</local:NavigablePage>
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ZoomItPage.xaml.cs
+++ b/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 : NavigatablePage, IRefreshablePage
+    public sealed partial class ZoomItPage : NavigablePage, IRefreshablePage
    {
        private ZoomItViewModel ViewModel { get; set; }