From 536c723599e09637bddddaec2a1e0d148b07068e Mon Sep 17 00:00:00 2001
From: Davide Giacometti <davide.giacometti@outlook.it>
Date: Tue, 24 Oct 2023 12:25:55 +0200
Subject: [PATCH] [Settings]XamlStyler formatting (#29114)

* XamlStyler formatting

* add generated files exclusion
---
 .pipelines/applyXamlStyling.ps1               |   2 +-
 .../Controls/FancyZonesPreviewControl.xaml    |  58 +-
 .../IsEnabledTextBlock.xaml                   |   3 +-
 .../Controls/KeyVisual/KeyVisual.xaml         |  40 +-
 .../Controls/PowerAccentShortcutControl.xaml  |   4 +-
 .../SettingsPageControl.xaml                  |  40 +-
 .../ShortcutDialogContentControl.xaml         |  22 +-
 .../SettingsXAML/Flyout/AppsListPage.xaml     |  10 +-
 .../SettingsXAML/FlyoutWindow.xaml            |  18 +-
 .../Settings.UI/SettingsXAML/MainWindow.xaml  |   4 +-
 .../OOBE/Views/OobeAlwaysOnTop.xaml           |  32 +-
 .../SettingsXAML/OOBE/Views/OobeAwake.xaml    |  32 +-
 .../OOBE/Views/OobeColorPicker.xaml           |  32 +-
 .../OOBE/Views/OobeCropAndLock.xaml           |  28 +-
 .../OOBE/Views/OobeFancyZones.xaml            |  38 +-
 .../OOBE/Views/OobeFileExplorer.xaml          |  24 +-
 .../OOBE/Views/OobeFileLocksmith.xaml         |  32 +-
 .../SettingsXAML/OOBE/Views/OobeHosts.xaml    |  16 +-
 .../OOBE/Views/OobeImageResizer.xaml          |  32 +-
 .../SettingsXAML/OOBE/Views/OobeKBM.xaml      |  32 +-
 .../OOBE/Views/OobeMeasureTool.xaml           |  28 +-
 .../OOBE/Views/OobeMouseUtils.xaml            |  48 +-
 .../OOBE/Views/OobeMouseWithoutBorders.xaml   |  32 +-
 .../SettingsXAML/OOBE/Views/OobeOverview.xaml |  20 +-
 .../OOBE/Views/OobeOverviewPlaceholder.xaml   |  20 +-
 .../OOBE/Views/OobePastePlain.xaml            |  24 +-
 .../SettingsXAML/OOBE/Views/OobePeek.xaml     |  34 +-
 .../OOBE/Views/OobePowerAccent.xaml           |  24 +-
 .../SettingsXAML/OOBE/Views/OobePowerOCR.xaml |  32 +-
 .../OOBE/Views/OobePowerRename.xaml           |  32 +-
 .../OOBE/Views/OobeRegistryPreview.xaml       |  32 +-
 .../SettingsXAML/OOBE/Views/OobeRun.xaml      |  32 +-
 .../OOBE/Views/OobeShortcutGuide.xaml         |  24 +-
 .../OOBE/Views/OobeVideoConference.xaml       |  40 +-
 .../SettingsXAML/OOBE/Views/OobeWhatsNew.xaml |   8 +-
 .../SettingsXAML/Styles/Button.xaml           | 894 +++++++++---------
 .../SettingsXAML/Styles/TextBlock.xaml        |  12 +-
 .../SettingsXAML/Themes/Colors.xaml           |  28 +-
 .../SettingsXAML/Views/ColorPickerPage.xaml   |   6 +-
 .../SettingsXAML/Views/FancyZonesPage.xaml    |   6 +-
 .../SettingsXAML/Views/PowerLauncherPage.xaml |   7 +-
 41 files changed, 720 insertions(+), 1162 deletions(-)

diff --git a/.pipelines/applyXamlStyling.ps1 b/.pipelines/applyXamlStyling.ps1
index 42e235f195..8f890d2a91 100644
--- a/.pipelines/applyXamlStyling.ps1
+++ b/.pipelines/applyXamlStyling.ps1
@@ -107,7 +107,7 @@ if (-not $Passive)
 else 
 {
     Write-Output "Checking all files (passively)"
-    $files = Get-ChildItem -Path "$PSScriptRoot\..\src\*.xaml" -Recurse | Select-Object -ExpandProperty FullName | Where-Object { $_ -notmatch "(\\obj\\)|(\\bin\\)|(\\x64\\)|(\\launcher\\PowerLauncher\\)|(\\launcher\\Wox.Plugin\\)|(\\colorPicker\\ColorPickerUI\\)|(\\settings-ui\\Settings.UI\\)" }
+    $files = Get-ChildItem -Path "$PSScriptRoot\..\src\*.xaml" -Recurse | Select-Object -ExpandProperty FullName | Where-Object { $_ -notmatch "(\\obj\\)|(\\bin\\)|(\\x64\\)|(\\Generated Files\\PowerRenameXAML\\)|(\\launcher\\PowerLauncher\\)|(\\launcher\\Wox.Plugin\\)|(\\colorPicker\\ColorPickerUI\\)" }
 
     if ($files.count -gt 0)
     {
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/FancyZonesPreviewControl.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/FancyZonesPreviewControl.xaml
index 36cd66e38a..ebb8e7eff5 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/FancyZonesPreviewControl.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/FancyZonesPreviewControl.xaml
@@ -11,39 +11,23 @@
         <ResourceDictionary>
             <ResourceDictionary.ThemeDictionaries>
                 <ResourceDictionary x:Key="Dark">
-                    <SolidColorBrush
-                        x:Key="SolidBackgroundBrush"
-                        Color="Black" />
-                    <SolidColorBrush
-                        x:Key="SolidZoneNumberBrush"
-                        Color="White" />
+                    <SolidColorBrush x:Key="SolidBackgroundBrush" Color="Black" />
+                    <SolidColorBrush x:Key="SolidZoneNumberBrush" Color="White" />
                 </ResourceDictionary>
                 <ResourceDictionary x:Key="Light">
-                    <SolidColorBrush
-                        x:Key="SolidBackgroundBrush"
-                        Color="White" />
-                    <SolidColorBrush
-                        x:Key="SolidZoneNumberBrush"
-                        Color="Black" />
+                    <SolidColorBrush x:Key="SolidBackgroundBrush" Color="White" />
+                    <SolidColorBrush x:Key="SolidZoneNumberBrush" Color="Black" />
                 </ResourceDictionary>
                 <ResourceDictionary x:Key="HighContrast">
-                    <SolidColorBrush
-                        x:Key="SolidBackgroundBrush"
-                        Color="Black" />
-                    <SolidColorBrush
-                        x:Key="SolidZoneNumberBrush"
-                        Color="White" />
+                    <SolidColorBrush x:Key="SolidBackgroundBrush" Color="Black" />
+                    <SolidColorBrush x:Key="SolidZoneNumberBrush" Color="White" />
                 </ResourceDictionary>
             </ResourceDictionary.ThemeDictionaries>
-            <SolidColorBrush
-                x:Key="DefaultAccentBrush"
-                Color="{ThemeResource SystemAccentColor}" />
-            <SolidColorBrush
-                x:Key="DefaultBorderBrush"
-                Color="{ThemeResource SystemAccentColor}" />
+            <SolidColorBrush x:Key="DefaultAccentBrush" Color="{ThemeResource SystemAccentColor}" />
+            <SolidColorBrush x:Key="DefaultBorderBrush" Color="{ThemeResource SystemAccentColor}" />
         </ResourceDictionary>
     </UserControl.Resources>
-    
+
     <Grid
         x:Name="RootGrid"
         MinWidth="170"
@@ -64,10 +48,10 @@
         <Border
             Grid.RowSpan="2"
             Grid.ColumnSpan="2"
-            Opacity="0.8"
-            CornerRadius="4">
+            CornerRadius="4"
+            Opacity="0.8">
             <Image
-               AutomationProperties.AccessibilityView="Raw"
+                AutomationProperties.AccessibilityView="Raw"
                 Source="{x:Bind WallpaperPath, Mode=OneWay}"
                 Stretch="UniformToFill" />
         </Border>
@@ -75,10 +59,10 @@
         <Border
             x:Name="Zone1"
             Grid.RowSpan="2"
-            BorderThickness="1"
             Margin="4,4,2,4"
-            CornerRadius="2"
-            Background="{ThemeResource SystemControlAcrylicElementBrush}">
+            Background="{ThemeResource SystemControlAcrylicElementBrush}"
+            BorderThickness="1"
+            CornerRadius="2">
             <TextBlock
                 x:Name="Zone1Number"
                 HorizontalAlignment="Center"
@@ -90,10 +74,10 @@
         <Border
             x:Name="Zone2"
             Grid.Column="1"
-            BorderThickness="1"
             Margin="2,4,4,2"
-            CornerRadius="2"
-            Background="{ThemeResource SystemControlAcrylicElementBrush}">
+            Background="{ThemeResource SystemControlAcrylicElementBrush}"
+            BorderThickness="1"
+            CornerRadius="2">
             <TextBlock
                 x:Name="Zone2Number"
                 HorizontalAlignment="Center"
@@ -106,10 +90,10 @@
             x:Name="Zone3"
             Grid.Row="1"
             Grid.Column="1"
-            BorderThickness="1"
             Margin="2,2,4,4"
-            CornerRadius="2"
-            Background="{ThemeResource SystemControlAcrylicElementBrush}">
+            Background="{ThemeResource SystemControlAcrylicElementBrush}"
+            BorderThickness="1"
+            CornerRadius="2">
             <TextBlock
                 x:Name="Zone3Number"
                 HorizontalAlignment="Center"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/IsEnabledTextBlock/IsEnabledTextBlock.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/IsEnabledTextBlock/IsEnabledTextBlock.xaml
index 1ea76328bc..e29a5b0182 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/IsEnabledTextBlock/IsEnabledTextBlock.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/IsEnabledTextBlock/IsEnabledTextBlock.xaml
@@ -35,9 +35,8 @@
     </Style>
     <Style
         x:Key="SecondaryIsEnabledTextBlockStyle"
-        TargetType="local:IsEnabledTextBlock"
         BasedOn="{StaticResource DefaultIsEnabledTextBlockStyle}"
-        >
+        TargetType="local:IsEnabledTextBlock">
         <Setter Property="Foreground" Value="{ThemeResource TextFillColorSecondaryBrush}" />
         <Setter Property="FontSize" Value="{StaticResource SecondaryTextFontSize}" />
     </Style>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.xaml
index 68590a040a..469a8be795 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.xaml
@@ -21,6 +21,26 @@
             <Setter.Value>
                 <ControlTemplate TargetType="local:KeyVisual">
                     <Grid>
+                        <Grid>
+                            <Rectangle
+                                x:Name="ContentHolder"
+                                Height="{TemplateBinding Height}"
+                                MinWidth="{TemplateBinding MinWidth}"
+                                Fill="{TemplateBinding Background}"
+                                RadiusX="4"
+                                RadiusY="4"
+                                Stroke="{TemplateBinding BorderBrush}"
+                                StrokeThickness="{TemplateBinding BorderThickness}" />
+                            <ContentPresenter
+                                x:Name="KeyPresenter"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="Center"
+                                Content="{TemplateBinding Content}"
+                                FontSize="{TemplateBinding FontSize}"
+                                FontWeight="{TemplateBinding FontWeight}"
+                                Foreground="{TemplateBinding Foreground}" />
+                        </Grid>
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualState x:Name="Normal" />
@@ -45,26 +65,6 @@
                                 </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
-                        <Grid>
-                            <Rectangle
-                                x:Name="ContentHolder"
-                                Height="{TemplateBinding Height}"
-                                MinWidth="{TemplateBinding MinWidth}"
-                                Fill="{TemplateBinding Background}"
-                                RadiusX="4"
-                                RadiusY="4"
-                                Stroke="{TemplateBinding BorderBrush}"
-                                StrokeThickness="{TemplateBinding BorderThickness}" />
-                            <ContentPresenter
-                                x:Name="KeyPresenter"
-                                Margin="{TemplateBinding Padding}"
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="Center"
-                                Content="{TemplateBinding Content}"
-                                FontSize="{TemplateBinding FontSize}"
-                                FontWeight="{TemplateBinding FontWeight}"
-                                Foreground="{TemplateBinding Foreground}" />
-                        </Grid>
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/PowerAccentShortcutControl.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/PowerAccentShortcutControl.xaml
index 0d44308c24..428663359b 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/PowerAccentShortcutControl.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/PowerAccentShortcutControl.xaml
@@ -22,9 +22,7 @@
             ItemsSource="{x:Bind Keys}">
             <ItemsControl.ItemsPanel>
                 <ItemsPanelTemplate>
-                    <StackPanel
-                        Orientation="Horizontal"
-                        Spacing="4" />
+                    <StackPanel Orientation="Horizontal" Spacing="4" />
                 </ItemsPanelTemplate>
             </ItemsControl.ItemsPanel>
             <ItemsControl.ItemTemplate>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsPageControl/SettingsPageControl.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsPageControl/SettingsPageControl.xaml
index 87b182b414..644fccc5e2 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsPageControl/SettingsPageControl.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsPageControl/SettingsPageControl.xaml
@@ -2,8 +2,8 @@
     x:Class="Microsoft.PowerToys.Settings.UI.Controls.SettingsPageControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:custom="using:CommunityToolkit.WinUI.UI.Controls"
     xmlns:converters="using:CommunityToolkit.WinUI.Converters"
+    xmlns:custom="using:CommunityToolkit.WinUI.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -24,25 +24,6 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <VisualStateManager.VisualStateGroups>
-            <VisualStateGroup>
-                <VisualState>
-                    <VisualState.StateTriggers>
-                        <AdaptiveTrigger MinWindowWidth="480" />
-                    </VisualState.StateTriggers>
-                </VisualState>
-                <VisualState>
-                    <VisualState.StateTriggers>
-                        <AdaptiveTrigger MinWindowWidth="0" />
-                    </VisualState.StateTriggers>
-                    <VisualState.Setters>
-                        <Setter Target="DescriptionPanel.(Grid.Row)" Value="1" />
-                        <Setter Target="DescriptionPanel.(Grid.Column)" Value="0" />
-                        <Setter Target="DescriptionPanel.(Grid.ColumnSpan)" Value="2" />
-                    </VisualState.Setters>
-                </VisualState>
-            </VisualStateGroup>
-        </VisualStateManager.VisualStateGroups>
         <TextBlock
             x:Name="Header"
             MaxWidth="{StaticResource PageMaxWidth}"
@@ -157,5 +138,24 @@
                 </StackPanel>
             </Grid>
         </ScrollViewer>
+        <VisualStateManager.VisualStateGroups>
+            <VisualStateGroup>
+                <VisualState>
+                    <VisualState.StateTriggers>
+                        <AdaptiveTrigger MinWindowWidth="480" />
+                    </VisualState.StateTriggers>
+                </VisualState>
+                <VisualState>
+                    <VisualState.StateTriggers>
+                        <AdaptiveTrigger MinWindowWidth="0" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="DescriptionPanel.(Grid.Row)" Value="1" />
+                        <Setter Target="DescriptionPanel.(Grid.Column)" Value="0" />
+                        <Setter Target="DescriptionPanel.(Grid.ColumnSpan)" Value="2" />
+                    </VisualState.Setters>
+                </VisualState>
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
     </Grid>
 </UserControl>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutDialogContentControl.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutDialogContentControl.xaml
index 9472c661cc..899f08f746 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutDialogContentControl.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutDialogContentControl.xaml
@@ -8,17 +8,14 @@
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     x:Name="ShortcutContentControl"
     mc:Ignorable="d">
-    <Grid
-        MinWidth="498"
-        MinHeight="220">
+    <Grid MinWidth="498" MinHeight="220">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition MinHeight="110" />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
 
-        <TextBlock
-            Grid.Row="0" />
+        <TextBlock Grid.Row="0" />
 
         <ItemsControl
             x:Name="KeysControl"
@@ -31,9 +28,7 @@
             ItemsSource="{x:Bind Keys, Mode=OneWay}">
             <ItemsControl.ItemsPanel>
                 <ItemsPanelTemplate>
-                    <StackPanel
-                        Orientation="Horizontal"
-                        Spacing="8" />
+                    <StackPanel Orientation="Horizontal" Spacing="8" />
                 </ItemsPanelTemplate>
             </ItemsControl.ItemsPanel>
             <ItemsControl.ItemTemplate>
@@ -57,11 +52,12 @@
             Spacing="8">
             <Grid Height="62">
 
-                <InfoBar x:Uid="InvalidShortcut"
-                         IsClosable="False"
-                         IsOpen="{Binding ElementName=ShortcutContentControl, Path=IsError, Mode=OneWay}"
-                         IsTabStop="{Binding ElementName=ShortcutContentControl, Path=IsError, Mode=OneWay}"
-                         Severity="Error" />
+                <InfoBar
+                    x:Uid="InvalidShortcut"
+                    IsClosable="False"
+                    IsOpen="{Binding ElementName=ShortcutContentControl, Path=IsError, Mode=OneWay}"
+                    IsTabStop="{Binding ElementName=ShortcutContentControl, Path=IsError, Mode=OneWay}"
+                    Severity="Error" />
 
             </Grid>
             <toolkitcontrols:MarkdownTextBlock
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Flyout/AppsListPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Flyout/AppsListPage.xaml
index c7c3d2824f..2c64b4277b 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Flyout/AppsListPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Flyout/AppsListPage.xaml
@@ -1,12 +1,12 @@
-<!--  Copyright (c) Microsoft Corporation and Contributors.  -->
+<!--  Copyright (c) Microsoft Corporation and Contributors.  -->
 <!--  Licensed under the MIT License.  -->
 
 <Page
     x:Class="Microsoft.PowerToys.Settings.UI.Flyout.AppsListPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:converters="using:CommunityToolkit.WinUI.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:viewmodels="using:Microsoft.PowerToys.Settings.UI.ViewModels"
     mc:Ignorable="d">
@@ -71,8 +71,8 @@
                         <!--<ViewBox VerticalAlignment="Center">-->
                         <Image
                             Width="20"
-                            VerticalAlignment="Center"
-                            Margin="0,0,16,0">
+                            Margin="0,0,16,0"
+                            VerticalAlignment="Center">
                             <Image.Source>
                                 <BitmapImage UriSource="{x:Bind Icon, Mode=OneWay}" />
                             </Image.Source>
@@ -86,9 +86,9 @@
                         <FontIcon
                             Grid.Column="2"
                             Width="20"
+                            VerticalAlignment="Center"
                             FontSize="16"
                             Glyph="&#xE72E;"
-                            VerticalAlignment="Center"
                             Visibility="{x:Bind IsLocked, Converter={StaticResource BoolToInvertedVisibilityConverter}, ConverterParameter=True, Mode=OneWay}">
                             <ToolTipService.ToolTip>
                                 <TextBlock x:Uid="GPO_IsSettingForcedText" TextWrapping="WrapWholeWords" />
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/FlyoutWindow.xaml b/src/settings-ui/Settings.UI/SettingsXAML/FlyoutWindow.xaml
index 8ecffb7013..7f9b221bcf 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/FlyoutWindow.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/FlyoutWindow.xaml
@@ -1,14 +1,14 @@
-<winuiex:WindowEx
+<winuiex:WindowEx
     x:Class="Microsoft.PowerToys.Settings.UI.FlyoutWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:flyout="using:Microsoft.PowerToys.Settings.UI.Flyout"
+    xmlns:i="using:Microsoft.Xaml.Interactivity"
+    xmlns:ic="using:Microsoft.Xaml.Interactions.Core"
     xmlns:local="using:Microsoft.PowerToys.Settings.UI"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:winuiex="using:WinUIEx"
-    xmlns:i="using:Microsoft.Xaml.Interactivity"
-    xmlns:ic="using:Microsoft.Xaml.Interactions.Core"
     Title="PowerToys Settings"
     IsAlwaysOnTop="True"
     IsMaximizable="False"
@@ -29,19 +29,15 @@
             LightTintOpacity="0" />
     </winuiex:WindowEx.Backdrop>
     <Grid>
-        <!-- HACK: https://github.com/microsoft/microsoft-ui-xaml/issues/7629 -->
-        <!-- W11 grey border, W10: no border  -->
+        <!--  HACK: https://github.com/microsoft/microsoft-ui-xaml/issues/7629  -->
+        <!--  W11 grey border, W10: no border  -->
         <i:Interaction.Behaviors>
             <ic:DataTriggerBehavior
                 Binding="{x:Bind ViewModel.Windows10}"
                 ComparisonCondition="Equal"
                 Value="True">
-                <ic:ChangePropertyAction
-                    PropertyName="BorderThickness"
-                    Value="1" />
-                <ic:ChangePropertyAction
-                    PropertyName="BorderBrush"
-                    Value="{ThemeResource SurfaceStrokeColorDefaultBrush}" />
+                <ic:ChangePropertyAction PropertyName="BorderThickness" Value="1" />
+                <ic:ChangePropertyAction PropertyName="BorderBrush" Value="{ThemeResource SurfaceStrokeColorDefaultBrush}" />
             </ic:DataTriggerBehavior>
         </i:Interaction.Behaviors>
         <flyout:ShellPage x:Name="FlyoutShellPage" />
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/MainWindow.xaml b/src/settings-ui/Settings.UI/SettingsXAML/MainWindow.xaml
index 54c2997ed3..88341fcc8b 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/MainWindow.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/MainWindow.xaml
@@ -1,4 +1,4 @@
-<winuiex:WindowEx
+<winuiex:WindowEx
     x:Class="Microsoft.PowerToys.Settings.UI.MainWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -11,7 +11,7 @@
     Closed="Window_Closed"
     mc:Ignorable="d">
     <Window.SystemBackdrop>
-        <MicaBackdrop/>
+        <MicaBackdrop />
     </Window.SystemBackdrop>
     <local:ShellPage x:Name="shellPage" />
 </winuiex:WindowEx>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeAlwaysOnTop.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeAlwaysOnTop.xaml
index 10abf7774a..ac731446d8 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeAlwaysOnTop.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeAlwaysOnTop.xaml
@@ -9,40 +9,24 @@
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <custom:OOBEPageControl
-        x:Uid="Oobe_AlwaysOnTop"
-        HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/AlwaysOnTop.png">
+    <custom:OOBEPageControl x:Uid="Oobe_AlwaysOnTop" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/AlwaysOnTop.png">
         <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
-                <TextBlock
-                    x:Uid="Oobe_HowToUse"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <custom:ShortcutWithTextLabelControl
-                    x:Name="HotkeyControl"
-                    x:Uid="Oobe_AlwaysOnTop_HowToUse" />
+                <custom:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_AlwaysOnTop_HowToUse" />
 
-                <TextBlock
-                    x:Uid="Oobe_TipsAndTricks"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <toolkitcontrols:MarkdownTextBlock
-                    x:Uid="Oobe_AlwaysOnTop_TipsAndTricks"
-                    Background="Transparent" />
+                <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_AlwaysOnTop_TipsAndTricks" Background="Transparent" />
 
                 <StackPanel
                     Margin="0,24,0,0"
                     Orientation="Horizontal"
                     Spacing="12">
-                    <Button
-                        x:Uid="OOBE_Settings"
-                        Click="SettingsLaunchButton_Click" />
-                    <HyperlinkButton
-                        NavigateUri="https://aka.ms/PowerToysOverview_AlwaysOnTop"
-                        Style="{StaticResource TextButtonStyle}">
-                        <TextBlock
-                            x:Uid="LearnMore_AlwaysOnTop"
-                            TextWrapping="Wrap" />
+                    <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+                    <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_AlwaysOnTop" Style="{StaticResource TextButtonStyle}">
+                        <TextBlock x:Uid="LearnMore_AlwaysOnTop" TextWrapping="Wrap" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeAwake.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeAwake.xaml
index 8075150bef..c83785f70f 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeAwake.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeAwake.xaml
@@ -8,41 +8,25 @@
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <custom:OOBEPageControl
-        x:Uid="Oobe_Awake"
-        HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/Awake.png">
+    <custom:OOBEPageControl x:Uid="Oobe_Awake" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/Awake.png">
 
         <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
-                <TextBlock
-                    x:Uid="Oobe_HowToUse"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <toolkitcontrols:MarkdownTextBlock
-                    x:Uid="Oobe_Awake_HowToUse"
-                    Background="Transparent" />
+                <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_Awake_HowToUse" Background="Transparent" />
 
-                <TextBlock
-                    x:Uid="Oobe_TipsAndTricks"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <toolkitcontrols:MarkdownTextBlock
-                    x:Uid="Oobe_Awake_TipsAndTricks"
-                    Background="Transparent" />
+                <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_Awake_TipsAndTricks" Background="Transparent" />
 
                 <StackPanel
                     Margin="0,24,0,0"
                     Orientation="Horizontal"
                     Spacing="12">
-                    <Button
-                        x:Uid="OOBE_Settings"
-                        Click="SettingsLaunchButton_Click" />
-                    <HyperlinkButton
-                        NavigateUri="https://aka.ms/PowerToysOverview_Awake"
-                        Style="{StaticResource TextButtonStyle}">
-                        <TextBlock
-                            x:Uid="LearnMore_Awake"
-                            TextWrapping="Wrap" />
+                    <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+                    <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_Awake" Style="{StaticResource TextButtonStyle}">
+                        <TextBlock x:Uid="LearnMore_Awake" TextWrapping="Wrap" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeColorPicker.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeColorPicker.xaml
index 724dd6dae2..273e8e35dd 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeColorPicker.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeColorPicker.xaml
@@ -9,27 +9,17 @@
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <custom:OOBEPageControl
-        x:Uid="Oobe_ColorPicker"
-        HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/ColorPicker.gif">
+    <custom:OOBEPageControl x:Uid="Oobe_ColorPicker" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/ColorPicker.gif">
 
         <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
-                <TextBlock
-                    x:Uid="Oobe_HowToUse"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <custom:ShortcutWithTextLabelControl
-                    x:Name="HotkeyControl"
-                    x:Uid="Oobe_ColorPicker_HowToUse" />
+                <custom:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_ColorPicker_HowToUse" />
 
-                <TextBlock
-                    x:Uid="Oobe_TipsAndTricks"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <toolkitcontrols:MarkdownTextBlock
-                    x:Uid="Oobe_ColorPicker_TipsAndTricks"
-                    Background="Transparent" />
+                <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_ColorPicker_TipsAndTricks" Background="Transparent" />
 
                 <StackPanel
                     Margin="0,24,0,0"
@@ -39,15 +29,9 @@
                         x:Uid="Launch_ColorPicker"
                         Click="Start_ColorPicker_Click"
                         Style="{StaticResource AccentButtonStyle}" />
-                    <Button
-                        x:Uid="OOBE_Settings"
-                        Click="SettingsLaunchButton_Click" />
-                    <HyperlinkButton
-                        NavigateUri="https://aka.ms/PowerToysOverview_ColorPicker"
-                        Style="{StaticResource TextButtonStyle}">
-                        <TextBlock
-                            x:Uid="LearnMore_ColorPicker"
-                            TextWrapping="Wrap" />
+                    <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+                    <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_ColorPicker" Style="{StaticResource TextButtonStyle}">
+                        <TextBlock x:Uid="LearnMore_ColorPicker" TextWrapping="Wrap" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeCropAndLock.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeCropAndLock.xaml
index 20cd6b637d..8d9c53e58f 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeCropAndLock.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeCropAndLock.xaml
@@ -9,36 +9,22 @@
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <custom:OOBEPageControl
-        x:Uid="Oobe_CropAndLock"
-        HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/CropAndLock.gif">
+    <custom:OOBEPageControl x:Uid="Oobe_CropAndLock" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/CropAndLock.gif">
         <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
-                <TextBlock
-                    x:Uid="Oobe_HowToUse"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <custom:ShortcutWithTextLabelControl
-                    x:Name="ThumbnailHotkeyControl"
-                    x:Uid="Oobe_CropAndLock_HowToUse_Thumbnail" />
+                <custom:ShortcutWithTextLabelControl x:Name="ThumbnailHotkeyControl" x:Uid="Oobe_CropAndLock_HowToUse_Thumbnail" />
 
-                <custom:ShortcutWithTextLabelControl
-                    x:Name="ReparentHotkeyControl"
-                    x:Uid="Oobe_CropAndLock_HowToUse_Reparent" />
+                <custom:ShortcutWithTextLabelControl x:Name="ReparentHotkeyControl" x:Uid="Oobe_CropAndLock_HowToUse_Reparent" />
 
                 <StackPanel
                     Margin="0,24,0,0"
                     Orientation="Horizontal"
                     Spacing="12">
-                    <Button
-                        x:Uid="OOBE_Settings"
-                        Click="SettingsLaunchButton_Click" />
-                    <HyperlinkButton
-                        NavigateUri="https://aka.ms/PowerToysOverview_CropAndLock"
-                        Style="{StaticResource TextButtonStyle}">
-                        <TextBlock
-                            x:Uid="LearnMore_CropAndLock"
-                            TextWrapping="Wrap" />
+                    <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+                    <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_CropAndLock" Style="{StaticResource TextButtonStyle}">
+                        <TextBlock x:Uid="LearnMore_CropAndLock" TextWrapping="Wrap" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFancyZones.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFancyZones.xaml
index 5f225a290b..9d4fbb763e 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFancyZones.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFancyZones.xaml
@@ -1,4 +1,4 @@
-<Page
+<Page
     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"
@@ -8,44 +8,26 @@
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <custom:OOBEPageControl
-        x:Uid="Oobe_FancyZones"
-        HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/FancyZones.gif">
+    <custom:OOBEPageControl x:Uid="Oobe_FancyZones" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/FancyZones.gif">
 
         <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
-                <TextBlock
-                    x:Uid="Oobe_HowToUse"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <toolkitcontrols:MarkdownTextBlock
-                    x:Uid="Oobe_FancyZones_HowToUse"
-                    Background="Transparent" />
-                <custom:ShortcutWithTextLabelControl
-                    x:Name="HotkeyControl"
-                    x:Uid="Oobe_FancyZones_HowToUse_Shortcut" />
+                <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_FancyZones_HowToUse" Background="Transparent" />
+                <custom:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_FancyZones_HowToUse_Shortcut" />
 
-                <TextBlock
-                    x:Uid="Oobe_TipsAndTricks"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <toolkitcontrols:MarkdownTextBlock
-                    x:Uid="Oobe_FancyZones_TipsAndTricks"
-                    Background="Transparent" />
+                <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_FancyZones_TipsAndTricks" Background="Transparent" />
 
                 <StackPanel
                     Margin="0,24,0,0"
                     Orientation="Horizontal"
                     Spacing="12">
-                    <Button
-                        x:Uid="OOBE_Settings"
-                        Click="SettingsLaunchButton_Click" />
-                    <HyperlinkButton
-                        NavigateUri="https://aka.ms/PowerToysOverview_FancyZones"
-                        Style="{StaticResource TextButtonStyle}">
-                        <TextBlock
-                            x:Uid="LearnMore_FancyZones"
-                            TextWrapping="Wrap" />
+                    <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+                    <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_FancyZones" Style="{StaticResource TextButtonStyle}">
+                        <TextBlock x:Uid="LearnMore_FancyZones" TextWrapping="Wrap" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileExplorer.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileExplorer.xaml
index e736192302..3d9bfaa4ad 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileExplorer.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileExplorer.xaml
@@ -9,33 +9,21 @@
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <custom:OOBEPageControl
-        x:Uid="Oobe_FileExplorer"
-        HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/FileExplorer.png">
+    <custom:OOBEPageControl x:Uid="Oobe_FileExplorer" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/FileExplorer.png">
 
         <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
-                <TextBlock
-                    x:Uid="Oobe_HowToEnable"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock x:Uid="Oobe_HowToEnable" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <toolkitcontrols:MarkdownTextBlock
-                    x:Uid="Oobe_FileExplorer_HowToEnable"
-                    Background="Transparent" />
+                <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_FileExplorer_HowToEnable" Background="Transparent" />
 
                 <StackPanel
                     Margin="0,24,0,0"
                     Orientation="Horizontal"
                     Spacing="12">
-                    <Button
-                        x:Uid="OOBE_Settings"
-                        Click="SettingsLaunchButton_Click" />
-                    <HyperlinkButton
-                        NavigateUri="https://aka.ms/PowerToysOverview_FileExplorerAddOns"
-                        Style="{StaticResource TextButtonStyle}">
-                        <TextBlock
-                            x:Uid="LearnMore_PowerPreview"
-                            TextWrapping="Wrap" />
+                    <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+                    <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_FileExplorerAddOns" Style="{StaticResource TextButtonStyle}">
+                        <TextBlock x:Uid="LearnMore_PowerPreview" TextWrapping="Wrap" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileLocksmith.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileLocksmith.xaml
index e469c93c52..aeb05beb0d 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileLocksmith.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileLocksmith.xaml
@@ -8,42 +8,26 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
-    <custom:OOBEPageControl
-        x:Uid="Oobe_FileLocksmith"
-        HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/FileLocksmith.gif">
+    <custom:OOBEPageControl x:Uid="Oobe_FileLocksmith" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/FileLocksmith.gif">
 
         <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
 
-                <TextBlock
-                    x:Uid="Oobe_HowToUse"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <toolkitcontrols:MarkdownTextBlock
-                    x:Uid="Oobe_FileLocksmith_HowToUse"
-                    Background="Transparent" />
+                <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_FileLocksmith_HowToUse" Background="Transparent" />
 
-                <TextBlock
-                    x:Uid="Oobe_TipsAndTricks"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <toolkitcontrols:MarkdownTextBlock
-                    x:Uid="Oobe_FileLocksmith_TipsAndTricks"
-                    Background="Transparent" />
+                <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_FileLocksmith_TipsAndTricks" Background="Transparent" />
 
                 <StackPanel
                     Margin="0,24,0,0"
                     Orientation="Horizontal"
                     Spacing="12">
-                    <Button
-                        x:Uid="OOBE_Settings"
-                        Click="SettingsLaunchButton_Click" />
-                    <HyperlinkButton
-                        NavigateUri="https://aka.ms/PowerToysOverview_FileLocksmith"
-                        Style="{StaticResource TextButtonStyle}">
-                        <TextBlock
-                            x:Uid="LearnMore_FileLocksmith"
-                            TextWrapping="Wrap" />
+                    <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+                    <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_FileLocksmith" Style="{StaticResource TextButtonStyle}">
+                        <TextBlock x:Uid="LearnMore_FileLocksmith" TextWrapping="Wrap" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeHosts.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeHosts.xaml
index bdebefdf10..9fa8503774 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeHosts.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeHosts.xaml
@@ -9,9 +9,7 @@
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <custom:OOBEPageControl
-        x:Uid="Oobe_Hosts"
-        HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/HostsFileEditor.png">
+    <custom:OOBEPageControl x:Uid="Oobe_Hosts" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/HostsFileEditor.png">
         <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
                 <StackPanel
@@ -22,15 +20,9 @@
                         x:Uid="Launch_Hosts"
                         Click="Launch_Hosts_Click"
                         Style="{StaticResource AccentButtonStyle}" />
-                    <Button
-                        x:Uid="OOBE_Settings"
-                        Click="Launch_Settings_Click" />
-                    <HyperlinkButton
-                        NavigateUri="https://aka.ms/PowerToysOverview_HostsFileEditor"
-                        Style="{StaticResource TextButtonStyle}">
-                        <TextBlock
-                            x:Uid="LearnMore_Hosts"
-                            TextWrapping="Wrap" />
+                    <Button x:Uid="OOBE_Settings" Click="Launch_Settings_Click" />
+                    <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_HostsFileEditor" Style="{StaticResource TextButtonStyle}">
+                        <TextBlock x:Uid="LearnMore_Hosts" TextWrapping="Wrap" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeImageResizer.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeImageResizer.xaml
index 2444219ab3..342f7e3fa9 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeImageResizer.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeImageResizer.xaml
@@ -9,41 +9,25 @@
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <custom:OOBEPageControl
-        x:Uid="Oobe_ImageResizer"
-        HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/ImageResizer.gif">
+    <custom:OOBEPageControl x:Uid="Oobe_ImageResizer" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/ImageResizer.gif">
 
         <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
-                <TextBlock
-                    x:Uid="Oobe_HowToLaunch"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock x:Uid="Oobe_HowToLaunch" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <toolkitcontrols:MarkdownTextBlock
-                    x:Uid="Oobe_ImageResizer_HowToLaunch"
-                    Background="Transparent" />
+                <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_ImageResizer_HowToLaunch" Background="Transparent" />
 
-                <TextBlock
-                    x:Uid="Oobe_TipsAndTricks"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <toolkitcontrols:MarkdownTextBlock
-                    x:Uid="Oobe_ImageResizer_TipsAndTricks"
-                    Background="Transparent" />
+                <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_ImageResizer_TipsAndTricks" Background="Transparent" />
 
                 <StackPanel
                     Margin="0,24,0,0"
                     Orientation="Horizontal"
                     Spacing="12">
-                    <Button
-                        x:Uid="OOBE_Settings"
-                        Click="SettingsLaunchButton_Click" />
-                    <HyperlinkButton
-                        NavigateUri="https://aka.ms/PowerToysOverview_ImageResizer"
-                        Style="{StaticResource TextButtonStyle}">
-                        <TextBlock
-                            x:Uid="LearnMore_ImageResizer"
-                            TextWrapping="Wrap" />
+                    <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+                    <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_ImageResizer" Style="{StaticResource TextButtonStyle}">
+                        <TextBlock x:Uid="LearnMore_ImageResizer" TextWrapping="Wrap" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeKBM.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeKBM.xaml
index 8582ce315f..f61a0ee8c7 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeKBM.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeKBM.xaml
@@ -7,42 +7,26 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
-    <custom:OOBEPageControl
-        x:Uid="Oobe_KBM"
-        HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/KBM.gif">
+    <custom:OOBEPageControl x:Uid="Oobe_KBM" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/KBM.gif">
 
         <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
 
-                <TextBlock
-                    x:Uid="Oobe_HowToCreateMappings"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock x:Uid="Oobe_HowToCreateMappings" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <toolkitcontrols:MarkdownTextBlock
-                    x:Uid="Oobe_KBM_HowToCreateMappings"
-                    Background="Transparent" />
+                <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_KBM_HowToCreateMappings" Background="Transparent" />
 
-                <TextBlock
-                    x:Uid="Oobe_TipsAndTricks"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <toolkitcontrols:MarkdownTextBlock
-                    x:Uid="Oobe_KBM_TipsAndTricks"
-                    Background="Transparent" />
+                <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_KBM_TipsAndTricks" Background="Transparent" />
 
                 <StackPanel
                     Margin="0,24,0,0"
                     Orientation="Horizontal"
                     Spacing="12">
-                    <Button
-                        x:Uid="OOBE_Settings"
-                        Click="SettingsLaunchButton_Click" />
-                    <HyperlinkButton
-                        NavigateUri="https://aka.ms/PowerToysOverview_KeyboardManager"
-                        Style="{StaticResource TextButtonStyle}">
-                        <TextBlock
-                            x:Uid="LearnMore_KBM"
-                            TextWrapping="Wrap" />
+                    <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+                    <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_KeyboardManager" Style="{StaticResource TextButtonStyle}">
+                        <TextBlock x:Uid="LearnMore_KBM" TextWrapping="Wrap" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMeasureTool.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMeasureTool.xaml
index 7e3e79962c..d02e29507f 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMeasureTool.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMeasureTool.xaml
@@ -9,37 +9,23 @@
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <custom:OOBEPageControl
-        x:Uid="Oobe_MeasureTool"
-        HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/ScreenRuler.gif">
+    <custom:OOBEPageControl x:Uid="Oobe_MeasureTool" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/ScreenRuler.gif">
 
         <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
-                <TextBlock
-                    x:Uid="Oobe_HowToLaunch"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock x:Uid="Oobe_HowToLaunch" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <custom:ShortcutWithTextLabelControl
-                    x:Name="HotkeyActivation"
-                    x:Uid="Oobe_MeasureTool_Activation" />
+                <custom:ShortcutWithTextLabelControl x:Name="HotkeyActivation" x:Uid="Oobe_MeasureTool_Activation" />
 
-                <toolkitcontrols:MarkdownTextBlock
-                    x:Uid="Oobe_MeasureTool_HowToLaunch"
-                    Background="Transparent" />
+                <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_MeasureTool_HowToLaunch" Background="Transparent" />
 
                 <StackPanel
                     Margin="0,24,0,0"
                     Orientation="Horizontal"
                     Spacing="12">
-                    <Button
-                        x:Uid="OOBE_Settings"
-                        Click="SettingsLaunchButton_Click" />
-                    <HyperlinkButton
-                        NavigateUri="https://aka.ms/PowerToysOverview_ScreenRuler"
-                        Style="{StaticResource TextButtonStyle}">
-                        <TextBlock
-                            x:Uid="LearnMore_MeasureTool"
-                            TextWrapping="Wrap" />
+                    <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+                    <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_ScreenRuler" Style="{StaticResource TextButtonStyle}">
+                        <TextBlock x:Uid="LearnMore_MeasureTool" TextWrapping="Wrap" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseUtils.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseUtils.xaml
index 04e6c62083..ab7006234c 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseUtils.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseUtils.xaml
@@ -8,53 +8,29 @@
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <custom:OOBEPageControl
-        x:Uid="Oobe_MouseUtils"
-        HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/MouseUtils.gif">
+    <custom:OOBEPageControl x:Uid="Oobe_MouseUtils" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/MouseUtils.gif">
 
         <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
-                <TextBlock
-                    x:Uid="Oobe_MouseUtils_FindMyMouse"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
-                <toolkitcontrols:MarkdownTextBlock
-                    x:Uid="Oobe_MouseUtils_FindMyMouse_Description"
-                    Background="Transparent" />
+                <TextBlock x:Uid="Oobe_MouseUtils_FindMyMouse" Style="{ThemeResource OobeSubtitleStyle}" />
+                <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_MouseUtils_FindMyMouse_Description" Background="Transparent" />
 
-                <TextBlock
-                    x:Uid="Oobe_MouseUtils_MouseHighlighter"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
-                <toolkitcontrols:MarkdownTextBlock
-                    x:Uid="Oobe_MouseUtils_MouseHighlighter_Description"
-                    Background="Transparent" />
+                <TextBlock x:Uid="Oobe_MouseUtils_MouseHighlighter" Style="{ThemeResource OobeSubtitleStyle}" />
+                <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_MouseUtils_MouseHighlighter_Description" Background="Transparent" />
 
-                <TextBlock
-                    x:Uid="Oobe_MouseUtils_MousePointerCrosshairs"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
-                <toolkitcontrols:MarkdownTextBlock
-                    x:Uid="Oobe_MouseUtils_MousePointerCrosshairs_Description"
-                    Background="Transparent" />
+                <TextBlock x:Uid="Oobe_MouseUtils_MousePointerCrosshairs" Style="{ThemeResource OobeSubtitleStyle}" />
+                <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_MouseUtils_MousePointerCrosshairs_Description" Background="Transparent" />
 
-                <TextBlock
-                    x:Uid="Oobe_MouseUtils_MouseJump"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
-                <toolkitcontrols:MarkdownTextBlock
-                    x:Uid="Oobe_MouseUtils_MouseJump_Description"
-                    Background="Transparent" />
+                <TextBlock x:Uid="Oobe_MouseUtils_MouseJump" Style="{ThemeResource OobeSubtitleStyle}" />
+                <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_MouseUtils_MouseJump_Description" Background="Transparent" />
 
                 <StackPanel
                     Margin="0,24,0,0"
                     Orientation="Horizontal"
                     Spacing="12">
-                    <Button
-                        x:Uid="OOBE_Settings"
-                        Click="SettingsLaunchButton_Click" />
-                    <HyperlinkButton
-                        NavigateUri="https://aka.ms/PowerToysOverview_MouseUtilities"
-                        Style="{StaticResource TextButtonStyle}">
-                        <TextBlock
-                            x:Uid="LearnMore_MouseUtils"
-                            TextWrapping="Wrap" />
+                    <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+                    <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_MouseUtilities" Style="{StaticResource TextButtonStyle}">
+                        <TextBlock x:Uid="LearnMore_MouseUtils" TextWrapping="Wrap" />
                     </HyperlinkButton>
                 </StackPanel>
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseWithoutBorders.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseWithoutBorders.xaml
index 2501813cd9..9065e0399d 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseWithoutBorders.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseWithoutBorders.xaml
@@ -8,42 +8,26 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
-    <custom:OOBEPageControl
-        x:Uid="Oobe_MouseWithoutBorders"
-        HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/MouseWithoutBorders.png">
+    <custom:OOBEPageControl x:Uid="Oobe_MouseWithoutBorders" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/MouseWithoutBorders.png">
 
         <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
 
-                <TextBlock
-                    x:Uid="Oobe_HowToUse"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <toolkitcontrols:MarkdownTextBlock
-                    x:Uid="Oobe_MouseWithoutBorders_HowToUse"
-                    Background="Transparent" />
+                <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_MouseWithoutBorders_HowToUse" Background="Transparent" />
 
-                <TextBlock
-                    x:Uid="Oobe_TipsAndTricks"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <toolkitcontrols:MarkdownTextBlock
-                    x:Uid="Oobe_MouseWithoutBorders_TipsAndTricks"
-                    Background="Transparent" />
+                <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_MouseWithoutBorders_TipsAndTricks" Background="Transparent" />
 
                 <StackPanel
                     Margin="0,24,0,0"
                     Orientation="Horizontal"
                     Spacing="12">
-                    <Button
-                        x:Uid="OOBE_Settings"
-                        Click="SettingsLaunchButton_Click" />
-                    <HyperlinkButton
-                        NavigateUri="https://aka.ms/PowerToysOverview_MouseWithoutBorders"
-                        Style="{StaticResource TextButtonStyle}">
-                        <TextBlock
-                            x:Uid="LearnMore_MouseWithoutBorders"
-                            TextWrapping="Wrap" />
+                    <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+                    <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_MouseWithoutBorders" Style="{StaticResource TextButtonStyle}">
+                        <TextBlock x:Uid="LearnMore_MouseWithoutBorders" TextWrapping="Wrap" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverview.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverview.xaml
index d0497d360c..fa25b7dc5c 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverview.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverview.xaml
@@ -8,31 +8,21 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <custom:OOBEPageControl
-        x:Uid="Oobe_Overview"
-        HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/OOBEPTHero.png">
+    <custom:OOBEPageControl x:Uid="Oobe_Overview" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/OOBEPTHero.png">
 
         <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
-                <TextBlock
-                    x:Uid="Oobe_HowToUse"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <HyperlinkButton
-                    NavigateUri="https://aka.ms/PowerToysOverview"
-                    Style="{StaticResource TextButtonStyle}">
-                    <TextBlock
-                        x:Uid="Oobe_Overview_DescriptionLinkText"
-                        TextWrapping="Wrap" />
+                <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview" Style="{StaticResource TextButtonStyle}">
+                    <TextBlock x:Uid="Oobe_Overview_DescriptionLinkText" TextWrapping="Wrap" />
                 </HyperlinkButton>
 
                 <StackPanel
                     Margin="0,24,0,0"
                     Orientation="Horizontal"
                     Spacing="12">
-                    <Button
-                        x:Uid="OOBE_Settings"
-                        Click="SettingsLaunchButton_Click" />
+                    <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
                 </StackPanel>
             </StackPanel>
         </custom:OOBEPageControl.PageContent>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverviewPlaceholder.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverviewPlaceholder.xaml
index 3c2a5abb45..9842853702 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverviewPlaceholder.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverviewPlaceholder.xaml
@@ -1,23 +1,23 @@
-<!-- Copyright (c) Microsoft Corporation. All rights reserved. -->
-<!-- Licensed under the MIT License. See LICENSE in the project root for license information. -->
+<!--  Copyright (c) Microsoft Corporation. All rights reserved.  -->
+<!--  Licensed under the MIT License. See LICENSE in the project root for license information.  -->
 
 <Page
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeOverviewPlaceholder"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
     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"
+    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
     Loaded="Page_Loaded"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+    mc:Ignorable="d">
 
     <Grid Margin="0,24,0,0">
         <ProgressRing
-                    x:Name="LoadingProgressRing"
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Center"
-                    IsIndeterminate="True"
-                    Visibility="Visible" />
+            x:Name="LoadingProgressRing"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            IsIndeterminate="True"
+            Visibility="Visible" />
     </Grid>
 </Page>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePastePlain.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePastePlain.xaml
index 78e7344f75..ecfe958853 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePastePlain.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePastePlain.xaml
@@ -9,33 +9,21 @@
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <custom:OOBEPageControl
-        x:Uid="Oobe_PastePlain"
-        HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PastePlain.gif">
+    <custom:OOBEPageControl x:Uid="Oobe_PastePlain" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PastePlain.gif">
 
         <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
-                <TextBlock
-                    x:Uid="Oobe_HowToUse"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <custom:ShortcutWithTextLabelControl
-                    x:Name="HotkeyControl"
-                    x:Uid="Oobe_PastePlain_HowToUse" />
+                <custom:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_PastePlain_HowToUse" />
 
                 <StackPanel
                     Margin="0,24,0,0"
                     Orientation="Horizontal"
                     Spacing="12">
-                    <Button
-                        x:Uid="OOBE_Settings"
-                        Click="SettingsLaunchButton_Click" />
-                    <HyperlinkButton
-                        NavigateUri="https://aka.ms/PowerToysOverview_PastePlain"
-                        Style="{StaticResource TextButtonStyle}">
-                        <TextBlock
-                            x:Uid="LearnMore_PastePlain"
-                            TextWrapping="Wrap" />
+                    <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+                    <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_PastePlain" Style="{StaticResource TextButtonStyle}">
+                        <TextBlock x:Uid="LearnMore_PastePlain" TextWrapping="Wrap" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePeek.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePeek.xaml
index 61417ed078..58f37dd223 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePeek.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePeek.xaml
@@ -1,45 +1,33 @@
-<!-- Copyright (c) Microsoft Corporation and Contributors. -->
-<!-- Licensed under the MIT License. -->
+<!--  Copyright (c) Microsoft Corporation and Contributors.  -->
+<!--  Licensed under the MIT License.  -->
 
 <Page
     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: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: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"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+    mc:Ignorable="d">
 
-    <custom:OOBEPageControl
-        x:Uid="Oobe_Peek"
-        HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/Peek.gif">
+    <custom:OOBEPageControl x:Uid="Oobe_Peek" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/Peek.gif">
 
         <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
-                <TextBlock
-                    x:Uid="Oobe_HowToUse"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <custom:ShortcutWithTextLabelControl
-                    x:Name="HotkeyControl"
-                    x:Uid="Oobe_Peek_HowToUse" />
+                <custom:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_Peek_HowToUse" />
 
                 <StackPanel
                     Margin="0,24,0,0"
                     Orientation="Horizontal"
                     Spacing="12">
-                    <Button
-                        x:Uid="OOBE_Settings"
-                        Click="SettingsLaunchButton_Click" />
-                    <HyperlinkButton
-                        NavigateUri="https://aka.ms/PowerToysOverview_Peek"
-                        Style="{StaticResource TextButtonStyle}">
-                        <TextBlock
-                            x:Uid="LearnMore_Peek"
-                            TextWrapping="Wrap" />
+                    <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+                    <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_Peek" Style="{StaticResource TextButtonStyle}">
+                        <TextBlock x:Uid="LearnMore_Peek" TextWrapping="Wrap" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerAccent.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerAccent.xaml
index 00531f7229..fea0fb4c09 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerAccent.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerAccent.xaml
@@ -9,33 +9,21 @@
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <custom:OOBEPageControl
-        x:Uid="Oobe_QuickAccent"
-        HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PowerAccent.gif">
+    <custom:OOBEPageControl x:Uid="Oobe_QuickAccent" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PowerAccent.gif">
 
         <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
-                <TextBlock
-                    x:Uid="Oobe_HowToUse"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <toolkitcontrols:MarkdownTextBlock
-                    x:Uid="Oobe_QuickAccent_HowToUse"
-                    Background="Transparent" />
+                <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_QuickAccent_HowToUse" Background="Transparent" />
 
                 <StackPanel
                     Margin="0,24,0,0"
                     Orientation="Horizontal"
                     Spacing="12">
-                    <Button
-                        x:Uid="OOBE_Settings"
-                        Click="SettingsLaunchButton_Click" />
-                    <HyperlinkButton
-                        NavigateUri="https://aka.ms/PowerToysOverview_QuickAccent"
-                        Style="{StaticResource TextButtonStyle}">
-                        <TextBlock
-                            x:Uid="LearnMore_QuickAccent"
-                            TextWrapping="Wrap" />
+                    <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+                    <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_QuickAccent" Style="{StaticResource TextButtonStyle}">
+                        <TextBlock x:Uid="LearnMore_QuickAccent" TextWrapping="Wrap" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerOCR.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerOCR.xaml
index e898809b56..700be92f1a 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerOCR.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerOCR.xaml
@@ -9,41 +9,25 @@
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <custom:OOBEPageControl
-        x:Uid="Oobe_TextExtractor"
-        HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PowerOCR.gif">
+    <custom:OOBEPageControl x:Uid="Oobe_TextExtractor" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PowerOCR.gif">
 
         <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
-                <TextBlock
-                    x:Uid="Oobe_HowToUse"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <custom:ShortcutWithTextLabelControl
-                    x:Name="HotkeyControl"
-                    x:Uid="Oobe_TextExtractor_HowToUse" />
+                <custom:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_TextExtractor_HowToUse" />
 
-                <TextBlock
-                    x:Uid="Oobe_TipsAndTricks"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <toolkitcontrols:MarkdownTextBlock
-                    x:Uid="Oobe_TextExtractor_TipsAndTricks"
-                    Background="Transparent" />
+                <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_TextExtractor_TipsAndTricks" Background="Transparent" />
 
                 <StackPanel
                     Margin="0,24,0,0"
                     Orientation="Horizontal"
                     Spacing="12">
-                    <Button
-                        x:Uid="OOBE_Settings"
-                        Click="SettingsLaunchButton_Click" />
-                    <HyperlinkButton
-                        NavigateUri="https://aka.ms/PowerToysOverview_TextExtractor"
-                        Style="{StaticResource TextButtonStyle}">
-                        <TextBlock
-                            x:Uid="LearnMore_TextExtractor"
-                            TextWrapping="Wrap" />
+                    <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+                    <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_TextExtractor" Style="{StaticResource TextButtonStyle}">
+                        <TextBlock x:Uid="LearnMore_TextExtractor" TextWrapping="Wrap" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerRename.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerRename.xaml
index be9b4d47ca..68f4c4a0e9 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerRename.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerRename.xaml
@@ -8,42 +8,26 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
-    <custom:OOBEPageControl
-        x:Uid="Oobe_PowerRename"
-        HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PowerRename.gif">
+    <custom:OOBEPageControl x:Uid="Oobe_PowerRename" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PowerRename.gif">
 
         <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
 
-                <TextBlock
-                    x:Uid="Oobe_HowToUse"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <toolkitcontrols:MarkdownTextBlock
-                    x:Uid="Oobe_PowerRename_HowToUse"
-                    Background="Transparent" />
+                <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_PowerRename_HowToUse" Background="Transparent" />
 
-                <TextBlock
-                    x:Uid="Oobe_TipsAndTricks"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <toolkitcontrols:MarkdownTextBlock
-                    x:Uid="Oobe_PowerRename_TipsAndTricks"
-                    Background="Transparent" />
+                <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_PowerRename_TipsAndTricks" Background="Transparent" />
 
                 <StackPanel
                     Margin="0,24,0,0"
                     Orientation="Horizontal"
                     Spacing="12">
-                    <Button
-                        x:Uid="OOBE_Settings"
-                        Click="SettingsLaunchButton_Click" />
-                    <HyperlinkButton
-                        NavigateUri="https://aka.ms/PowerToysOverview_PowerRename"
-                        Style="{StaticResource TextButtonStyle}">
-                        <TextBlock
-                            x:Uid="LearnMore_PowerRename"
-                            TextWrapping="Wrap" />
+                    <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+                    <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_PowerRename" Style="{StaticResource TextButtonStyle}">
+                        <TextBlock x:Uid="LearnMore_PowerRename" TextWrapping="Wrap" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRegistryPreview.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRegistryPreview.xaml
index b1b99bd641..5bb7497143 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRegistryPreview.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRegistryPreview.xaml
@@ -8,28 +8,18 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
-    <custom:OOBEPageControl
-        x:Uid="Oobe_RegistryPreview"
-        HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/RegistryPreview.png">
+    <custom:OOBEPageControl x:Uid="Oobe_RegistryPreview" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/RegistryPreview.png">
 
         <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
 
-                <TextBlock
-                    x:Uid="Oobe_HowToUse"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <toolkitcontrols:MarkdownTextBlock
-                    x:Uid="Oobe_RegistryPreview_HowToUse"
-                    Background="Transparent" />
+                <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_RegistryPreview_HowToUse" Background="Transparent" />
 
-                <TextBlock
-                    x:Uid="Oobe_TipsAndTricks"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <toolkitcontrols:MarkdownTextBlock
-                    x:Uid="Oobe_RegistryPreview_TipsAndTricks"
-                    Background="Transparent" />
+                <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_RegistryPreview_TipsAndTricks" Background="Transparent" />
 
                 <StackPanel
                     Margin="0,24,0,0"
@@ -39,15 +29,9 @@
                         x:Uid="Launch_RegistryPreview"
                         Click="Launch_RegistryPreview_Click"
                         Style="{StaticResource AccentButtonStyle}" />
-                    <Button
-                        x:Uid="OOBE_Settings"
-                        Click="SettingsLaunchButton_Click" />
-                    <HyperlinkButton
-                        NavigateUri="https://aka.ms/PowerToysOverview_RegistryPreview"
-                        Style="{StaticResource TextButtonStyle}">
-                        <TextBlock
-                            x:Uid="LearnMore_RegistryPreview"
-                            TextWrapping="Wrap" />
+                    <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+                    <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_RegistryPreview" Style="{StaticResource TextButtonStyle}">
+                        <TextBlock x:Uid="LearnMore_RegistryPreview" TextWrapping="Wrap" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRun.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRun.xaml
index a2901b6062..b4e13d6dc1 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRun.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRun.xaml
@@ -9,27 +9,17 @@
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <custom:OOBEPageControl
-        x:Uid="Oobe_Run"
-        HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/Run.gif">
+    <custom:OOBEPageControl x:Uid="Oobe_Run" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/Run.gif">
 
         <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
-                <TextBlock
-                    x:Uid="Oobe_HowToLaunch"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock x:Uid="Oobe_HowToLaunch" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <custom:ShortcutWithTextLabelControl
-                    x:Name="HotkeyControl"
-                    x:Uid="Oobe_Run_HowToLaunch" />
+                <custom:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_Run_HowToLaunch" />
 
-                <TextBlock
-                    x:Uid="Oobe_TipsAndTricks"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <toolkitcontrols:MarkdownTextBlock
-                    x:Uid="Oobe_Run_TipsAndTricks"
-                    Background="Transparent" />
+                <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_Run_TipsAndTricks" Background="Transparent" />
 
                 <StackPanel
                     Margin="0,24,0,0"
@@ -39,15 +29,9 @@
                         x:Uid="Launch_Run"
                         Click="Start_Run_Click"
                         Style="{StaticResource AccentButtonStyle}" />
-                    <Button
-                        x:Uid="OOBE_Settings"
-                        Click="SettingsLaunchButton_Click" />
-                    <HyperlinkButton
-                        NavigateUri="https://aka.ms/PowerToysOverview_PowerToysRun"
-                        Style="{StaticResource TextButtonStyle}">
-                        <TextBlock
-                            x:Uid="LearnMore_Run"
-                            TextWrapping="Wrap" />
+                    <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+                    <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_PowerToysRun" Style="{StaticResource TextButtonStyle}">
+                        <TextBlock x:Uid="LearnMore_Run" TextWrapping="Wrap" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShortcutGuide.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShortcutGuide.xaml
index 80da3847ed..59799686f2 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShortcutGuide.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShortcutGuide.xaml
@@ -8,19 +8,13 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
-    <custom:OOBEPageControl
-        x:Uid="Oobe_ShortcutGuide"
-        HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/OOBEShortcutGuide.png">
+    <custom:OOBEPageControl x:Uid="Oobe_ShortcutGuide" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/OOBEShortcutGuide.png">
         <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
 
-                <TextBlock
-                    x:Uid="Oobe_HowToLaunch"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock x:Uid="Oobe_HowToLaunch" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <custom:ShortcutWithTextLabelControl
-                    x:Name="HotkeyControl"
-                    x:Uid="Oobe_ShortcutGuide_HowToLaunch" />
+                <custom:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_ShortcutGuide_HowToLaunch" />
                 <StackPanel
                     Margin="0,24,0,0"
                     Orientation="Horizontal"
@@ -29,15 +23,9 @@
                         x:Uid="Launch_ShortcutGuide"
                         Click="Start_ShortcutGuide_Click"
                         Style="{StaticResource AccentButtonStyle}" />
-                    <Button
-                        x:Uid="OOBE_Settings"
-                        Click="SettingsLaunchButton_Click" />
-                    <HyperlinkButton
-                        NavigateUri="https://aka.ms/PowerToysOverview_ShortcutGuide"
-                        Style="{StaticResource TextButtonStyle}">
-                        <TextBlock
-                            x:Uid="LearnMore_ShortcutGuide"
-                            TextWrapping="Wrap" />
+                    <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+                    <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_ShortcutGuide" Style="{StaticResource TextButtonStyle}">
+                        <TextBlock x:Uid="LearnMore_ShortcutGuide" TextWrapping="Wrap" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeVideoConference.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeVideoConference.xaml
index c5e4da5f39..d80042df92 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeVideoConference.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeVideoConference.xaml
@@ -9,46 +9,26 @@
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <custom:OOBEPageControl
-        x:Uid="Oobe_VideoConference"
-        HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/VideoConferenceMute.png">
+    <custom:OOBEPageControl x:Uid="Oobe_VideoConference" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/VideoConferenceMute.png">
 
         <custom:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
-                <TextBlock
-                    x:Uid="Oobe_HowToLaunch"
-                    Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock x:Uid="Oobe_HowToLaunch" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <custom:ShortcutWithTextLabelControl
-                    x:Name="HotkeyMicVidControl"
-                    x:Uid="Oobe_VideoConference_ToggleMicVid" />
-                <custom:ShortcutWithTextLabelControl
-                    x:Name="HotkeyMicControl"
-                    x:Uid="Oobe_VideoConference_ToggleMic" />
-                <custom:ShortcutWithTextLabelControl
-                    x:Name="HotkeyPushToTalkControl"
-                    x:Uid="Oobe_VideoConference_PushToTalkMic" />
-                <custom:ShortcutWithTextLabelControl
-                    x:Name="HotkeyVidControl"
-                    x:Uid="Oobe_VideoConference_ToggleVid" />
+                <custom:ShortcutWithTextLabelControl x:Name="HotkeyMicVidControl" x:Uid="Oobe_VideoConference_ToggleMicVid" />
+                <custom:ShortcutWithTextLabelControl x:Name="HotkeyMicControl" x:Uid="Oobe_VideoConference_ToggleMic" />
+                <custom:ShortcutWithTextLabelControl x:Name="HotkeyPushToTalkControl" x:Uid="Oobe_VideoConference_PushToTalkMic" />
+                <custom:ShortcutWithTextLabelControl x:Name="HotkeyVidControl" x:Uid="Oobe_VideoConference_ToggleVid" />
 
-                <toolkitcontrols:MarkdownTextBlock
-                    x:Uid="Oobe_VideoConference_HowToLaunch"
-                    Background="Transparent" />
+                <toolkitcontrols:MarkdownTextBlock x:Uid="Oobe_VideoConference_HowToLaunch" Background="Transparent" />
 
                 <StackPanel
                     Margin="0,24,0,0"
                     Orientation="Horizontal"
                     Spacing="12">
-                    <Button
-                        x:Uid="OOBE_Settings"
-                        Click="SettingsLaunchButton_Click" />
-                    <HyperlinkButton
-                        NavigateUri="https://aka.ms/PowerToysOverview_VideoConference"
-                        Style="{StaticResource TextButtonStyle}">
-                        <TextBlock
-                            x:Uid="LearnMore_VCM"
-                            TextWrapping="Wrap" />
+                    <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+                    <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_VideoConference" Style="{StaticResource TextButtonStyle}">
+                        <TextBlock x:Uid="LearnMore_VCM" TextWrapping="Wrap" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeWhatsNew.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeWhatsNew.xaml
index ff24a40f70..a197367f9e 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeWhatsNew.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeWhatsNew.xaml
@@ -30,9 +30,7 @@
                 Margin="0,0,0,16"
                 NavigateUri="https://github.com/microsoft/PowerToys/releases"
                 Style="{StaticResource TextButtonStyle}">
-                <TextBlock
-                    x:Uid="Oobe_WhatsNew_DetailedReleaseNotesLink"
-                    TextWrapping="Wrap" />
+                <TextBlock x:Uid="Oobe_WhatsNew_DetailedReleaseNotesLink" TextWrapping="Wrap" />
             </HyperlinkButton>
         </StackPanel>
         <InfoBar
@@ -53,9 +51,7 @@
             IsOpen="False"
             IsTabStop="True"
             Severity="Warning" />
-        <ScrollViewer
-            Grid.Row="1"
-            VerticalScrollBarVisibility="Auto">
+        <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
             <Grid Margin="32,24,32,24">
                 <ProgressRing
                     x:Name="LoadingProgressRing"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Styles/Button.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Styles/Button.xaml
index dd324e9a92..4c470915d9 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Styles/Button.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Styles/Button.xaml
@@ -117,6 +117,12 @@
                         Margin="{TemplateBinding Padding}"
                         Background="{TemplateBinding Background}"
                         CornerRadius="4">
+                        <ContentPresenter
+                            x:Name="Text"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Content="{TemplateBinding Content}"
+                            FontWeight="SemiBold" />
 
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
@@ -164,12 +170,6 @@
                                 </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
-                        <ContentPresenter
-                            x:Name="Text"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            Content="{TemplateBinding Content}"
-                            FontWeight="SemiBold" />
                     </Grid>
 
                 </ControlTemplate>
@@ -177,9 +177,10 @@
         </Setter>
     </Style>
 
-    <Style x:Key="RightAlignedCompactToggleSwitchStyle"
-           BasedOn="{StaticResource DefaultToggleSwitchStyle}"
-           TargetType="ToggleSwitch">
+    <Style
+        x:Key="RightAlignedCompactToggleSwitchStyle"
+        BasedOn="{StaticResource DefaultToggleSwitchStyle}"
+        TargetType="ToggleSwitch">
         <Style.Setters>
             <Setter Property="MinWidth" Value="0" />
             <Setter Property="Height" Value="36" />
@@ -187,148 +188,270 @@
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="ToggleSwitch">
-                        <Grid VerticalAlignment="Center"
-                              Background="{TemplateBinding Background}"
-                              BorderBrush="{TemplateBinding BorderBrush}"
-                              BorderThickness="{TemplateBinding BorderThickness}"
-                              CornerRadius="{TemplateBinding CornerRadius}">
+                        <Grid
+                            VerticalAlignment="Center"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding CornerRadius}">
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto" />
                                 <RowDefinition Height="*" />
                             </Grid.RowDefinitions>
+                            <ContentPresenter
+                                x:Name="HeaderContentPresenter"
+                                Grid.Row="0"
+                                Margin="{ThemeResource ToggleSwitchTopHeaderMargin}"
+                                VerticalAlignment="Top"
+                                x:DeferLoadStrategy="Lazy"
+                                AutomationProperties.AccessibilityView="Raw"
+                                Content="{TemplateBinding Header}"
+                                ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                Foreground="{ThemeResource ToggleSwitchHeaderForeground}"
+                                IsHitTestVisible="False"
+                                TextWrapping="Wrap"
+                                Visibility="Collapsed" />
+                            <Grid
+                                Grid.Row="1"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Top">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="{ThemeResource ToggleSwitchPreContentMargin}" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="{ThemeResource ToggleSwitchPostContentMargin}" />
+                                </Grid.RowDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="12" MaxWidth="12" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+                                <Grid
+                                    x:Name="SwitchAreaGrid"
+                                    Grid.RowSpan="3"
+                                    Grid.ColumnSpan="3"
+                                    Margin="0,5"
+                                    Background="{ThemeResource ToggleSwitchContainerBackground}"
+                                    Control.IsTemplateFocusTarget="True"
+                                    CornerRadius="{TemplateBinding CornerRadius}" />
+                                <ContentPresenter
+                                    x:Name="OffContentPresenter"
+                                    Grid.RowSpan="3"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    AutomationProperties.AccessibilityView="Raw"
+                                    Content="{TemplateBinding OffContent}"
+                                    ContentTemplate="{TemplateBinding OffContentTemplate}"
+                                    Foreground="{TemplateBinding Foreground}"
+                                    IsHitTestVisible="False"
+                                    Opacity="0" />
+                                <ContentPresenter
+                                    x:Name="OnContentPresenter"
+                                    Grid.RowSpan="3"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    AutomationProperties.AccessibilityView="Raw"
+                                    Content="{TemplateBinding OnContent}"
+                                    ContentTemplate="{TemplateBinding OnContentTemplate}"
+                                    Foreground="{TemplateBinding Foreground}"
+                                    IsHitTestVisible="False"
+                                    Opacity="0" />
+                                <Rectangle
+                                    x:Name="OuterBorder"
+                                    Grid.Row="1"
+                                    Grid.Column="2"
+                                    Width="40"
+                                    Height="20"
+                                    Fill="{ThemeResource ToggleSwitchFillOff}"
+                                    RadiusX="10"
+                                    RadiusY="10"
+                                    Stroke="{ThemeResource ToggleSwitchStrokeOff}"
+                                    StrokeThickness="{ThemeResource ToggleSwitchOuterBorderStrokeThickness}" />
+                                <Rectangle
+                                    x:Name="SwitchKnobBounds"
+                                    Grid.Row="1"
+                                    Grid.Column="2"
+                                    Width="40"
+                                    Height="20"
+                                    Fill="{ThemeResource ToggleSwitchFillOn}"
+                                    Opacity="0"
+                                    RadiusX="10"
+                                    RadiusY="10"
+                                    Stroke="{ThemeResource ToggleSwitchStrokeOn}"
+                                    StrokeThickness="{ThemeResource ToggleSwitchOnStrokeThickness}" />
+                                <Grid
+                                    x:Name="SwitchKnob"
+                                    Grid.Row="1"
+                                    Grid.Column="2"
+                                    Width="20"
+                                    Height="20"
+                                    HorizontalAlignment="Left">
+                                    <Border
+                                        x:Name="SwitchKnobOn"
+                                        Width="12"
+                                        Height="12"
+                                        Margin="0,0,3,0"
+                                        HorizontalAlignment="Right"
+                                        Background="{ThemeResource ToggleSwitchKnobFillOn}"
+                                        BackgroundSizing="OuterBorderEdge"
+                                        BorderBrush="{ThemeResource ToggleSwitchKnobStrokeOn}"
+                                        CornerRadius="7"
+                                        Opacity="0"
+                                        RenderTransformOrigin="0.5, 0.5">
+                                        <Border.RenderTransform>
+                                            <CompositeTransform />
+                                        </Border.RenderTransform>
+                                    </Border>
+                                    <Rectangle
+                                        x:Name="SwitchKnobOff"
+                                        Width="12"
+                                        Height="12"
+                                        Margin="3,0,0,0"
+                                        HorizontalAlignment="Left"
+                                        Fill="{ThemeResource ToggleSwitchKnobFillOff}"
+                                        RadiusX="7"
+                                        RadiusY="7"
+                                        RenderTransformOrigin="0.5, 0.5">
+                                        <Rectangle.RenderTransform>
+                                            <CompositeTransform />
+                                        </Rectangle.RenderTransform>
+                                    </Rectangle>
+                                    <Grid.RenderTransform>
+                                        <TranslateTransform x:Name="KnobTranslateTransform" />
+                                    </Grid.RenderTransform>
+                                </Grid>
+                                <Thumb
+                                    x:Name="SwitchThumb"
+                                    Grid.RowSpan="3"
+                                    Grid.ColumnSpan="3"
+                                    AutomationProperties.AccessibilityView="Raw">
+                                    <Thumb.Template>
+                                        <ControlTemplate TargetType="Thumb">
+                                            <Rectangle Fill="Transparent" />
+                                        </ControlTemplate>
+                                    </Thumb.Template>
+                                </Thumb>
+                            </Grid>
                             <VisualStateManager.VisualStateGroups>
                                 <VisualStateGroup x:Name="CommonStates">
                                     <VisualState x:Name="Normal">
                                         <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder"
-                                                                           Storyboard.TargetProperty="Stroke">
-                                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource ToggleSwitchStrokeOff}" />
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="Stroke">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchStrokeOff}" />
                                             </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder"
-                                                                           Storyboard.TargetProperty="Fill">
-                                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource ToggleSwitchFillOff}" />
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="Fill">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchFillOff}" />
                                             </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff"
-                                                                           Storyboard.TargetProperty="Fill">
-                                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource ToggleSwitchKnobFillOff}" />
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Fill">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchKnobFillOff}" />
                                             </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn"
-                                                                           Storyboard.TargetProperty="Background">
-                                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource ToggleSwitchKnobFillOn}" />
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Background">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchKnobFillOn}" />
                                             </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds"
-                                                                           Storyboard.TargetProperty="Fill">
-                                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource ToggleSwitchFillOn}" />
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Fill">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchFillOn}" />
                                             </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds"
-                                                                           Storyboard.TargetProperty="Stroke">
-                                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource ToggleSwitchStrokeOn}" />
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Stroke">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchStrokeOn}" />
                                             </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchAreaGrid"
-                                                                           Storyboard.TargetProperty="Background">
-                                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource ToggleSwitchContainerBackground}" />
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchAreaGrid" Storyboard.TargetProperty="Background">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchContainerBackground}" />
                                             </ObjectAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames EnableDependentAnimation="True"
-                                                                           Storyboard.TargetName="SwitchKnobOn"
-                                                                           Storyboard.TargetProperty="Width">
-                                                <SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-                                                                      KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                      Value="12" />
+                                            <DoubleAnimationUsingKeyFrames
+                                                EnableDependentAnimation="True"
+                                                Storyboard.TargetName="SwitchKnobOn"
+                                                Storyboard.TargetProperty="Width">
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="{StaticResource ControlFasterAnimationDuration}"
+                                                    Value="12" />
                                             </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames EnableDependentAnimation="True"
-                                                                           Storyboard.TargetName="SwitchKnobOn"
-                                                                           Storyboard.TargetProperty="Height">
-                                                <SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-                                                                      KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                      Value="12" />
+                                            <DoubleAnimationUsingKeyFrames
+                                                EnableDependentAnimation="True"
+                                                Storyboard.TargetName="SwitchKnobOn"
+                                                Storyboard.TargetProperty="Height">
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="{StaticResource ControlFasterAnimationDuration}"
+                                                    Value="12" />
                                             </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames EnableDependentAnimation="True"
-                                                                           Storyboard.TargetName="SwitchKnobOff"
-                                                                           Storyboard.TargetProperty="Width">
-                                                <SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-                                                                      KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                      Value="12" />
+                                            <DoubleAnimationUsingKeyFrames
+                                                EnableDependentAnimation="True"
+                                                Storyboard.TargetName="SwitchKnobOff"
+                                                Storyboard.TargetProperty="Width">
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="{StaticResource ControlFasterAnimationDuration}"
+                                                    Value="12" />
                                             </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames EnableDependentAnimation="True"
-                                                                           Storyboard.TargetName="SwitchKnobOff"
-                                                                           Storyboard.TargetProperty="Height">
-                                                <SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-                                                                      KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                      Value="12" />
+                                            <DoubleAnimationUsingKeyFrames
+                                                EnableDependentAnimation="True"
+                                                Storyboard.TargetName="SwitchKnobOff"
+                                                Storyboard.TargetProperty="Height">
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="{StaticResource ControlFasterAnimationDuration}"
+                                                    Value="12" />
                                             </DoubleAnimationUsingKeyFrames>
                                         </Storyboard>
                                     </VisualState>
                                     <VisualState x:Name="PointerOver">
                                         <Storyboard>
-                                            <ColorAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder"
-                                                                          Storyboard.TargetProperty="(Shape.Stroke).(SolidColorBrush.Color)">
-                                                <LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                     Value="{ThemeResource ToggleSwitchStrokeOffPointerOver}" />
+                                            <ColorAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="(Shape.Stroke).(SolidColorBrush.Color)">
+                                                <LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchStrokeOffPointerOver}" />
                                             </ColorAnimationUsingKeyFrames>
-                                            <ColorAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder"
-                                                                          Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
-                                                <LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                     Value="{ThemeResource ToggleSwitchFillOffPointerOver}" />
+                                            <ColorAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
+                                                <LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchFillOffPointerOver}" />
                                             </ColorAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff"
-                                                                           Storyboard.TargetProperty="Fill">
-                                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource ToggleSwitchKnobFillOffPointerOver}" />
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Fill">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchKnobFillOffPointerOver}" />
                                             </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn"
-                                                                           Storyboard.TargetProperty="Background">
-                                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource ToggleSwitchKnobFillOnPointerOver}" />
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Background">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchKnobFillOnPointerOver}" />
                                             </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds"
-                                                                           Storyboard.TargetProperty="Fill">
-                                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource ToggleSwitchFillOnPointerOver}" />
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Fill">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchFillOnPointerOver}" />
                                             </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds"
-                                                                           Storyboard.TargetProperty="Stroke">
-                                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource ToggleSwitchStrokeOnPointerOver}" />
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Stroke">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchStrokeOnPointerOver}" />
                                             </ObjectAnimationUsingKeyFrames>
-                                            <ColorAnimationUsingKeyFrames Storyboard.TargetName="SwitchAreaGrid"
-                                                                          Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)">
-                                                <LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                     Value="{ThemeResource ToggleSwitchContainerBackgroundPointerOver}" />
+                                            <ColorAnimationUsingKeyFrames Storyboard.TargetName="SwitchAreaGrid" Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)">
+                                                <LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchContainerBackgroundPointerOver}" />
                                             </ColorAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames EnableDependentAnimation="True"
-                                                                           Storyboard.TargetName="SwitchKnobOn"
-                                                                           Storyboard.TargetProperty="Width">
-                                                <SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-                                                                      KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                      Value="14" />
+                                            <DoubleAnimationUsingKeyFrames
+                                                EnableDependentAnimation="True"
+                                                Storyboard.TargetName="SwitchKnobOn"
+                                                Storyboard.TargetProperty="Width">
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="{StaticResource ControlFasterAnimationDuration}"
+                                                    Value="14" />
                                             </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames EnableDependentAnimation="True"
-                                                                           Storyboard.TargetName="SwitchKnobOn"
-                                                                           Storyboard.TargetProperty="Height">
-                                                <SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-                                                                      KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                      Value="14" />
+                                            <DoubleAnimationUsingKeyFrames
+                                                EnableDependentAnimation="True"
+                                                Storyboard.TargetName="SwitchKnobOn"
+                                                Storyboard.TargetProperty="Height">
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="{StaticResource ControlFasterAnimationDuration}"
+                                                    Value="14" />
                                             </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames EnableDependentAnimation="True"
-                                                                           Storyboard.TargetName="SwitchKnobOff"
-                                                                           Storyboard.TargetProperty="Width">
-                                                <SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-                                                                      KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                      Value="14" />
+                                            <DoubleAnimationUsingKeyFrames
+                                                EnableDependentAnimation="True"
+                                                Storyboard.TargetName="SwitchKnobOff"
+                                                Storyboard.TargetProperty="Width">
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="{StaticResource ControlFasterAnimationDuration}"
+                                                    Value="14" />
                                             </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames EnableDependentAnimation="True"
-                                                                           Storyboard.TargetName="SwitchKnobOff"
-                                                                           Storyboard.TargetProperty="Height">
-                                                <SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-                                                                      KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                      Value="14" />
+                                            <DoubleAnimationUsingKeyFrames
+                                                EnableDependentAnimation="True"
+                                                Storyboard.TargetName="SwitchKnobOff"
+                                                Storyboard.TargetProperty="Height">
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="{StaticResource ControlFasterAnimationDuration}"
+                                                    Value="14" />
                                             </DoubleAnimationUsingKeyFrames>
                                         </Storyboard>
                                     </VisualState>
@@ -340,266 +463,221 @@
                                             <Setter Target="SwitchKnobOff.Margin" Value="3,0,0,0" />
                                         </VisualState.Setters>
                                         <Storyboard>
-                                            <ColorAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder"
-                                                                          Storyboard.TargetProperty="(Shape.Stroke).(SolidColorBrush.Color)">
-                                                <LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                     Value="{ThemeResource ToggleSwitchStrokeOffPressed}" />
+                                            <ColorAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="(Shape.Stroke).(SolidColorBrush.Color)">
+                                                <LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchStrokeOffPressed}" />
                                             </ColorAnimationUsingKeyFrames>
-                                            <ColorAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder"
-                                                                          Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
-                                                <LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                     Value="{ThemeResource ToggleSwitchFillOffPressed}" />
+                                            <ColorAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
+                                                <LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchFillOffPressed}" />
                                             </ColorAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds"
-                                                                           Storyboard.TargetProperty="Fill">
-                                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource ToggleSwitchFillOnPressed}" />
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Fill">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchFillOnPressed}" />
                                             </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds"
-                                                                           Storyboard.TargetProperty="Stroke">
-                                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource ToggleSwitchStrokeOnPressed}" />
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Stroke">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchStrokeOnPressed}" />
                                             </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff"
-                                                                           Storyboard.TargetProperty="Fill">
-                                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource ToggleSwitchKnobFillOffPressed}" />
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Fill">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchKnobFillOffPressed}" />
                                             </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn"
-                                                                           Storyboard.TargetProperty="Background">
-                                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource ToggleSwitchKnobFillOnPressed}" />
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Background">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchKnobFillOnPressed}" />
                                             </ObjectAnimationUsingKeyFrames>
-                                            <ColorAnimationUsingKeyFrames Storyboard.TargetName="SwitchAreaGrid"
-                                                                          Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)">
-                                                <LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                     Value="{ThemeResource ToggleSwitchContainerBackgroundPressed}" />
+                                            <ColorAnimationUsingKeyFrames Storyboard.TargetName="SwitchAreaGrid" Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)">
+                                                <LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchContainerBackgroundPressed}" />
                                             </ColorAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames EnableDependentAnimation="True"
-                                                                           Storyboard.TargetName="SwitchKnobOn"
-                                                                           Storyboard.TargetProperty="Width">
-                                                <SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-                                                                      KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                      Value="17" />
+                                            <DoubleAnimationUsingKeyFrames
+                                                EnableDependentAnimation="True"
+                                                Storyboard.TargetName="SwitchKnobOn"
+                                                Storyboard.TargetProperty="Width">
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="{StaticResource ControlFasterAnimationDuration}"
+                                                    Value="17" />
                                             </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames EnableDependentAnimation="True"
-                                                                           Storyboard.TargetName="SwitchKnobOn"
-                                                                           Storyboard.TargetProperty="Height">
-                                                <SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-                                                                      KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                      Value="14" />
+                                            <DoubleAnimationUsingKeyFrames
+                                                EnableDependentAnimation="True"
+                                                Storyboard.TargetName="SwitchKnobOn"
+                                                Storyboard.TargetProperty="Height">
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="{StaticResource ControlFasterAnimationDuration}"
+                                                    Value="14" />
                                             </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames EnableDependentAnimation="True"
-                                                                           Storyboard.TargetName="SwitchKnobOff"
-                                                                           Storyboard.TargetProperty="Width">
-                                                <SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-                                                                      KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                      Value="17" />
+                                            <DoubleAnimationUsingKeyFrames
+                                                EnableDependentAnimation="True"
+                                                Storyboard.TargetName="SwitchKnobOff"
+                                                Storyboard.TargetProperty="Width">
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="{StaticResource ControlFasterAnimationDuration}"
+                                                    Value="17" />
                                             </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames EnableDependentAnimation="True"
-                                                                           Storyboard.TargetName="SwitchKnobOff"
-                                                                           Storyboard.TargetProperty="Height">
-                                                <SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-                                                                      KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                      Value="14" />
+                                            <DoubleAnimationUsingKeyFrames
+                                                EnableDependentAnimation="True"
+                                                Storyboard.TargetName="SwitchKnobOff"
+                                                Storyboard.TargetProperty="Height">
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="{StaticResource ControlFasterAnimationDuration}"
+                                                    Value="14" />
                                             </DoubleAnimationUsingKeyFrames>
                                         </Storyboard>
                                     </VisualState>
                                     <VisualState x:Name="Disabled">
                                         <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HeaderContentPresenter"
-                                                                           Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource ToggleSwitchHeaderForegroundDisabled}" />
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HeaderContentPresenter" Storyboard.TargetProperty="Foreground">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchHeaderForegroundDisabled}" />
                                             </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OffContentPresenter"
-                                                                           Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource ToggleSwitchContentForegroundDisabled}" />
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OffContentPresenter" Storyboard.TargetProperty="Foreground">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchContentForegroundDisabled}" />
                                             </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OnContentPresenter"
-                                                                           Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource ToggleSwitchContentForegroundDisabled}" />
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OnContentPresenter" Storyboard.TargetProperty="Foreground">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchContentForegroundDisabled}" />
                                             </ObjectAnimationUsingKeyFrames>
-                                            <ColorAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder"
-                                                                          Storyboard.TargetProperty="(Shape.Stroke).(SolidColorBrush.Color)">
-                                                <LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                     Value="{ThemeResource ToggleSwitchStrokeOffDisabled}" />
+                                            <ColorAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="(Shape.Stroke).(SolidColorBrush.Color)">
+                                                <LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchStrokeOffDisabled}" />
                                             </ColorAnimationUsingKeyFrames>
-                                            <ColorAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder"
-                                                                          Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
-                                                <LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                     Value="{ThemeResource ToggleSwitchFillOffDisabled}" />
+                                            <ColorAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
+                                                <LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchFillOffDisabled}" />
                                             </ColorAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds"
-                                                                           Storyboard.TargetProperty="Fill">
-                                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource ToggleSwitchFillOnDisabled}" />
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Fill">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchFillOnDisabled}" />
                                             </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds"
-                                                                           Storyboard.TargetProperty="Stroke">
-                                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource ToggleSwitchStrokeOnDisabled}" />
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Stroke">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchStrokeOnDisabled}" />
                                             </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff"
-                                                                           Storyboard.TargetProperty="Fill">
-                                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource ToggleSwitchKnobFillOffDisabled}" />
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Fill">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchKnobFillOffDisabled}" />
                                             </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn"
-                                                                           Storyboard.TargetProperty="Background">
-                                                <DiscreteObjectKeyFrame KeyTime="0"
-                                                                        Value="{ThemeResource ToggleSwitchKnobFillOnDisabled}" />
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Background">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchKnobFillOnDisabled}" />
                                             </ObjectAnimationUsingKeyFrames>
-                                            <ColorAnimationUsingKeyFrames Storyboard.TargetName="SwitchAreaGrid"
-                                                                          Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)">
-                                                <LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                     Value="{ThemeResource ToggleSwitchContainerBackgroundDisabled}" />
+                                            <ColorAnimationUsingKeyFrames Storyboard.TargetName="SwitchAreaGrid" Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)">
+                                                <LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchContainerBackgroundDisabled}" />
                                             </ColorAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames EnableDependentAnimation="True"
-                                                                           Storyboard.TargetName="SwitchKnobOn"
-                                                                           Storyboard.TargetProperty="Width">
-                                                <SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-                                                                      KeyTime="{StaticResource ControlNormalAnimationDuration}"
-                                                                      Value="12" />
+                                            <DoubleAnimationUsingKeyFrames
+                                                EnableDependentAnimation="True"
+                                                Storyboard.TargetName="SwitchKnobOn"
+                                                Storyboard.TargetProperty="Width">
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="{StaticResource ControlNormalAnimationDuration}"
+                                                    Value="12" />
                                             </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames EnableDependentAnimation="True"
-                                                                           Storyboard.TargetName="SwitchKnobOn"
-                                                                           Storyboard.TargetProperty="Height">
-                                                <SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-                                                                      KeyTime="{StaticResource ControlNormalAnimationDuration}"
-                                                                      Value="12" />
+                                            <DoubleAnimationUsingKeyFrames
+                                                EnableDependentAnimation="True"
+                                                Storyboard.TargetName="SwitchKnobOn"
+                                                Storyboard.TargetProperty="Height">
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="{StaticResource ControlNormalAnimationDuration}"
+                                                    Value="12" />
                                             </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames EnableDependentAnimation="True"
-                                                                           Storyboard.TargetName="SwitchKnobOff"
-                                                                           Storyboard.TargetProperty="Width">
-                                                <SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-                                                                      KeyTime="{StaticResource ControlNormalAnimationDuration}"
-                                                                      Value="12" />
+                                            <DoubleAnimationUsingKeyFrames
+                                                EnableDependentAnimation="True"
+                                                Storyboard.TargetName="SwitchKnobOff"
+                                                Storyboard.TargetProperty="Width">
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="{StaticResource ControlNormalAnimationDuration}"
+                                                    Value="12" />
                                             </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames EnableDependentAnimation="True"
-                                                                           Storyboard.TargetName="SwitchKnobOff"
-                                                                           Storyboard.TargetProperty="Height">
-                                                <SplineDoubleKeyFrame KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-                                                                      KeyTime="{StaticResource ControlNormalAnimationDuration}"
-                                                                      Value="12" />
+                                            <DoubleAnimationUsingKeyFrames
+                                                EnableDependentAnimation="True"
+                                                Storyboard.TargetName="SwitchKnobOff"
+                                                Storyboard.TargetProperty="Height">
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="{StaticResource ControlNormalAnimationDuration}"
+                                                    Value="12" />
                                             </DoubleAnimationUsingKeyFrames>
                                         </Storyboard>
                                     </VisualState>
                                 </VisualStateGroup>
                                 <VisualStateGroup x:Name="ToggleStates">
                                     <VisualStateGroup.Transitions>
-                                        <VisualTransition x:Name="DraggingToOnTransition"
-                                                          GeneratedDuration="0"
-                                                          From="Dragging"
-                                                          To="On">
+                                        <VisualTransition
+                                            x:Name="DraggingToOnTransition"
+                                            GeneratedDuration="0"
+                                            From="Dragging"
+                                            To="On">
                                             <Storyboard>
-                                                <RepositionThemeAnimation FromHorizontalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.KnobCurrentToOnOffset}"
-                                                                              TargetName="SwitchKnob" />
-                                                <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds"
-                                                                               Storyboard.TargetProperty="Opacity">
-                                                    <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                          Value="1" />
+                                                <RepositionThemeAnimation FromHorizontalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.KnobCurrentToOnOffset}" TargetName="SwitchKnob" />
+                                                <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Opacity">
+                                                    <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="1" />
                                                 </DoubleAnimationUsingKeyFrames>
-                                                <DoubleAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder"
-                                                                               Storyboard.TargetProperty="Opacity">
-                                                    <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                          Value="0" />
+                                                <DoubleAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="Opacity">
+                                                    <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
                                                 </DoubleAnimationUsingKeyFrames>
-                                                <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn"
-                                                                               Storyboard.TargetProperty="Opacity">
-                                                    <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                          Value="1" />
+                                                <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Opacity">
+                                                    <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="1" />
                                                 </DoubleAnimationUsingKeyFrames>
-                                                <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff"
-                                                                               Storyboard.TargetProperty="Opacity">
-                                                    <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                          Value="0" />
+                                                <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Opacity">
+                                                    <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
                                                 </DoubleAnimationUsingKeyFrames>
                                             </Storyboard>
                                         </VisualTransition>
-                                        <VisualTransition x:Name="OnToDraggingTransition"
-                                                          GeneratedDuration="0"
-                                                          From="On"
-                                                          To="Dragging">
+                                        <VisualTransition
+                                            x:Name="OnToDraggingTransition"
+                                            GeneratedDuration="0"
+                                            From="On"
+                                            To="Dragging">
                                             <Storyboard>
-                                                <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds"
-                                                                               Storyboard.TargetProperty="Opacity">
-                                                    <LinearDoubleKeyFrame KeyTime="0"
-                                                                          Value="1" />
+                                                <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Opacity">
+                                                    <LinearDoubleKeyFrame KeyTime="0" Value="1" />
                                                 </DoubleAnimationUsingKeyFrames>
-                                                <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn"
-                                                                               Storyboard.TargetProperty="Opacity">
-                                                    <LinearDoubleKeyFrame KeyTime="0"
-                                                                          Value="1" />
+                                                <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Opacity">
+                                                    <LinearDoubleKeyFrame KeyTime="0" Value="1" />
                                                 </DoubleAnimationUsingKeyFrames>
-                                                <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff"
-                                                                               Storyboard.TargetProperty="Opacity">
-                                                    <LinearDoubleKeyFrame KeyTime="0"
-                                                                          Value="0" />
+                                                <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Opacity">
+                                                    <LinearDoubleKeyFrame KeyTime="0" Value="0" />
                                                 </DoubleAnimationUsingKeyFrames>
                                             </Storyboard>
                                         </VisualTransition>
-                                        <VisualTransition x:Name="DraggingToOffTransition"
-                                                          GeneratedDuration="0"
-                                                          From="Dragging"
-                                                          To="Off">
+                                        <VisualTransition
+                                            x:Name="DraggingToOffTransition"
+                                            GeneratedDuration="0"
+                                            From="Dragging"
+                                            To="Off">
                                             <Storyboard>
-                                                <RepositionThemeAnimation FromHorizontalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.KnobCurrentToOffOffset}"
-                                                                              TargetName="SwitchKnob" />
-                                                <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds"
-                                                                               Storyboard.TargetProperty="Opacity">
-                                                    <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                          Value="0" />
+                                                <RepositionThemeAnimation FromHorizontalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.KnobCurrentToOffOffset}" TargetName="SwitchKnob" />
+                                                <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Opacity">
+                                                    <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
                                                 </DoubleAnimationUsingKeyFrames>
-                                                <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn"
-                                                                               Storyboard.TargetProperty="Opacity">
-                                                    <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                          Value="0" />
+                                                <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Opacity">
+                                                    <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
                                                 </DoubleAnimationUsingKeyFrames>
-                                                <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff"
-                                                                               Storyboard.TargetProperty="Opacity">
-                                                    <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                          Value="1" />
+                                                <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Opacity">
+                                                    <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="1" />
                                                 </DoubleAnimationUsingKeyFrames>
                                             </Storyboard>
                                         </VisualTransition>
-                                        <VisualTransition x:Name="OnToOffTransition"
-                                                          GeneratedDuration="0"
-                                                          From="On"
-                                                          To="Off">
+                                        <VisualTransition
+                                            x:Name="OnToOffTransition"
+                                            GeneratedDuration="0"
+                                            From="On"
+                                            To="Off">
                                             <Storyboard>
-                                                <RepositionThemeAnimation FromHorizontalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.KnobOnToOffOffset}"
-                                                                              TargetName="SwitchKnob" />
+                                                <RepositionThemeAnimation FromHorizontalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.KnobOnToOffOffset}" TargetName="SwitchKnob" />
                                             </Storyboard>
                                         </VisualTransition>
-                                        <VisualTransition x:Name="OffToOnTransition"
-                                                          GeneratedDuration="0"
-                                                          From="Off"
-                                                          To="On">
+                                        <VisualTransition
+                                            x:Name="OffToOnTransition"
+                                            GeneratedDuration="0"
+                                            From="Off"
+                                            To="On">
                                             <Storyboard>
-                                                <RepositionThemeAnimation FromHorizontalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.KnobOffToOnOffset}"
-                                                                              TargetName="SwitchKnob" />
-                                                <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds"
-                                                                               Storyboard.TargetProperty="Opacity">
-                                                    <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                          Value="1" />
+                                                <RepositionThemeAnimation FromHorizontalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.KnobOffToOnOffset}" TargetName="SwitchKnob" />
+                                                <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Opacity">
+                                                    <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="1" />
                                                 </DoubleAnimationUsingKeyFrames>
-                                                <DoubleAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder"
-                                                                               Storyboard.TargetProperty="Opacity">
-                                                    <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                          Value="0" />
+                                                <DoubleAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="Opacity">
+                                                    <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
                                                 </DoubleAnimationUsingKeyFrames>
-                                                <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn"
-                                                                               Storyboard.TargetProperty="Opacity">
-                                                    <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                          Value="1" />
+                                                <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Opacity">
+                                                    <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="1" />
                                                 </DoubleAnimationUsingKeyFrames>
-                                                <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff"
-                                                                               Storyboard.TargetProperty="Opacity">
-                                                    <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                          Value="0" />
+                                                <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Opacity">
+                                                    <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
                                                 </DoubleAnimationUsingKeyFrames>
                                             </Storyboard>
                                         </VisualTransition>
@@ -608,29 +686,22 @@
                                     <VisualState x:Name="Off" />
                                     <VisualState x:Name="On">
                                         <Storyboard>
-                                            <DoubleAnimation Storyboard.TargetName="KnobTranslateTransform"
-                                                             Storyboard.TargetProperty="X"
-                                                             To="20"
-                                                             Duration="0" />
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds"
-                                                                           Storyboard.TargetProperty="Opacity">
-                                                <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                      Value="1" />
+                                            <DoubleAnimation
+                                                Storyboard.TargetName="KnobTranslateTransform"
+                                                Storyboard.TargetProperty="X"
+                                                To="20"
+                                                Duration="0" />
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Opacity">
+                                                <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="1" />
                                             </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder"
-                                                                           Storyboard.TargetProperty="Opacity">
-                                                <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                      Value="0" />
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="Opacity">
+                                                <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
                                             </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn"
-                                                                           Storyboard.TargetProperty="Opacity">
-                                                <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                      Value="1" />
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Opacity">
+                                                <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="1" />
                                             </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff"
-                                                                           Storyboard.TargetProperty="Opacity">
-                                                <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}"
-                                                                      Value="0" />
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Opacity">
+                                                <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
                                             </DoubleAnimationUsingKeyFrames>
                                         </Storyboard>
                                     </VisualState>
@@ -638,12 +709,12 @@
                                 <VisualStateGroup x:Name="ContentStates">
                                     <VisualState x:Name="OffContent">
                                         <Storyboard>
-                                            <DoubleAnimation Storyboard.TargetName="OffContentPresenter"
-                                                             Storyboard.TargetProperty="Opacity"
-                                                             To="1"
-                                                             Duration="0" />
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OffContentPresenter"
-                                                                           Storyboard.TargetProperty="IsHitTestVisible">
+                                            <DoubleAnimation
+                                                Storyboard.TargetName="OffContentPresenter"
+                                                Storyboard.TargetProperty="Opacity"
+                                                To="1"
+                                                Duration="0" />
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OffContentPresenter" Storyboard.TargetProperty="IsHitTestVisible">
                                                 <DiscreteObjectKeyFrame KeyTime="0">
                                                     <DiscreteObjectKeyFrame.Value>
                                                         <x:Boolean>True</x:Boolean>
@@ -654,12 +725,12 @@
                                     </VisualState>
                                     <VisualState x:Name="OnContent">
                                         <Storyboard>
-                                            <DoubleAnimation Storyboard.TargetName="OnContentPresenter"
-                                                             Storyboard.TargetProperty="Opacity"
-                                                             To="1"
-                                                             Duration="0" />
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OnContentPresenter"
-                                                                           Storyboard.TargetProperty="IsHitTestVisible">
+                                            <DoubleAnimation
+                                                Storyboard.TargetName="OnContentPresenter"
+                                                Storyboard.TargetProperty="Opacity"
+                                                To="1"
+                                                Duration="0" />
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OnContentPresenter" Storyboard.TargetProperty="IsHitTestVisible">
                                                 <DiscreteObjectKeyFrame KeyTime="0">
                                                     <DiscreteObjectKeyFrame.Value>
                                                         <x:Boolean>True</x:Boolean>
@@ -670,129 +741,6 @@
                                     </VisualState>
                                 </VisualStateGroup>
                             </VisualStateManager.VisualStateGroups>
-                            <ContentPresenter x:Name="HeaderContentPresenter"
-                                              Grid.Row="0"
-                                              Margin="{ThemeResource ToggleSwitchTopHeaderMargin}"
-                                              VerticalAlignment="Top"
-                                              AutomationProperties.AccessibilityView="Raw"
-                                              x:DeferLoadStrategy="Lazy"
-                                              Content="{TemplateBinding Header}"
-                                              ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                              Foreground="{ThemeResource ToggleSwitchHeaderForeground}"
-                                              IsHitTestVisible="False"
-                                              TextWrapping="Wrap"
-                                              Visibility="Collapsed" />
-                            <Grid Grid.Row="1"
-                                  HorizontalAlignment="Right"
-                                  VerticalAlignment="Top">
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="{ThemeResource ToggleSwitchPreContentMargin}" />
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="{ThemeResource ToggleSwitchPostContentMargin}" />
-                                </Grid.RowDefinitions>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="12"
-                                                      MaxWidth="12" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
-                                <Grid x:Name="SwitchAreaGrid"
-                                      Grid.RowSpan="3"
-                                      Grid.ColumnSpan="3"
-                                      Margin="0,5"
-                                      Background="{ThemeResource ToggleSwitchContainerBackground}"
-                                      Control.IsTemplateFocusTarget="True"
-                                      CornerRadius="{TemplateBinding CornerRadius}" />
-                                <ContentPresenter x:Name="OffContentPresenter"
-                                                  Grid.RowSpan="3"
-                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                  AutomationProperties.AccessibilityView="Raw"
-                                                  Content="{TemplateBinding OffContent}"
-                                                  ContentTemplate="{TemplateBinding OffContentTemplate}"
-                                                  Foreground="{TemplateBinding Foreground}"
-                                                  IsHitTestVisible="False"
-                                                  Opacity="0" />
-                                <ContentPresenter x:Name="OnContentPresenter"
-                                                  Grid.RowSpan="3"
-                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                  AutomationProperties.AccessibilityView="Raw"
-                                                  Content="{TemplateBinding OnContent}"
-                                                  ContentTemplate="{TemplateBinding OnContentTemplate}"
-                                                  Foreground="{TemplateBinding Foreground}"
-                                                  IsHitTestVisible="False"
-                                                  Opacity="0" />
-                                <Rectangle x:Name="OuterBorder"
-                                           Grid.Row="1"
-                                           Grid.Column="2"
-                                           Width="40"
-                                           Height="20"
-                                           Fill="{ThemeResource ToggleSwitchFillOff}"
-                                           RadiusX="10"
-                                           RadiusY="10"
-                                           Stroke="{ThemeResource ToggleSwitchStrokeOff}"
-                                           StrokeThickness="{ThemeResource ToggleSwitchOuterBorderStrokeThickness}" />
-                                <Rectangle x:Name="SwitchKnobBounds"
-                                           Grid.Row="1"
-                                           Grid.Column="2"
-                                           Width="40"
-                                           Height="20"
-                                           Fill="{ThemeResource ToggleSwitchFillOn}"
-                                           Opacity="0"
-                                           RadiusX="10"
-                                           RadiusY="10"
-                                           Stroke="{ThemeResource ToggleSwitchStrokeOn}"
-                                           StrokeThickness="{ThemeResource ToggleSwitchOnStrokeThickness}" />
-                                <Grid x:Name="SwitchKnob"
-                                      Grid.Row="1"
-                                      Grid.Column="2"
-                                      Width="20"
-                                      Height="20"
-                                      HorizontalAlignment="Left">
-                                    <Border x:Name="SwitchKnobOn"
-                                            Width="12"
-                                            Height="12"
-                                            Margin="0,0,3,0"
-                                            HorizontalAlignment="Right"
-                                            Background="{ThemeResource ToggleSwitchKnobFillOn}"
-                                            BackgroundSizing="OuterBorderEdge"
-                                            BorderBrush="{ThemeResource ToggleSwitchKnobStrokeOn}"
-                                            CornerRadius="7"
-                                            Opacity="0"
-                                            RenderTransformOrigin="0.5, 0.5">
-                                        <Border.RenderTransform>
-                                            <CompositeTransform />
-                                        </Border.RenderTransform>
-                                    </Border>
-                                    <Rectangle x:Name="SwitchKnobOff"
-                                               Width="12"
-                                               Height="12"
-                                               Margin="3,0,0,0"
-                                               HorizontalAlignment="Left"
-                                               Fill="{ThemeResource ToggleSwitchKnobFillOff}"
-                                               RadiusX="7"
-                                               RadiusY="7"
-                                               RenderTransformOrigin="0.5, 0.5">
-                                        <Rectangle.RenderTransform>
-                                            <CompositeTransform />
-                                        </Rectangle.RenderTransform>
-                                    </Rectangle>
-                                    <Grid.RenderTransform>
-                                        <TranslateTransform x:Name="KnobTranslateTransform" />
-                                    </Grid.RenderTransform>
-                                </Grid>
-                                <Thumb x:Name="SwitchThumb"
-                                       Grid.RowSpan="3"
-                                       Grid.ColumnSpan="3"
-                                       AutomationProperties.AccessibilityView="Raw">
-                                    <Thumb.Template>
-                                        <ControlTemplate TargetType="Thumb">
-                                            <Rectangle Fill="Transparent" />
-                                        </ControlTemplate>
-                                    </Thumb.Template>
-                                </Thumb>
-                            </Grid>
                         </Grid>
                     </ControlTemplate>
                 </Setter.Value>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Styles/TextBlock.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Styles/TextBlock.xaml
index 2af0b66b0d..1b490901e7 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Styles/TextBlock.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Styles/TextBlock.xaml
@@ -1,10 +1,6 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <Style
-        x:Key="OobeSubtitleStyle"
-        TargetType="TextBlock">
+    <Style x:Key="OobeSubtitleStyle" TargetType="TextBlock">
         <Setter Property="Margin" Value="0,16,0,0" />
         <Setter Property="Foreground" Value="{ThemeResource DefaultTextForegroundThemeBrush}" />
         <Setter Property="AutomationProperties.HeadingLevel" Value="Level3" />
@@ -25,8 +21,8 @@
 
     <x:Double x:Key="HeaderTextFontSize">12</x:Double>
     <Style x:Key="HeaderTextStyle" TargetType="TextBlock">
-        <Setter Property="FontSize" Value="{StaticResource HeaderTextFontSize}"/>
-        <Setter Property="Foreground" Value="{ThemeResource TextFillColorSecondaryBrush}"/>
+        <Setter Property="FontSize" Value="{StaticResource HeaderTextFontSize}" />
+        <Setter Property="Foreground" Value="{ThemeResource TextFillColorSecondaryBrush}" />
         <Setter Property="FontWeight" Value="Bold" />
     </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Themes/Colors.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Themes/Colors.xaml
index ec196fd89a..9bcb4de2da 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Themes/Colors.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Themes/Colors.xaml
@@ -1,35 +1,21 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Dark">
-            <SolidColorBrush
-                x:Key="InfoBarInformationalSeverityBackgroundBrush"
-                Color="#FF34424d" />
+            <SolidColorBrush x:Key="InfoBarInformationalSeverityBackgroundBrush" Color="#FF34424d" />
             <Color x:Key="InfoBarInformationalSeverityIconBackground">#FF5fb2f2</Color>
-            <SolidColorBrush
-                x:Key="SolidBackgroundBrush"
-                Color="Black" />
+            <SolidColorBrush x:Key="SolidBackgroundBrush" Color="Black" />
         </ResourceDictionary>
 
         <ResourceDictionary x:Key="Light">
-            <SolidColorBrush
-                x:Key="InfoBarInformationalSeverityBackgroundBrush"
-                Color="#FFd3e7f7" />
+            <SolidColorBrush x:Key="InfoBarInformationalSeverityBackgroundBrush" Color="#FFd3e7f7" />
             <Color x:Key="InfoBarInformationalSeverityIconBackground">#FF0063b1</Color>
-            <SolidColorBrush
-                x:Key="SolidBackgroundBrush"
-                Color="White" />
+            <SolidColorBrush x:Key="SolidBackgroundBrush" Color="White" />
         </ResourceDictionary>
 
         <ResourceDictionary x:Key="HighContrast">
-            <SolidColorBrush
-                x:Key="InfoBarInformationalSeverityBackgroundBrush"
-                Color="#FF34424d" />
-            <SolidColorBrush
-                x:Key="SolidBackgroundBrush"
-                Color="Black" />
+            <SolidColorBrush x:Key="InfoBarInformationalSeverityBackgroundBrush" Color="#FF34424d" />
+            <SolidColorBrush x:Key="SolidBackgroundBrush" Color="Black" />
             <Color x:Key="InfoBarInformationalSeverityIconBackground">#FF5fb2f2</Color>
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml
index 8b583d3186..8a5f879acb 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml
@@ -1,4 +1,4 @@
-<Page
+<Page
     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"
@@ -160,9 +160,9 @@
                 <ContentDialog
                     x:Name="ColorFormatDialog"
                     x:Uid="ColorFormatDialog"
+                    Closed="ColorFormatDialog_Closed"
                     IsPrimaryButtonEnabled="{Binding IsValid, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                    PrimaryButtonStyle="{ThemeResource AccentButtonStyle}"
-                    Closed="ColorFormatDialog_Closed">
+                    PrimaryButtonStyle="{ThemeResource AccentButtonStyle}">
                     <ContentDialog.DataContext>
                         <models:ColorFormatModel />
                     </ContentDialog.DataContext>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml
index c121cae7c0..8e2ea8090a 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml
@@ -1,4 +1,4 @@
-<Page
+<Page
     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"
@@ -171,8 +171,8 @@
                         IsExpanded="True">
                         <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.WindowSwitching}" />
                         <controls:SettingsExpander.Items>
-                            <!-- HACK: For some weird reason, a Shortcut Control is not working correctly if it's the first item in the expander, so we add an invisible card as the first one. -->
-                            <controls:SettingsCard Visibility="Collapsed"/>
+                            <!--  HACK: For some weird reason, a Shortcut Control is not working correctly if it's the first item in the expander, so we add an invisible card as the first one.  -->
+                            <controls:SettingsCard Visibility="Collapsed" />
                             <controls:SettingsCard x:Uid="FancyZones_HotkeyNextTabControl" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.WindowSwitchingCategoryEnabled}">
                                 <custom:ShortcutControl MinWidth="{StaticResource SettingActionControlMinWidth}" HotkeySettings="{x:Bind Path=ViewModel.NextTabHotkey, Mode=TwoWay}" />
                             </controls:SettingsCard>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml
index 42832199a9..c397d6a645 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml
@@ -1,4 +1,4 @@
-<Page
+<Page
     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"
@@ -298,7 +298,10 @@
                                                     Visibility="{x:Bind ShowBadgeOnPluginSettingError}" />
                                             </Grid>
 
-                                            <ToggleSwitch x:Uid="PowerLauncher_EnablePluginToggle" IsOn="{x:Bind Path=Disabled, Converter={StaticResource BoolNegationConverter}, Mode=TwoWay}" IsEnabled="{x:Bind Path=EnabledGpoRuleIsConfigured, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
+                                            <ToggleSwitch
+                                                x:Uid="PowerLauncher_EnablePluginToggle"
+                                                IsEnabled="{x:Bind Path=EnabledGpoRuleIsConfigured, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
+                                                IsOn="{x:Bind Path=Disabled, Converter={StaticResource BoolNegationConverter}, Mode=TwoWay}" />
 
                                         </StackPanel>
                                         <controls:SettingsExpander.Items>