[Deps]Upgrading to CommunityToolkit.WinUI v8.0 (#28205)

* Adding new package references

* Updating namespaces and controls

* Fixing GridSplitter

* Bump up version numbers

* Fix namespaces for Settings

* Fixing FontIcon extensions

* Use Toolkit converters

* Update notice

* Remove unused reference

* Namespace fixes

* Update MainPage.xaml

* Upgrading packages to latest

* Resolve CI issues

* Fix Hosts merge

src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeAlwaysOnTop.xaml

@@ -2,23 +2,23 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeAlwaysOnTop"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <controls:OOBEPageControl
+    <custom:OOBEPageControl
         x:Uid="Oobe_AlwaysOnTop"
         HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/AlwaysOnTop.png">
-        <controls:OOBEPageControl.PageContent>
+        <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
                 <TextBlock
                     x:Uid="Oobe_HowToUse"
                     Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <controls:ShortcutWithTextLabelControl
+                <custom:ShortcutWithTextLabelControl
                     x:Name="HotkeyControl"
                     x:Uid="Oobe_AlwaysOnTop_HowToUse" />
 
@@ -46,6 +46,6 @@
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
-        </controls:OOBEPageControl.PageContent>
-    </controls:OOBEPageControl>
+        </custom:OOBEPageControl.PageContent>
+    </custom:OOBEPageControl>
 </Page>

src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeAwake.xaml

@@ -2,17 +2,17 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeAwake"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <controls:OOBEPageControl
+    <custom:OOBEPageControl
         x:Uid="Oobe_Awake"
         HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/Awake.png">
 
-        <controls:OOBEPageControl.PageContent>
+        <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
                 <TextBlock
                     x:Uid="Oobe_HowToUse"
@@ -46,6 +46,6 @@
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
-        </controls:OOBEPageControl.PageContent>
-    </controls:OOBEPageControl>
+        </custom:OOBEPageControl.PageContent>
+    </custom:OOBEPageControl>
 </Page>

src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeColorPicker.xaml

@@ -2,24 +2,24 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeColorPicker"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <controls:OOBEPageControl
+    <custom:OOBEPageControl
         x:Uid="Oobe_ColorPicker"
         HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/ColorPicker.gif">
 
-        <controls:OOBEPageControl.PageContent>
+        <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
                 <TextBlock
                     x:Uid="Oobe_HowToUse"
                     Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <controls:ShortcutWithTextLabelControl
+                <custom:ShortcutWithTextLabelControl
                     x:Name="HotkeyControl"
                     x:Uid="Oobe_ColorPicker_HowToUse" />
 
@@ -51,6 +51,6 @@
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
-        </controls:OOBEPageControl.PageContent>
-    </controls:OOBEPageControl>
+        </custom:OOBEPageControl.PageContent>
+    </custom:OOBEPageControl>
 </Page>

src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeCropAndLock.xaml

@@ -2,27 +2,27 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeCropAndLock"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <controls:OOBEPageControl
+    <custom:OOBEPageControl
         x:Uid="Oobe_CropAndLock"
         HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/CropAndLock.gif">
-        <controls:OOBEPageControl.PageContent>
+        <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
                 <TextBlock
                     x:Uid="Oobe_HowToUse"
                     Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <controls:ShortcutWithTextLabelControl
+                <custom:ShortcutWithTextLabelControl
                     x:Name="ThumbnailHotkeyControl"
                     x:Uid="Oobe_CropAndLock_HowToUse_Thumbnail" />
 
-                <controls:ShortcutWithTextLabelControl
+                <custom:ShortcutWithTextLabelControl
                     x:Name="ReparentHotkeyControl"
                     x:Uid="Oobe_CropAndLock_HowToUse_Reparent" />
 
@@ -42,6 +42,6 @@
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
-        </controls:OOBEPageControl.PageContent>
-    </controls:OOBEPageControl>
+        </custom:OOBEPageControl.PageContent>
+    </custom:OOBEPageControl>
 </Page>

src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFancyZones.xaml

@@ -2,17 +2,17 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeFancyZones"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <controls:OOBEPageControl
+    <custom:OOBEPageControl
         x:Uid="Oobe_FancyZones"
         HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/FancyZones.gif">
 
-        <controls:OOBEPageControl.PageContent>
+        <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
                 <TextBlock
                     x:Uid="Oobe_HowToUse"
@@ -21,7 +21,7 @@
                 <toolkitcontrols:MarkdownTextBlock
                     x:Uid="Oobe_FancyZones_HowToUse"
                     Background="Transparent" />
-                <controls:ShortcutWithTextLabelControl
+                <custom:ShortcutWithTextLabelControl
                     x:Name="HotkeyControl"
                     x:Uid="Oobe_FancyZones_HowToUse_Shortcut" />
 
@@ -49,6 +49,6 @@
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
-        </controls:OOBEPageControl.PageContent>
-    </controls:OOBEPageControl>
+        </custom:OOBEPageControl.PageContent>
+    </custom:OOBEPageControl>
 </Page>

src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileExplorer.xaml

@@ -2,18 +2,18 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeFileExplorer"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <controls:OOBEPageControl
+    <custom:OOBEPageControl
         x:Uid="Oobe_FileExplorer"
         HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/FileExplorer.png">
 
-        <controls:OOBEPageControl.PageContent>
+        <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
                 <TextBlock
                     x:Uid="Oobe_HowToEnable"
@@ -39,6 +39,6 @@
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
-        </controls:OOBEPageControl.PageContent>
-    </controls:OOBEPageControl>
+        </custom:OOBEPageControl.PageContent>
+    </custom:OOBEPageControl>
 </Page>

src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileLocksmith.xaml

@@ -2,17 +2,17 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeFileLocksmith"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
-    <controls:OOBEPageControl
+    <custom:OOBEPageControl
         x:Uid="Oobe_FileLocksmith"
         HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/FileLocksmith.gif">
 
-        <controls:OOBEPageControl.PageContent>
+        <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
 
                 <TextBlock
@@ -47,6 +47,6 @@
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
-        </controls:OOBEPageControl.PageContent>
-    </controls:OOBEPageControl>
+        </custom:OOBEPageControl.PageContent>
+    </custom:OOBEPageControl>
 </Page>

src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeHosts.xaml

@@ -2,17 +2,17 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeHosts"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <controls:OOBEPageControl
+    <custom:OOBEPageControl
         x:Uid="Oobe_Hosts"
         HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/HostsFileEditor.png">
-        <controls:OOBEPageControl.PageContent>
+        <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
                 <StackPanel
                     Margin="0,24,0,0"
@@ -34,6 +34,6 @@
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
-        </controls:OOBEPageControl.PageContent>
-    </controls:OOBEPageControl>
+        </custom:OOBEPageControl.PageContent>
+    </custom:OOBEPageControl>
 </Page>

src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeImageResizer.xaml

@@ -2,18 +2,18 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeImageResizer"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <controls:OOBEPageControl
+    <custom:OOBEPageControl
         x:Uid="Oobe_ImageResizer"
         HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/ImageResizer.gif">
 
-        <controls:OOBEPageControl.PageContent>
+        <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
                 <TextBlock
                     x:Uid="Oobe_HowToLaunch"
@@ -47,6 +47,6 @@
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
-        </controls:OOBEPageControl.PageContent>
-    </controls:OOBEPageControl>
+        </custom:OOBEPageControl.PageContent>
+    </custom:OOBEPageControl>
 </Page>

src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeKBM.xaml

@@ -2,16 +2,16 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeKBM"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
-    <controls:OOBEPageControl
+    <custom:OOBEPageControl
         x:Uid="Oobe_KBM"
         HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/KBM.gif">
 
-        <controls:OOBEPageControl.PageContent>
+        <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
 
                 <TextBlock
@@ -46,6 +46,6 @@
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
-        </controls:OOBEPageControl.PageContent>
-    </controls:OOBEPageControl>
+        </custom:OOBEPageControl.PageContent>
+    </custom:OOBEPageControl>
 </Page>

src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMeasureTool.xaml

@@ -2,24 +2,24 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeMeasureTool"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <controls:OOBEPageControl
+    <custom:OOBEPageControl
         x:Uid="Oobe_MeasureTool"
         HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/ScreenRuler.gif">
 
-        <controls:OOBEPageControl.PageContent>
+        <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
                 <TextBlock
                     x:Uid="Oobe_HowToLaunch"
                     Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <controls:ShortcutWithTextLabelControl
+                <custom:ShortcutWithTextLabelControl
                     x:Name="HotkeyActivation"
                     x:Uid="Oobe_MeasureTool_Activation" />
 
@@ -43,6 +43,6 @@
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
-        </controls:OOBEPageControl.PageContent>
-    </controls:OOBEPageControl>
+        </custom:OOBEPageControl.PageContent>
+    </custom:OOBEPageControl>
 </Page>

src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseUtils.xaml

@@ -2,17 +2,17 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeMouseUtils"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <controls:OOBEPageControl
+    <custom:OOBEPageControl
         x:Uid="Oobe_MouseUtils"
         HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/MouseUtils.gif">
 
-        <controls:OOBEPageControl.PageContent>
+        <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
                 <TextBlock
                     x:Uid="Oobe_MouseUtils_FindMyMouse"
@@ -59,6 +59,6 @@
                 </StackPanel>
 
             </StackPanel>
-        </controls:OOBEPageControl.PageContent>
-    </controls:OOBEPageControl>
+        </custom:OOBEPageControl.PageContent>
+    </custom:OOBEPageControl>
 </Page>

src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseWithoutBorders.xaml

@@ -2,17 +2,17 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeMouseWithoutBorders"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
-    <controls:OOBEPageControl
+    <custom:OOBEPageControl
         x:Uid="Oobe_MouseWithoutBorders"
         HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/MouseWithoutBorders.png">
 
-        <controls:OOBEPageControl.PageContent>
+        <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
 
                 <TextBlock
@@ -47,6 +47,6 @@
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
-        </controls:OOBEPageControl.PageContent>
-    </controls:OOBEPageControl>
+        </custom:OOBEPageControl.PageContent>
+    </custom:OOBEPageControl>
 </Page>

src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverview.xaml

@@ -2,17 +2,17 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeOverview"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <controls:OOBEPageControl
+    <custom:OOBEPageControl
         x:Uid="Oobe_Overview"
         HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/OOBEPTHero.png">
 
-        <controls:OOBEPageControl.PageContent>
+        <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
                 <TextBlock
                     x:Uid="Oobe_HowToUse"
@@ -35,6 +35,6 @@
                         Click="SettingsLaunchButton_Click" />
                 </StackPanel>
             </StackPanel>
-        </controls:OOBEPageControl.PageContent>
-    </controls:OOBEPageControl>
+        </custom:OOBEPageControl.PageContent>
+    </custom:OOBEPageControl>
 </Page>

src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverviewAlternate.xaml

@@ -2,18 +2,18 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeOverviewAlternate"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <controls:OOBEPageControl
+    <custom:OOBEPageControl
         x:Uid="Oobe_Overview"
         HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/OOBEPTHeroShort.png"
         HeroImageHeight="120">
 
-        <controls:OOBEPageControl.PageContent>
+        <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
                 <TextBlock
                     x:Uid="Alternate_OOBE_Description"
@@ -55,7 +55,7 @@
                                 FontSize="12"
                                 Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                                 TextWrapping="Wrap" />
-                            <controls:ShortcutWithTextLabelControl
+                            <custom:ShortcutWithTextLabelControl
                                 x:Name="FancyZonesHotkeyControl"
                                 Grid.Row="3"
                                 Margin="0,8,0,0" />
@@ -96,7 +96,7 @@
                                 FontSize="12"
                                 Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                                 TextWrapping="Wrap" />
-                            <controls:ShortcutWithTextLabelControl
+                            <custom:ShortcutWithTextLabelControl
                                 x:Name="RunHotkeyControl"
                                 Grid.Row="3"
                                 Margin="0,8,0,0" />
@@ -138,7 +138,7 @@
                                 Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                                 Text="To pick a color:"
                                 TextWrapping="Wrap" />
-                            <controls:ShortcutWithTextLabelControl
+                            <custom:ShortcutWithTextLabelControl
                                 x:Name="ColorPickerHotkeyControl"
                                 Grid.Row="3"
                                 Margin="0,8,0,0" />
@@ -179,7 +179,7 @@
                                 FontSize="12"
                                 Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                                 TextWrapping="Wrap" />
-                            <controls:ShortcutWithTextLabelControl
+                            <custom:ShortcutWithTextLabelControl
                                 x:Name="AlwaysOnTopHotkeyControl"
                                 Grid.Row="3"
                                 Margin="0,8,0,0" />
@@ -188,6 +188,6 @@
 
                 </GridView>
             </StackPanel>
-        </controls:OOBEPageControl.PageContent>
-    </controls:OOBEPageControl>
+        </custom:OOBEPageControl.PageContent>
+    </custom:OOBEPageControl>
 </Page>

src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePastePlain.xaml

@@ -2,24 +2,24 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobePastePlain"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <controls:OOBEPageControl
+    <custom:OOBEPageControl
         x:Uid="Oobe_PastePlain"
         HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PastePlain.gif">
 
-        <controls:OOBEPageControl.PageContent>
+        <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
                 <TextBlock
                     x:Uid="Oobe_HowToUse"
                     Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <controls:ShortcutWithTextLabelControl
+                <custom:ShortcutWithTextLabelControl
                     x:Name="HotkeyControl"
                     x:Uid="Oobe_PastePlain_HowToUse" />
 
@@ -39,6 +39,6 @@
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
-        </controls:OOBEPageControl.PageContent>
-    </controls:OOBEPageControl>
+        </custom:OOBEPageControl.PageContent>
+    </custom:OOBEPageControl>
 </Page>

src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePeek.xaml

@@ -5,7 +5,7 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobePeek"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -13,17 +13,17 @@
     mc:Ignorable="d"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
 
-    <controls:OOBEPageControl
+    <custom:OOBEPageControl
         x:Uid="Oobe_Peek"
         HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/Peek.gif">
 
-        <controls:OOBEPageControl.PageContent>
+        <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
                 <TextBlock
                     x:Uid="Oobe_HowToUse"
                     Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <controls:ShortcutWithTextLabelControl
+                <custom:ShortcutWithTextLabelControl
                     x:Name="HotkeyControl"
                     x:Uid="Oobe_Peek_HowToUse" />
 
@@ -43,6 +43,6 @@
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
-        </controls:OOBEPageControl.PageContent>
-    </controls:OOBEPageControl>
+        </custom:OOBEPageControl.PageContent>
+    </custom:OOBEPageControl>
 </Page>

src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerAccent.xaml

@@ -2,18 +2,18 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobePowerAccent"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <controls:OOBEPageControl
+    <custom:OOBEPageControl
         x:Uid="Oobe_QuickAccent"
         HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PowerAccent.gif">
 
-        <controls:OOBEPageControl.PageContent>
+        <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
                 <TextBlock
                     x:Uid="Oobe_HowToUse"
@@ -39,6 +39,6 @@
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
-        </controls:OOBEPageControl.PageContent>
-    </controls:OOBEPageControl>
+        </custom:OOBEPageControl.PageContent>
+    </custom:OOBEPageControl>
 </Page>

src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerOCR.xaml

@@ -2,24 +2,24 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobePowerOCR"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <controls:OOBEPageControl
+    <custom:OOBEPageControl
         x:Uid="Oobe_TextExtractor"
         HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PowerOCR.gif">
 
-        <controls:OOBEPageControl.PageContent>
+        <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
                 <TextBlock
                     x:Uid="Oobe_HowToUse"
                     Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <controls:ShortcutWithTextLabelControl
+                <custom:ShortcutWithTextLabelControl
                     x:Name="HotkeyControl"
                     x:Uid="Oobe_TextExtractor_HowToUse" />
 
@@ -47,6 +47,6 @@
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
-        </controls:OOBEPageControl.PageContent>
-    </controls:OOBEPageControl>
+        </custom:OOBEPageControl.PageContent>
+    </custom:OOBEPageControl>
 </Page>

src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerRename.xaml

@@ -2,17 +2,17 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobePowerRename"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
-    <controls:OOBEPageControl
+    <custom:OOBEPageControl
         x:Uid="Oobe_PowerRename"
         HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PowerRename.gif">
 
-        <controls:OOBEPageControl.PageContent>
+        <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
 
                 <TextBlock
@@ -47,6 +47,6 @@
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
-        </controls:OOBEPageControl.PageContent>
-    </controls:OOBEPageControl>
+        </custom:OOBEPageControl.PageContent>
+    </custom:OOBEPageControl>
 </Page>

src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRegistryPreview.xaml

@@ -2,17 +2,17 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeRegistryPreview"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
-    <controls:OOBEPageControl
+    <custom:OOBEPageControl
         x:Uid="Oobe_RegistryPreview"
         HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/RegistryPreview.png">
 
-        <controls:OOBEPageControl.PageContent>
+        <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
 
                 <TextBlock
@@ -51,6 +51,6 @@
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
-        </controls:OOBEPageControl.PageContent>
-    </controls:OOBEPageControl>
+        </custom:OOBEPageControl.PageContent>
+    </custom:OOBEPageControl>
 </Page>

src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRun.xaml

@@ -2,24 +2,24 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeRun"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <controls:OOBEPageControl
+    <custom:OOBEPageControl
         x:Uid="Oobe_Run"
         HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/Run.gif">
 
-        <controls:OOBEPageControl.PageContent>
+        <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
                 <TextBlock
                     x:Uid="Oobe_HowToLaunch"
                     Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <controls:ShortcutWithTextLabelControl
+                <custom:ShortcutWithTextLabelControl
                     x:Name="HotkeyControl"
                     x:Uid="Oobe_Run_HowToLaunch" />
 
@@ -51,6 +51,6 @@
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
-        </controls:OOBEPageControl.PageContent>
-    </controls:OOBEPageControl>
+        </custom:OOBEPageControl.PageContent>
+    </custom:OOBEPageControl>
 </Page>

src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml

@@ -2,10 +2,10 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeShellPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:animations="using:CommunityToolkit.WinUI.UI.Animations"
+    xmlns:animations="using:CommunityToolkit.WinUI.Animations"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="using:CommunityToolkit.WinUI.UI"
+    xmlns:ui="using:CommunityToolkit.WinUI"
     HighContrastAdjustment="None"
     Loaded="ShellPage_Loaded"
     mc:Ignorable="d">
@@ -171,7 +171,7 @@
             <NavigationView.FooterMenuItems>
                 <NavigationViewItem
                     x:Uid="Shell_WhatsNew"
-                    Icon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                    Icon="{ui:FontIcon 
                                        Glyph=&#xF133;}"
                     Tag="WhatsNew" />
             </NavigationView.FooterMenuItems>

src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShortcutGuide.xaml

@@ -2,23 +2,23 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeShortcutGuide"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
-    <controls:OOBEPageControl
+    <custom:OOBEPageControl
         x:Uid="Oobe_ShortcutGuide"
         HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/OOBEShortcutGuide.png">
-        <controls:OOBEPageControl.PageContent>
+        <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
 
                 <TextBlock
                     x:Uid="Oobe_HowToLaunch"
                     Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <controls:ShortcutWithTextLabelControl
+                <custom:ShortcutWithTextLabelControl
                     x:Name="HotkeyControl"
                     x:Uid="Oobe_ShortcutGuide_HowToLaunch" />
                 <StackPanel
@@ -41,6 +41,6 @@
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
-        </controls:OOBEPageControl.PageContent>
-    </controls:OOBEPageControl>
+        </custom:OOBEPageControl.PageContent>
+    </custom:OOBEPageControl>
 </Page>

src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeVideoConference.xaml

@@ -2,33 +2,33 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeVideoConference"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <controls:OOBEPageControl
+    <custom:OOBEPageControl
         x:Uid="Oobe_VideoConference"
         HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/VideoConferenceMute.png">
 
-        <controls:OOBEPageControl.PageContent>
+        <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
                 <TextBlock
                     x:Uid="Oobe_HowToLaunch"
                     Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <controls:ShortcutWithTextLabelControl
+                <custom:ShortcutWithTextLabelControl
                     x:Name="HotkeyMicVidControl"
                     x:Uid="Oobe_VideoConference_ToggleMicVid" />
-                <controls:ShortcutWithTextLabelControl
+                <custom:ShortcutWithTextLabelControl
                     x:Name="HotkeyMicControl"
                     x:Uid="Oobe_VideoConference_ToggleMic" />
-                <controls:ShortcutWithTextLabelControl
+                <custom:ShortcutWithTextLabelControl
                     x:Name="HotkeyPushToTalkControl"
                     x:Uid="Oobe_VideoConference_PushToTalkMic" />
-                <controls:ShortcutWithTextLabelControl
+                <custom:ShortcutWithTextLabelControl
                     x:Name="HotkeyVidControl"
                     x:Uid="Oobe_VideoConference_ToggleVid" />
 
@@ -52,6 +52,6 @@
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
-        </controls:OOBEPageControl.PageContent>
-    </controls:OOBEPageControl>
+        </custom:OOBEPageControl.PageContent>
+    </custom:OOBEPageControl>
 </Page>

src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeWhatsNew.xaml

@@ -2,7 +2,7 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeWhatsNew"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:custom="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"