diff --git a/src/settings-ui/Settings.UI.UnitTests/Settings.UI.UnitTests.csproj b/src/settings-ui/Settings.UI.UnitTests/Settings.UI.UnitTests.csproj
index 03b755ac69..5f772a116b 100644
--- a/src/settings-ui/Settings.UI.UnitTests/Settings.UI.UnitTests.csproj
+++ b/src/settings-ui/Settings.UI.UnitTests/Settings.UI.UnitTests.csproj
@@ -18,6 +18,11 @@
     <OutputPath>..\..\..\x64\Release\SettingsTest\</OutputPath>
   </PropertyGroup>
 
+  <!-- Needed for CommunityToolkit.Labs.WinUI.SettingsControls. -->
+  <PropertyGroup>
+    <RestoreAdditionalProjectSources>https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-Labs/nuget/v3/index.json</RestoreAdditionalProjectSources>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
diff --git a/src/settings-ui/Settings.UI/App.xaml b/src/settings-ui/Settings.UI/App.xaml
index 0ec73f08c0..78ae97dba8 100644
--- a/src/settings-ui/Settings.UI/App.xaml
+++ b/src/settings-ui/Settings.UI/App.xaml
@@ -2,8 +2,9 @@
     x:Class="Microsoft.PowerToys.Settings.UI.App"
     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"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls">
+    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -11,25 +12,51 @@
                 <ResourceDictionary Source="/Controls/KeyVisual/KeyVisual.xaml" />
                 <ResourceDictionary Source="/Controls/IsEnabledTextBlock/IsEnabledTextBlock.xaml" />
                 <ResourceDictionary Source="/Styles/TextBlock.xaml" />
-                <ResourceDictionary Source="/Styles/Button.xaml"/>
-                <ResourceDictionary Source="/Themes/Colors.xaml"/>
-                <ResourceDictionary Source="/Themes/SettingsExpanderStyles.xaml"/>
-                <!-- Other merged dictionaries here -->
+                <ResourceDictionary Source="/Styles/Button.xaml" />
+                <ResourceDictionary Source="/Themes/Colors.xaml" />
+                <!--  Other merged dictionaries here  -->
             </ResourceDictionary.MergedDictionaries>
 
+            <!--  Converters  -->
+            <converters:BoolToVisibilityConverter
+                x:Key="ReverseBoolToVisibilityConverter"
+                FalseValue="Visible"
+                TrueValue="Collapsed" />
+            <converters:BoolToVisibilityConverter
+                x:Key="BoolToVisibilityConverter"
+                FalseValue="Collapsed"
+                TrueValue="Visible" />
+
+            <converters:BoolToObjectConverter
+                x:Key="BoolToComboBoxIndexConverter"
+                FalseValue="0"
+                TrueValue="1" />
+
+            <converters:BoolToObjectConverter
+                x:Key="ReverseBoolToComboBoxIndexConverter"
+                FalseValue="1"
+                TrueValue="0" />
+
+            <converters:StringFormatConverter x:Key="StringFormatConverter" />
+            <converters:BoolNegationConverter x:Key="BoolNegationConverter" />
+
+            <!--  Overrides  -->
             <Thickness x:Key="InfoBarIconMargin">6,16,16,16</Thickness>
             <Thickness x:Key="InfoBarContentRootPadding">16,0,0,0</Thickness>
             <x:Double x:Key="SettingActionControlMinWidth">240</x:Double>
 
+
             <Style TargetType="ListViewItem">
                 <Setter Property="Margin" Value="0,0,0,2" />
                 <Setter Property="Padding" Value="0,0,0,0" />
                 <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-                <Setter Property="IsTabStop" Value="False"/>
+                <Setter Property="IsTabStop" Value="False" />
             </Style>
 
-            <Style TargetType="controls:CheckBoxWithDescriptionControl" BasedOn="{StaticResource DefaultCheckBoxStyle}" />
-            <!-- Other app resources here -->
+            <Style
+                BasedOn="{StaticResource DefaultCheckBoxStyle}"
+                TargetType="controls:CheckBoxWithDescriptionControl" />
+            <!--  Other app resources here  -->
         </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/src/settings-ui/Settings.UI/Controls/ColorPickerButton.xaml b/src/settings-ui/Settings.UI/Controls/ColorPickerButton.xaml
index b5352a1b91..29920b778e 100644
--- a/src/settings-ui/Settings.UI/Controls/ColorPickerButton.xaml
+++ b/src/settings-ui/Settings.UI/Controls/ColorPickerButton.xaml
@@ -2,38 +2,39 @@
     x:Class="Microsoft.PowerToys.Settings.UI.Controls.ColorPickerButton"
     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.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"
-    mc:Ignorable="d"
-    
     d:DesignHeight="300"
-    d:DesignWidth="400">
+    d:DesignWidth="400"
+    mc:Ignorable="d">
 
     <Grid>
         <!--TODO(stefan): ToDisplayName is no longer available in ColorHelper
         <DropDownButton Padding="4,4,8,4" AutomationProperties.FullDescription="{x:Bind clr:ColorHelper.ToDisplayName(SelectedColor), Mode=OneWay }">
         -->
         <DropDownButton Padding="4,4,8,4">
-            <Border x:Name="ColorPreviewBorder"
-                    Width="48"
-                    CornerRadius="2"
-                    Height="24"
-                    BorderBrush="{ThemeResource CardBorderBrush}"
-                    BorderThickness="{ThemeResource CardBorderThickness}">
+            <Border
+                x:Name="ColorPreviewBorder"
+                Width="48"
+                Height="24"
+                BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                BorderThickness="1"
+                CornerRadius="{ThemeResource ControlCornerRadius}">
                 <Border.Background>
-                    <SolidColorBrush Color="{x:Bind SelectedColor, Mode=OneWay}"/>
+                    <SolidColorBrush Color="{x:Bind SelectedColor, Mode=OneWay}" />
                 </Border.Background>
             </Border>
             <DropDownButton.Flyout>
                 <Flyout>
-                    <ColorPicker IsColorSliderVisible="True"
-                                      IsColorChannelTextInputVisible="True"
-                                      IsHexInputVisible="True"
-                                      IsAlphaEnabled="False"
-                                      IsAlphaSliderVisible="False"
-                                      IsAlphaTextInputVisible="False"
-                                      Color="{x:Bind SelectedColor, Mode=TwoWay}" />
+                    <ColorPicker
+                        IsAlphaEnabled="False"
+                        IsAlphaSliderVisible="False"
+                        IsAlphaTextInputVisible="False"
+                        IsColorChannelTextInputVisible="True"
+                        IsColorSliderVisible="True"
+                        IsHexInputVisible="True"
+                        Color="{x:Bind SelectedColor, Mode=TwoWay}" />
                 </Flyout>
             </DropDownButton.Flyout>
         </DropDownButton>
diff --git a/src/settings-ui/Settings.UI/Controls/FancyZonesPreviewControl.xaml b/src/settings-ui/Settings.UI/Controls/FancyZonesPreviewControl.xaml
index da3efa820d..6e56b3094e 100644
--- a/src/settings-ui/Settings.UI/Controls/FancyZonesPreviewControl.xaml
+++ b/src/settings-ui/Settings.UI/Controls/FancyZonesPreviewControl.xaml
@@ -2,10 +2,8 @@
     x:Class="Microsoft.PowerToys.Settings.UI.Controls.FancyZonesPreviewControl"
     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.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
     Loaded="FancyZonesPreviewControl_Loaded"
     RequestedTheme="Dark"
     mc:Ignorable="d">
@@ -13,37 +11,118 @@
         <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}"/>
-            <converters:BoolToObjectConverter x:Key="BoolToVisibilityConverter" TrueValue="Visible" FalseValue="Collapsed"/>
+            <SolidColorBrush
+                x:Key="DefaultAccentBrush"
+                Color="{ThemeResource SystemAccentColor}" />
+            <SolidColorBrush
+                x:Key="DefaultBorderBrush"
+                Color="{ThemeResource SystemAccentColor}" />
         </ResourceDictionary>
-      
+
     </UserControl.Resources>
-    <Grid x:Name="RootGrid" CornerRadius="4" BorderBrush="Black" Background="Black" BorderThickness="6" HorizontalAlignment="Center" MinWidth="170" MinHeight="86">
+    <Grid
+        x:Name="RootGrid"
+        MinWidth="170"
+        MinHeight="86"
+        HorizontalAlignment="Center"
+        Background="Black"
+        BorderBrush="Black"
+        BorderThickness="6"
+        CornerRadius="4">
         <Grid.RowDefinitions>
-            <RowDefinition Height="*"/>
-            <RowDefinition Height="*"/>
-            <RowDefinition Height="auto"/>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="auto" />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
+        <Border
+            Grid.RowSpan="3"
+            Grid.ColumnSpan="2"
+            CornerRadius="2"
+            Opacity="0.8">
+            <Image
+                AutomationProperties.AccessibilityView="Raw"
+                Source="{x:Bind WallpaperPath, Mode=OneWay}"
+                Stretch="UniformToFill" />
+        </Border>
+
+        <Grid
+            Grid.Row="2"
+            Grid.ColumnSpan="2"
+            Background="{ThemeResource SystemControlAcrylicElementBrush}" />
+        <Border
+            x:Name="Zone1"
+            Grid.RowSpan="2"
+            Margin="4,4,2,4"
+            BorderThickness="1"
+            CornerRadius="2">
+            <TextBlock
+                x:Name="Zone1Number"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontWeight="SemiBold"
+                Text="1"
+                Visibility="{x:Bind ShowZoneNumber, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+        </Border>
+        <Border
+            x:Name="Zone2"
+            Grid.Column="1"
+            Margin="2,4,4,2"
+            BorderThickness="1"
+            CornerRadius="2">
+            <TextBlock
+                x:Name="Zone2Number"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontWeight="SemiBold"
+                Text="2"
+                Visibility="{x:Bind ShowZoneNumber, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+        </Border>
+        <Border
+            x:Name="Zone3"
+            Grid.Row="1"
+            Grid.Column="1"
+            Margin="2,2,4,4"
+            BorderThickness="1"
+            CornerRadius="2">
+            <TextBlock
+                x:Name="Zone3Number"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontWeight="SemiBold"
+                Text="3"
+                Visibility="{x:Bind ShowZoneNumber, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+        </Border>
         <VisualStateManager.VisualStateGroups>
             <VisualStateGroup x:Name="CommonStates">
-                <VisualState x:Name="Normal"/>
+                <VisualState x:Name="Normal" />
                 <VisualState x:Name="Disabled">
                     <VisualState.Setters>
                         <Setter Target="RootGrid.Opacity" Value="0.4" />
@@ -51,19 +130,5 @@
                 </VisualState>
             </VisualStateGroup>
         </VisualStateManager.VisualStateGroups>
-        <Border Opacity="0.8" Grid.ColumnSpan="2" Grid.RowSpan="3" CornerRadius="2" >
-            <Image Source="{x:Bind WallpaperPath, Mode=OneWay}" Stretch="UniformToFill" AutomationProperties.AccessibilityView="Raw"/>
-        </Border>
-     
-        <Grid Background="{ThemeResource SystemControlAcrylicElementBrush}" Grid.Row="2"  Grid.ColumnSpan="2"/>
-        <Border x:Name="Zone1" Margin="4,4,2,4" CornerRadius="2" Grid.RowSpan="2" BorderThickness="1">
-            <TextBlock x:Name="Zone1Number" Text="1" FontWeight="SemiBold" VerticalAlignment="Center" HorizontalAlignment="Center" Visibility="{x:Bind ShowZoneNumber, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
-        </Border>
-        <Border x:Name="Zone2" Margin="2,4,4,2" CornerRadius="2" Grid.Column="1" BorderThickness="1">
-            <TextBlock x:Name="Zone2Number" Text="2" FontWeight="SemiBold" VerticalAlignment="Center" HorizontalAlignment="Center" Visibility="{x:Bind ShowZoneNumber, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
-        </Border>
-        <Border x:Name="Zone3" Margin="2,2,4,4" CornerRadius="2" Grid.Row="1" Grid.Column="1" BorderThickness="1">
-            <TextBlock x:Name="Zone3Number" Text="3" FontWeight="SemiBold" VerticalAlignment="Center" HorizontalAlignment="Center" Visibility="{x:Bind ShowZoneNumber, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
-        </Border>
     </Grid>
 </UserControl>
diff --git a/src/settings-ui/Settings.UI/Controls/IsEnabledTextBlock/IsEnabledTextBlock.xaml b/src/settings-ui/Settings.UI/Controls/IsEnabledTextBlock/IsEnabledTextBlock.xaml
index 636ac9d8a3..124f2b9167 100644
--- a/src/settings-ui/Settings.UI/Controls/IsEnabledTextBlock/IsEnabledTextBlock.xaml
+++ b/src/settings-ui/Settings.UI/Controls/IsEnabledTextBlock/IsEnabledTextBlock.xaml
@@ -1,5 +1,5 @@
 <ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+    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.Controls">
 
@@ -10,9 +10,17 @@
             <Setter.Value>
                 <ControlTemplate TargetType="local:IsEnabledTextBlock">
                     <Grid>
+                        <TextBlock
+                            x:Name="Label"
+                            FontFamily="{TemplateBinding FontFamily}"
+                            FontSize="{TemplateBinding FontSize}"
+                            FontWeight="{TemplateBinding FontWeight}"
+                            Foreground="{TemplateBinding Foreground}"
+                            Text="{TemplateBinding Text}"
+                            TextWrapping="WrapWholeWords" />
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal"/>
+                                <VisualState x:Name="Normal" />
                                 <VisualState x:Name="Disabled">
                                     <VisualState.Setters>
                                         <Setter Target="Label.Foreground" Value="{ThemeResource TextFillColorDisabledBrush}" />
@@ -20,20 +28,15 @@
                                 </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
-                        <TextBlock x:Name="Label"
-                                   FontSize="{TemplateBinding FontSize}"
-                                   FontWeight="{TemplateBinding FontWeight}"
-                                   FontFamily="{TemplateBinding FontFamily}"
-                                   Foreground="{TemplateBinding Foreground}"
-                                   TextWrapping="WrapWholeWords"
-                                   Text="{TemplateBinding Text}" />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
-    <Style TargetType="local:IsEnabledTextBlock" x:Key="SecondaryIsEnabledTextBlockStyle">
+    <Style
+        x:Key="SecondaryIsEnabledTextBlockStyle"
+        TargetType="local:IsEnabledTextBlock">
         <Setter Property="Foreground" Value="{ThemeResource TextFillColorSecondaryBrush}" />
-        <Setter Property="FontSize" Value="{StaticResource SecondaryTextFontSize}"/>
+        <Setter Property="FontSize" Value="{StaticResource SecondaryTextFontSize}" />
     </Style>
 </ResourceDictionary>
diff --git a/src/settings-ui/Settings.UI/Controls/KeyVisual/KeyVisual.xaml b/src/settings-ui/Settings.UI/Controls/KeyVisual/KeyVisual.xaml
index df88c48728..2d469563a2 100644
--- a/src/settings-ui/Settings.UI/Controls/KeyVisual/KeyVisual.xaml
+++ b/src/settings-ui/Settings.UI/Controls/KeyVisual/KeyVisual.xaml
@@ -1,10 +1,13 @@
-<ResourceDictionary 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.Controls">
+<ResourceDictionary
+    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.Controls">
 
     <x:Double x:Key="DefaultIconSize">16</x:Double>
     <x:Double x:Key="SmallIconSize">12</x:Double>
-    <Style x:Key="DefaultTextKeyVisualStyle" TargetType="local:KeyVisual">
+    <Style
+        x:Key="DefaultTextKeyVisualStyle"
+        TargetType="local:KeyVisual">
         <Setter Property="MinWidth" Value="56" />
         <Setter Property="MinHeight" Value="48" />
         <Setter Property="Background" Value="{ThemeResource AccentButtonBackground}" />
@@ -20,9 +23,29 @@
             <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"/>
+                                <VisualState x:Name="Normal" />
                                 <VisualState x:Name="Disabled">
                                     <VisualState.Setters>
                                         <Setter Target="ContentHolder.Fill" Value="{ThemeResource AccentButtonBackgroundDisabled}" />
@@ -33,7 +56,7 @@
                                 </VisualState>
                             </VisualStateGroup>
                             <VisualStateGroup x:Name="StateStates">
-                                <VisualState x:Name="Default"/>
+                                <VisualState x:Name="Default" />
                                 <VisualState x:Name="Error">
                                     <VisualState.Setters>
                                         <Setter Target="ContentHolder.Fill" Value="{ThemeResource InfoBarErrorSeverityBackgroundBrush}" />
@@ -44,31 +67,16 @@
                                 </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
-                        <Grid>
-                            <Rectangle x:Name="ContentHolder"
-                                Fill="{TemplateBinding Background}"
-                                Stroke="{TemplateBinding BorderBrush}"
-                                StrokeThickness="{TemplateBinding BorderThickness}"
-                                RadiusX="4"
-                                RadiusY="4"
-                                Height="{TemplateBinding Height}"
-                                MinWidth="{TemplateBinding MinWidth}"/>
-                            <ContentPresenter x:Name="KeyPresenter"
-                                          FontWeight="{TemplateBinding FontWeight}"
-                                          Foreground="{TemplateBinding Foreground}"
-                                          Content="{TemplateBinding Content}"
-                                          Margin="{TemplateBinding Padding}"
-                                          FontSize="{TemplateBinding FontSize}"
-                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                          VerticalAlignment="Center" />
-                        </Grid>
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style x:Key="SmallTextKeyVisualStyle" TargetType="local:KeyVisual" BasedOn="{StaticResource DefaultTextKeyVisualStyle}">
+    <Style
+        x:Key="SmallTextKeyVisualStyle"
+        BasedOn="{StaticResource DefaultTextKeyVisualStyle}"
+        TargetType="local:KeyVisual">
         <Setter Property="MinWidth" Value="40" />
         <Setter Property="Height" Value="36" />
         <Setter Property="FontWeight" Value="SemiBold" />
@@ -77,7 +85,10 @@
         <Setter Property="HorizontalContentAlignment" Value="Center" />
     </Style>
 
-    <Style x:Key="SmallOutlineTextKeyVisualStyle" TargetType="local:KeyVisual" BasedOn="{StaticResource DefaultTextKeyVisualStyle}">
+    <Style
+        x:Key="SmallOutlineTextKeyVisualStyle"
+        BasedOn="{StaticResource DefaultTextKeyVisualStyle}"
+        TargetType="local:KeyVisual">
         <Setter Property="MinWidth" Value="40" />
         <Setter Property="Background" Value="{ThemeResource ButtonBackground}" />
         <Setter Property="Foreground" Value="{ThemeResource ButtonForeground}" />
@@ -90,7 +101,10 @@
     </Style>
 
 
-    <Style x:Key="DefaultIconKeyVisualStyle" TargetType="local:KeyVisual" BasedOn="{StaticResource DefaultTextKeyVisualStyle}">
+    <Style
+        x:Key="DefaultIconKeyVisualStyle"
+        BasedOn="{StaticResource DefaultTextKeyVisualStyle}"
+        TargetType="local:KeyVisual">
         <Setter Property="MinWidth" Value="56" />
         <Setter Property="MinHeight" Value="48" />
         <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
@@ -99,7 +113,10 @@
         <Setter Property="HorizontalContentAlignment" Value="Center" />
     </Style>
 
-    <Style x:Key="SmallIconKeyVisualStyle" TargetType="local:KeyVisual" BasedOn="{StaticResource DefaultTextKeyVisualStyle}">
+    <Style
+        x:Key="SmallIconKeyVisualStyle"
+        BasedOn="{StaticResource DefaultTextKeyVisualStyle}"
+        TargetType="local:KeyVisual">
         <Setter Property="MinWidth" Value="40" />
         <Setter Property="Height" Value="36" />
         <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
@@ -109,7 +126,10 @@
         <Setter Property="HorizontalContentAlignment" Value="Center" />
     </Style>
 
-    <Style x:Key="SmallOutlineIconKeyVisualStyle" TargetType="local:KeyVisual" BasedOn="{StaticResource DefaultTextKeyVisualStyle}">
+    <Style
+        x:Key="SmallOutlineIconKeyVisualStyle"
+        BasedOn="{StaticResource DefaultTextKeyVisualStyle}"
+        TargetType="local:KeyVisual">
         <Setter Property="MinWidth" Value="40" />
         <Setter Property="Background" Value="{ThemeResource ButtonBackground}" />
         <Setter Property="Foreground" Value="{ThemeResource ButtonForeground}" />
diff --git a/src/settings-ui/Settings.UI/Controls/OOBEPageControl/OOBEPageControl.xaml b/src/settings-ui/Settings.UI/Controls/OOBEPageControl/OOBEPageControl.xaml
index d256adf903..391026cee4 100644
--- a/src/settings-ui/Settings.UI/Controls/OOBEPageControl/OOBEPageControl.xaml
+++ b/src/settings-ui/Settings.UI/Controls/OOBEPageControl/OOBEPageControl.xaml
@@ -2,13 +2,11 @@
     x:Class="Microsoft.PowerToys.Settings.UI.Controls.OOBEPageControl"
     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.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-   
     d:DesignHeight="300"
-    d:DesignWidth="400">
+    d:DesignWidth="400"
+    mc:Ignorable="d">
 
     <Grid>
         <Grid.RowDefinitions>
@@ -16,32 +14,38 @@
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
-        <Image x:Name="HeaderImage"
-               Source="{x:Bind HeroImage}"
-               Stretch="UniformToFill" />
+        <Image
+            x:Name="HeaderImage"
+            Source="{x:Bind HeroImage}"
+            Stretch="UniformToFill" />
 
-        <ScrollViewer Grid.Row="1"
-                      VerticalScrollBarVisibility="Auto"
-                      Padding="32,24,32,24">
-            <StackPanel Orientation="Vertical"
-                        VerticalAlignment="Top">
-                
-                <TextBlock x:Name="TitleTxt"
-                           Text="{x:Bind Title}"
-                           AutomationProperties.HeadingLevel="Level1"
-                           Style="{StaticResource TitleTextBlockStyle}" />
+        <ScrollViewer
+            Grid.Row="1"
+            Padding="32,24,32,24"
+            VerticalScrollBarVisibility="Auto">
+            <StackPanel
+                VerticalAlignment="Top"
+                Orientation="Vertical">
 
-                <TextBlock x:Name="DescriptionTxt"
-                           Margin="0,8,0,0"
-                           Text="{x:Bind Description}"
-                           Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                           TextWrapping="Wrap" />
+                <TextBlock
+                    x:Name="TitleTxt"
+                    AutomationProperties.HeadingLevel="Level1"
+                    Style="{StaticResource TitleTextBlockStyle}"
+                    Text="{x:Bind Title}" />
 
-                <ContentPresenter x:Name="ModuleContentPresenter"
-                                  Content="{x:Bind PageContent}"
-                                  HorizontalAlignment="Stretch"
-                                  HorizontalContentAlignment="Stretch"
-                                  Margin="0,12,0,0"/>
+                <TextBlock
+                    x:Name="DescriptionTxt"
+                    Margin="0,8,0,0"
+                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                    Text="{x:Bind Description}"
+                    TextWrapping="Wrap" />
+
+                <ContentPresenter
+                    x:Name="ModuleContentPresenter"
+                    Margin="0,12,0,0"
+                    HorizontalAlignment="Stretch"
+                    HorizontalContentAlignment="Stretch"
+                    Content="{x:Bind PageContent}" />
             </StackPanel>
         </ScrollViewer>
     </Grid>
diff --git a/src/settings-ui/Settings.UI/Controls/PowerAccentShortcutControl.xaml b/src/settings-ui/Settings.UI/Controls/PowerAccentShortcutControl.xaml
index 82fe8d310d..c148a00831 100644
--- a/src/settings-ui/Settings.UI/Controls/PowerAccentShortcutControl.xaml
+++ b/src/settings-ui/Settings.UI/Controls/PowerAccentShortcutControl.xaml
@@ -2,43 +2,47 @@
     x:Class="Microsoft.PowerToys.Settings.UI.Controls.PowerAccentShortcutControl"
     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.Controls"
+    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
-    mc:Ignorable="d"
     d:DesignHeight="300"
-    d:DesignWidth="400">
+    d:DesignWidth="400"
+    mc:Ignorable="d">
 
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
-        <ItemsControl AutomationProperties.AccessibilityView="Raw"
-                          ItemsSource="{x:Bind Keys}"
-                          VerticalAlignment="Center"
-                          IsTabStop="False">
-                <ItemsControl.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <StackPanel Orientation="Horizontal" Spacing="4" />
-                    </ItemsPanelTemplate>
-                </ItemsControl.ItemsPanel>
-                <ItemsControl.ItemTemplate>
-                    <DataTemplate>
-                        <controls:KeyVisual IsTabStop="False"
-                                            AutomationProperties.AccessibilityView="Raw"
-                                            VisualType="SmallOutline"
-                                            VerticalAlignment="Center"
-                                            Content="{Binding}" />
-                    </DataTemplate>
-                </ItemsControl.ItemTemplate>
-            </ItemsControl>
-        <toolkitcontrols:MarkdownTextBlock Background="Transparent"
-                                           Text="{x:Bind Text}"
-                                           Margin="8,0,0,0"
-                                           Grid.Column="1"
-                                           VerticalAlignment="Center" />
+        <ItemsControl
+            VerticalAlignment="Center"
+            AutomationProperties.AccessibilityView="Raw"
+            IsTabStop="False"
+            ItemsSource="{x:Bind Keys}">
+            <ItemsControl.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <StackPanel
+                        Orientation="Horizontal"
+                        Spacing="4" />
+                </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+            <ItemsControl.ItemTemplate>
+                <DataTemplate>
+                    <controls:KeyVisual
+                        VerticalAlignment="Center"
+                        AutomationProperties.AccessibilityView="Raw"
+                        Content="{Binding}"
+                        IsTabStop="False"
+                        VisualType="SmallOutline" />
+                </DataTemplate>
+            </ItemsControl.ItemTemplate>
+        </ItemsControl>
+        <toolkitcontrols:MarkdownTextBlock
+            Grid.Column="1"
+            Margin="8,0,0,0"
+            VerticalAlignment="Center"
+            Background="Transparent"
+            Text="{x:Bind Text}" />
     </Grid>
 </UserControl>
diff --git a/src/settings-ui/Settings.UI/Controls/Setting/Setting.cs b/src/settings-ui/Settings.UI/Controls/Setting/Setting.cs
deleted file mode 100644
index d235fb9751..0000000000
--- a/src/settings-ui/Settings.UI/Controls/Setting/Setting.cs
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.ComponentModel;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Automation;
-using Microsoft.UI.Xaml.Controls;
-
-namespace Microsoft.PowerToys.Settings.UI.Controls
-{
-    [TemplateVisualState(Name = "Normal", GroupName = "CommonStates")]
-    [TemplateVisualState(Name = "Disabled", GroupName = "CommonStates")]
-    [TemplatePart(Name = PartIconPresenter, Type = typeof(ContentPresenter))]
-    [TemplatePart(Name = PartDescriptionPresenter, Type = typeof(ContentPresenter))]
-    public class Setting : ContentControl
-    {
-        private const string PartIconPresenter = "IconPresenter";
-        private const string PartDescriptionPresenter = "DescriptionPresenter";
-        private ContentPresenter _iconPresenter;
-        private ContentPresenter _descriptionPresenter;
-        private Setting _setting;
-
-        public Setting()
-        {
-            this.DefaultStyleKey = typeof(Setting);
-        }
-
-        public static readonly DependencyProperty HeaderProperty = DependencyProperty.Register(
-           "Header",
-           typeof(string),
-           typeof(Setting),
-           new PropertyMetadata(default(string), OnHeaderChanged));
-
-        public static readonly DependencyProperty DescriptionProperty = DependencyProperty.Register(
-            "Description",
-            typeof(object),
-            typeof(Setting),
-            new PropertyMetadata(null, OnDescriptionChanged));
-
-        public static readonly DependencyProperty IconProperty = DependencyProperty.Register(
-            "Icon",
-            typeof(object),
-            typeof(Setting),
-            new PropertyMetadata(default(string), OnIconChanged));
-
-        public static readonly DependencyProperty ActionContentProperty = DependencyProperty.Register(
-            "ActionContent",
-            typeof(object),
-            typeof(Setting),
-            null);
-
-        [Localizable(true)]
-        public string Header
-        {
-            get => (string)GetValue(HeaderProperty);
-            set => SetValue(HeaderProperty, value);
-        }
-
-        [Localizable(true)]
-        public object Description
-        {
-            get => (object)GetValue(DescriptionProperty);
-            set => SetValue(DescriptionProperty, value);
-        }
-
-        public object Icon
-        {
-            get => (object)GetValue(IconProperty);
-            set => SetValue(IconProperty, value);
-        }
-
-        public object ActionContent
-        {
-            get => (object)GetValue(ActionContentProperty);
-            set => SetValue(ActionContentProperty, value);
-        }
-
-        protected override void OnApplyTemplate()
-        {
-            IsEnabledChanged -= Setting_IsEnabledChanged;
-            _setting = (Setting)this;
-            _iconPresenter = (ContentPresenter)_setting.GetTemplateChild(PartIconPresenter);
-            _descriptionPresenter = (ContentPresenter)_setting.GetTemplateChild(PartDescriptionPresenter);
-            Update();
-            SetEnabledState();
-            IsEnabledChanged += Setting_IsEnabledChanged;
-            base.OnApplyTemplate();
-        }
-
-        private static void OnHeaderChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((Setting)d).Update();
-        }
-
-        private static void OnIconChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((Setting)d).Update();
-        }
-
-        private static void OnDescriptionChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((Setting)d).Update();
-        }
-
-        private void Setting_IsEnabledChanged(object sender, DependencyPropertyChangedEventArgs e)
-        {
-            SetEnabledState();
-        }
-
-        private void SetEnabledState()
-        {
-            VisualStateManager.GoToState(this, IsEnabled ? "Normal" : "Disabled", true);
-        }
-
-        private void Update()
-        {
-            if (_setting == null)
-            {
-                return;
-            }
-
-            if (_setting.ActionContent != null)
-            {
-                if (_setting.ActionContent.GetType() != typeof(Button))
-                {
-                    // We do not want to override the default AutomationProperties.Name of a button. Its Content property already describes what it does.
-                    if (!string.IsNullOrEmpty(_setting.Header))
-                    {
-                        AutomationProperties.SetName((UIElement)_setting.ActionContent, _setting.Header);
-                    }
-                }
-            }
-
-            if (_setting._iconPresenter != null)
-            {
-                if (_setting.Icon == null)
-                {
-                    _setting._iconPresenter.Visibility = Visibility.Collapsed;
-                }
-                else
-                {
-                    _setting._iconPresenter.Visibility = Visibility.Visible;
-                }
-            }
-
-            if (_setting.Description == null)
-            {
-                _setting._descriptionPresenter.Visibility = Visibility.Collapsed;
-            }
-            else
-            {
-                _setting._descriptionPresenter.Visibility = Visibility.Visible;
-            }
-        }
-    }
-}
diff --git a/src/settings-ui/Settings.UI/Controls/Setting/Setting.xaml b/src/settings-ui/Settings.UI/Controls/Setting/Setting.xaml
deleted file mode 100644
index 14e3328cc4..0000000000
--- a/src/settings-ui/Settings.UI/Controls/Setting/Setting.xaml
+++ /dev/null
@@ -1,107 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls">
-
-    <Style TargetType="controls:Setting">
-        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}"/>
-        <Setter Property="Background" Value="{ThemeResource CardBackgroundBrush}" />
-        <Setter Property="BorderThickness" Value="{ThemeResource CardBorderThickness}" />
-        <Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}" />
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="Padding" Value="16" />
-        <Setter Property="Margin" Value="0,0,0,0"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="controls:Setting">
-                    <Grid x:Name="RootGrid"
-                          CornerRadius="{TemplateBinding CornerRadius}"
-                          Background="{TemplateBinding Background}"
-                          BorderThickness="{TemplateBinding BorderThickness}"
-                          BorderBrush="{TemplateBinding BorderBrush}"
-                          Padding="{TemplateBinding Padding}"
-                          HorizontalAlignment="Stretch"
-                          VerticalAlignment="Center"
-                          MinHeight="48">
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal"/>
-                                <VisualState x:Name="Disabled">
-                                    <VisualState.Setters>
-                                        <Setter Target="HeaderPresenter.Foreground" Value="{ThemeResource TextFillColorDisabledBrush}" />
-                                        <Setter Target="DescriptionPresenter.Foreground" Value="{ThemeResource TextFillColorDisabledBrush}" />
-                                        <Setter Target="IconPresenter.Foreground" Value="{ThemeResource TextFillColorDisabledBrush}" />
-                                        <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TextFillColorDisabledBrush}" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto"/>
-                            <!-- Icon -->
-                            <ColumnDefinition Width="*"/>
-                            <!-- Header and subtitle -->
-                            <ColumnDefinition Width="Auto"/>
-                            <!-- Action control -->
-                        </Grid.ColumnDefinitions>
-
-                        <ContentPresenter x:Name="IconPresenter"
-                          Content="{TemplateBinding Icon}"
-                          HorizontalAlignment="Center"
-                          FontSize="20"
-                          IsTextScaleFactorEnabled="False"
-                          Margin="2,0,18,0"
-                          MaxWidth="20"
-                          AutomationProperties.AccessibilityView="Raw"
-                          FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                          Foreground="{ThemeResource CardPrimaryForegroundBrush}"
-                          VerticalAlignment="Center"/>
-
-                        <StackPanel
-                            VerticalAlignment="Center"
-                            Grid.Column="1"
-                            HorizontalAlignment="Stretch"
-                            Margin="0,0,16,0">
-
-                            <TextBlock
-                                x:Name="HeaderPresenter"
-                                Text="{TemplateBinding Header}"
-                                VerticalAlignment="Center"
-                                Foreground="{ThemeResource CardPrimaryForegroundBrush}" />
-
-                            <ContentPresenter
-                                x:Name="DescriptionPresenter"
-                                Content="{TemplateBinding Description}"
-                                FontSize="{StaticResource SecondaryTextFontSize}"
-                                TextWrapping="WrapWholeWords"
-                                Foreground="{ThemeResource TextFillColorSecondaryBrush}">
-                                <ContentPresenter.Resources>
-                                    <Style TargetType="TextBlock" BasedOn="{StaticResource CaptionTextBlockStyle}">
-                                        <Style.Setters>
-                                            <Setter Property="TextWrapping" Value="WrapWholeWords"/>
-                                        </Style.Setters>
-                                    </Style>
-                                    <Style TargetType="HyperlinkButton" BasedOn="{StaticResource TextButtonStyle}">
-                                        <Style.Setters>
-                                            <Setter Property="FontSize" Value="12"/>
-                                            <Setter Property="Padding" Value="0,0,0,0"/>
-                                        </Style.Setters>
-                                    </Style>
-                                </ContentPresenter.Resources>
-                            </ContentPresenter>
-                        </StackPanel>
-
-                        <ContentPresenter
-                            x:Name="ContentPresenter"
-                            Content="{TemplateBinding ActionContent}"
-                            Grid.Column="2"
-                            VerticalAlignment="Center"
-                            HorizontalAlignment="Right" />
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/src/settings-ui/Settings.UI/Controls/SettingExpander/SettingExpander.cs b/src/settings-ui/Settings.UI/Controls/SettingExpander/SettingExpander.cs
deleted file mode 100644
index 78322e5435..0000000000
--- a/src/settings-ui/Settings.UI/Controls/SettingExpander/SettingExpander.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Automation;
-using Microsoft.UI.Xaml.Controls;
-
-namespace Microsoft.PowerToys.Settings.UI.Controls
-{
-    public partial class SettingExpander : Expander
-    {
-        public SettingExpander()
-        {
-            DefaultStyleKey = typeof(Expander);
-            this.Style = (Style)App.Current.Resources["SettingExpanderStyle"];
-            this.RegisterPropertyChangedCallback(Expander.HeaderProperty, OnHeaderChanged);
-        }
-
-        private static void OnHeaderChanged(DependencyObject d, DependencyProperty dp)
-        {
-            SettingExpander self = (SettingExpander)d;
-            if (self.Header != null)
-            {
-                if (self.Header.GetType() == typeof(Setting))
-                {
-                    Setting selfSetting = (Setting)self.Header;
-                    selfSetting.Style = (Style)App.Current.Resources["ExpanderHeaderSettingStyle"];
-
-                    if (!string.IsNullOrEmpty(selfSetting.Header))
-                    {
-                        AutomationProperties.SetName(self, selfSetting.Header);
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/src/settings-ui/Settings.UI/Controls/SettingsGroup/SettingsGroup.xaml b/src/settings-ui/Settings.UI/Controls/SettingsGroup/SettingsGroup.xaml
index f594a918e3..be4c302813 100644
--- a/src/settings-ui/Settings.UI/Controls/SettingsGroup/SettingsGroup.xaml
+++ b/src/settings-ui/Settings.UI/Controls/SettingsGroup/SettingsGroup.xaml
@@ -1,5 +1,5 @@
 <ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls">
 
@@ -7,8 +7,9 @@
         <Setter Property="ItemsPanel">
             <Setter.Value>
                 <ItemsPanelTemplate>
-                    <StackPanel Orientation="Vertical"
-                                Spacing="2"/>
+                    <StackPanel
+                        Orientation="Vertical"
+                        Spacing="2" />
                 </ItemsPanelTemplate>
             </Setter.Value>
         </Setter>
@@ -19,9 +20,49 @@
             <Setter.Value>
                 <ControlTemplate TargetType="controls:SettingsGroup">
                     <Grid HorizontalAlignment="Stretch">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <TextBlock
+                            x:Name="HeaderPresenter"
+                            Grid.Row="0"
+                            Margin="1,32,0,0"
+                            AutomationProperties.HeadingLevel="Level2"
+                            Style="{ThemeResource BodyStrongTextBlockStyle}"
+                            Text="{TemplateBinding Header}" />
+
+                        <ContentPresenter
+                            x:Name="DescriptionPresenter"
+                            Grid.Row="1"
+                            Margin="1,0,0,0"
+                            Content="{TemplateBinding Description}"
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                            TextWrapping="WrapWholeWords">
+                            <ContentPresenter.Resources>
+                                <Style
+                                    BasedOn="{StaticResource CaptionTextBlockStyle}"
+                                    TargetType="TextBlock">
+                                    <Style.Setters>
+                                        <Setter Property="TextWrapping" Value="WrapWholeWords" />
+                                    </Style.Setters>
+                                </Style>
+                                <Style
+                                    BasedOn="{StaticResource TextButtonStyle}"
+                                    TargetType="HyperlinkButton">
+                                    <Style.Setters>
+                                        <Setter Property="Padding" Value="0,0,0,0" />
+                                    </Style.Setters>
+                                </Style>
+                            </ContentPresenter.Resources>
+                        </ContentPresenter>
+                        <ItemsPresenter
+                            Grid.Row="2"
+                            Margin="0,8,0,0" />
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal"/>
+                                <VisualState x:Name="Normal" />
                                 <VisualState x:Name="Disabled">
                                     <VisualState.Setters>
                                         <Setter Target="HeaderPresenter.Foreground" Value="{ThemeResource TextFillColorDisabledBrush}" />
@@ -30,39 +71,6 @@
                                 </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition Height="Auto"/>
-                        </Grid.RowDefinitions>
-                        <TextBlock x:Name="HeaderPresenter"
-                                   Text="{TemplateBinding Header}"
-                                   Grid.Row="0"
-                                   Style="{ThemeResource BodyStrongTextBlockStyle}"
-                                   Margin="1,32,0,0"
-                                   AutomationProperties.HeadingLevel="Level2"/>
-
-                        <ContentPresenter
-                                x:Name="DescriptionPresenter"
-                                Content="{TemplateBinding Description}"
-                                TextWrapping="WrapWholeWords"
-                                Margin="1,4,0,0"
-                                Grid.Row="1"
-                                Foreground="{ThemeResource TextFillColorSecondaryBrush}">
-                            <ContentPresenter.Resources>
-                                <Style TargetType="TextBlock" BasedOn="{StaticResource CaptionTextBlockStyle}">
-                                    <Style.Setters>
-                                        <Setter Property="TextWrapping" Value="WrapWholeWords"/>
-                                    </Style.Setters>
-                                </Style>
-                                <Style TargetType="HyperlinkButton" BasedOn="{StaticResource TextButtonStyle}">
-                                    <Style.Setters>
-                                        <Setter Property="Padding" Value="0,0,0,0"/>
-                                    </Style.Setters>
-                                </Style>
-                            </ContentPresenter.Resources>
-                        </ContentPresenter>
-                        <ItemsPresenter Grid.Row="2" Margin="0,8,0,0"/>
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/src/settings-ui/Settings.UI/Controls/SettingsPageControl/SettingsPageControl.xaml b/src/settings-ui/Settings.UI/Controls/SettingsPageControl/SettingsPageControl.xaml
index b916bf3736..c04dc9fc97 100644
--- a/src/settings-ui/Settings.UI/Controls/SettingsPageControl/SettingsPageControl.xaml
+++ b/src/settings-ui/Settings.UI/Controls/SettingsPageControl/SettingsPageControl.xaml
@@ -2,52 +2,63 @@
     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:local="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:controls="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
     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"
     Loaded="UserControl_Loaded"
-    xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
-    xmlns:controls="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
     <UserControl.Resources>
-        <converters:DoubleToVisibilityConverter x:Name="doubleToVisibilityConverter" GreaterThan="0" TrueValue="Visible" FalseValue="Collapsed" />
+        <x:Double x:Key="PageMaxWidth">1000</x:Double>
+        <converters:DoubleToVisibilityConverter
+            x:Name="doubleToVisibilityConverter"
+            FalseValue="Collapsed"
+            GreaterThan="0"
+            TrueValue="Visible" />
     </UserControl.Resources>
 
-    <Grid RowSpacing="24" Padding="20,0,0,0">
+    <Grid
+        Padding="20,0,0,0"
+        RowSpacing="24">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
-            <RowDefinition Height="*"/>
- 
+            <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        
-        <TextBlock x:Name="Header"
-                   Text="{x:Bind ModuleTitle}"
-                   AutomationProperties.HeadingLevel="1"
-                   Style="{StaticResource TitleTextBlockStyle}"
-                   Margin="0,44,0,0"
-                   VerticalAlignment="Stretch"/>
+
+        <TextBlock
+            x:Name="Header"
+            MaxWidth="{StaticResource PageMaxWidth}"
+            Margin="0,44,0,0"
+            HorizontalAlignment="Stretch"
+            VerticalAlignment="Stretch"
+            AutomationProperties.HeadingLevel="1"
+            Style="{StaticResource TitleTextBlockStyle}"
+            Text="{x:Bind ModuleTitle}" />
 
         <ScrollViewer Grid.Row="1">
-            <Grid RowSpacing="24"
-                  Padding="0,0,20,48" >
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition MaxWidth="1048" Width="*"/>
-                    <ColumnDefinition Width="Auto"/>
-                </Grid.ColumnDefinitions>
+            <Grid
+                Padding="0,0,20,48"
+                RowSpacing="24">
+
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
 
-                <!-- Top panel -->
-                <Grid ColumnSpacing="16">
+                <!--  Top panel  -->
+                <Grid
+                    MaxWidth="{StaticResource PageMaxWidth}"
+                    ColumnSpacing="16">
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="160"/>
+                        <ColumnDefinition Width="160" />
                         <ColumnDefinition Width="*" />
                     </Grid.ColumnDefinitions>
-                    <Border CornerRadius="4" VerticalAlignment="Top">
+                    <Border
+                        VerticalAlignment="Top"
+                        CornerRadius="4">
                         <Image AutomationProperties.AccessibilityView="Raw">
                             <Image.Source>
                                 <BitmapImage UriSource="{x:Bind ModuleImageSource}" />
@@ -56,58 +67,80 @@
                     </Border>
 
                     <StackPanel Grid.Column="1">
-                        <TextBlock x:Name="AboutDescription"
-                                   Text="{x:Bind ModuleDescription}"
-                                   Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                   TextWrapping="Wrap"/>
+                        <TextBlock
+                            x:Name="AboutDescription"
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                            Text="{x:Bind ModuleDescription}"
+                            TextWrapping="Wrap" />
 
-                        <ItemsControl x:Name="PrimaryLinksControl" ItemsSource="{x:Bind PrimaryLinks}" IsTabStop="False" Margin="0,8,0,0">
+                        <ItemsControl
+                            x:Name="PrimaryLinksControl"
+                            Margin="0,8,0,0"
+                            IsTabStop="False"
+                            ItemsSource="{x:Bind PrimaryLinks}">
                             <ItemsControl.ItemTemplate>
                                 <DataTemplate x:DataType="local:PageLink">
-                                    <HyperlinkButton NavigateUri="{x:Bind Link}" Style="{StaticResource TextButtonStyle}">
-                                        <TextBlock Text="{x:Bind Text}" TextWrapping="Wrap" />
+                                    <HyperlinkButton
+                                        NavigateUri="{x:Bind Link}"
+                                        Style="{StaticResource TextButtonStyle}">
+                                        <TextBlock
+                                            Text="{x:Bind Text}"
+                                            TextWrapping="Wrap" />
                                     </HyperlinkButton>
                                 </DataTemplate>
                             </ItemsControl.ItemTemplate>
                             <ItemsControl.ItemsPanel>
                                 <ItemsPanelTemplate>
-                                    <controls:WrapPanel Orientation="Horizontal" HorizontalSpacing="24"/>
+                                    <controls:WrapPanel
+                                        HorizontalSpacing="24"
+                                        Orientation="Horizontal" />
                                 </ItemsPanelTemplate>
                             </ItemsControl.ItemsPanel>
                         </ItemsControl>
                     </StackPanel>
-
                 </Grid>
 
-                <!-- Content panel -->
-                <ContentPresenter x:Name="ModuleContentPresenter"
-                                      HorizontalAlignment="Stretch"
-                                      HorizontalContentAlignment="Stretch"
-                                      Content="{x:Bind ModuleContent}"
-                                      MaxWidth="1048"
-                                      Margin="0,12,0,0" Grid.Row="1"/>
+                <!--  Content panel  -->
+                <ContentPresenter
+                    x:Name="ModuleContentPresenter"
+                    Grid.Row="1"
+                    MaxWidth="{StaticResource PageMaxWidth}"
+                    Margin="0,12,0,0"
+                    Content="{x:Bind ModuleContent}" />
 
-                <!-- Bottom panel -->
-                <StackPanel x:Name="SecondaryLinksPanel"
-                            Grid.Row="2"
-                            Visibility="{x:Bind SecondaryLinks.Count, Converter={StaticResource doubleToVisibilityConverter}}"
-                            Orientation="Vertical">
-                    <TextBlock Text="{x:Bind SecondaryLinksHeader}"
-                               Style="{ThemeResource BodyStrongTextBlockStyle}"
-                               Margin="2,8,0,0"
-                               AutomationProperties.HeadingLevel="Level2"/>
-
-                    <ItemsControl x:Name="SecondaryLinksItemControl" IsTabStop="False" Margin="2,0,0,0" ItemsSource="{x:Bind SecondaryLinks}">
+                <!--  Bottom panel  -->
+                <StackPanel
+                    x:Name="SecondaryLinksPanel"
+                    Grid.Row="2"
+                    MaxWidth="{StaticResource PageMaxWidth}"
+                    Orientation="Vertical"
+                    Visibility="{x:Bind SecondaryLinks.Count, Converter={StaticResource doubleToVisibilityConverter}}">
+                    <TextBlock
+                        Margin="2,8,0,0"
+                        AutomationProperties.HeadingLevel="Level2"
+                        Style="{ThemeResource BodyStrongTextBlockStyle}"
+                        Text="{x:Bind SecondaryLinksHeader}" />
+                    <ItemsControl
+                        x:Name="SecondaryLinksItemControl"
+                        Margin="2,0,0,0"
+                        IsTabStop="False"
+                        ItemsSource="{x:Bind SecondaryLinks}">
                         <ItemsControl.ItemTemplate>
                             <DataTemplate x:DataType="local:PageLink">
-                                <HyperlinkButton NavigateUri="{x:Bind Link}" Style="{StaticResource TextButtonStyle}">
-                                    <TextBlock Text="{x:Bind Text}" TextWrapping="Wrap" />
+                                <HyperlinkButton
+                                    NavigateUri="{x:Bind Link}"
+                                    Style="{StaticResource TextButtonStyle}">
+                                    <TextBlock
+                                        Text="{x:Bind Text}"
+                                        TextWrapping="Wrap" />
                                 </HyperlinkButton>
                             </DataTemplate>
                         </ItemsControl.ItemTemplate>
                         <ItemsControl.ItemsPanel>
                             <ItemsPanelTemplate>
-                                <controls:WrapPanel Orientation="Horizontal" HorizontalSpacing="24"/>
+                                <controls:WrapPanel
+                                    HorizontalSpacing="24"
+                                    Orientation="Horizontal" />
                             </ItemsPanelTemplate>
                         </ItemsControl.ItemsPanel>
                     </ItemsControl>
diff --git a/src/settings-ui/Settings.UI/Controls/ShortcutControl/ShortcutControl.xaml b/src/settings-ui/Settings.UI/Controls/ShortcutControl/ShortcutControl.xaml
index 248d67f75e..f66b81e5b1 100644
--- a/src/settings-ui/Settings.UI/Controls/ShortcutControl/ShortcutControl.xaml
+++ b/src/settings-ui/Settings.UI/Controls/ShortcutControl/ShortcutControl.xaml
@@ -2,46 +2,53 @@
     x:Class="Microsoft.PowerToys.Settings.UI.Controls.ShortcutControl"
     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.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"
-    mc:Ignorable="d"
     x:Name="LayoutRoot"
     d:DesignHeight="300"
-    d:DesignWidth="400">
+    d:DesignWidth="400"
+    mc:Ignorable="d">
 
     <Grid HorizontalAlignment="Right">
         <StackPanel Orientation="Horizontal">
-            <Button x:Name="EditButton"
-                    Padding="0"
-                    Background="Transparent"
-                    BorderBrush="Transparent"
-                    Click="OpenDialogButton_Click" >
-                <StackPanel Orientation="Horizontal"
-                            Margin="6,0,6,0"
-                            Spacing="16">
-                    <ItemsControl x:Name="PreviewKeysControl"
-                                  IsEnabled="{Binding ElementName=EditButton, Path=IsEnabled}"
-                                  VerticalAlignment="Center"
-                                  IsTabStop="False">
+            <Button
+                x:Name="EditButton"
+                Padding="0"
+                Background="Transparent"
+                BorderBrush="Transparent"
+                Click="OpenDialogButton_Click">
+                <StackPanel
+                    Margin="6,0,6,0"
+                    Orientation="Horizontal"
+                    Spacing="16">
+                    <ItemsControl
+                        x:Name="PreviewKeysControl"
+                        VerticalAlignment="Center"
+                        IsEnabled="{Binding ElementName=EditButton, Path=IsEnabled}"
+                        IsTabStop="False">
                         <ItemsControl.ItemsPanel>
                             <ItemsPanelTemplate>
-                                <StackPanel Orientation="Horizontal" Spacing="4" />
+                                <StackPanel
+                                    Orientation="Horizontal"
+                                    Spacing="4" />
                             </ItemsPanelTemplate>
                         </ItemsControl.ItemsPanel>
                         <ItemsControl.ItemTemplate>
                             <DataTemplate>
-                                <local:KeyVisual IsTabStop="False"
-                                                 AutomationProperties.AccessibilityView="Raw"
-                                                 VisualType="Small"
-                                                 VerticalAlignment="Center"
-                                                 Content="{Binding}" />
+                                <local:KeyVisual
+                                    VerticalAlignment="Center"
+                                    AutomationProperties.AccessibilityView="Raw"
+                                    Content="{Binding}"
+                                    IsTabStop="False"
+                                    VisualType="Small" />
                             </DataTemplate>
                         </ItemsControl.ItemTemplate>
                     </ItemsControl>
-                    <FontIcon Glyph="&#xE70F;"
-                              FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                              FontSize="14"/>
+                    <FontIcon
+                        FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                        FontSize="14"
+                        Glyph="&#xE70F;" />
                 </StackPanel>
             </Button>
         </StackPanel>
diff --git a/src/settings-ui/Settings.UI/Controls/ShortcutControl/ShortcutDialogContentControl.xaml b/src/settings-ui/Settings.UI/Controls/ShortcutControl/ShortcutDialogContentControl.xaml
index f91649d05e..2ea9aa3d94 100644
--- a/src/settings-ui/Settings.UI/Controls/ShortcutControl/ShortcutDialogContentControl.xaml
+++ b/src/settings-ui/Settings.UI/Controls/ShortcutControl/ShortcutDialogContentControl.xaml
@@ -2,92 +2,99 @@
     x:Class="Microsoft.PowerToys.Settings.UI.Controls.ShortcutDialogContentControl"
     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.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"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
-    xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
-    mc:Ignorable="d"
-    x:Name="ShortcutContentControl">
-    <UserControl.Resources>
-        <converters:BoolToVisibilityConverter x:Key="boolToVisibilityConverter" FalseValue="Collapsed" TrueValue="Visible" />
-    </UserControl.Resources>
-    <Grid MinWidth="498" MinHeight="220">
+    x:Name="ShortcutContentControl"
+    mc:Ignorable="d">
+    <Grid
+        MinWidth="498"
+        MinHeight="220">
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition MinHeight="110"/>
-            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto" />
+            <RowDefinition MinHeight="110" />
+            <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
 
-        <TextBlock x:Uid="Activation_Shortcut_Description" Grid.Row="0" />
+        <TextBlock
+            x:Uid="Activation_Shortcut_Description"
+            Grid.Row="0" />
 
-        <ItemsControl x:Name="KeysControl"
-                              Height="56"
-                              Grid.Row="1"
-                              Margin="0,64,0,0"
-                              HorizontalContentAlignment="Center"
-                              ItemsSource="{x:Bind Keys, Mode=OneWay}"
-                              HorizontalAlignment="Center"
-                              VerticalAlignment="Top">
+        <ItemsControl
+            x:Name="KeysControl"
+            Grid.Row="1"
+            Height="56"
+            Margin="0,64,0,0"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Top"
+            HorizontalContentAlignment="Center"
+            ItemsSource="{x:Bind Keys, Mode=OneWay}">
             <ItemsControl.ItemsPanel>
                 <ItemsPanelTemplate>
-                    <StackPanel Orientation="Horizontal" Spacing="8"/>
+                    <StackPanel
+                        Orientation="Horizontal"
+                        Spacing="8" />
                 </ItemsPanelTemplate>
             </ItemsControl.ItemsPanel>
             <ItemsControl.ItemTemplate>
                 <DataTemplate>
-                    <local:KeyVisual AutomationProperties.AccessibilityView="Raw"
-                                         Height="56"
-                                         VisualType="Large"
-                                         IsError="{Binding ElementName=ShortcutContentControl, Path=IsError, Mode=OneWay}"
-                                         IsTabStop="False"
-                                         Content="{Binding}" />
+                    <local:KeyVisual
+                        Height="56"
+                        AutomationProperties.AccessibilityView="Raw"
+                        Content="{Binding}"
+                        IsError="{Binding ElementName=ShortcutContentControl, Path=IsError, Mode=OneWay}"
+                        IsTabStop="False"
+                        VisualType="Large" />
                 </DataTemplate>
             </ItemsControl.ItemTemplate>
         </ItemsControl>
 
-        <StackPanel Orientation="Vertical"
-                    Grid.Row="2"
-                    Spacing="8"
-                    
-                    Margin="0,24,0,0"
-                    VerticalAlignment="Top">
+        <StackPanel
+            Grid.Row="2"
+            Margin="0,24,0,0"
+            VerticalAlignment="Top"
+            Orientation="Vertical"
+            Spacing="8">
             <Grid Height="36">
-                
-            <Border x:Name="WarningBanner"
+
+                <Border
+                    x:Name="WarningBanner"
+                    Margin="-2,0,0,0"
+                    Padding="8"
                     Background="{ThemeResource InfoBarErrorSeverityBackgroundBrush}"
-                    CornerRadius="{ThemeResource ControlCornerRadius}"
                     BorderBrush="{ThemeResource InfoBarBorderBrush}"
                     BorderThickness="{ThemeResource InfoBarBorderThickness}"
-                    Padding="8"
-                    Margin="-2,0,0,0"
-                    Visibility="{Binding ElementName=ShortcutContentControl, Path=IsError, Mode=OneWay, Converter={StaticResource boolToVisibilityConverter}}">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
+                    CornerRadius="{ThemeResource ControlCornerRadius}"
+                    Visibility="{Binding ElementName=ShortcutContentControl, Path=IsError, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
 
-                    <!--TODO(stefan) InfoBadge not available
+                        <!--TODO(stefan) InfoBadge not available
                         <InfoBadge AutomationProperties.AccessibilityView="Raw"
                                         Margin="2,0,12,0"
                                         Style="{StaticResource CriticalIconInfoBadgeStyle}" />
-                    -->
+                        -->
 
-                    <TextBlock x:Name="InvalidShortcutWarningLabel"
-                               x:Uid="InvalidShortcut"
-                               VerticalAlignment="Center"
-                               Margin="0,-1,0,0"
-                               Foreground="{ThemeResource InfoBarTitleForeground}"
-                               FontWeight="{ThemeResource InfoBarTitleFontWeight}"
-                               Grid.Column="1" />
-                </Grid>
-            </Border>
+                        <TextBlock
+                            x:Name="InvalidShortcutWarningLabel"
+                            x:Uid="InvalidShortcut"
+                            Grid.Column="1"
+                            Margin="0,-1,0,0"
+                            VerticalAlignment="Center"
+                            FontWeight="{ThemeResource InfoBarTitleFontWeight}"
+                            Foreground="{ThemeResource InfoBarTitleForeground}" />
+                    </Grid>
+                </Border>
             </Grid>
-            <toolkitcontrols:MarkdownTextBlock x:Uid="InvalidShortcutWarningLabel"
-                                               FontSize="12"
-                                               Background="Transparent"
-                                               Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
+            <toolkitcontrols:MarkdownTextBlock
+                x:Uid="InvalidShortcutWarningLabel"
+                Background="Transparent"
+                FontSize="12"
+                Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
         </StackPanel>
     </Grid>
 </UserControl>
diff --git a/src/settings-ui/Settings.UI/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml b/src/settings-ui/Settings.UI/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml
index 291c6ffa38..d1ef5a63b4 100644
--- a/src/settings-ui/Settings.UI/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml
+++ b/src/settings-ui/Settings.UI/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml
@@ -2,43 +2,48 @@
     x:Class="Microsoft.PowerToys.Settings.UI.Controls.ShortcutWithTextLabelControl"
     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.Controls"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:controls="using:Microsoft.PowerToys.Settings.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"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
-    mc:Ignorable="d"
     d:DesignHeight="300"
-    d:DesignWidth="400">
+    d:DesignWidth="400"
+    mc:Ignorable="d">
 
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
-        <ItemsControl AutomationProperties.AccessibilityView="Raw"
-                          ItemsSource="{x:Bind Keys}"
-                          VerticalAlignment="Center"
-                          IsTabStop="False">
-                <ItemsControl.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <StackPanel Orientation="Horizontal" Spacing="4" />
-                    </ItemsPanelTemplate>
-                </ItemsControl.ItemsPanel>
-                <ItemsControl.ItemTemplate>
-                    <DataTemplate>
-                        <controls:KeyVisual IsTabStop="False"
-                                            AutomationProperties.AccessibilityView="Raw"
-                                            VisualType="SmallOutline"
-                                            VerticalAlignment="Center"
-                                            Content="{Binding}" />
-                    </DataTemplate>
-                </ItemsControl.ItemTemplate>
-            </ItemsControl>
-        <toolkitcontrols:MarkdownTextBlock Background="Transparent"
-                                           Text="{x:Bind Text}"
-                                           Margin="8,0,0,0"
-                                           Grid.Column="1"
-                                           VerticalAlignment="Center" />
+        <ItemsControl
+            VerticalAlignment="Center"
+            AutomationProperties.AccessibilityView="Raw"
+            IsTabStop="False"
+            ItemsSource="{x:Bind Keys}">
+            <ItemsControl.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <StackPanel
+                        Orientation="Horizontal"
+                        Spacing="4" />
+                </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+            <ItemsControl.ItemTemplate>
+                <DataTemplate>
+                    <controls:KeyVisual
+                        VerticalAlignment="Center"
+                        AutomationProperties.AccessibilityView="Raw"
+                        Content="{Binding}"
+                        IsTabStop="False"
+                        VisualType="SmallOutline" />
+                </DataTemplate>
+            </ItemsControl.ItemTemplate>
+        </ItemsControl>
+        <toolkitcontrols:MarkdownTextBlock
+            Grid.Column="1"
+            Margin="8,0,0,0"
+            VerticalAlignment="Center"
+            Background="Transparent"
+            Text="{x:Bind Text}" />
     </Grid>
 </UserControl>
diff --git a/src/settings-ui/Settings.UI/Views/VisibleIfNotEmpty.cs b/src/settings-ui/Settings.UI/Converters/VisibleIfNotEmptyConverter.cs
similarity index 71%
rename from src/settings-ui/Settings.UI/Views/VisibleIfNotEmpty.cs
rename to src/settings-ui/Settings.UI/Converters/VisibleIfNotEmptyConverter.cs
index ee910c2f89..ae2e6554da 100644
--- a/src/settings-ui/Settings.UI/Views/VisibleIfNotEmpty.cs
+++ b/src/settings-ui/Settings.UI/Converters/VisibleIfNotEmptyConverter.cs
@@ -7,13 +7,13 @@ using System.Collections;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Data;
 
-namespace Microsoft.PowerToys.Settings.UI.Views
+namespace Microsoft.PowerToys.Settings.UI.Converters
 {
-    public class VisibleIfNotEmpty : IValueConverter
+    public class VisibleIfNotEmptyConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, string language)
         {
-            return (value == null) || (value as IList).Count == 0 ? Visibility.Collapsed : Visibility.Visible;
+            return value == null || (value as IList).Count == 0 ? Visibility.Collapsed : Visibility.Visible;
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, string language)
diff --git a/src/settings-ui/Settings.UI/MainWindow.xaml b/src/settings-ui/Settings.UI/MainWindow.xaml
index 4afa682cfe..715a25863c 100644
--- a/src/settings-ui/Settings.UI/MainWindow.xaml
+++ b/src/settings-ui/Settings.UI/MainWindow.xaml
@@ -2,14 +2,13 @@
     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"
-    xmlns:local="using:Microsoft.PowerToys.Settings.UI.Views"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:Microsoft.PowerToys.Settings.UI.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
     Closed="Window_Closed"
-    >
+    mc:Ignorable="d">
 
     <Grid>
-        <local:ShellPage/>
+        <local:ShellPage />
     </Grid>
 </Window>
diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeAlwaysOnTop.xaml b/src/settings-ui/Settings.UI/OOBE/Views/OobeAlwaysOnTop.xaml
index a6c86a9c56..e9dd27edd7 100644
--- a/src/settings-ui/Settings.UI/OOBE/Views/OobeAlwaysOnTop.xaml
+++ b/src/settings-ui/Settings.UI/OOBE/Views/OobeAlwaysOnTop.xaml
@@ -2,36 +2,47 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeAlwaysOnTop"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-    xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls">
-
-    <controls:OOBEPageControl x:Uid="Oobe_AlwaysOnTop"
-                              HeroImage="ms-appx:///Assets/Modules/OOBE/AlwaysOnTop.png">
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
+    mc:Ignorable="d">
 
+    <controls:OOBEPageControl
+        x:Uid="Oobe_AlwaysOnTop"
+        HeroImage="ms-appx:///Assets/Modules/OOBE/AlwaysOnTop.png">
         <controls:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
-                <TextBlock x:Uid="Oobe_HowToUse"
-                           Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock
+                    x:Uid="Oobe_HowToUse"
+                    Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <controls:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_AlwaysOnTop_HowToUse" />
+                <controls: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 Background="Transparent" x:Uid="Oobe_AlwaysOnTop_TipsAndTricks" />
-                
-                <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
-                    <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" />
+                <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" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeAwake.xaml b/src/settings-ui/Settings.UI/OOBE/Views/OobeAwake.xaml
index fe13c6e771..b43d6bfc7e 100644
--- a/src/settings-ui/Settings.UI/OOBE/Views/OobeAwake.xaml
+++ b/src/settings-ui/Settings.UI/OOBE/Views/OobeAwake.xaml
@@ -1,38 +1,51 @@
-<Page x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeAwake"
+<Page
+    x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeAwake"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
+    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-    xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls">
+    xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
+    mc:Ignorable="d">
 
-    <controls:OOBEPageControl x:Uid="Oobe_Awake"
-                              HeroImage="ms-appx:///Assets/Modules/OOBE/Awake.png">
+    <controls:OOBEPageControl
+        x:Uid="Oobe_Awake"
+        HeroImage="ms-appx:///Assets/Modules/OOBE/Awake.png">
 
         <controls:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
-                <TextBlock x:Uid="Oobe_HowToUse"
-                           Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock
+                    x:Uid="Oobe_HowToUse"
+                    Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <toolkitcontrols:MarkdownTextBlock Background="Transparent" x:Uid="Oobe_Awake_HowToUse" />
+                <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 Background="Transparent" x:Uid="Oobe_Awake_TipsAndTricks" />
+                <toolkitcontrols:MarkdownTextBlock
+                    x:Uid="Oobe_Awake_TipsAndTricks"
+                    Background="Transparent" />
 
-                <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
-                    <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" />
+                <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" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
         </controls:OOBEPageControl.PageContent>
     </controls:OOBEPageControl>
-</Page>
+</Page>
\ No newline at end of file
diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeColorPicker.xaml b/src/settings-ui/Settings.UI/OOBE/Views/OobeColorPicker.xaml
index 6df1bcd62f..a30004b872 100644
--- a/src/settings-ui/Settings.UI/OOBE/Views/OobeColorPicker.xaml
+++ b/src/settings-ui/Settings.UI/OOBE/Views/OobeColorPicker.xaml
@@ -2,36 +2,52 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeColorPicker"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-    xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls">
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
+    mc:Ignorable="d">
 
-    <controls:OOBEPageControl x:Uid="Oobe_ColorPicker"
-                              HeroImage="ms-appx:///Assets/Modules/OOBE/ColorPicker.gif">
+    <controls:OOBEPageControl
+        x:Uid="Oobe_ColorPicker"
+        HeroImage="ms-appx:///Assets/Modules/OOBE/ColorPicker.gif">
 
         <controls:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
-                <TextBlock x:Uid="Oobe_HowToUse"
-                           Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock
+                    x:Uid="Oobe_HowToUse"
+                    Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <controls:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_ColorPicker_HowToUse" />
-              
+                <controls: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 Background="Transparent" x:Uid="Oobe_ColorPicker_TipsAndTricks" />
-               
-                <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
-                    <Button x:Uid="Launch_ColorPicker" Style="{StaticResource AccentButtonStyle}" Click="Start_ColorPicker_Click"/>
-                    <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" />
+                <toolkitcontrols:MarkdownTextBlock
+                    x:Uid="Oobe_ColorPicker_TipsAndTricks"
+                    Background="Transparent" />
+
+                <StackPanel
+                    Margin="0,24,0,0"
+                    Orientation="Horizontal"
+                    Spacing="12">
+                    <Button
+                        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" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeFancyZones.xaml b/src/settings-ui/Settings.UI/OOBE/Views/OobeFancyZones.xaml
index b0ebfbaeae..33b57d96c0 100644
--- a/src/settings-ui/Settings.UI/OOBE/Views/OobeFancyZones.xaml
+++ b/src/settings-ui/Settings.UI/OOBE/Views/OobeFancyZones.xaml
@@ -2,35 +2,50 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeFancyZones"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <controls:OOBEPageControl x:Uid="Oobe_FancyZones"
-                              HeroImage="ms-appx:///Assets/Modules/OOBE/FancyZones.gif">
+    <controls:OOBEPageControl
+        x:Uid="Oobe_FancyZones"
+        HeroImage="ms-appx:///Assets/Modules/OOBE/FancyZones.gif">
 
         <controls:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
-                <TextBlock x:Uid="Oobe_HowToUse"
-                           Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock
+                    x:Uid="Oobe_HowToUse"
+                    Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <toolkitcontrols:MarkdownTextBlock Background="Transparent" x:Uid="Oobe_FancyZones_HowToUse" />
-                <controls:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_FancyZones_HowToUse_Shortcut" />
-                
+                <toolkitcontrols:MarkdownTextBlock
+                    x:Uid="Oobe_FancyZones_HowToUse"
+                    Background="Transparent" />
+                <controls: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 Background="Transparent"  x:Uid="Oobe_FancyZones_TipsAndTricks" />
-                
-                <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
-                    <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" />
+                <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" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeFileExplorer.xaml b/src/settings-ui/Settings.UI/OOBE/Views/OobeFileExplorer.xaml
index ab88a91f86..766cc20a2d 100644
--- a/src/settings-ui/Settings.UI/OOBE/Views/OobeFileExplorer.xaml
+++ b/src/settings-ui/Settings.UI/OOBE/Views/OobeFileExplorer.xaml
@@ -1,29 +1,41 @@
-<Page x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeFileExplorer"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-      xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
-      mc:Ignorable="d">
+<Page
+    x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeFileExplorer"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
+    mc:Ignorable="d">
 
-    <controls:OOBEPageControl x:Uid="Oobe_FileExplorer"
-                              HeroImage="ms-appx:///Assets/Modules/OOBE/FileExplorer.png">
+    <controls:OOBEPageControl
+        x:Uid="Oobe_FileExplorer"
+        HeroImage="ms-appx:///Assets/Modules/OOBE/FileExplorer.png">
 
         <controls:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
-                <TextBlock x:Uid="Oobe_HowToEnable"
-                           Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock
+                    x:Uid="Oobe_HowToEnable"
+                    Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <toolkitcontrols:MarkdownTextBlock Background="Transparent" x:Uid="Oobe_FileExplorer_HowToEnable" />
+                <toolkitcontrols:MarkdownTextBlock
+                    x:Uid="Oobe_FileExplorer_HowToEnable"
+                    Background="Transparent" />
 
-                <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
-                    <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" />
+                <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" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeFileLocksmith.xaml b/src/settings-ui/Settings.UI/OOBE/Views/OobeFileLocksmith.xaml
index 4f016e3ce8..2f3f7eb1fc 100644
--- a/src/settings-ui/Settings.UI/OOBE/Views/OobeFileLocksmith.xaml
+++ b/src/settings-ui/Settings.UI/OOBE/Views/OobeFileLocksmith.xaml
@@ -1,34 +1,49 @@
-<Page x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeFileLocksmith"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-      xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
-      mc:Ignorable="d">
-    <controls:OOBEPageControl x:Uid="Oobe_FileLocksmith"
-                              HeroImage="ms-appx:///Assets/Modules/OOBE/FileLocksmith.gif">
-        
+<Page
+    x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeFileLocksmith"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
+    mc:Ignorable="d">
+    <controls:OOBEPageControl
+        x:Uid="Oobe_FileLocksmith"
+        HeroImage="ms-appx:///Assets/Modules/OOBE/FileLocksmith.gif">
+
         <controls:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
 
-                <TextBlock x:Uid="Oobe_HowToUse"
-                           Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock
+                    x:Uid="Oobe_HowToUse"
+                    Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <toolkitcontrols:MarkdownTextBlock Background="Transparent" x:Uid="Oobe_FileLocksmith_HowToUse" />
+                <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 Background="Transparent" x:Uid="Oobe_FileLocksmith_TipsAndTricks" />
+                <toolkitcontrols:MarkdownTextBlock
+                    x:Uid="Oobe_FileLocksmith_TipsAndTricks"
+                    Background="Transparent" />
 
-                <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
-                    <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" />
+                <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" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeHosts.xaml b/src/settings-ui/Settings.UI/OOBE/Views/OobeHosts.xaml
index 61a27489b7..df02035fac 100644
--- a/src/settings-ui/Settings.UI/OOBE/Views/OobeHosts.xaml
+++ b/src/settings-ui/Settings.UI/OOBE/Views/OobeHosts.xaml
@@ -2,24 +2,35 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeHosts"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-    xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls">
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
+    mc:Ignorable="d">
 
-    <controls:OOBEPageControl x:Uid="Oobe_Hosts"
-                              HeroImage="ms-appx:///Assets/Modules/OOBE/HostsFileEditor.png">
+    <controls:OOBEPageControl
+        x:Uid="Oobe_Hosts"
+        HeroImage="ms-appx:///Assets/Modules/OOBE/HostsFileEditor.png">
         <controls:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
-                <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
-                    <Button x:Uid="Launch_Hosts" Style="{StaticResource AccentButtonStyle}" Click="Launch_Hosts_Click" />
-                    <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" />
+                <StackPanel
+                    Margin="0,24,0,0"
+                    Orientation="Horizontal"
+                    Spacing="12">
+                    <Button
+                        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" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeImageResizer.xaml b/src/settings-ui/Settings.UI/OOBE/Views/OobeImageResizer.xaml
index a23ae6ec0c..574c8613bd 100644
--- a/src/settings-ui/Settings.UI/OOBE/Views/OobeImageResizer.xaml
+++ b/src/settings-ui/Settings.UI/OOBE/Views/OobeImageResizer.xaml
@@ -2,34 +2,48 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeImageResizer"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <controls:OOBEPageControl x:Uid="Oobe_ImageResizer"
-                              HeroImage="ms-appx:///Assets/Modules/OOBE/ImageResizer.gif">
+    <controls:OOBEPageControl
+        x:Uid="Oobe_ImageResizer"
+        HeroImage="ms-appx:///Assets/Modules/OOBE/ImageResizer.gif">
 
         <controls:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
-                <TextBlock x:Uid="Oobe_HowToLaunch"
-                           Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock
+                    x:Uid="Oobe_HowToLaunch"
+                    Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <toolkitcontrols:MarkdownTextBlock Background="Transparent" x:Uid="Oobe_ImageResizer_HowToLaunch" />
+                <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 Background="Transparent" x:Uid="Oobe_ImageResizer_TipsAndTricks" />
+                <toolkitcontrols:MarkdownTextBlock
+                    x:Uid="Oobe_ImageResizer_TipsAndTricks"
+                    Background="Transparent" />
 
-                <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
-                    <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" />
+                <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" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeKBM.xaml b/src/settings-ui/Settings.UI/OOBE/Views/OobeKBM.xaml
index d5886ef722..6a48076685 100644
--- a/src/settings-ui/Settings.UI/OOBE/Views/OobeKBM.xaml
+++ b/src/settings-ui/Settings.UI/OOBE/Views/OobeKBM.xaml
@@ -1,33 +1,48 @@
-<Page x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeKBM"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-      xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
-      mc:Ignorable="d">
-    <controls:OOBEPageControl x:Uid="Oobe_KBM"
-                              HeroImage="ms-appx:///Assets/Modules/OOBE/KBM.gif">
+<Page
+    x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeKBM"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
+    mc:Ignorable="d">
+    <controls:OOBEPageControl
+        x:Uid="Oobe_KBM"
+        HeroImage="ms-appx:///Assets/Modules/OOBE/KBM.gif">
 
         <controls:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
 
-                <TextBlock x:Uid="Oobe_HowToCreateMappings"
-                           Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock
+                    x:Uid="Oobe_HowToCreateMappings"
+                    Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <toolkitcontrols:MarkdownTextBlock Background="Transparent" x:Uid="Oobe_KBM_HowToCreateMappings" />
+                <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 Background="Transparent" x:Uid="Oobe_KBM_TipsAndTricks" />
+                <toolkitcontrols:MarkdownTextBlock
+                    x:Uid="Oobe_KBM_TipsAndTricks"
+                    Background="Transparent" />
 
-                <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
-                    <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" />
+                <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" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeMeasureTool.xaml b/src/settings-ui/Settings.UI/OOBE/Views/OobeMeasureTool.xaml
index 6caa3bbd10..e46476d488 100644
--- a/src/settings-ui/Settings.UI/OOBE/Views/OobeMeasureTool.xaml
+++ b/src/settings-ui/Settings.UI/OOBE/Views/OobeMeasureTool.xaml
@@ -9,23 +9,37 @@
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <controls:OOBEPageControl x:Uid="Oobe_MeasureTool" HeroImage="ms-appx:///Assets/Modules/OOBE/ScreenRuler.gif">
+    <controls:OOBEPageControl
+        x:Uid="Oobe_MeasureTool"
+        HeroImage="ms-appx:///Assets/Modules/OOBE/ScreenRuler.gif">
 
         <controls:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
-                <TextBlock x:Uid="Oobe_HowToLaunch" Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock
+                    x:Uid="Oobe_HowToLaunch"
+                    Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <controls:ShortcutWithTextLabelControl x:Name="HotkeyActivation" x:Uid="Oobe_MeasureTool_Activation" />
+                <controls: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/OOBE/Views/OobeMouseUtils.xaml b/src/settings-ui/Settings.UI/OOBE/Views/OobeMouseUtils.xaml
index bf3fc4befc..fe19acd4bc 100644
--- a/src/settings-ui/Settings.UI/OOBE/Views/OobeMouseUtils.xaml
+++ b/src/settings-ui/Settings.UI/OOBE/Views/OobeMouseUtils.xaml
@@ -2,35 +2,52 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeMouseUtils"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <controls:OOBEPageControl x:Uid="Oobe_MouseUtils"
-                              HeroImage="ms-appx:///Assets/Modules/OOBE/MouseUtils.gif">
+    <controls:OOBEPageControl
+        x:Uid="Oobe_MouseUtils"
+        HeroImage="ms-appx:///Assets/Modules/OOBE/MouseUtils.gif">
 
         <controls:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
-                <TextBlock x:Uid="Oobe_MouseUtils_FindMyMouse"
-                           Style="{ThemeResource OobeSubtitleStyle}" />
-                <toolkitcontrols:MarkdownTextBlock Background="Transparent" x:Uid="Oobe_MouseUtils_FindMyMouse_Description" />
+                <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 Background="Transparent" x:Uid="Oobe_MouseUtils_MouseHighlighter_Description" />
+                <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 Background="Transparent" x:Uid="Oobe_MouseUtils_MousePointerCrosshairs_Description" />
+                <TextBlock
+                    x:Uid="Oobe_MouseUtils_MousePointerCrosshairs"
+                    Style="{ThemeResource OobeSubtitleStyle}" />
+                <toolkitcontrols:MarkdownTextBlock
+                    x:Uid="Oobe_MouseUtils_MousePointerCrosshairs_Description"
+                    Background="Transparent" />
 
-                <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
-                    <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" />
+                <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" />
                     </HyperlinkButton>
                 </StackPanel>
 
diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeOverview.xaml b/src/settings-ui/Settings.UI/OOBE/Views/OobeOverview.xaml
index 2b49a48850..b7033e4a62 100644
--- a/src/settings-ui/Settings.UI/OOBE/Views/OobeOverview.xaml
+++ b/src/settings-ui/Settings.UI/OOBE/Views/OobeOverview.xaml
@@ -1,28 +1,38 @@
-<Page x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeOverview"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-      mc:Ignorable="d">
+<Page
+    x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeOverview"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
 
-    <controls:OOBEPageControl x:Uid="Oobe_Overview"
-                              HeroImage="ms-appx:///Assets/Modules/OOBE/OOBEPTHero.png">
+    <controls:OOBEPageControl
+        x:Uid="Oobe_Overview"
+        HeroImage="ms-appx:///Assets/Modules/OOBE/OOBEPTHero.png">
 
         <controls: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 Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
-                    <Button x:Uid="OOBE_Settings"
-                            Click="SettingsLaunchButton_Click"/>
+                <StackPanel
+                    Margin="0,24,0,0"
+                    Orientation="Horizontal"
+                    Spacing="12">
+                    <Button
+                        x:Uid="OOBE_Settings"
+                        Click="SettingsLaunchButton_Click" />
                 </StackPanel>
             </StackPanel>
         </controls:OOBEPageControl.PageContent>
diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobePowerAccent.xaml b/src/settings-ui/Settings.UI/OOBE/Views/OobePowerAccent.xaml
index f0fc62f293..67b3542be4 100644
--- a/src/settings-ui/Settings.UI/OOBE/Views/OobePowerAccent.xaml
+++ b/src/settings-ui/Settings.UI/OOBE/Views/OobePowerAccent.xaml
@@ -1,30 +1,41 @@
-<Page x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobePowerAccent"
+<Page
+    x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobePowerAccent"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-    xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls">
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
+    mc:Ignorable="d">
 
-    <controls:OOBEPageControl x:Uid="Oobe_QuickAccent"
-                              HeroImage="ms-appx:///Assets/Modules/OOBE/PowerAccent.gif">
+    <controls:OOBEPageControl
+        x:Uid="Oobe_QuickAccent"
+        HeroImage="ms-appx:///Assets/Modules/OOBE/PowerAccent.gif">
 
         <controls:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
-                <TextBlock x:Uid="Oobe_HowToUse"
-                           Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock
+                    x:Uid="Oobe_HowToUse"
+                    Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <toolkitcontrols:MarkdownTextBlock Background="Transparent" x:Uid="Oobe_QuickAccent_HowToUse" />
+                <toolkitcontrols:MarkdownTextBlock
+                    x:Uid="Oobe_QuickAccent_HowToUse"
+                    Background="Transparent" />
 
-                <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
-                    <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" />
+                <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" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobePowerOCR.xaml b/src/settings-ui/Settings.UI/OOBE/Views/OobePowerOCR.xaml
index e773c5cf76..f9bf723f9b 100644
--- a/src/settings-ui/Settings.UI/OOBE/Views/OobePowerOCR.xaml
+++ b/src/settings-ui/Settings.UI/OOBE/Views/OobePowerOCR.xaml
@@ -2,35 +2,48 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobePowerOCR"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-    xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls">
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
+    mc:Ignorable="d">
 
-    <controls:OOBEPageControl x:Uid="Oobe_TextExtractor"
-                              HeroImage="ms-appx:///Assets/Modules/OOBE/PowerOCR.gif">
+    <controls:OOBEPageControl
+        x:Uid="Oobe_TextExtractor"
+        HeroImage="ms-appx:///Assets/Modules/OOBE/PowerOCR.gif">
 
         <controls:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
-                <TextBlock x:Uid="Oobe_HowToUse"
-                           Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock
+                    x:Uid="Oobe_HowToUse"
+                    Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <controls:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_TextExtractor_HowToUse" />
-              
+                <controls: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 Background="Transparent" x:Uid="Oobe_TextExtractor_TipsAndTricks" />
+                <toolkitcontrols:MarkdownTextBlock
+                    x:Uid="Oobe_TextExtractor_TipsAndTricks"
+                    Background="Transparent" />
 
-                <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
-                    <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" />
+                <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" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobePowerRename.xaml b/src/settings-ui/Settings.UI/OOBE/Views/OobePowerRename.xaml
index 2b900b3843..31c72a23ab 100644
--- a/src/settings-ui/Settings.UI/OOBE/Views/OobePowerRename.xaml
+++ b/src/settings-ui/Settings.UI/OOBE/Views/OobePowerRename.xaml
@@ -1,34 +1,49 @@
-<Page x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobePowerRename"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-      xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
-      mc:Ignorable="d">
-    <controls:OOBEPageControl x:Uid="Oobe_PowerRename"
-                              HeroImage="ms-appx:///Assets/Modules/OOBE/PowerRename.gif">
-        
+<Page
+    x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobePowerRename"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
+    mc:Ignorable="d">
+    <controls:OOBEPageControl
+        x:Uid="Oobe_PowerRename"
+        HeroImage="ms-appx:///Assets/Modules/OOBE/PowerRename.gif">
+
         <controls:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
 
-                <TextBlock x:Uid="Oobe_HowToUse"
-                           Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock
+                    x:Uid="Oobe_HowToUse"
+                    Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <toolkitcontrols:MarkdownTextBlock Background="Transparent" x:Uid="Oobe_PowerRename_HowToUse" />
+                <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 Background="Transparent" x:Uid="Oobe_PowerRename_TipsAndTricks" />
+                <toolkitcontrols:MarkdownTextBlock
+                    x:Uid="Oobe_PowerRename_TipsAndTricks"
+                    Background="Transparent" />
 
-                <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
-                    <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" />
+                <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" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeRun.xaml b/src/settings-ui/Settings.UI/OOBE/Views/OobeRun.xaml
index e12d03717b..6bea8f9e81 100644
--- a/src/settings-ui/Settings.UI/OOBE/Views/OobeRun.xaml
+++ b/src/settings-ui/Settings.UI/OOBE/Views/OobeRun.xaml
@@ -2,35 +2,52 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeRun"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <controls:OOBEPageControl x:Uid="Oobe_Run"
-                              HeroImage="ms-appx:///Assets/Modules/OOBE/Run.gif">
+    <controls:OOBEPageControl
+        x:Uid="Oobe_Run"
+        HeroImage="ms-appx:///Assets/Modules/OOBE/Run.gif">
 
         <controls:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
-                <TextBlock x:Uid="Oobe_HowToLaunch"
-                           Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock
+                    x:Uid="Oobe_HowToLaunch"
+                    Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <controls:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_Run_HowToLaunch" />
+                <controls: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 Background="Transparent" x:Uid="Oobe_Run_TipsAndTricks" />
+                <toolkitcontrols:MarkdownTextBlock
+                    x:Uid="Oobe_Run_TipsAndTricks"
+                    Background="Transparent" />
 
-                <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
-                    <Button x:Uid="Launch_Run" Style="{StaticResource AccentButtonStyle}" Click="Start_Run_Click"/>
-                    <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" />
+                <StackPanel
+                    Margin="0,24,0,0"
+                    Orientation="Horizontal"
+                    Spacing="12">
+                    <Button
+                        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" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeShellPage.xaml b/src/settings-ui/Settings.UI/OOBE/Views/OobeShellPage.xaml
index 998ca1249a..865c6c649b 100644
--- a/src/settings-ui/Settings.UI/OOBE/Views/OobeShellPage.xaml
+++ b/src/settings-ui/Settings.UI/OOBE/Views/OobeShellPage.xaml
@@ -6,6 +6,7 @@
     xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
     xmlns:localModels="using:Microsoft.PowerToys.Settings.UI.OOBE.ViewModel"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:CommunityToolkit.WinUI.UI"
     HighContrastAdjustment="None"
     mc:Ignorable="d">
     <!--
@@ -23,103 +24,84 @@
             PaneDisplayMode="Left"
             SelectionChanged="NavigationView_SelectionChanged">
             <NavigationView.MenuItems>
-                <NavigationViewItem x:Uid="Shell_General" Tag="Overview">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerToys.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
-                <NavigationViewItem x:Uid="Shell_AlwaysOnTop" Tag="AlwaysOnTop">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsAlwaysOnTop.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
-                <NavigationViewItem x:Uid="Shell_Awake" Tag="Awake">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsAwake.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
-                <NavigationViewItem x:Uid="Shell_ColorPicker" Tag="ColorPicker">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsColorPicker.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
-                <NavigationViewItem x:Uid="Shell_FancyZones" Tag="FancyZones">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsFancyZones.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
-                <NavigationViewItem x:Uid="Shell_FileLocksmith" Tag="FileLocksmith">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsFileLocksmith.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
-                <NavigationViewItem x:Uid="Shell_PowerPreview" Tag="FileExplorer">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsFileExplorerPreview.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
-                <NavigationViewItem x:Uid="Shell_Hosts" Tag="Hosts">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsHosts.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
-                <NavigationViewItem x:Uid="Shell_ImageResizer" Tag="ImageResizer">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsImageResizer.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
-                <NavigationViewItem x:Uid="Shell_KeyboardManager" Tag="KBM">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsKeyboardManager.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
-                <NavigationViewItem x:Uid="Shell_MouseUtilities" Tag="MouseUtils">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsMouseUtils.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
-                <NavigationViewItem x:Uid="Shell_PowerRename" Tag="PowerRename">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerRename.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
-                <NavigationViewItem x:Uid="Shell_PowerLauncher" Tag="Run">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerToysRun.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
-                <NavigationViewItem x:Uid="Shell_QuickAccent" Tag="QuickAccent">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerAccent.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
-                <NavigationViewItem x:Uid="Shell_MeasureTool" Tag="MeasureTool">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsScreenRuler.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
-                <NavigationViewItem x:Uid="Shell_ShortcutGuide" Tag="ShortcutGuide">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsShortcutGuide.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
-                <NavigationViewItem x:Uid="Shell_TextExtractor" Tag="TextExtractor">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerOCR.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
-                <NavigationViewItem x:Uid="Shell_VideoConference" Tag="VideoConference">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsVideoConferenceMute.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
+                <NavigationViewItem
+                    x:Uid="Shell_General"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsPowerToys.png}"
+                    Tag="Overview" />
+                <NavigationViewItem
+                    x:Uid="Shell_AlwaysOnTop"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsAlwaysOnTop.png}"
+                    Tag="AlwaysOnTop" />
+                <NavigationViewItem
+                    x:Uid="Shell_Awake"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsAwake.png}"
+                    Tag="Awake" />
+                <NavigationViewItem
+                    x:Uid="Shell_ColorPicker"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsColorPicker.png}"
+                    Tag="ColorPicker" />
+                <NavigationViewItem
+                    x:Uid="Shell_FancyZones"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsFancyZones.png}"
+                    Tag="FancyZones" />
+                <NavigationViewItem
+                    x:Uid="Shell_FileLocksmith"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsFileLocksmith.png}"
+                    Tag="FileLocksmith" />
+                <NavigationViewItem
+                    x:Uid="Shell_PowerPreview"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsFileExplorerPreview.png}"
+                    Tag="FileExplorer" />
+                <NavigationViewItem
+                    x:Uid="Shell_Hosts"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsHosts.png}"
+                    Tag="Hosts" />
+                <NavigationViewItem
+                    x:Uid="Shell_ImageResizer"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsImageResizer.png}"
+                    Tag="ImageResizer" />
+                <NavigationViewItem
+                    x:Uid="Shell_KeyboardManager"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsKeyboardManager.png}"
+                    Tag="KBM" />
+                <NavigationViewItem
+                    x:Uid="Shell_MouseUtilities"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsMouseUtils.png}"
+                    Tag="MouseUtils" />
+                <NavigationViewItem
+                    x:Uid="Shell_PowerRename"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsPowerRename.png}"
+                    Tag="PowerRename" />
+                <NavigationViewItem
+                    x:Uid="Shell_PowerLauncher"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsPowerToysRun.png}"
+                    Tag="Run" />
+                <NavigationViewItem
+                    x:Uid="Shell_QuickAccent"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsPowerAccent.png}"
+                    Tag="QuickAccent" />
+                <NavigationViewItem
+                    x:Uid="Shell_MeasureTool"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsScreenRuler.png}"
+                    Tag="MeasureTool" />
+                <NavigationViewItem
+                    x:Uid="Shell_ShortcutGuide"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsShortcutGuide.png}"
+                    Tag="ShortcutGuide" />
+                <NavigationViewItem
+                    x:Uid="Shell_TextExtractor"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsPowerOCR.png}"
+                    Tag="TextExtractor" />
+                <NavigationViewItem
+                    x:Uid="Shell_VideoConference"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsVideoConferenceMute.png}"
+                    Tag="VideoConference" />
             </NavigationView.MenuItems>
             <NavigationView.FooterMenuItems>
-                <NavigationViewItem x:Uid="Shell_WhatsNew" Tag="WhatsNew">
-                    <NavigationViewItem.Icon>
-                        <FontIcon Glyph="&#xF133;" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
+                <NavigationViewItem
+                    x:Uid="Shell_WhatsNew"
+                    Icon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xF133;}"
+                    Tag="WhatsNew" />
             </NavigationView.FooterMenuItems>
             <NavigationView.Content>
                 <Frame x:Name="NavigationFrame" />
diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeShortcutGuide.xaml b/src/settings-ui/Settings.UI/OOBE/Views/OobeShortcutGuide.xaml
index 22521b6d40..00e03aa3f0 100644
--- a/src/settings-ui/Settings.UI/OOBE/Views/OobeShortcutGuide.xaml
+++ b/src/settings-ui/Settings.UI/OOBE/Views/OobeShortcutGuide.xaml
@@ -2,28 +2,42 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeShortcutGuide"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
-    <controls:OOBEPageControl x:Uid="Oobe_ShortcutGuide"
-                              HeroImage="ms-appx:///Assets/Modules/OOBE/OOBEShortcutGuide.png">
+    <controls:OOBEPageControl
+        x:Uid="Oobe_ShortcutGuide"
+        HeroImage="ms-appx:///Assets/Modules/OOBE/OOBEShortcutGuide.png">
         <controls:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
 
-                <TextBlock x:Uid="Oobe_HowToLaunch"
-                           Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock
+                    x:Uid="Oobe_HowToLaunch"
+                    Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <controls:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_ShortcutGuide_HowToLaunch" />
-                <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
-                    <Button x:Uid="Launch_ShortcutGuide" Style="{StaticResource AccentButtonStyle}" Click="Start_ShortcutGuide_Click"/>
-                    <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" />
+                <controls:ShortcutWithTextLabelControl
+                    x:Name="HotkeyControl"
+                    x:Uid="Oobe_ShortcutGuide_HowToLaunch" />
+                <StackPanel
+                    Margin="0,24,0,0"
+                    Orientation="Horizontal"
+                    Spacing="12">
+                    <Button
+                        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" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeVideoConference.xaml b/src/settings-ui/Settings.UI/OOBE/Views/OobeVideoConference.xaml
index d48f83d02f..e586a97604 100644
--- a/src/settings-ui/Settings.UI/OOBE/Views/OobeVideoConference.xaml
+++ b/src/settings-ui/Settings.UI/OOBE/Views/OobeVideoConference.xaml
@@ -2,33 +2,50 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeVideoConference"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
     mc:Ignorable="d">
 
-    <controls:OOBEPageControl x:Uid="Oobe_VideoConference"
-                              HeroImage="ms-appx:///Assets/Modules/OOBE/VideoConferenceMute.png">
+    <controls:OOBEPageControl
+        x:Uid="Oobe_VideoConference"
+        HeroImage="ms-appx:///Assets/Modules/OOBE/VideoConferenceMute.png">
 
         <controls:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical">
-                <TextBlock x:Uid="Oobe_HowToLaunch"
-                           Style="{ThemeResource OobeSubtitleStyle}" />
+                <TextBlock
+                    x:Uid="Oobe_HowToLaunch"
+                    Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <controls:ShortcutWithTextLabelControl x:Name="HotkeyMicVidControl" x:Uid="Oobe_VideoConference_ToggleMicVid" />
-                <controls:ShortcutWithTextLabelControl x:Name="HotkeyMicControl" x:Uid="Oobe_VideoConference_ToggleMic" />
-                <controls:ShortcutWithTextLabelControl x:Name="HotkeyVidControl" x:Uid="Oobe_VideoConference_ToggleVid" />
-                
-                <toolkitcontrols:MarkdownTextBlock Background="Transparent" x:Uid="Oobe_VideoConference_HowToLaunch" />
+                <controls:ShortcutWithTextLabelControl
+                    x:Name="HotkeyMicVidControl"
+                    x:Uid="Oobe_VideoConference_ToggleMicVid" />
+                <controls:ShortcutWithTextLabelControl
+                    x:Name="HotkeyMicControl"
+                    x:Uid="Oobe_VideoConference_ToggleMic" />
+                <controls:ShortcutWithTextLabelControl
+                    x:Name="HotkeyVidControl"
+                    x:Uid="Oobe_VideoConference_ToggleVid" />
 
-                <StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
-                    <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" />
+                <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" />
                     </HyperlinkButton>
                 </StackPanel>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeWhatsNew.xaml b/src/settings-ui/Settings.UI/OOBE/Views/OobeWhatsNew.xaml
index 6ffee4e491..750a970380 100644
--- a/src/settings-ui/Settings.UI/OOBE/Views/OobeWhatsNew.xaml
+++ b/src/settings-ui/Settings.UI/OOBE/Views/OobeWhatsNew.xaml
@@ -1,29 +1,34 @@
-<Page x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeWhatsNew"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-      xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
-      mc:Ignorable="d"
-      Loaded="Page_Loaded">
+<Page
+    x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeWhatsNew"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns: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"
+    Loaded="Page_Loaded"
+    mc:Ignorable="d">
 
 
     <Grid Margin="0,24,0,0">
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
-        <StackPanel Grid.Row="0" Margin="32,0,0,0" Orientation="Vertical" VerticalAlignment="Top">
+        <StackPanel
+            Grid.Row="0"
+            Margin="32,0,0,0"
+            VerticalAlignment="Top"
+            Orientation="Vertical">
             <TextBlock
                 x:Uid="Oobe_WhatsNew"
                 AutomationProperties.HeadingLevel="Level1"
                 Style="{StaticResource TitleTextBlockStyle}" />
             <HyperlinkButton
-                NavigateUri="https://github.com/microsoft/PowerToys/releases"
                 Margin="0,0,0,16"
+                NavigateUri="https://github.com/microsoft/PowerToys/releases"
                 Style="{StaticResource TextButtonStyle}">
                 <TextBlock
                     x:Uid="Oobe_WhatsNew_DetailedReleaseNotesLink"
@@ -31,47 +36,48 @@
             </HyperlinkButton>
         </StackPanel>
         <InfoBar
-                Severity="Error"
-                x:Name="ErrorInfoBar"
-                Grid.Row="1"
-                x:Uid="Oobe_WhatsNew_LoadingError"
-                Visibility="Collapsed"
-                VerticalAlignment="Top"
-                IsClosable="False"
-                IsOpen="True"
-                IsTabStop="True" />
-        <InfoBar
-            x:Name="ProxyWarningInfoBar"
-            Severity="Warning"
+            x:Name="ErrorInfoBar"
+            x:Uid="Oobe_WhatsNew_LoadingError"
             Grid.Row="1"
-            Visibility="Collapsed"
-            x:Uid="Oobe_WhatsNew_ProxyAuthenticationWarning"
             VerticalAlignment="Top"
             IsClosable="False"
-            IsOpen="True"
-            IsTabStop="True" />
-        <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
+            IsOpen="False"
+            IsTabStop="True"
+            Severity="Error" />
+        <InfoBar
+            x:Name="ProxyWarningInfoBar"
+            x:Uid="Oobe_WhatsNew_ProxyAuthenticationWarning"
+            Grid.Row="1"
+            VerticalAlignment="Top"
+            IsClosable="False"
+            IsOpen="False"
+            IsTabStop="True"
+            Severity="Warning" />
+        <ScrollViewer
+            Grid.Row="1"
+            VerticalScrollBarVisibility="Auto">
             <Grid Margin="32,24,32,24">
                 <ProgressRing
-                x:Name="LoadingProgressRing"
-                IsIndeterminate="True"
-                VerticalAlignment="Center"
-                HorizontalAlignment="Center"
-                Visibility="Visible"/>
-                <toolkitcontrols:MarkdownTextBlock x:Name="ReleaseNotesMarkdown"
-                                                   Visibility="Collapsed"
-                                                   Header1FontSize="20"
-                                                   Header2FontSize="17"
-                                                   Header2FontWeight="SemiBold"
-                                                   Header4FontSize="14"
-                                                   Header4FontWeight="SemiBold"
-                                                   Header1Margin="0,16,0,0"
-                                                   HorizontalRuleMargin="24"
-                                                   VerticalAlignment="Top"
-                                                   Background="Transparent"
-                                                   ParagraphMargin="0,0,0,0"
-                                                   TableMargin="24"
-                                                   LinkClicked="ReleaseNotesMarkdown_LinkClicked"/>
+                    x:Name="LoadingProgressRing"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    IsIndeterminate="True"
+                    Visibility="Visible" />
+                <toolkitcontrols:MarkdownTextBlock
+                    x:Name="ReleaseNotesMarkdown"
+                    VerticalAlignment="Top"
+                    Background="Transparent"
+                    Header1FontSize="20"
+                    Header1Margin="0,16,0,0"
+                    Header2FontSize="17"
+                    Header2FontWeight="SemiBold"
+                    Header4FontSize="14"
+                    Header4FontWeight="SemiBold"
+                    HorizontalRuleMargin="24"
+                    LinkClicked="ReleaseNotesMarkdown_LinkClicked"
+                    ParagraphMargin="0,0,0,0"
+                    TableMargin="24"
+                    Visibility="Collapsed" />
             </Grid>
         </ScrollViewer>
     </Grid>
diff --git a/src/settings-ui/Settings.UI/OobeWindow.xaml b/src/settings-ui/Settings.UI/OobeWindow.xaml
index c45c7bbc57..ee2da9598b 100644
--- a/src/settings-ui/Settings.UI/OobeWindow.xaml
+++ b/src/settings-ui/Settings.UI/OobeWindow.xaml
@@ -2,14 +2,13 @@
     x:Class="Microsoft.PowerToys.Settings.UI.OobeWindow"
     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"
     Closed="Window_Closed"
-    >
+    mc:Ignorable="d">
 
     <Grid>
-        <local:OobeShellPage x:Name="shellPage"/>
+        <local:OobeShellPage x:Name="shellPage" />
     </Grid>
 </Window>
diff --git a/src/settings-ui/Settings.UI/PowerToys.Settings.csproj b/src/settings-ui/Settings.UI/PowerToys.Settings.csproj
index 882c8945ee..8bf044ecba 100644
--- a/src/settings-ui/Settings.UI/PowerToys.Settings.csproj
+++ b/src/settings-ui/Settings.UI/PowerToys.Settings.csproj
@@ -34,7 +34,7 @@
     <WarningsNotAsErrors>CA1720</WarningsNotAsErrors>
     <Optimize>true</Optimize>
   </PropertyGroup>
-
+	
   <!-- See https://learn.microsoft.com/windows/apps/develop/platform/csharp-winrt/net-projection-from-cppwinrt-component for more info -->
   <PropertyGroup>
     <CsWinRTIncludes>PowerToys.GPOWrapper</CsWinRTIncludes>
@@ -42,9 +42,10 @@
     <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Remove="OOBE\Views\OobeHosts.xaml" />
-  </ItemGroup>
+	<!-- Needed for CommunityToolkit.Labs.WinUI.SettingsControls. -->
+	<PropertyGroup>
+		<RestoreAdditionalProjectSources>https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-Labs/nuget/v3/index.json</RestoreAdditionalProjectSources>
+	</PropertyGroup>
 
   <ItemGroup>
     <Content Include="Assets\SplashScreen.scale-200.png" />
@@ -57,6 +58,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="CommunityToolkit.Labs.WinUI.SettingsControls" Version="0.0.7" />
     <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.0" />
     <PackageReference Include="CommunityToolkit.WinUI.UI" Version="7.1.2" />
     <PackageReference Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
diff --git a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
index 390c76feb7..7ccd619849 100644
--- a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
+++ b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
@@ -366,10 +366,6 @@
     <value>Remap a key</value>
     <comment>Keyboard Manager remap keyboard button content</comment>
   </data>
-  <data name="KeyboardManager_RemapKeyboardButton_Accessible.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Remap a key</value>
-    <comment>Keyboard Manager remap keyboard button content</comment>
-  </data>
   <data name="KeyboardManager_Keys.Header" xml:space="preserve">
     <value>Keys</value>
     <comment>Keyboard Manager remap keyboard header</comment>
@@ -378,10 +374,6 @@
     <value>Remap a shortcut</value>
     <comment>Keyboard Manager remap shortcuts button</comment>
   </data>
-  <data name="KeyboardManager_RemapShortcutsButton_Accessible.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Remap a shortcut</value>
-    <comment>Keyboard Manager remap shortcuts button</comment>
-  </data>
   <data name="KeyboardManager_Shortcuts.Header" xml:space="preserve">
     <value>Shortcuts</value>
     <comment>Keyboard Manager remap keyboard header</comment>
@@ -588,10 +580,6 @@
     <value>Launch layout editor</value>
     <comment>launches the FancyZones layout editor application</comment>
   </data>
-  <data name="FancyZones_LaunchEditorButton_Accessible.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Launch layout editor</value>
-    <comment>launches the FancyZones layout editor application</comment>
-  </data>
   <data name="FancyZones_LaunchEditorButtonControl.Description" xml:space="preserve">
     <value>Set and manage your layouts</value>
     <comment>launches the FancyZones layout editor application</comment>
@@ -676,8 +664,8 @@
   <data name="General_SettingsBackupAndRestore_ButtonRestore.Content" xml:space="preserve">
     <value>Restore</value>
   </data>
-  <data name="General_SettingsBackupAndRestore_ButtonSelectLocation.Content" xml:space="preserve">
-    <value>Browse</value>
+  <data name="General_SettingsBackupAndRestore_ButtonSelectLocation.Text" xml:space="preserve">
+    <value>Select folder</value>
   </data>
   <data name="GeneralPage_UpdateNow.Content" xml:space="preserve">
     <value>Update now</value>
@@ -845,6 +833,9 @@
   </data>
   <data name="General_SettingsBackupAndRestore.Header" xml:space="preserve">
     <value>Backup and restore your settings at any time</value>
+  </data>
+	<data name="General_SettingsBackupAndRestore.Description" xml:space="preserve">
+    <value>PowerToys will restart automatically if needed.</value>
   </data>
   <data name="ShortcutGuide_Enable.Header" xml:space="preserve">
     <value>Enable Shortcut Guide</value>
@@ -1024,6 +1015,9 @@
   </data>
   <data name="GeneralSettings_AlwaysRunAsAdminText.Header" xml:space="preserve">
     <value>Always run as administrator</value>
+  </data>
+	<data name="GeneralSettings_AlwaysRunAsAdminText.Description" xml:space="preserve">
+    <value>You need to run as administrator to use this setting</value>
   </data>
   <data name="GeneralSettings_RunningAsUserText" xml:space="preserve">
     <value>Running as user</value>
@@ -1082,9 +1076,6 @@
   <data name="General_SettingsBackupInfo_DateHeader.Text" xml:space="preserve">
     <value>Created at:</value>
   </data>
-  <data name="General_SettingsBackupAndRestoreDescription.Text" xml:space="preserve">
-    <value>PowerToys will restart automatically if needed.</value>
-  </data>
   <data name="General_SettingsBackupAndRestoreStatusInfo.Header" xml:space="preserve">
     <value>Backup information</value>
   </data>
@@ -1100,9 +1091,6 @@
   <data name="Admin_mode.Header" xml:space="preserve">
     <value>Administrator mode</value>
   </data>
-  <data name="General_RunAsAdminRequired.Title" xml:space="preserve">
-    <value>You need to run as administrator to use this setting.</value>
-  </data>
   <data name="FancyZones_RestoreSize.Content" xml:space="preserve">
     <value>Restore the original size of windows when unsnapping</value>
   </data>
@@ -2648,10 +2636,6 @@ Activate by holding the key for the character you want to add an accent to, then
     <value>Launch Host File Editor</value>
     <comment>"Host File Editor" is a product name</comment>
   </data>
-  <data name="Hosts_LaunchButton_Accessible.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Launch Host File Editor</value>
-    <comment>"Host File Editor" is a product name</comment>
-  </data>
   <data name="Hosts_AdditionalLinesPosition.Header" xml:space="preserve">
     <value>Position of additional content</value>
   </data>
diff --git a/src/settings-ui/Settings.UI/Styles/Button.xaml b/src/settings-ui/Settings.UI/Styles/Button.xaml
index 1905af5347..6e60ec3530 100644
--- a/src/settings-ui/Settings.UI/Styles/Button.xaml
+++ b/src/settings-ui/Settings.UI/Styles/Button.xaml
@@ -1,21 +1,157 @@
 <ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
-    xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)">
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <Style x:Key="SettingButtonStyle" TargetType="Button" BasedOn="{StaticResource DefaultButtonStyle}" >
-        <Setter Property="BorderBrush" Value="{ThemeResource CardBorderBrush}" />
+    <SolidColorBrush
+        x:Key="SubtleButtonBackground"
+        Color="{ThemeResource SubtleFillColorTransparent}" />
+    <SolidColorBrush
+        x:Key="SubtleButtonBackgroundPointerOver"
+        Color="{ThemeResource SubtleFillColorSecondary}" />
+    <SolidColorBrush
+        x:Key="SubtleButtonBackgroundPressed"
+        Color="{ThemeResource SubtleFillColorTertiary}" />
+    <SolidColorBrush
+        x:Key="SubtleButtonBackgroundDisabled"
+        Color="{ThemeResource SubtleFillColorTransparent}" />
+    <SolidColorBrush
+        x:Key="SubtleButtonForeground"
+        Color="{ThemeResource TextFillColorPrimary}" />
+    <SolidColorBrush
+        x:Key="SubtleButtonForegroundPointerOver"
+        Color="{ThemeResource TextFillColorPrimary}" />
+    <SolidColorBrush
+        x:Key="SubtleButtonForegroundPressed"
+        Color="{ThemeResource TextFillColorSecondary}" />
+    <SolidColorBrush
+        x:Key="SubtleButtonForegroundDisabled"
+        Color="{ThemeResource TextFillColorDisabled}" />
+
+    <Style
+        x:Key="SubtleButtonStyle"
+        TargetType="Button">
+        <Setter Property="Background" Value="{ThemeResource SubtleButtonBackground}" />
+        <Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
+        <Setter Property="Foreground" Value="{ThemeResource SubtleButtonForeground}" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Width" Value="36" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="Height" Value="36" />
+        <Setter Property="Padding" Value="{StaticResource ButtonPadding}" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
+        <Setter Property="FontWeight" Value="Normal" />
+        <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
+        <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+        <Setter Property="FocusVisualMargin" Value="-3" />
         <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
-        <Setter Property="Padding" Value="16,0,16,0" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <ContentPresenter
+                        x:Name="ContentPresenter"
+                        Padding="{TemplateBinding Padding}"
+                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                        AnimatedIcon.State="Normal"
+                        AutomationProperties.AccessibilityView="Raw"
+                        Background="{TemplateBinding Background}"
+                        BackgroundSizing="{TemplateBinding BackgroundSizing}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        Content="{TemplateBinding Content}"
+                        ContentTemplate="{TemplateBinding ContentTemplate}"
+                        ContentTransitions="{TemplateBinding ContentTransitions}"
+                        CornerRadius="{TemplateBinding CornerRadius}">
+                        <ContentPresenter.BackgroundTransition>
+                            <BrushTransition Duration="0:0:0.083" />
+                        </ContentPresenter.BackgroundTransition>
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames
+                                            Storyboard.TargetName="ContentPresenter"
+                                            Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame
+                                                KeyTime="0"
+                                                Value="{ThemeResource SubtleButtonBackgroundPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames
+                                            Storyboard.TargetName="ContentPresenter"
+                                            Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame
+                                                KeyTime="0"
+                                                Value="{ThemeResource SubtleButtonForegroundPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                    <VisualState.Setters>
+                                        <Setter Target="ContentPresenter.(AnimatedIcon.State)" Value="PointerOver" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames
+                                            Storyboard.TargetName="ContentPresenter"
+                                            Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame
+                                                KeyTime="0"
+                                                Value="{ThemeResource SubtleButtonBackgroundPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames
+                                            Storyboard.TargetName="ContentPresenter"
+                                            Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame
+                                                KeyTime="0"
+                                                Value="{ThemeResource SubtleButtonForegroundPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                    <VisualState.Setters>
+                                        <Setter Target="ContentPresenter.(AnimatedIcon.State)" Value="Pressed" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames
+                                            Storyboard.TargetName="ContentPresenter"
+                                            Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame
+                                                KeyTime="0"
+                                                Value="{ThemeResource SubtleButtonBackgroundDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames
+                                            Storyboard.TargetName="ContentPresenter"
+                                            Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame
+                                                KeyTime="0"
+                                                Value="{ThemeResource SubtleButtonForegroundDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                    <VisualState.Setters>
+                                        <!--  DisabledVisual Should be handled by the control, not the animated icon.  -->
+                                        <Setter Target="ContentPresenter.(AnimatedIcon.State)" Value="Normal" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </ContentPresenter>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
     </Style>
 
-    <Style x:Key="HyperlinkButtonStyle" TargetType="HyperlinkButton" >
-    </Style>
+    <Style
+        x:Key="HyperlinkButtonStyle"
+        TargetType="HyperlinkButton" />
 
-    <Style x:Key="TextButtonStyle" TargetType="ButtonBase">
+    <Style
+        x:Key="TextButtonStyle"
+        TargetType="ButtonBase">
         <Setter Property="Background" Value="{ThemeResource HyperlinkButtonBackground}" />
         <Setter Property="Foreground" Value="{ThemeResource HyperlinkButtonForeground}" />
         <Setter Property="MinWidth" Value="0" />
@@ -25,555 +161,103 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ButtonBase">
-                    <Grid Margin="{TemplateBinding Padding}" CornerRadius="4" Background="{TemplateBinding Background}">
-                        <ContentPresenter x:Name="Text"
-                                          Content="{TemplateBinding Content}"
-                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                          FontWeight="SemiBold"
-                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                    <Grid
+                        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">
                                 <VisualState x:Name="Normal" />
-
                                 <VisualState x:Name="PointerOver">
-
                                     <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonForegroundPointerOver}" />
+                                        <ObjectAnimationUsingKeyFrames
+                                            Storyboard.TargetName="Text"
+                                            Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame
+                                                KeyTime="0"
+                                                Value="{ThemeResource HyperlinkButtonForegroundPointerOver}" />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonBackgroundPointerOver}" />
+                                        <ObjectAnimationUsingKeyFrames
+                                            Storyboard.TargetName="Text"
+                                            Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame
+                                                KeyTime="0"
+                                                Value="{ThemeResource HyperlinkButtonBackgroundPointerOver}" />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="BorderBrush">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonBorderBrushPointerOver}" />
+                                        <ObjectAnimationUsingKeyFrames
+                                            Storyboard.TargetName="Text"
+                                            Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame
+                                                KeyTime="0"
+                                                Value="{ThemeResource HyperlinkButtonBorderBrushPointerOver}" />
                                         </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
 
                                 <VisualState x:Name="Pressed">
-
                                     <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonForegroundPressed}" />
+                                        <ObjectAnimationUsingKeyFrames
+                                            Storyboard.TargetName="Text"
+                                            Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame
+                                                KeyTime="0"
+                                                Value="{ThemeResource HyperlinkButtonForegroundPressed}" />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonBackgroundPressed}" />
+                                        <ObjectAnimationUsingKeyFrames
+                                            Storyboard.TargetName="Text"
+                                            Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame
+                                                KeyTime="0"
+                                                Value="{ThemeResource HyperlinkButtonBackgroundPressed}" />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="BorderBrush">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonBorderBrushPressed}" />
+                                        <ObjectAnimationUsingKeyFrames
+                                            Storyboard.TargetName="Text"
+                                            Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame
+                                                KeyTime="0"
+                                                Value="{ThemeResource HyperlinkButtonBorderBrushPressed}" />
                                         </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
 
                                 <VisualState x:Name="Disabled">
-
                                     <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonForegroundDisabled}" />
+                                        <ObjectAnimationUsingKeyFrames
+                                            Storyboard.TargetName="Text"
+                                            Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame
+                                                KeyTime="0"
+                                                Value="{ThemeResource HyperlinkButtonForegroundDisabled}" />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonBackgroundDisabled}" />
+                                        <ObjectAnimationUsingKeyFrames
+                                            Storyboard.TargetName="Text"
+                                            Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame
+                                                KeyTime="0"
+                                                Value="{ThemeResource HyperlinkButtonBackgroundDisabled}" />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="BorderBrush">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonBorderBrushDisabled}" />
+                                        <ObjectAnimationUsingKeyFrames
+                                            Storyboard.TargetName="Text"
+                                            Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame
+                                                KeyTime="0"
+                                                Value="{ThemeResource HyperlinkButtonBorderBrushDisabled}" />
                                         </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
-
                             </VisualStateGroup>
-
                         </VisualStateManager.VisualStateGroups>
-
                     </Grid>
 
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
-
-    <!-- This style overrides the default style so that all ToggleSwitches are right aligned, with the label on the left -->
-    <Style TargetType="ToggleSwitch">
-        <Setter Property="Foreground" Value="{ThemeResource ToggleSwitchContentForeground}" />
-        <Setter Property="HorizontalAlignment" Value="Right" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Right" />
-        <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
-        <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
-        <Setter Property="ManipulationMode" Value="System,TranslateX" />
-        <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
-        <Setter Property="FocusVisualMargin" Value="-7,-3,-7,-3" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ToggleSwitch">
-                    <Grid
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        contract7Present:CornerRadius="{TemplateBinding CornerRadius}">
-
-                        <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>
-                                        <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>
-                                        <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>
-                                        <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>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Width" EnableDependentAnimation="True" >
-                                            <SplineDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" KeySpline="{StaticResource ControlFastOutSlowInKeySpline}" Value="12" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Height" EnableDependentAnimation="True">
-                                            <SplineDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" KeySpline="{StaticResource ControlFastOutSlowInKeySpline}" Value="12" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Width" EnableDependentAnimation="True">
-                                            <SplineDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" KeySpline="{StaticResource ControlFastOutSlowInKeySpline}" Value="12" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Height" EnableDependentAnimation="True">
-                                            <SplineDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" KeySpline="{StaticResource ControlFastOutSlowInKeySpline}" 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>
-                                        <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>
-                                        <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>
-                                        <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>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Width" EnableDependentAnimation="True" >
-                                            <SplineDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" KeySpline="{StaticResource ControlFastOutSlowInKeySpline}" Value="14" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Height" EnableDependentAnimation="True">
-                                            <SplineDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" KeySpline="{StaticResource ControlFastOutSlowInKeySpline}" Value="14" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Width" EnableDependentAnimation="True">
-                                            <SplineDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" KeySpline="{StaticResource ControlFastOutSlowInKeySpline}" Value="14" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Height" EnableDependentAnimation="True">
-                                            <SplineDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" KeySpline="{StaticResource ControlFastOutSlowInKeySpline}" Value="14" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Pressed">
-
-                                    <VisualState.Setters>
-                                        <Setter Target="SwitchKnobOn.HorizontalAlignment" Value="Right" />
-                                        <Setter Target="SwitchKnobOn.Margin" Value="0,0,3,0" />
-                                        <Setter Target="SwitchKnobOff.HorizontalAlignment" Value="Left" />
-                                        <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>
-                                        <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>
-                                        <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>
-                                        <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>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Width" EnableDependentAnimation="True" >
-                                            <SplineDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" KeySpline="{StaticResource ControlFastOutSlowInKeySpline}" Value="17" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Height" EnableDependentAnimation="True">
-                                            <SplineDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" KeySpline="{StaticResource ControlFastOutSlowInKeySpline}" Value="14" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Width" EnableDependentAnimation="True">
-                                            <SplineDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" KeySpline="{StaticResource ControlFastOutSlowInKeySpline}" Value="17" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Height" EnableDependentAnimation="True">
-                                            <SplineDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" KeySpline="{StaticResource ControlFastOutSlowInKeySpline}" Value="14" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Disabled">
-                                    <Storyboard>
-                                        <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>
-                                        <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>
-                                        <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>
-                                        <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>
-                                        <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>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Width" EnableDependentAnimation="True" >
-                                            <SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}" KeySpline="{StaticResource ControlFastOutSlowInKeySpline}" Value="12" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Height" EnableDependentAnimation="True">
-                                            <SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}" KeySpline="{StaticResource ControlFastOutSlowInKeySpline}" Value="12" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Width" EnableDependentAnimation="True">
-                                            <SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}" KeySpline="{StaticResource ControlFastOutSlowInKeySpline}" Value="12" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Height" EnableDependentAnimation="True">
-                                            <SplineDoubleKeyFrame KeyTime="{StaticResource ControlNormalAnimationDuration}" KeySpline="{StaticResource ControlFastOutSlowInKeySpline}" Value="12" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="ToggleStates">
-
-                                <VisualStateGroup.Transitions>
-                                    <VisualTransition x:Name="DraggingToOnTransition"
-                                        From="Dragging"
-                                        To="On"
-                                        GeneratedDuration="0">
-
-                                        <Storyboard>
-                                            <RepositionThemeAnimation TargetName="SwitchKnob" FromHorizontalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.KnobCurrentToOnOffset}" />
-                                            <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>
-                                            <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>
-                                    </VisualTransition>
-                                    <VisualTransition x:Name="OnToDraggingTransition"
-                                        From="On"
-                                        To="Dragging"
-                                        GeneratedDuration="0">
-                                        <Storyboard>
-                                            <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>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Opacity">
-                                                <LinearDoubleKeyFrame KeyTime="0" Value="0" />
-                                            </DoubleAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualTransition>
-                                    <VisualTransition x:Name="DraggingToOffTransition"
-                                        From="Dragging"
-                                        To="Off"
-                                        GeneratedDuration="0">
-
-                                        <Storyboard>
-                                            <RepositionThemeAnimation TargetName="SwitchKnob" FromHorizontalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.KnobCurrentToOffOffset}" />
-                                            <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>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Opacity">
-                                                <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="1" />
-                                            </DoubleAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualTransition>
-                                    <VisualTransition x:Name="OnToOffTransition"
-                                        From="On"
-                                        To="Off"
-                                        GeneratedDuration="0">
-
-                                        <Storyboard>
-                                            <RepositionThemeAnimation TargetName="SwitchKnob" FromHorizontalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.KnobOnToOffOffset}" />
-                                        </Storyboard>
-                                    </VisualTransition>
-                                    <VisualTransition x:Name="OffToOnTransition"
-                                        From="Off"
-                                        To="On"
-                                        GeneratedDuration="0">
-
-                                        <Storyboard>
-                                            <RepositionThemeAnimation TargetName="SwitchKnob" FromHorizontalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.KnobOffToOnOffset}"/>
-                                            <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>
-                                            <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>
-                                    </VisualTransition>
-                                </VisualStateGroup.Transitions>
-                                <VisualState x:Name="Dragging" />
-                                <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" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <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>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Opacity">
-                                            <LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="ContentStates">
-                                <VisualState x:Name="OffContent">
-
-                                    <Storyboard>
-                                        <DoubleAnimation Storyboard.TargetName="OffContentPresenter"
-                                            Storyboard.TargetProperty="Opacity"
-                                            To="1"
-                                            Duration="0" />
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="IsHitTestVisible" Storyboard.TargetName="OffContentPresenter">
-                                            <DiscreteObjectKeyFrame KeyTime="0">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <x:Boolean>True</x:Boolean>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="OnContent">
-
-                                    <Storyboard>
-                                        <DoubleAnimation Storyboard.TargetName="OnContentPresenter"
-                                            Storyboard.TargetProperty="Opacity"
-                                            To="1"
-                                            Duration="0" />
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="IsHitTestVisible" Storyboard.TargetName="OnContentPresenter">
-                                            <DiscreteObjectKeyFrame KeyTime="0">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <x:Boolean>True</x:Boolean>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-
-                            </VisualStateGroup>
-
-                        </VisualStateManager.VisualStateGroups>
-
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="*" />
-                        </Grid.RowDefinitions>
-
-                        <ContentPresenter x:Name="HeaderContentPresenter"
-                            x:DeferLoadStrategy="Lazy"
-                            Grid.Row="0"
-                            Content="{TemplateBinding Header}"
-                            ContentTemplate="{TemplateBinding HeaderTemplate}"
-                            Foreground="{ThemeResource ToggleSwitchHeaderForeground}"
-                            IsHitTestVisible="False"
-                            Margin="{ThemeResource ToggleSwitchTopHeaderMargin}"
-                            TextWrapping="Wrap"
-                            VerticalAlignment="Top"
-                            Visibility="Collapsed"
-                            AutomationProperties.AccessibilityView="Raw" />
-                        <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"
-                                contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
-                                contract7NotPresent:CornerRadius="{StaticResource ControlCornerRadius}"
-                                Control.IsTemplateFocusTarget="True"
-                                Background="{ThemeResource ToggleSwitchContainerBackground}" />
-                            <ContentPresenter x:Name="OffContentPresenter"
-                                Grid.RowSpan="3"
-                                Grid.Column="0"
-                                Opacity="0"
-                                Foreground="{TemplateBinding Foreground}"
-                                IsHitTestVisible="False"
-                                Content="{TemplateBinding OffContent}"
-                                ContentTemplate="{TemplateBinding OffContentTemplate}"
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                AutomationProperties.AccessibilityView="Raw" />
-                            <ContentPresenter x:Name="OnContentPresenter"
-                                Grid.RowSpan="3"
-                                Grid.Column="0"
-                                Opacity="0"
-                                Foreground="{TemplateBinding Foreground}"
-                                IsHitTestVisible="False"
-                                Content="{TemplateBinding OnContent}"
-                                ContentTemplate="{TemplateBinding OnContentTemplate}"
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                AutomationProperties.AccessibilityView="Raw" />
-                            <Rectangle x:Name="OuterBorder"
-                                Grid.Row="1"
-                                               Grid.Column="2"
-                                Height="20"
-                                Width="40"
-                                RadiusX="10"
-                                RadiusY="10"
-                                Fill="{ThemeResource ToggleSwitchFillOff}"
-                                Stroke="{ThemeResource ToggleSwitchStrokeOff}"
-                                StrokeThickness="{ThemeResource ToggleSwitchOuterBorderStrokeThickness}" />
-                            <Rectangle x:Name="SwitchKnobBounds"
-                                Grid.Row="1"
-                                Height="20"
-                                Width="40"
-                                RadiusX="10"
-                                RadiusY="10"
-                                               Grid.Column="2"
-                                Fill="{ThemeResource ToggleSwitchFillOn}"
-                                Stroke="{ThemeResource ToggleSwitchStrokeOn}"
-                                StrokeThickness="{ThemeResource ToggleSwitchOnStrokeThickness}"
-                                Opacity="0" />
-                            <Grid x:Name="SwitchKnob"
-                                Grid.Row="1"
-                                          Grid.Column="2"
-                                HorizontalAlignment="Left"
-                                Width="20"
-                                Height="20">
-                                <Border x:Name="SwitchKnobOn"
-                                    Background="{ThemeResource ToggleSwitchKnobFillOn}"
-                                    BorderBrush="{ThemeResource ToggleSwitchKnobStrokeOn}"
-                                    contract7Present:BackgroundSizing="OuterBorderEdge"       
-                                    Width="12"
-                                    Height="12"
-                                    CornerRadius="7"
-                                                Grid.Column="2"
-                                    Opacity="0"
-                                    HorizontalAlignment="Center"
-                                    Margin="0,0,1,0"
-                                    RenderTransformOrigin="0.5, 0.5">
-                                    <Border.RenderTransform>
-                                        <CompositeTransform/>
-                                    </Border.RenderTransform>
-                                </Border>
-                                <Rectangle x:Name="SwitchKnobOff"
-                                    Fill="{ThemeResource ToggleSwitchKnobFillOff}"
-                                    Width="12"
-                                    Height="12"
-                                    RadiusX="7"
-                                                   Grid.Column="2"
-                                    RadiusY="7"
-                                    HorizontalAlignment="Center"
-                                    Margin="-1,0,0,0"
-                                    RenderTransformOrigin="0.5, 0.5">
-                                    <Rectangle.RenderTransform>
-                                        <CompositeTransform/>
-                                    </Rectangle.RenderTransform>
-                                </Rectangle>
-                                <Grid.RenderTransform>
-                                    <TranslateTransform x:Name="KnobTranslateTransform" />
-                                </Grid.RenderTransform>
-                            </Grid>
-                            <Thumb x:Name="SwitchThumb"
-                                AutomationProperties.AccessibilityView="Raw"
-                                Grid.RowSpan="3"
-                                Grid.ColumnSpan="3">
-                                <Thumb.Template>
-                                    <ControlTemplate TargetType="Thumb">
-                                        <Rectangle Fill="Transparent" />
-                                    </ControlTemplate>
-                                </Thumb.Template>
-                            </Thumb>
-
-                        </Grid>
-
-                    </Grid>
-
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
 </ResourceDictionary>
diff --git a/src/settings-ui/Settings.UI/Styles/TextBlock.xaml b/src/settings-ui/Settings.UI/Styles/TextBlock.xaml
index 731b635388..806bf88118 100644
--- a/src/settings-ui/Settings.UI/Styles/TextBlock.xaml
+++ b/src/settings-ui/Settings.UI/Styles/TextBlock.xaml
@@ -1,8 +1,10 @@
 <ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+    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" />
@@ -16,15 +18,10 @@
     </Style>
 
     <x:Double x:Key="SecondaryTextFontSize">12</x:Double>
-    <Style x:Key="SecondaryTextStyle" TargetType="TextBlock">
-        <Setter Property="FontSize" Value="{StaticResource SecondaryTextFontSize}"/>
-        <Setter Property="Foreground" Value="{ThemeResource TextFillColorSecondaryBrush}"/>
-    </Style>
-
-    <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="FontWeight" Value="Bold" />
+    <Style
+        x:Key="SecondaryTextStyle"
+        TargetType="TextBlock">
+        <Setter Property="FontSize" Value="{StaticResource SecondaryTextFontSize}" />
+        <Setter Property="Foreground" Value="{ThemeResource TextFillColorSecondaryBrush}" />
     </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/settings-ui/Settings.UI/Themes/Colors.xaml b/src/settings-ui/Settings.UI/Themes/Colors.xaml
index 2ae414382d..ec196fd89a 100644
--- a/src/settings-ui/Settings.UI/Themes/Colors.xaml
+++ b/src/settings-ui/Settings.UI/Themes/Colors.xaml
@@ -1,36 +1,36 @@
 <ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Dark">
-            <StaticResource x:Key="CardBackgroundBrush" ResourceKey="CardBackgroundFillColorDefaultBrush" />
-            <StaticResource x:Key="CardBorderBrush" ResourceKey="CardStrokeColorDefaultBrush" />
-            <StaticResource x:Key="CardPrimaryForegroundBrush" ResourceKey="TextFillColorPrimaryBrush" />
-            <SolidColorBrush x:Key="InfoBarInformationalSeverityBackgroundBrush" Color="#FF34424d"/>
+            <SolidColorBrush
+                x:Key="InfoBarInformationalSeverityBackgroundBrush"
+                Color="#FF34424d" />
             <Color x:Key="InfoBarInformationalSeverityIconBackground">#FF5fb2f2</Color>
-            <SolidColorBrush x:Key="SolidBackgroundBrush" Color="Black" />
-            <Thickness x:Key="CardBorderThickness">1</Thickness>
+            <SolidColorBrush
+                x:Key="SolidBackgroundBrush"
+                Color="Black" />
         </ResourceDictionary>
 
         <ResourceDictionary x:Key="Light">
-            <StaticResource x:Key="CardBackgroundBrush" ResourceKey="CardBackgroundFillColorDefaultBrush" />
-            <StaticResource x:Key="CardBorderBrush" ResourceKey="CardStrokeColorDefaultBrush" />
-            <StaticResource x:Key="CardPrimaryForegroundBrush" ResourceKey="TextFillColorPrimaryBrush" />
-            <SolidColorBrush x:Key="InfoBarInformationalSeverityBackgroundBrush" Color="#FFd3e7f7"/>
+            <SolidColorBrush
+                x:Key="InfoBarInformationalSeverityBackgroundBrush"
+                Color="#FFd3e7f7" />
             <Color x:Key="InfoBarInformationalSeverityIconBackground">#FF0063b1</Color>
-            <SolidColorBrush x:Key="SolidBackgroundBrush" Color="White" />
-            <Thickness x:Key="CardBorderThickness">1</Thickness>
+            <SolidColorBrush
+                x:Key="SolidBackgroundBrush"
+                Color="White" />
         </ResourceDictionary>
 
         <ResourceDictionary x:Key="HighContrast">
-            <StaticResource x:Key="CardBackgroundBrush" ResourceKey="SystemColorButtonFaceColorBrush" />
-            <StaticResource x:Key="CardBorderBrush" ResourceKey="SystemColorButtonTextColorBrush" />
-            <StaticResource x:Key="CardPrimaryForegroundBrush" ResourceKey="SystemColorButtonTextColorBrush" />
-            <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>
-            <Thickness x:Key="CardBorderThickness">2</Thickness>
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/settings-ui/Settings.UI/Themes/Generic.xaml b/src/settings-ui/Settings.UI/Themes/Generic.xaml
index 8629816d97..bec1641aaa 100644
--- a/src/settings-ui/Settings.UI/Themes/Generic.xaml
+++ b/src/settings-ui/Settings.UI/Themes/Generic.xaml
@@ -1,9 +1,8 @@
 <ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="ms-appx:///Controls/Setting/Setting.xaml" />
         <ResourceDictionary Source="ms-appx:///Controls/SettingsGroup/SettingsGroup.xaml" />
         <ResourceDictionary Source="ms-appx:///Controls/IsEnabledTextBlock/IsEnabledTextBlock.xaml" />
     </ResourceDictionary.MergedDictionaries>
diff --git a/src/settings-ui/Settings.UI/Themes/SettingsExpanderStyles.xaml b/src/settings-ui/Settings.UI/Themes/SettingsExpanderStyles.xaml
deleted file mode 100644
index 75d0bbe394..0000000000
--- a/src/settings-ui/Settings.UI/Themes/SettingsExpanderStyles.xaml
+++ /dev/null
@@ -1,59 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls">
-
-    <!-- Thickness -->
-    <Thickness x:Key="ExpanderContentPadding">0</Thickness>
-    <Thickness x:Key="ExpanderSettingMargin">56, 8, 40, 8</Thickness>
-    <Thickness x:Key="ExpanderSettingMarginTight">86, 0, 40, 8</Thickness>
-
-    <SolidColorBrush x:Key="ExpanderChevronPointerOverBackground">Transparent</SolidColorBrush>
-
-    <!-- Styles -->
-    <!-- Setting used in a Expander header -->
-    <Style x:Key="ExpanderHeaderSettingStyle" TargetType="controls:Setting">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="BorderBrush" Value="Transparent" />
-        <Setter Property="Padding" Value="0, 14, 0, 14" />
-        <Setter Property="Margin" Value="0"/>
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-    </Style>
-
-    <Thickness x:Key="ExpanderChevronMargin">0,0,8,0</Thickness>
-
-    <!-- Setting used in a Expander header -->
-    <Style x:Key="ExpanderContentSettingStyle" TargetType="controls:Setting">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderThickness" Value="0,1,0,0" />
-        <Setter Property="BorderBrush" Value="{ThemeResource CardBorderBrush}" />
-        <Setter Property="CornerRadius" Value="0" />
-        <Setter Property="Padding" Value="{StaticResource ExpanderSettingMargin}" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-    </Style>
-
-    <Style x:Key="ExpanderContentSettingStyleTight" TargetType="controls:Setting">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderThickness" Value="0,0,0,0" />
-        <Setter Property="BorderBrush" Value="{ThemeResource CardBorderBrush}" />
-        <Setter Property="CornerRadius" Value="0" />
-        <Setter Property="Padding" Value="{StaticResource ExpanderSettingMarginTight}" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-    </Style>
-    
-    
-    <!-- Setting expander style -->
-    <Style x:Key="SettingExpanderStyle" TargetType="Expander">
-        <Setter Property="Background" Value="{ThemeResource CardBackgroundBrush}" />
-        <Setter Property="BorderThickness" Value="{ThemeResource CardBorderThickness}" />
-        <Setter Property="BorderBrush" Value="{ThemeResource CardBorderBrush}" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-    </Style>
-
-    <Style x:Key="ExpanderSeparatorStyle" TargetType="Rectangle">
-        <Setter Property="Height" Value="1"/>
-        <Setter Property="Stroke" Value="{ThemeResource CardBorderBrush}" />
-    </Style>
-</ResourceDictionary>
diff --git a/src/settings-ui/Settings.UI/Views/AlwaysOnTopPage.xaml b/src/settings-ui/Settings.UI/Views/AlwaysOnTopPage.xaml
index 908d0a305b..c856bdbe0b 100644
--- a/src/settings-ui/Settings.UI/Views/AlwaysOnTopPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/AlwaysOnTopPage.xaml
@@ -1,141 +1,154 @@
 <Page
     x:Class="Microsoft.PowerToys.Settings.UI.Views.AlwaysOnTopPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-    xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
-    mc:Ignorable="d"
-    AutomationProperties.LandmarkType="Main">
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:CommunityToolkit.WinUI.UI"
+    AutomationProperties.LandmarkType="Main"
+    mc:Ignorable="d">
 
-    <Page.Resources>
-        <converters:BoolNegationConverter x:Key="BoolNegationConverter"/>
-        <converters:BoolToObjectConverter x:Key="BoolToComboBoxIndexConverter" TrueValue="1" FalseValue="0"/>
-        <converters:BoolToVisibilityConverter x:Key="FalseToVisibleConverter" TrueValue="Collapsed" FalseValue="Visible"/>
-        <converters:BoolToVisibilityConverter x:Key="TrueToVisibleConverter" TrueValue="Visible" FalseValue="Collapsed"/>
-    </Page.Resources>
-
-    <controls:SettingsPageControl x:Uid="AlwaysOnTop" IsTabStop="False"
-                                  ModuleImageSource="ms-appx:///Assets/Modules/AlwaysOnTop.png">
+    <controls:SettingsPageControl
+        x:Uid="AlwaysOnTop"
+        IsTabStop="False"
+        ModuleImageSource="ms-appx:///Assets/Modules/AlwaysOnTop.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel Orientation="Vertical">
-                <controls:Setting x:Uid="AlwaysOnTop_EnableToggleControl_HeaderText" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
-                    <controls:Setting.Icon>
-                        <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsAlwaysOnTop.png" ShowAsMonochrome="False" />
-                    </controls:Setting.Icon>
-                    <controls:Setting.ActionContent>
-                        <ToggleSwitch IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" x:Uid="ToggleSwitch"/>
-                    </controls:Setting.ActionContent>
-                </controls:Setting>
-                <InfoBar x:Uid="GPO_IsSettingForced"
-                    Severity="Informational"
+                <labs:SettingsCard
+                    x:Uid="AlwaysOnTop_EnableToggleControl_HeaderText"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsAlwaysOnTop.png}"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
+                    <ToggleSwitch
+                        x:Uid="ToggleSwitch"
+                        IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                </labs:SettingsCard>
+                <InfoBar
+                    x:Uid="GPO_IsSettingForced"
                     IsClosable="False"
                     IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}"
-                    IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}" />
+                    IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}"
+                    Severity="Informational" />
+                <controls:SettingsGroup
+                    x:Uid="AlwaysOnTop_Activation_GroupSettings"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
 
-                <controls:SettingsGroup x:Uid="AlwaysOnTop_Activation_GroupSettings" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                 
-                    <controls:SettingExpander IsExpanded="True">
-                        <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="AlwaysOnTop_ActivationShortcut" Icon="&#xEDA7;">
-                            <controls:Setting.ActionContent>
-                                <controls:ShortcutControl MinWidth="{StaticResource SettingActionControlMinWidth}" HotkeySettings="{x:Bind Path=ViewModel.Hotkey, Mode=TwoWay}"/>
-                            </controls:Setting.ActionContent>
-                        </controls:Setting>
-                        </controls:SettingExpander.Header>
-                        <controls:SettingExpander.Content>
-                            <StackPanel>
-                                <CheckBox IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.DoNotActivateOnGameMode}" x:Uid="AlwaysOnTop_GameMode" Margin="{StaticResource ExpanderSettingMargin}"/>
-                            </StackPanel>
-                        </controls:SettingExpander.Content>
-                    </controls:SettingExpander>
+                    <labs:SettingsExpander
+                        x:Uid="AlwaysOnTop_ActivationShortcut"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xEDA7;}"
+                        IsExpanded="True">
+                        <controls:ShortcutControl
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            HotkeySettings="{x:Bind Path=ViewModel.Hotkey, Mode=TwoWay}" />
+                        <labs:SettingsExpander.Items>
+                            <labs:SettingsCard ContentAlignment="Left">
+                                <CheckBox
+                                    x:Uid="AlwaysOnTop_GameMode"
+                                    IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.DoNotActivateOnGameMode}" />
+                            </labs:SettingsCard>
+                        </labs:SettingsExpander.Items>
+                    </labs:SettingsExpander>
                 </controls:SettingsGroup>
 
-                <controls:SettingsGroup x:Uid="AlwaysOnTop_Behavior_GroupSettings" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <controls:SettingExpander IsExpanded="True">
-                        <controls:SettingExpander.Header>
-                            <controls:Setting Icon="&#xEB3C;" Style="{StaticResource ExpanderHeaderSettingStyle}" x:Uid="AlwaysOnTop_FrameEnabled">
-                                <controls:Setting.ActionContent>
-                                    <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.FrameEnabled}" x:Uid="ToggleSwitch"/>
-                                </controls:Setting.ActionContent>
-                            </controls:Setting>
-                        </controls:SettingExpander.Header>
-                        <controls:SettingExpander.Content>
-                            <StackPanel>
+                <controls:SettingsGroup
+                    x:Uid="AlwaysOnTop_Behavior_GroupSettings"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                    <labs:SettingsExpander
+                        x:Uid="AlwaysOnTop_FrameEnabled"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xEB3C;}"
+                        IsExpanded="True">
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.FrameEnabled}" />
+                        <labs:SettingsExpander.Items>
+                            <labs:SettingsCard
+                                x:Uid="AlwaysOnTop_FrameColor_Mode"
+                                IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.FrameEnabled}">
+                                <ComboBox
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.FrameAccentColor, Converter={StaticResource BoolToComboBoxIndexConverter}}">
+                                    <ComboBoxItem x:Uid="AlwaysOnTop_Radio_Custom_Color" />
+                                    <ComboBoxItem x:Uid="AlwaysOnTop_Radio_Windows_Default" />
+                                </ComboBox>
+                            </labs:SettingsCard>
+                            <labs:SettingsCard
+                                x:Uid="AlwaysOnTop_FrameColor"
+                                IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.FrameEnabled}"
+                                Visibility="{x:Bind Mode=OneWay, Path=ViewModel.FrameAccentColor, Converter={StaticResource ReverseBoolToVisibilityConverter}}">
+                                <controls:ColorPickerButton SelectedColor="{x:Bind Path=ViewModel.FrameColor, Mode=TwoWay}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard
+                                x:Uid="AlwaysOnTop_FrameThickness"
+                                IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.FrameEnabled}">
+                                <Slider
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    LargeChange="5"
+                                    Maximum="30"
+                                    Minimum="1"
+                                    SmallChange="1"
+                                    Value="{x:Bind ViewModel.FrameThickness, Mode=TwoWay}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard
+                                ContentAlignment="Left"
+                                Visibility="{x:Bind Mode=OneWay, Path=ViewModel.Windows11, Converter={StaticResource BoolToVisibilityConverter}}">
+                                <CheckBox
+                                    x:Uid="AlwaysOnTop_RoundCorners"
+                                    IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.RoundCornersEnabled}" />
+                            </labs:SettingsCard>
+                        </labs:SettingsExpander.Items>
+                    </labs:SettingsExpander>
 
-                                <controls:Setting x:Uid="AlwaysOnTop_FrameColor_Mode" Style="{StaticResource ExpanderContentSettingStyle}" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.FrameEnabled}">
-                                    <controls:Setting.ActionContent>
-                                        <ComboBox SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.FrameAccentColor, Converter={StaticResource BoolToComboBoxIndexConverter}}" MinWidth="{StaticResource SettingActionControlMinWidth}">
-                                            <ComboBoxItem x:Uid="AlwaysOnTop_Radio_Custom_Color"/>
-                                            <ComboBoxItem x:Uid="AlwaysOnTop_Radio_Windows_Default"/>
-                                        </ComboBox>
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-
-                                <controls:Setting x:Uid="AlwaysOnTop_FrameColor" Style="{StaticResource ExpanderContentSettingStyle}" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.FrameEnabled}" Visibility="{x:Bind Mode=OneWay, Path=ViewModel.FrameAccentColor, Converter={StaticResource FalseToVisibleConverter}}">
-                                    <controls:Setting.ActionContent>
-                                        <controls:ColorPickerButton SelectedColor="{x:Bind Path=ViewModel.FrameColor, Mode=TwoWay}" />
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-
-                                <controls:Setting x:Uid="AlwaysOnTop_FrameThickness" Style="{StaticResource ExpanderContentSettingStyle}" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.FrameEnabled}">
-                                    <controls:Setting.ActionContent>
-                                        <Slider Value="{x:Bind ViewModel.FrameThickness, Mode=TwoWay}"
-                                                Minimum="1"
-                                                MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                                HorizontalAlignment="Right"
-                                                Maximum="30"
-                                                SmallChange="1" 
-                                                LargeChange="5"/>
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-
-                                <CheckBox x:Uid="AlwaysOnTop_RoundCorners" 
-                                          IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.RoundCornersEnabled}" 
-                                          Margin="{StaticResource ExpanderSettingMargin}"
-                                          Visibility="{x:Bind Mode=OneWay, Path=ViewModel.Windows11, Converter={StaticResource TrueToVisibleConverter}}"/>
-
-                            </StackPanel>
-                        </controls:SettingExpander.Content>
-                    </controls:SettingExpander>
-
-                    <controls:SettingExpander IsExpanded="True">
-                        <controls:SettingExpander.Header>
-                            <controls:Setting Style="{StaticResource ExpanderHeaderSettingStyle}" x:Uid="AlwaysOnTop_SoundTitle" Icon="&#xE7F3;"/>
-                            </controls:SettingExpander.Header>
-                                <controls:SettingExpander.Content>
-                            <StackPanel>
-                                <CheckBox IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.SoundEnabled}" x:Uid="AlwaysOnTop_Sound" Margin="{StaticResource ExpanderSettingMargin}"/>
-                            </StackPanel>
-                        </controls:SettingExpander.Content>
-                    </controls:SettingExpander>
+                    <labs:SettingsExpander
+                        x:Uid="AlwaysOnTop_SoundTitle"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xE7F3;}"
+                        IsExpanded="True">
+                        <labs:SettingsExpander.Items>
+                            <labs:SettingsCard ContentAlignment="Left">
+                                <CheckBox
+                                    x:Uid="AlwaysOnTop_Sound"
+                                    IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.SoundEnabled}" />
+                            </labs:SettingsCard>
+                        </labs:SettingsExpander.Items>
+                    </labs:SettingsExpander>
                 </controls:SettingsGroup>
-                
-                <controls:SettingsGroup x:Uid="ExcludedApps" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <controls:SettingExpander IsExpanded="True">
-                        <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="AlwaysOnTop_ExcludedApps" Icon="&#xECE4;" Style="{StaticResource ExpanderHeaderSettingStyle}"/>
-                        </controls:SettingExpander.Header>
-                        <controls:SettingExpander.Content>
-                            <TextBox x:Uid="AlwaysOnTop_ExcludedApps_TextBoxControl"
-                                 Margin="{StaticResource ExpanderSettingMargin}"
-                                         Text="{x:Bind Mode=TwoWay, Path=ViewModel.ExcludedApps, UpdateSourceTrigger=PropertyChanged}"
-                                         ScrollViewer.VerticalScrollBarVisibility ="Visible"
-                                         ScrollViewer.VerticalScrollMode="Enabled"
-                                         ScrollViewer.IsVerticalRailEnabled="True"
-                                         TextWrapping="Wrap"
-                                         AcceptsReturn="True"
-                                         MinWidth="240"
-                                         MinHeight="160" />
-                        </controls:SettingExpander.Content>
-                    </controls:SettingExpander>
+
+                <controls:SettingsGroup
+                    x:Uid="ExcludedApps"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                    <labs:SettingsExpander
+                        x:Uid="AlwaysOnTop_ExcludedApps"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xECE4;}"
+                        IsExpanded="True">
+                        <labs:SettingsExpander.Items>
+                            <labs:SettingsCard
+                                HorizontalContentAlignment="Stretch"
+                                ContentAlignment="Vertical">
+                                <TextBox
+                                    x:Uid="AlwaysOnTop_ExcludedApps_TextBoxControl"
+                                    MinWidth="240"
+                                    MinHeight="160"
+                                    AcceptsReturn="True"
+                                    ScrollViewer.IsVerticalRailEnabled="True"
+                                    ScrollViewer.VerticalScrollBarVisibility="Visible"
+                                    ScrollViewer.VerticalScrollMode="Enabled"
+                                    Text="{x:Bind Mode=TwoWay, Path=ViewModel.ExcludedApps, UpdateSourceTrigger=PropertyChanged}"
+                                    TextWrapping="Wrap" />
+                            </labs:SettingsCard>
+                        </labs:SettingsExpander.Items>
+                    </labs:SettingsExpander>
                 </controls:SettingsGroup>
             </StackPanel>
         </controls:SettingsPageControl.ModuleContent>
 
         <controls:SettingsPageControl.PrimaryLinks>
-            <controls:PageLink x:Uid="LearnMore_AlwaysOnTop" Link="https://aka.ms/PowerToysOverview_AlwaysOnTop"/>
+            <controls:PageLink
+                x:Uid="LearnMore_AlwaysOnTop"
+                Link="https://aka.ms/PowerToysOverview_AlwaysOnTop" />
         </controls:SettingsPageControl.PrimaryLinks>
     </controls:SettingsPageControl>
 </Page>
diff --git a/src/settings-ui/Settings.UI/Views/AwakePage.xaml b/src/settings-ui/Settings.UI/Views/AwakePage.xaml
index a9f4954920..5f51e667c3 100644
--- a/src/settings-ui/Settings.UI/Views/AwakePage.xaml
+++ b/src/settings-ui/Settings.UI/Views/AwakePage.xaml
@@ -1,93 +1,106 @@
 <Page
     x:Class="Microsoft.PowerToys.Settings.UI.Views.AwakePage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters"
-    xmlns:toolkitConverters="using:CommunityToolkit.WinUI.UI.Converters"
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-    mc:Ignorable="d"
-    AutomationProperties.LandmarkType="Main">
+    xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:CommunityToolkit.WinUI.UI"
+    AutomationProperties.LandmarkType="Main"
+    mc:Ignorable="d">
 
     <Page.Resources>
-        <toolkitConverters:BoolNegationConverter x:Key="BoolNegationConverter"/>
         <converters:AwakeModeToIntConverter x:Key="AwakeModeToIntConverter" />
     </Page.Resources>
 
-    <controls:SettingsPageControl x:Uid="Awake" IsTabStop="False"
-                                  ModuleImageSource="ms-appx:///Assets/Modules/Awake.png">
+    <controls:SettingsPageControl
+        x:Uid="Awake"
+        IsTabStop="False"
+        ModuleImageSource="ms-appx:///Assets/Modules/Awake.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel Orientation="Vertical">
-
-                <controls:Setting x:Uid="Awake_EnableAwake" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
-                    <controls:Setting.Icon>
-                        <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsAwake.png" ShowAsMonochrome="False" />
-                    </controls:Setting.Icon>
-                    <controls:Setting.ActionContent>
-                        <ToggleSwitch IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" x:Uid="ToggleSwitch" HorizontalAlignment="Right"/>
-                    </controls:Setting.ActionContent>
-                </controls:Setting>
-                <InfoBar x:Uid="GPO_IsSettingForced"
-                    Severity="Informational"
+                <labs:SettingsCard
+                    x:Uid="Awake_EnableAwake"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsAwake.png}"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
+                    <ToggleSwitch
+                        x:Uid="ToggleSwitch"
+                        IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                </labs:SettingsCard>
+                <InfoBar
+                    x:Uid="GPO_IsSettingForced"
                     IsClosable="False"
                     IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}"
-                    IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}" />
+                    IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}"
+                    Severity="Informational" />
 
-                <controls:SettingsGroup x:Uid="Awake_Behavior_GroupSettings" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                 
-                    <controls:Setting x:Uid="Awake_Mode" Icon="&#xE945;" >
-                        <controls:Setting.ActionContent>
-                            <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                      SelectedIndex="{x:Bind Path=ViewModel.Mode, Mode=TwoWay, Converter={StaticResource AwakeModeToIntConverter}}">
-                                <ComboBoxItem x:Uid="Awake_NoKeepAwake"/>
-                                <ComboBoxItem x:Uid="Awake_IndefiniteKeepAwake"/>
-                                <ComboBoxItem x:Uid="Awake_TemporaryKeepAwake"/>
-                            </ComboBox>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
+                <controls:SettingsGroup
+                    x:Uid="Awake_Behavior_GroupSettings"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
 
-                    <controls:Setting x:Uid="Awake_TimeBeforeAwake" Icon="&#xE916;" Visibility="{x:Bind ViewModel.IsTimeConfigurationEnabled, Mode=OneWay}">
-                        <controls:Setting.ActionContent>
-                            <StackPanel
-                                                Orientation="Horizontal">
-                                <NumberBox x:Uid="Awake_TemporaryKeepAwake_Hours"
-                                                Value="{x:Bind ViewModel.Hours, Mode=TwoWay}"
-                                                Minimum="0"
-                                                SpinButtonPlacementMode="Compact"
-                                                HorizontalAlignment="Left"
-                                                Width="96"
-                                                SmallChange="1" 
-                                                LargeChange="5"/>
-                                <NumberBox x:Uid="Awake_TemporaryKeepAwake_Minutes"
-                                                Value="{x:Bind ViewModel.Minutes, Mode=TwoWay}"
-                                                Minimum="0"
-                                                SpinButtonPlacementMode="Compact"
-                                                Margin="8,0,0,0"
-                                                HorizontalAlignment="Left"
-                                                Width="96"
-                                                Maximum="60"
-                                                SmallChange="1" 
-                                                LargeChange="5"/>
-                            </StackPanel>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
+                    <labs:SettingsCard
+                        x:Uid="Awake_Mode"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xE945;}">
+                        <ComboBox
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            SelectedIndex="{x:Bind Path=ViewModel.Mode, Mode=TwoWay, Converter={StaticResource AwakeModeToIntConverter}}">
+                            <ComboBoxItem x:Uid="Awake_NoKeepAwake" />
+                            <ComboBoxItem x:Uid="Awake_IndefiniteKeepAwake" />
+                            <ComboBoxItem x:Uid="Awake_TemporaryKeepAwake" />
+                        </ComboBox>
+                    </labs:SettingsCard>
 
-                    <controls:Setting x:Uid="Awake_EnableDisplayKeepAwake" Icon="&#xE7FB;">
-                        <controls:Setting.ActionContent>
-                            <ToggleSwitch IsOn="{x:Bind ViewModel.KeepDisplayOn, Mode=TwoWay}" x:Uid="ToggleSwitch" />
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
+                    <labs:SettingsCard
+                        x:Uid="Awake_TimeBeforeAwake"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xE916;}"
+                        Visibility="{x:Bind ViewModel.IsTimeConfigurationEnabled, Mode=OneWay}">
+                        <StackPanel Orientation="Horizontal">
+                            <NumberBox
+                                x:Uid="Awake_TemporaryKeepAwake_Hours"
+                                Width="96"
+                                HorizontalAlignment="Left"
+                                LargeChange="5"
+                                Minimum="0"
+                                SmallChange="1"
+                                SpinButtonPlacementMode="Compact"
+                                Value="{x:Bind ViewModel.Hours, Mode=TwoWay}" />
+                            <NumberBox
+                                x:Uid="Awake_TemporaryKeepAwake_Minutes"
+                                Width="96"
+                                Margin="8,0,0,0"
+                                HorizontalAlignment="Left"
+                                LargeChange="5"
+                                Maximum="60"
+                                Minimum="0"
+                                SmallChange="1"
+                                SpinButtonPlacementMode="Compact"
+                                Value="{x:Bind ViewModel.Minutes, Mode=TwoWay}" />
+                        </StackPanel>
+                    </labs:SettingsCard>
 
+                    <labs:SettingsCard
+                        x:Uid="Awake_EnableDisplayKeepAwake"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xE7FB;}"
+                        Visibility="{x:Bind ViewModel.IsTimeConfigurationEnabled, Mode=OneWay}">
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            IsOn="{x:Bind ViewModel.KeepDisplayOn, Mode=TwoWay}" />
+                    </labs:SettingsCard>
                 </controls:SettingsGroup>
             </StackPanel>
         </controls:SettingsPageControl.ModuleContent>
 
         <controls:SettingsPageControl.PrimaryLinks>
-            <controls:PageLink x:Uid="LearnMore_Awake" Link="https://aka.ms/PowerToysOverview_Awake"/>
+            <controls:PageLink
+                x:Uid="LearnMore_Awake"
+                Link="https://aka.ms/PowerToysOverview_Awake" />
         </controls:SettingsPageControl.PrimaryLinks>
         <controls:SettingsPageControl.SecondaryLinks>
-            <controls:PageLink Text="Den Delimarsky's work on creating Awake" Link="https://Awake.den.dev"/>
+            <controls:PageLink
+                Link="https://Awake.den.dev"
+                Text="Den Delimarsky's work on creating Awake" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
 </Page>
diff --git a/src/settings-ui/Settings.UI/Views/ColorPickerPage.xaml b/src/settings-ui/Settings.UI/Views/ColorPickerPage.xaml
index 54ba68ef83..bd86828c21 100644
--- a/src/settings-ui/Settings.UI/Views/ColorPickerPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/ColorPickerPage.xaml
@@ -2,171 +2,191 @@
     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"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-    xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:models="using:Microsoft.PowerToys.Settings.UI.Library"
-    mc:Ignorable="d"
+    xmlns:ui="using:CommunityToolkit.WinUI.UI"
     x:Name="RootPage"
-    AutomationProperties.LandmarkType="Main">
+    AutomationProperties.LandmarkType="Main"
+    mc:Ignorable="d">
 
-    <Page.Resources>
-        <converters:BoolNegationConverter x:Key="BoolNegationConverter"/>
-    </Page.Resources>
-
-    <controls:SettingsPageControl x:Uid="ColorPicker"
-                                  ModuleImageSource="ms-appx:///Assets/Modules/ColorPicker.png">
+    <controls:SettingsPageControl
+        x:Uid="ColorPicker"
+        ModuleImageSource="ms-appx:///Assets/Modules/ColorPicker.png">
         <controls:SettingsPageControl.ModuleContent>
 
-        <StackPanel Orientation="Vertical"
-                    x:Name="ColorPickerView">
+            <StackPanel
+                x:Name="ColorPickerView"
+                Orientation="Vertical">
+                <labs:SettingsCard
+                    x:Uid="ColorPicker_EnableColorPicker"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsColorPicker.png}"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
+                    <ToggleSwitch
+                        x:Uid="ToggleSwitch"
+                        IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                </labs:SettingsCard>
+                <InfoBar
+                    x:Uid="GPO_IsSettingForced"
+                    IsClosable="False"
+                    IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}"
+                    IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}"
+                    Severity="Informational" />
 
-            <controls:Setting x:Uid="ColorPicker_EnableColorPicker" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
-                <controls:Setting.Icon>
-                    <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsColorPicker.png" ShowAsMonochrome="False" />
-                </controls:Setting.Icon>
-                <controls:Setting.ActionContent>
-                    <ToggleSwitch IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" x:Uid="ToggleSwitch" />
-                </controls:Setting.ActionContent>
-            </controls:Setting>
-            <InfoBar x:Uid="GPO_IsSettingForced"
-                Severity="Informational"
-                IsClosable="False"
-                IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}"
-                IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}" />
+                <controls:SettingsGroup
+                    x:Uid="Shortcut"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                    <labs:SettingsCard
+                        x:Uid="Activation_Shortcut"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xEDA7;}">
+                        <controls:ShortcutControl
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            HotkeySettings="{x:Bind Path=ViewModel.ActivationShortcut, Mode=TwoWay}" />
+                    </labs:SettingsCard>
 
-            <controls:SettingsGroup x:Uid="Shortcut" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                <controls:Setting x:Uid="Activation_Shortcut" Icon="&#xEDA7;">
-                    <controls:Setting.ActionContent>
-                        <controls:ShortcutControl MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                                    HotkeySettings="{x:Bind Path=ViewModel.ActivationShortcut, Mode=TwoWay}"/>
-                    </controls:Setting.ActionContent>
-                </controls:Setting>
+                    <labs:SettingsCard
+                        x:Uid="ColorPicker_ActivationAction"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xEC4E;}">
+                        <ComboBox
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            SelectedIndex="{x:Bind Path=ViewModel.ActivationBehavior, Mode=TwoWay}">
+                            <ComboBoxItem x:Uid="EditorFirst" />
+                            <ComboBoxItem x:Uid="ColorPickerFirst" />
+                            <ComboBoxItem x:Uid="ColorPickerOnly" />
+                        </ComboBox>
+                    </labs:SettingsCard>
 
-                        <controls:Setting x:Uid="ColorPicker_ActivationAction" Icon="&#xEC4E;" >
-                            <controls:Setting.ActionContent>
-                        <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                    SelectedIndex="{x:Bind Path=ViewModel.ActivationBehavior, Mode=TwoWay}" >
-                                    <ComboBoxItem x:Uid="EditorFirst"/>
-                                    <ComboBoxItem x:Uid="ColorPickerFirst"/>
-                                    <ComboBoxItem x:Uid="ColorPickerOnly"/>
-                                </ComboBox>
-                            </controls:Setting.ActionContent>
-                        </controls:Setting>
-            </controls:SettingsGroup>
+                </controls:SettingsGroup>
 
-            <controls:SettingsGroup x:Uid="ColorFormats" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                <controls:Setting x:Uid="ColorPicker_CopiedColorRepresentation" Icon="&#xF0E3;">
-                    <controls:Setting.ActionContent>
-                        <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                    x:Name="ColorPicker_ComboBox"
-                                    HorizontalAlignment="Left"
-                                    DisplayMemberPath="Value"
-                                    ItemsSource="{Binding SelectableColorRepresentations}"
-                                    Loaded="ColorPicker_ComboBox_Loaded"
-                                    SelectedValue="{Binding SelectedColorRepresentationValue, Mode=TwoWay}"
-                                    SelectedValuePath="Key" />
-                    </controls:Setting.ActionContent>
-                </controls:Setting>
+                <controls:SettingsGroup
+                    x:Uid="ColorFormats"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                    <labs:SettingsCard
+                        x:Uid="ColorPicker_CopiedColorRepresentation"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xF0E3;}">
+                        <ComboBox
+                            x:Name="ColorPicker_ComboBox"
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            DisplayMemberPath="Value"
+                            ItemsSource="{Binding SelectableColorRepresentations}"
+                            Loaded="ColorPicker_ComboBox_Loaded"
+                            SelectedValue="{Binding SelectedColorRepresentationValue, Mode=TwoWay}"
+                            SelectedValuePath="Key" />
+                    </labs:SettingsCard>
 
-
-                <controls:Setting x:Uid="ColorPicker_ShowColorName">
-                    <controls:Setting.ActionContent>
-                        <ToggleSwitch IsOn="{Binding ShowColorName, Mode=TwoWay}" x:Uid="ToggleSwitch"/>
-                    </controls:Setting.ActionContent>
-                </controls:Setting>
-                <!--
-                Disabling this until we have a safer way to reset cursor as 
+                    <labs:SettingsCard x:Uid="ColorPicker_ShowColorName">
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            IsOn="{Binding ShowColorName, Mode=TwoWay}" />
+                    </labs:SettingsCard>
+                    <!--
+                Disabling this until we have a safer way to reset cursor as
                 we can hit a state where the cursor doesn't reset
-                
-                <CheckBox x:Uid="ColorPicker_ChangeCursor" 
+
+                <CheckBox x:Uid="ColorPicker_ChangeCursor"
                         IsChecked="{Binding ChangeCursor, Mode=TwoWay}"
                         Margin="{StaticResource SmallTopMargin}"
                         IsEnabled="{Binding IsEnabled}"/>
-                        -->
-            </controls:SettingsGroup>
+                    -->
+                </controls:SettingsGroup>
 
-            <controls:SettingsGroup x:Uid="ColorPicker_Editor" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                <controls:Setting x:Name="ColorFormatsSetting" x:Uid="ColorPicker_ColorFormats" Icon="&#xE762;"/>
+                <controls:SettingsGroup
+                    x:Uid="ColorPicker_Editor"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                    <labs:SettingsCard
+                        x:Name="ColorFormatsSetting"
+                        x:Uid="ColorPicker_ColorFormats"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xE762;}" />
 
-                <!-- Disabled reordering by dragging -->
-                <!-- CanReorderItems="True" AllowDrop="True" -->
-                <ListView ItemsSource="{Binding ColorFormats, Mode=TwoWay}"
-                            AutomationProperties.Name="{Binding ElementName=ColorFormatsSetting, Path=Header}"
-                            SelectionMode="None"
-                            HorizontalAlignment="Stretch">
-                    <ListView.ItemTemplate>
-                        <DataTemplate x:DataType="models:ColorFormatModel">
-                            <Grid AutomationProperties.Name="{x:Bind Name}"
-                                    HorizontalAlignment="Stretch"
-                                    Background="{ThemeResource CardBackgroundBrush}"
-                                    BorderThickness="{ThemeResource CardBorderThickness}"
-                                    BorderBrush="{ThemeResource CardBorderBrush}"
-                                    CornerRadius="{ThemeResource ControlCornerRadius}"
-                                    Padding="0,0,16,0"
-                                    MinHeight="68">
-                                <Grid.RowDefinitions>
-                                    <RowDefinition/>
-                                    <RowDefinition/>
-                                </Grid.RowDefinitions>
-                                <TextBlock FontWeight="SemiBold"
-                                    FontSize="16"
-                                    Margin="56,8,0,0"
-                                    Text="{x:Bind Name}"/>
-                                <TextBlock Style="{StaticResource SecondaryTextStyle}"
-                                    Text="{x:Bind Example}"
-                                    Grid.Row="1"
-                                    Margin="56,0,0,8"/>
-                                <ToggleSwitch IsOn="{x:Bind IsShown, Mode=TwoWay}"
-                                                OnContent=""
-                                                OffContent=""
-                                                Grid.RowSpan="2"
-                                                x:Uid="Enable_ColorFormat"
-                                                AutomationProperties.HelpText="{x:Bind Name}"
-                                                HorizontalAlignment="Right"
-                                                Margin="0,0,56,0"/>
-
-                                <Button Background="Transparent"
-                                        FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                    <!--  Disabled reordering by dragging  -->
+                    <!--  CanReorderItems="True" AllowDrop="True"  -->
+                    <ItemsControl
+                        HorizontalAlignment="Stretch"
+                        AutomationProperties.Name="{Binding ElementName=ColorFormatsSetting, Path=Header}"
+                        ItemsSource="{Binding ColorFormats, Mode=TwoWay}">
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate x:DataType="models:ColorFormatModel">
+                                <labs:SettingsCard
+                                    Margin="0,0,0,2"
+                                    Description="{x:Bind Example}"
+                                    Header="{x:Bind Name}">
+                                    <labs:SettingsCard.Resources>
+                                        <x:Double x:Key="SettingsCardLeftIndention">42</x:Double>
+                                    </labs:SettingsCard.Resources>
+                                    <Grid
                                         HorizontalAlignment="Right"
-                                        VerticalAlignment="Center"
-                                        Grid.RowSpan="2"
-                                        x:Uid="More_Options_Button"
-                                        Content="&#xE712;">
-                                    <Button.Flyout>
-                                            <MenuFlyout>
-                                                <MenuFlyoutItem x:Uid="MoveUp" IsEnabled="{x:Bind CanMoveUp}" Click="ReorderButtonUp_Click">
-                                                    <MenuFlyoutItem.Icon>
-                                                        <FontIcon Glyph="&#xE74A;" />
-                                                    </MenuFlyoutItem.Icon>
-                                                </MenuFlyoutItem>
-                                                <MenuFlyoutItem x:Uid="MoveDown" IsEnabled="{x:Bind CanMoveDown}" Click="ReorderButtonDown_Click">
-                                                    <MenuFlyoutItem.Icon>
-                                                        <FontIcon Glyph="&#xE74B;" />
-                                                    </MenuFlyoutItem.Icon>
-                                                </MenuFlyoutItem>
-                                            </MenuFlyout>
-                                        </Button.Flyout>
-                                    <ToolTipService.ToolTip>
-                                        <TextBlock x:Uid="More_Options_ButtonTooltip" />
-                                    </ToolTipService.ToolTip>
-                                </Button>
-                            </Grid>
-                        </DataTemplate>
-                    </ListView.ItemTemplate>
-                </ListView>
-            </controls:SettingsGroup>
-        </StackPanel>
+                                        ColumnSpacing="8">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="Auto" />
+                                        </Grid.ColumnDefinitions>
+                                        <ToggleSwitch
+                                            x:Uid="Enable_ColorFormat"
+                                            HorizontalAlignment="Right"
+                                            AutomationProperties.HelpText="{x:Bind Name}"
+                                            IsOn="{x:Bind IsShown, Mode=TwoWay}"
+                                            OffContent=""
+                                            OnContent="" />
+                                        <Button
+                                            x:Uid="More_Options_Button"
+                                            Grid.Column="1"
+                                            VerticalAlignment="Center"
+                                            Background="Transparent"
+                                            Content="&#xE712;"
+                                            FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                            Style="{StaticResource SubtleButtonStyle}">
+                                            <Button.Flyout>
+                                                <MenuFlyout>
+                                                    <MenuFlyoutItem
+                                                        x:Uid="MoveUp"
+                                                        Click="ReorderButtonUp_Click"
+                                                        IsEnabled="{x:Bind CanMoveUp}">
+                                                        <MenuFlyoutItem.Icon>
+                                                            <FontIcon Glyph="&#xE74A;" />
+                                                        </MenuFlyoutItem.Icon>
+                                                    </MenuFlyoutItem>
+                                                    <MenuFlyoutItem
+                                                        x:Uid="MoveDown"
+                                                        Click="ReorderButtonDown_Click"
+                                                        IsEnabled="{x:Bind CanMoveDown}">
+                                                        <MenuFlyoutItem.Icon>
+                                                            <FontIcon Glyph="&#xE74B;" />
+                                                        </MenuFlyoutItem.Icon>
+                                                    </MenuFlyoutItem>
+                                                </MenuFlyout>
+                                            </Button.Flyout>
+                                            <ToolTipService.ToolTip>
+                                                <TextBlock x:Uid="More_Options_ButtonTooltip" />
+                                            </ToolTipService.ToolTip>
+                                        </Button>
+                                    </Grid>
+                                </labs:SettingsCard>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                        </ItemsControl>
+                </controls:SettingsGroup>
+            </StackPanel>
 
-</controls:SettingsPageControl.ModuleContent>
+        </controls:SettingsPageControl.ModuleContent>
 
-<controls:SettingsPageControl.PrimaryLinks>
-            <controls:PageLink x:Uid="LearnMore_ColorPicker" Link="https://aka.ms/PowerToysOverview_ColorPicker"/>
+        <controls:SettingsPageControl.PrimaryLinks>
+            <controls:PageLink
+                x:Uid="LearnMore_ColorPicker"
+                Link="https://aka.ms/PowerToysOverview_ColorPicker" />
         </controls:SettingsPageControl.PrimaryLinks>
-<controls:SettingsPageControl.SecondaryLinks>
-            <controls:PageLink Text="Martin Chrzan's Color Picker" Link="https://github.com/martinchrzan/ColorPicker/"/>
-            <controls:PageLink Text="Niels Laute's UX concept" Link="https://medium.com/@Niels9001/a-fluent-color-meter-for-powertoys-20407ededf0c"/>
-</controls:SettingsPageControl.SecondaryLinks>
-</controls:SettingsPageControl>
+        <controls:SettingsPageControl.SecondaryLinks>
+            <controls:PageLink
+                Link="https://github.com/martinchrzan/ColorPicker/"
+                Text="Martin Chrzan's Color Picker" />
+            <controls:PageLink
+                Link="https://medium.com/@Niels9001/a-fluent-color-meter-for-powertoys-20407ededf0c"
+                Text="Niels Laute's UX concept" />
+        </controls:SettingsPageControl.SecondaryLinks>
+    </controls:SettingsPageControl>
 </Page>
\ No newline at end of file
diff --git a/src/settings-ui/Settings.UI/Views/FancyZonesPage.xaml b/src/settings-ui/Settings.UI/Views/FancyZonesPage.xaml
index a69064e2d5..305d9d4065 100644
--- a/src/settings-ui/Settings.UI/Views/FancyZonesPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/FancyZonesPage.xaml
@@ -2,318 +2,350 @@
     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"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-    xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
-    mc:Ignorable="d"
-    AutomationProperties.LandmarkType="Main">
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:CommunityToolkit.WinUI.UI"
+    AutomationProperties.LandmarkType="Main"
+    mc:Ignorable="d">
 
-    <Page.Resources>
-        <converters:BoolNegationConverter x:Key="BoolNegationConverter"/>
-        <converters:BoolToObjectConverter x:Key="BoolToComboBoxIndexConverter" TrueValue="1" FalseValue="0"/>
-        <converters:StringFormatConverter x:Key="StringFormatConverter"/>
-        <converters:BoolToVisibilityConverter x:Key="FalseToVisibleConverter" TrueValue="Collapsed" FalseValue="Visible"/>
-        <converters:BoolToVisibilityConverter x:Key="TrueToVisibleConverter" TrueValue="Visible" FalseValue="Collapsed"/>
-    </Page.Resources>
-
-    <controls:SettingsPageControl x:Uid="FancyZones"
-                                  ModuleImageSource="ms-appx:///Assets/Modules/FancyZones.png">
+    <controls:SettingsPageControl
+        x:Uid="FancyZones"
+        ModuleImageSource="ms-appx:///Assets/Modules/FancyZones.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel Orientation="Vertical">
+                <labs:SettingsCard
+                    x:Uid="FancyZones_EnableToggleControl_HeaderText"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsFancyZones.png}"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
+                    <ToggleSwitch
+                        x:Uid="ToggleSwitch"
+                        IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                </labs:SettingsCard>
 
-                <controls:Setting x:Uid="FancyZones_EnableToggleControl_HeaderText" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
-                    <controls:Setting.Icon>
-                        <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsFancyZones.png" ShowAsMonochrome="False" />
-                    </controls:Setting.Icon>
-                    <controls:Setting.ActionContent>
-                        <ToggleSwitch IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" x:Uid="ToggleSwitch"/>
-                    </controls:Setting.ActionContent>
-                </controls:Setting>
-                <InfoBar x:Uid="GPO_IsSettingForced"
-                    Severity="Informational"
-                    IsClosable="False"
-                    IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}"
-                    IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}" />
+                <controls:SettingsGroup
+                    x:Uid="FancyZones_Editor_GroupSettings"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                    <labs:SettingsCard
+                        x:Uid="FancyZones_LaunchEditorButtonControl"
+                        ActionIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, FontSize=14, Glyph=&#xE8A7;}"
+                        Command="{x:Bind ViewModel.LaunchEditorEventHandler}"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xEB3C;}"
+                        IsClickEnabled="True" />
 
-                <controls:SettingsGroup x:Uid="FancyZones_Editor_GroupSettings" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <Button Style="{StaticResource SettingButtonStyle}" x:Uid="FancyZones_LaunchEditorButton_Accessible" Command="{x:Bind ViewModel.LaunchEditorEventHandler}">
-                        <controls:Setting x:Uid="FancyZones_LaunchEditorButtonControl" Style="{StaticResource ExpanderHeaderSettingStyle}" Icon="&#xEB3C;">
-                            <!--<controls:Setting.Icon>
-                                <PathIcon Data="M45,48H25.5V45H45V25.5H25.5v-3H45V3H25.5V0H48V48ZM22.5,48H3V45H22.5V3H3V0H25.5V48ZM0,48V0H3V48Z"/>
-                            </controls:Setting.Icon>-->
-                            <controls:Setting.ActionContent>
-                                <FontIcon Glyph="&#xE8A7;" FontSize="18" FontFamily="{ThemeResource SymbolThemeFontFamily}" />
-                            </controls:Setting.ActionContent>
-                        </controls:Setting>
-                    </Button>
-                  
-                    <controls:Setting x:Uid="Activation_Shortcut" Icon="&#xEDA7;">
-                        <controls:Setting.ActionContent>
-                            <controls:ShortcutControl MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                                      HotkeySettings="{x:Bind Path=ViewModel.EditorHotkey, Mode=TwoWay}"/>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
+                    <labs:SettingsCard
+                        x:Uid="Activation_Shortcut"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xEDA7;}">
+                        <controls:ShortcutControl
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            HotkeySettings="{x:Bind Path=ViewModel.EditorHotkey, Mode=TwoWay}" />
+                    </labs:SettingsCard>
 
-                    <controls:Setting x:Uid="FancyZones_UseCursorPosEditorStartupScreen" Icon="&#xe7b5;">
-                        <controls:Setting.ActionContent>
-                            <ComboBox SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.UseCursorPosEditorStartupScreen, Converter={StaticResource BoolToComboBoxIndexConverter}}" MinWidth="{StaticResource SettingActionControlMinWidth}">
-                                <ComboBoxItem x:Uid="FancyZones_LaunchPositionScreen" />
-                                <ComboBoxItem x:Uid="FancyZones_LaunchPositionMouse" />
-                            </ComboBox>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
+                    <labs:SettingsCard
+                        x:Uid="FancyZones_UseCursorPosEditorStartupScreen"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xe7b5;}">
+                        <ComboBox
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.UseCursorPosEditorStartupScreen, Converter={StaticResource BoolToComboBoxIndexConverter}}">
+                            <ComboBoxItem x:Uid="FancyZones_LaunchPositionScreen" />
+                            <ComboBoxItem x:Uid="FancyZones_LaunchPositionMouse" />
+                        </ComboBox>
+                    </labs:SettingsCard>
                 </controls:SettingsGroup>
 
 
-                <controls:SettingsGroup x:Uid="FancyZones_Zones" x:Name="ZonesSettingsGroup" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <controls:SettingExpander IsExpanded="True">
-                        <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="FancyZones_ZoneBehavior_GroupSettings" Style="{StaticResource ExpanderHeaderSettingStyle}" />
-                        </controls:SettingExpander.Header>
-                        <controls:SettingExpander.Content>
-                            <StackPanel>
-                                <CheckBox x:Uid="FancyZones_ShiftDragCheckBoxControl_Header" IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.ShiftDrag}" Margin="{StaticResource ExpanderSettingMargin}"  />
-                                <Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
-                                <CheckBox x:Uid="FancyZones_MouseDragCheckBoxControl_Header" IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.MouseSwitch}" Margin="{StaticResource ExpanderSettingMargin}"  />
-                                <Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
-                                <CheckBox x:Uid="FancyZones_ShowZonesOnAllMonitorsCheckBoxControl" IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.ShowOnAllMonitors}" Margin="{StaticResource ExpanderSettingMargin}"  />
-                                <Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
-                                <controls:CheckBoxWithDescriptionControl IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.SpanZonesAcrossMonitors}"
-                                                                 Margin="56, -2, 40, 14"
-                                                                 x:Uid="FancyZones_SpanZonesAcrossMonitors"/>
+                <controls:SettingsGroup
+                    x:Name="ZonesSettingsGroup"
+                    x:Uid="FancyZones_Zones"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                    <labs:SettingsExpander
+                        x:Uid="FancyZones_ZoneBehavior_GroupSettings"
+                        IsExpanded="True">
+                        <labs:SettingsExpander.Items>
+                            <labs:SettingsCard ContentAlignment="Left">
+                                <CheckBox
+                                    x:Uid="FancyZones_ShiftDragCheckBoxControl_Header"
+                                    IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.ShiftDrag}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard ContentAlignment="Left">
+                                <CheckBox
+                                    x:Uid="FancyZones_MouseDragCheckBoxControl_Header"
+                                    IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.MouseSwitch}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard ContentAlignment="Left">
+                                <CheckBox
+                                    x:Uid="FancyZones_ShowZonesOnAllMonitorsCheckBoxControl"
+                                    IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.ShowOnAllMonitors}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard ContentAlignment="Left">
+                                <controls:CheckBoxWithDescriptionControl
+                                    x:Uid="FancyZones_SpanZonesAcrossMonitors"
+                                    IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.SpanZonesAcrossMonitors}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard x:Uid="FancyZones_OverlappingZones">
+                                <ComboBox
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    SelectedIndex="{x:Bind Path=ViewModel.OverlappingZonesAlgorithmIndex, Mode=TwoWay}">
+                                    <ComboBoxItem x:Uid="FancyZones_OverlappingZonesSmallest" />
+                                    <ComboBoxItem x:Uid="FancyZones_OverlappingZonesLargest" />
+                                    <ComboBoxItem x:Uid="FancyZones_OverlappingZonesPositional" />
+                                    <ComboBoxItem x:Uid="FancyZones_OverlappingZonesClosestCenter" />
+                                </ComboBox>
+                            </labs:SettingsCard>
+                        </labs:SettingsExpander.Items>
+                    </labs:SettingsExpander>
 
-                                <controls:Setting x:Uid="FancyZones_OverlappingZones" Style="{StaticResource ExpanderContentSettingStyle}">
-                                    <controls:Setting.ActionContent>
-                                        <ComboBox SelectedIndex="{x:Bind Path=ViewModel.OverlappingZonesAlgorithmIndex, Mode=TwoWay}" MinWidth="{StaticResource SettingActionControlMinWidth}">
-                                            <ComboBoxItem x:Uid="FancyZones_OverlappingZonesSmallest" />
-                                            <ComboBoxItem x:Uid="FancyZones_OverlappingZonesLargest" />
-                                            <ComboBoxItem x:Uid="FancyZones_OverlappingZonesPositional" />
-                                            <ComboBoxItem x:Uid="FancyZones_OverlappingZonesClosestCenter" />
-                                        </ComboBox>
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
+                    <labs:SettingsExpander
+                        x:Uid="FancyZones_Zone_Appearance"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xEB3C;}"
+                        IsExpanded="True">
+                        <ComboBox
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.SystemTheme, Converter={StaticResource BoolToComboBoxIndexConverter}}">
+                            <ComboBoxItem x:Uid="FancyZones_Radio_Custom_Colors" />
+                            <ComboBoxItem x:Uid="FancyZones_Radio_Default_Theme" />
+                        </ComboBox>
+                        <labs:SettingsExpander.Items>
+                            <labs:SettingsCard ContentAlignment="Left">
+                                <controls:FancyZonesPreviewControl
+                                    Width="170"
+                                    Height="86"
+                                    CustomBorderColor="{x:Bind Path=ViewModel.ZoneBorderColor, Mode=OneWay}"
+                                    CustomHighlightColor="{x:Bind Path=ViewModel.ZoneHighlightColor, Mode=OneWay}"
+                                    CustomInActiveColor="{x:Bind Path=ViewModel.ZoneInActiveColor, Mode=OneWay}"
+                                    CustomNumberColor="{x:Bind Path=ViewModel.ZoneNumberColor, Mode=OneWay}"
+                                    HighlightOpacity="{x:Bind Mode=OneWay, Path=ViewModel.HighlightOpacity}"
+                                    IsSystemTheme="{x:Bind Mode=OneWay, Path=ViewModel.SystemTheme}"
+                                    ShowZoneNumber="{x:Bind Path=ViewModel.ShowZoneNumber, Mode=OneWay}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard ContentAlignment="Left">
+                                <CheckBox
+                                    x:Uid="FancyZones_ShowZoneNumberCheckBoxControl"
+                                    IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.ShowZoneNumber}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard x:Uid="FancyZones_HighlightOpacity">
+                                <Slider
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    Maximum="100"
+                                    Minimum="0"
+                                    Value="{x:Bind Mode=TwoWay, Path=ViewModel.HighlightOpacity}" />
+                            </labs:SettingsCard>
 
-                               
-                            </StackPanel>
-                        </controls:SettingExpander.Content>
-                    </controls:SettingExpander>
-                  
-                    <controls:SettingExpander IsExpanded="True">
-                        <controls:SettingExpander.Header>
-
-                            <controls:Setting x:Uid="FancyZones_Zone_Appearance" Icon="&#xEB3C;" Style="{StaticResource ExpanderHeaderSettingStyle}" >
-                                <controls:Setting.ActionContent>
-                                    <ComboBox SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.SystemTheme, Converter={StaticResource BoolToComboBoxIndexConverter}}" MinWidth="{StaticResource SettingActionControlMinWidth}">
-                                        <ComboBoxItem x:Uid="FancyZones_Radio_Custom_Colors"/>
-                                        <ComboBoxItem x:Uid="FancyZones_Radio_Default_Theme"/>
-                                    </ComboBox>
-                                </controls:Setting.ActionContent>
-                            </controls:Setting>
-                        </controls:SettingExpander.Header>
-                        <controls:SettingExpander.Content>
-                            <StackPanel>
-                                <controls:FancyZonesPreviewControl HighlightOpacity="{x:Bind Mode=OneWay, Path=ViewModel.HighlightOpacity}"
-                                                                   IsSystemTheme="{x:Bind Mode=OneWay, Path=ViewModel.SystemTheme}"
-                                                                   CustomHighlightColor="{x:Bind Path=ViewModel.ZoneHighlightColor, Mode=OneWay}"
-                                                                   CustomBorderColor="{x:Bind Path=ViewModel.ZoneBorderColor, Mode=OneWay}"
-                                                                   CustomInActiveColor="{x:Bind Path=ViewModel.ZoneInActiveColor, Mode=OneWay}"
-                                                                   CustomNumberColor="{x:Bind Path=ViewModel.ZoneNumberColor, Mode=OneWay}"
-                                                                   ShowZoneNumber="{x:Bind Path=ViewModel.ShowZoneNumber, Mode=OneWay}"
-                                                                   Margin="{StaticResource ExpanderSettingMargin}" 
-                                                                   HorizontalAlignment="Center"
-                                                                   Width="170"
-                                                                   Grid.Column="1"
-                                                                   Height="86"/>
-                                
-                                <Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
-                                <CheckBox x:Uid="FancyZones_ShowZoneNumberCheckBoxControl" IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.ShowZoneNumber}" Margin="{StaticResource ExpanderSettingMargin}"/>
-                                
-                                <controls:Setting x:Uid="FancyZones_HighlightOpacity" Style="{StaticResource ExpanderContentSettingStyle}">
-                                    <controls:Setting.ActionContent>
-                                        <Slider Minimum="0"
-                                            Maximum="100"
-                                            MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                            Value="{x:Bind Mode=TwoWay, Path=ViewModel.HighlightOpacity}"
-                                            HorizontalAlignment="Right"/>
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-                                      
-                                <StackPanel Visibility="{x:Bind Mode=OneWay, Path=ViewModel.SystemTheme, Converter={StaticResource FalseToVisibleConverter}}" >
-                                    <controls:Setting x:Uid="FancyZones_ZoneHighlightColor" Style="{StaticResource ExpanderContentSettingStyle}">
-                                        <controls:Setting.ActionContent>
-                                            <controls:ColorPickerButton SelectedColor="{x:Bind Path=ViewModel.ZoneHighlightColor, Mode=TwoWay}" />
-                                        </controls:Setting.ActionContent>
-                                    </controls:Setting>
-
-                                    <controls:Setting x:Uid="FancyZones_InActiveColor" Style="{StaticResource ExpanderContentSettingStyle}">
-                                        <controls:Setting.ActionContent>
-                                            <controls:ColorPickerButton x:Name="InActiveColorButton"  SelectedColor="{x:Bind Path=ViewModel.ZoneInActiveColor, Mode=TwoWay}" />
-                                        </controls:Setting.ActionContent>
-                                    </controls:Setting>
-
-                                    <controls:Setting x:Uid="FancyZones_BorderColor" Style="{StaticResource ExpanderContentSettingStyle}">
-                                        <controls:Setting.ActionContent>
-                                            <controls:ColorPickerButton SelectedColor="{x:Bind Path=ViewModel.ZoneBorderColor, Mode=TwoWay}" />
-                                        </controls:Setting.ActionContent>
-                                    </controls:Setting>
-                                    
-                                    <controls:Setting x:Uid="FancyZones_NumberColor" Style="{StaticResource ExpanderContentSettingStyle}">
-                                        <controls:Setting.ActionContent>
-                                            <controls:ColorPickerButton SelectedColor="{x:Bind Path=ViewModel.ZoneNumberColor, Mode=TwoWay}" />
-                                        </controls:Setting.ActionContent>
-                                    </controls:Setting>
-                                </StackPanel>
-                            </StackPanel>
-                        </controls:SettingExpander.Content>
-                    </controls:SettingExpander>
-                </controls:SettingsGroup>
-                
-                <controls:SettingsGroup x:Uid="FancyZones_Windows" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-
-                    <controls:SettingExpander IsExpanded="True">
-                        <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="FancyZones_WindowBehavior_GroupSettings" Style="{StaticResource ExpanderHeaderSettingStyle}" />
-                        </controls:SettingExpander.Header>
-                        <controls:SettingExpander.Content>
-                            <StackPanel>
-                                <CheckBox x:Uid="FancyZones_DisplayChangeMoveWindowsCheckBoxControl" IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.DisplayChangeMoveWindows}" Margin="{StaticResource ExpanderSettingMargin}"/>
-                                <Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
-                                <CheckBox x:Uid="FancyZones_ZoneSetChangeMoveWindows" IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.ZoneSetChangeMoveWindows}" Margin="{StaticResource ExpanderSettingMargin}"/>
-                                <Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
-                                <CheckBox x:Uid="FancyZones_AppLastZoneMoveWindows" IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.AppLastZoneMoveWindows}" Margin="{StaticResource ExpanderSettingMargin}"/>
-                                <Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
-                                <CheckBox x:Uid="FancyZones_OpenWindowOnActiveMonitor" IsChecked="{ Binding Mode=TwoWay, Path=OpenWindowOnActiveMonitor}" Margin="{StaticResource ExpanderSettingMargin}"/>
-                                <Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
-                                <CheckBox x:Uid="FancyZones_RestoreSize" IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.RestoreSize}" Margin="{StaticResource ExpanderSettingMargin}"/>
-                                <Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
-                                <CheckBox x:Uid="FancyZones_MakeDraggedWindowTransparentCheckBoxControl" IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.MakeDraggedWindowsTransparent}" Margin="{StaticResource ExpanderSettingMargin}"/>
-                                <Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
-                                <controls:CheckBoxWithDescriptionControl IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.AllowPopupWindowSnap}"
-                                                                 Margin="56, -2, 40, 14"
-                                                                 x:Uid="FancyZones_AllowPopupWindowSnap"/>
-                                <Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
-                                <CheckBox x:Uid="FancyZones_AllowChildWindowSnap" IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.AllowChildWindowSnap}" Margin="{StaticResource ExpanderSettingMargin}"/>
-                                <Rectangle Style="{StaticResource ExpanderSeparatorStyle}" Visibility="{x:Bind Mode=OneWay, Path=ViewModel.Windows11, Converter={StaticResource TrueToVisibleConverter}}"/>
-                                <CheckBox x:Uid="FancyZones_DisableRoundCornersOnWindowSnap" IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.DisableRoundCornersOnWindowSnap}" Margin="{StaticResource ExpanderSettingMargin}" Visibility="{x:Bind Mode=OneWay, Path=ViewModel.Windows11, Converter={StaticResource TrueToVisibleConverter}}"/>
-                            </StackPanel>
-
-                        </controls:SettingExpander.Content>
-                    </controls:SettingExpander>
-
-                    <controls:SettingExpander IsExpanded="True">
-                        <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="FancyZones_WindowSwitching_GroupSettings" Icon="&#xEDA7;" Style="{StaticResource ExpanderHeaderSettingStyle}">
-                                <controls:Setting.ActionContent>
-                                    <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.WindowSwitching}" x:Uid="ToggleSwitch"/>
-                                </controls:Setting.ActionContent>
-                            </controls:Setting>
-                        </controls:SettingExpander.Header>
-                        <controls:SettingExpander.Content>
-                            <StackPanel>
-                                <controls:Setting x:Uid="FancyZones_HotkeyNextTabControl" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.WindowSwitchingCategoryEnabled}" Style="{StaticResource ExpanderContentSettingStyle}">
-                                    <controls:Setting.ActionContent>
-                                        <controls:ShortcutControl HotkeySettings="{x:Bind Path=ViewModel.NextTabHotkey, Mode=TwoWay}" MinWidth="{StaticResource SettingActionControlMinWidth}"/>
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-
-                                <controls:Setting x:Uid="FancyZones_HotkeyPrevTabControl" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.WindowSwitchingCategoryEnabled}" Style="{StaticResource ExpanderContentSettingStyle}">
-                                    <controls:Setting.ActionContent>
-                                        <controls:ShortcutControl HotkeySettings="{x:Bind Path=ViewModel.PrevTabHotkey, Mode=TwoWay}" MinWidth="{StaticResource SettingActionControlMinWidth}"/>
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-                            </StackPanel>
-                        </controls:SettingExpander.Content>
-                    </controls:SettingExpander>
-
-                    <controls:SettingExpander IsExpanded="True">
-                        <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="FancyZones_OverrideSnapHotkeys" Icon="&#xE90C;" Style="{StaticResource ExpanderHeaderSettingStyle}">
-                                <controls:Setting.ActionContent>
-                                    <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.OverrideSnapHotkeys}" x:Uid="ToggleSwitch"/>
-                                </controls:Setting.ActionContent>
-                            </controls:Setting>
-                        </controls:SettingExpander.Header>
-
-                        <controls:SettingExpander.Content>
-                            <StackPanel>
-                                <controls:Setting x:Uid="FancyZones_MoveWindow" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.SnapHotkeysCategoryEnabled}" Style="{StaticResource ExpanderContentSettingStyle}">
-                                    <controls:Setting.ActionContent>
-                                        <ComboBox SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.MoveWindowsBasedOnPosition, Converter={StaticResource BoolToComboBoxIndexConverter}}" MinHeight="56" MinWidth="{StaticResource SettingActionControlMinWidth}">
-                                            <ComboBoxItem x:Uid="FancyZones_MoveWindowLeftRightBasedOnZoneIndex_Accessible">
-                                                <StackPanel Orientation="Vertical" Spacing="4">
-                                                    <controls:IsEnabledTextBlock x:Uid="FancyZones_MoveWindowLeftRightBasedOnZoneIndex"/>
-                                                    <TextBlock FontFamily="{ThemeResource SymbolThemeFontFamily}" Style="{StaticResource SecondaryTextStyle}">
-                                                        <Run x:Uid="FancyZones_MoveWindowLeftRightBasedOnZoneIndex_Description" />
-                                                    </TextBlock>
-                                                </StackPanel>
-                                            </ComboBoxItem>
-                                            <ComboBoxItem x:Uid="FancyZones_MoveWindowBasedOnRelativePosition_Accessible">
-                                                <StackPanel Orientation="Vertical" Spacing="4">
-                                                    <controls:IsEnabledTextBlock x:Uid="FancyZones_MoveWindowBasedOnRelativePosition"/>
-                                                    <TextBlock FontFamily="{ThemeResource SymbolThemeFontFamily}" Style="{StaticResource SecondaryTextStyle}">
-                                                        <Run x:Uid="FancyZones_MoveWindowBasedOnRelativePosition_Description" />
-                                                    </TextBlock>
-                                                </StackPanel>
-                                            </ComboBoxItem>
-                                        </ComboBox>
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-
-                                <Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
-                                <CheckBox x:Uid="FancyZones_MoveWindowsAcrossAllMonitorsCheckBoxControl"
-                                          Margin="56,8,16,8"
-                                          IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.MoveWindowsAcrossMonitors}"
-                                          IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.SnapHotkeysCategoryEnabled}"/>
-                            </StackPanel>
-                        </controls:SettingExpander.Content>
-                    </controls:SettingExpander>
+                            <labs:SettingsCard
+                                x:Uid="FancyZones_ZoneHighlightColor"
+                                Visibility="{x:Bind Mode=OneWay, Path=ViewModel.SystemTheme, Converter={StaticResource ReverseBoolToVisibilityConverter}}">
+                                <controls:ColorPickerButton SelectedColor="{x:Bind Path=ViewModel.ZoneHighlightColor, Mode=TwoWay}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard
+                                x:Uid="FancyZones_InActiveColor"
+                                Visibility="{x:Bind Mode=OneWay, Path=ViewModel.SystemTheme, Converter={StaticResource ReverseBoolToVisibilityConverter}}">
+                                <controls:ColorPickerButton
+                                    x:Name="InActiveColorButton"
+                                    SelectedColor="{x:Bind Path=ViewModel.ZoneInActiveColor, Mode=TwoWay}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard
+                                x:Uid="FancyZones_BorderColor"
+                                Visibility="{x:Bind Mode=OneWay, Path=ViewModel.SystemTheme, Converter={StaticResource ReverseBoolToVisibilityConverter}}">
+                                <controls:ColorPickerButton SelectedColor="{x:Bind Path=ViewModel.ZoneBorderColor, Mode=TwoWay}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard
+                                x:Uid="FancyZones_NumberColor"
+                                Visibility="{x:Bind Mode=OneWay, Path=ViewModel.SystemTheme, Converter={StaticResource ReverseBoolToVisibilityConverter}}">
+                                <controls:ColorPickerButton SelectedColor="{x:Bind Path=ViewModel.ZoneNumberColor, Mode=TwoWay}" />
+                            </labs:SettingsCard>
+                        </labs:SettingsExpander.Items>
+                    </labs:SettingsExpander>
                 </controls:SettingsGroup>
 
-                <controls:SettingsGroup x:Uid="FancyZones_Layouts" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <controls:SettingExpander IsExpanded="True">
-                        <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="FancyZones_QuickLayoutSwitch" Icon="&#xEDA7;" Style="{StaticResource ExpanderHeaderSettingStyle}" >
-                                <controls:Setting.ActionContent>
-                                    <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.QuickLayoutSwitch}" x:Uid="ToggleSwitch"/>
-                                </controls:Setting.ActionContent>
-                            </controls:Setting>
-                        </controls:SettingExpander.Header>
+                <controls:SettingsGroup
+                    x:Uid="FancyZones_Windows"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
 
-                        <controls:SettingExpander.Content>
-                            <StackPanel>
-                                <CheckBox x:Uid="FancyZones_FlashZonesOnQuickSwitch" IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.FlashZonesOnQuickSwitch}" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.QuickSwitchEnabled}" Margin="{StaticResource ExpanderSettingMargin}"/>
-                            </StackPanel>
-                        </controls:SettingExpander.Content>
-                    </controls:SettingExpander>
+                    <labs:SettingsExpander
+                        x:Uid="FancyZones_WindowBehavior_GroupSettings"
+                        IsExpanded="True">
+                        <labs:SettingsExpander.Items>
+                            <labs:SettingsCard ContentAlignment="Left">
+                                <CheckBox
+                                    x:Uid="FancyZones_DisplayChangeMoveWindowsCheckBoxControl"
+                                    IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.DisplayChangeMoveWindows}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard ContentAlignment="Left">
+                                <CheckBox
+                                    x:Uid="FancyZones_ZoneSetChangeMoveWindows"
+                                    IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.ZoneSetChangeMoveWindows}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard ContentAlignment="Left">
+                                <CheckBox
+                                    x:Uid="FancyZones_AppLastZoneMoveWindows"
+                                    IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.AppLastZoneMoveWindows}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard ContentAlignment="Left">
+                                <CheckBox
+                                    x:Uid="FancyZones_OpenWindowOnActiveMonitor"
+                                    IsChecked="{Binding Mode=TwoWay, Path=OpenWindowOnActiveMonitor}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard ContentAlignment="Left">
+                                <CheckBox
+                                    x:Uid="FancyZones_RestoreSize"
+                                    IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.RestoreSize}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard ContentAlignment="Left">
+                                <CheckBox
+                                    x:Uid="FancyZones_MakeDraggedWindowTransparentCheckBoxControl"
+                                    IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.MakeDraggedWindowsTransparent}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard ContentAlignment="Left">
+                                <controls:CheckBoxWithDescriptionControl
+                                    x:Uid="FancyZones_AllowPopupWindowSnap"
+                                    Margin="0,0,0,6"
+                                    IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.AllowPopupWindowSnap}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard ContentAlignment="Left">
+                                <CheckBox
+                                    x:Uid="FancyZones_AllowChildWindowSnap"
+                                    IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.AllowChildWindowSnap}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard
+                                ContentAlignment="Left"
+                                Visibility="{x:Bind Mode=OneWay, Path=ViewModel.Windows11, Converter={StaticResource BoolToVisibilityConverter}}">
+                                <CheckBox
+                                    x:Uid="FancyZones_DisableRoundCornersOnWindowSnap"
+                                    IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.DisableRoundCornersOnWindowSnap}" />
+                            </labs:SettingsCard>
+                        </labs:SettingsExpander.Items>
+                    </labs:SettingsExpander>
+
+                    <labs:SettingsExpander
+                        x:Uid="FancyZones_WindowSwitching_GroupSettings"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xEDA7;}"
+                        IsExpanded="True">
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.WindowSwitching}" />
+                        <labs:SettingsExpander.Items>
+                            <labs:SettingsCard
+                                x:Uid="FancyZones_HotkeyNextTabControl"
+                                IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.WindowSwitchingCategoryEnabled}">
+                                <controls:ShortcutControl
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    HotkeySettings="{x:Bind Path=ViewModel.NextTabHotkey, Mode=TwoWay}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard
+                                x:Uid="FancyZones_HotkeyPrevTabControl"
+                                IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.WindowSwitchingCategoryEnabled}">
+                                <controls:ShortcutControl
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    HotkeySettings="{x:Bind Path=ViewModel.PrevTabHotkey, Mode=TwoWay}" />
+                            </labs:SettingsCard>
+                        </labs:SettingsExpander.Items>
+                    </labs:SettingsExpander>
+
+                    <labs:SettingsExpander
+                        x:Uid="FancyZones_OverrideSnapHotkeys"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xE90C;}"
+                        IsExpanded="True">
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.OverrideSnapHotkeys}" />
+                        <labs:SettingsExpander.Items>
+                            <labs:SettingsCard
+                                x:Uid="FancyZones_MoveWindow"
+                                IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.SnapHotkeysCategoryEnabled}">
+                                <ComboBox
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    MinHeight="56"
+                                    SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.MoveWindowsBasedOnPosition, Converter={StaticResource BoolToComboBoxIndexConverter}}">
+                                    <ComboBoxItem x:Uid="FancyZones_MoveWindowLeftRightBasedOnZoneIndex_Accessible">
+                                        <StackPanel
+                                            Orientation="Vertical"
+                                            Spacing="4">
+                                            <controls:IsEnabledTextBlock x:Uid="FancyZones_MoveWindowLeftRightBasedOnZoneIndex" />
+                                            <TextBlock
+                                                FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                                Style="{StaticResource SecondaryTextStyle}">
+                                                <Run x:Uid="FancyZones_MoveWindowLeftRightBasedOnZoneIndex_Description" />
+                                            </TextBlock>
+                                        </StackPanel>
+                                    </ComboBoxItem>
+                                    <ComboBoxItem x:Uid="FancyZones_MoveWindowBasedOnRelativePosition_Accessible">
+                                        <StackPanel
+                                            Orientation="Vertical"
+                                            Spacing="4">
+                                            <controls:IsEnabledTextBlock x:Uid="FancyZones_MoveWindowBasedOnRelativePosition" />
+                                            <TextBlock
+                                                FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                                Style="{StaticResource SecondaryTextStyle}">
+                                                <Run x:Uid="FancyZones_MoveWindowBasedOnRelativePosition_Description" />
+                                            </TextBlock>
+                                        </StackPanel>
+                                    </ComboBoxItem>
+                                </ComboBox>
+                            </labs:SettingsCard>
+                            <labs:SettingsCard
+                                ContentAlignment="Left"
+                                IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.SnapHotkeysCategoryEnabled}">
+                                <CheckBox
+                                    x:Uid="FancyZones_MoveWindowsAcrossAllMonitorsCheckBoxControl"
+                                    IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.MoveWindowsAcrossMonitors}" />
+                            </labs:SettingsCard>
+                        </labs:SettingsExpander.Items>
+                    </labs:SettingsExpander>
                 </controls:SettingsGroup>
 
-                <controls:SettingsGroup x:Uid="ExcludedApps" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <controls:SettingExpander IsExpanded="True">
-                        <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="FancyZones_ExcludeApps" Icon="&#xECE4;" Style="{StaticResource ExpanderHeaderSettingStyle}"/>
-                        </controls:SettingExpander.Header>
-                        <controls:SettingExpander.Content>
-                            <TextBox x:Uid="FancyZones_ExcludeApps_TextBoxControl"
-                                 Margin="{StaticResource ExpanderSettingMargin}"
-                                         Text="{x:Bind Mode=TwoWay, Path=ViewModel.ExcludedApps, UpdateSourceTrigger=PropertyChanged}"
-                                         ScrollViewer.VerticalScrollBarVisibility ="Visible"
-                                         ScrollViewer.VerticalScrollMode="Enabled"
-                                         ScrollViewer.IsVerticalRailEnabled="True"
-                                         TextWrapping="Wrap"
-                                         AcceptsReturn="True"
-                                         MinWidth="240"
-                                         MinHeight="160" />
-                        </controls:SettingExpander.Content>
-                    </controls:SettingExpander>
+                <controls:SettingsGroup
+                    x:Uid="FancyZones_Layouts"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                    <labs:SettingsExpander
+                        x:Uid="FancyZones_QuickLayoutSwitch"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xEDA7;}">
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.QuickLayoutSwitch}" />
+                        <labs:SettingsExpander.Items>
+                            <labs:SettingsCard
+                                ContentAlignment="Left"
+                                IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.QuickSwitchEnabled}">
+                                <CheckBox
+                                    x:Uid="FancyZones_FlashZonesOnQuickSwitch"
+                                    IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.FlashZonesOnQuickSwitch}" />
+                            </labs:SettingsCard>
+                        </labs:SettingsExpander.Items>
+                    </labs:SettingsExpander>
+                </controls:SettingsGroup>
+
+                <controls:SettingsGroup
+                    x:Uid="ExcludedApps"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+
+                    <labs:SettingsExpander
+                        x:Uid="FancyZones_ExcludeApps"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xECE4;}"
+                        IsExpanded="True">
+                        <labs:SettingsExpander.Items>
+                            <labs:SettingsCard ContentAlignment="Vertical" HorizontalContentAlignment="Stretch">
+                                <TextBox
+                                    x:Uid="FancyZones_ExcludeApps_TextBoxControl"
+                                    MinWidth="240"
+                                    MinHeight="160"
+                                    AcceptsReturn="True"
+                                    ScrollViewer.IsVerticalRailEnabled="True"
+                                    ScrollViewer.VerticalScrollBarVisibility="Visible"
+                                    ScrollViewer.VerticalScrollMode="Enabled"
+                                    Text="{x:Bind Mode=TwoWay, Path=ViewModel.ExcludedApps, UpdateSourceTrigger=PropertyChanged}"
+                                    TextWrapping="Wrap" />
+                            </labs:SettingsCard>
+                        </labs:SettingsExpander.Items>
+                    </labs:SettingsExpander>
                 </controls:SettingsGroup>
             </StackPanel>
+        </controls:SettingsPageControl.ModuleContent>
 
-        
-</controls:SettingsPageControl.ModuleContent>
-
-<controls:SettingsPageControl.PrimaryLinks>
-            <controls:PageLink x:Uid="LearnMore_FancyZones" Link="https://aka.ms/PowerToysOverview_FancyZones"/>
+        <controls:SettingsPageControl.PrimaryLinks>
+            <controls:PageLink
+                x:Uid="LearnMore_FancyZones"
+                Link="https://aka.ms/PowerToysOverview_FancyZones" />
         </controls:SettingsPageControl.PrimaryLinks>
-</controls:SettingsPageControl>
+    </controls:SettingsPageControl>
 </Page>
\ No newline at end of file
diff --git a/src/settings-ui/Settings.UI/Views/FileLocksmithPage.xaml b/src/settings-ui/Settings.UI/Views/FileLocksmithPage.xaml
index 7f57f46d3f..9a341edd86 100644
--- a/src/settings-ui/Settings.UI/Views/FileLocksmithPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/FileLocksmithPage.xaml
@@ -2,41 +2,40 @@
     x:Class="Microsoft.PowerToys.Settings.UI.Views.FileLocksmithPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
-    AutomationProperties.LandmarkType="Main">
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:CommunityToolkit.WinUI.UI"
+    AutomationProperties.LandmarkType="Main"
+    mc:Ignorable="d">
 
-    <Page.Resources>
-        <converters:BoolNegationConverter x:Key="BoolNegationConverter"/>
-    </Page.Resources>
-
-    <controls:SettingsPageControl x:Uid="FileLocksmith"
-                                  ModuleImageSource="ms-appx:///Assets/Modules/FileLocksmith.png">
+    <controls:SettingsPageControl
+        x:Uid="FileLocksmith"
+        ModuleImageSource="ms-appx:///Assets/Modules/FileLocksmith.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel Orientation="Vertical">
+                <labs:SettingsCard
+                    x:Uid="FileLocksmith_Enable_FileLocksmith"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsFileLocksmith.png}"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
+                    <ToggleSwitch IsOn="{x:Bind ViewModel.IsFileLocksmithEnabled, Mode=TwoWay}" />
+                </labs:SettingsCard>
 
-                <controls:Setting x:Uid="FileLocksmith_Enable_FileLocksmith" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
-                    <controls:Setting.Icon>
-                        <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsFileLocksmith.png" ShowAsMonochrome="False" />
-                    </controls:Setting.Icon>
-                    <controls:Setting.ActionContent>
-                        <ToggleSwitch IsOn="{x:Bind ViewModel.IsFileLocksmithEnabled, Mode=TwoWay}" HorizontalAlignment="Right"/>
-                    </controls:Setting.ActionContent>
-                </controls:Setting>
-                <InfoBar x:Uid="GPO_IsSettingForced"
-                    Severity="Informational"
+                <InfoBar
+                    x:Uid="GPO_IsSettingForced"
                     IsClosable="False"
                     IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}"
-                    IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}" />
+                    IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}"
+                    Severity="Informational" />
 
             </StackPanel>
         </controls:SettingsPageControl.ModuleContent>
         <controls:SettingsPageControl.PrimaryLinks>
-            <controls:PageLink x:Uid="LearnMore_FileLocksmith" Link="https://aka.ms/PowerToysOverview_FileLocksmith"/>
+            <controls:PageLink
+                x:Uid="LearnMore_FileLocksmith"
+                Link="https://aka.ms/PowerToysOverview_FileLocksmith" />
         </controls:SettingsPageControl.PrimaryLinks>
     </controls:SettingsPageControl>
 </Page>
diff --git a/src/settings-ui/Settings.UI/Views/GeneralPage.xaml b/src/settings-ui/Settings.UI/Views/GeneralPage.xaml
index ae8985eeb0..f1bf1b8a00 100644
--- a/src/settings-ui/Settings.UI/Views/GeneralPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/GeneralPage.xaml
@@ -4,400 +4,404 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
     xmlns:localConverters="using:Microsoft.PowerToys.Settings.UI.Converters"
-    mc:Ignorable="d"
-    AutomationProperties.LandmarkType="Main">
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:CommunityToolkit.WinUI.UI"
+    AutomationProperties.LandmarkType="Main"
+    mc:Ignorable="d">
 
     <Page.Resources>
-        <converters:BoolToVisibilityConverter x:Key="VisibleIfTrueConverter"/>
-        <converters:BoolNegationConverter x:Key="NegationConverter"/>
         <localConverters:UpdateStateToBoolConverter x:Key="UpdateStateToBoolConverter" />
-        <localConverters:StringToInfoBarSeverityConverter x:Key="StringToInfoBarSeverityConverter"/>
+        <localConverters:StringToInfoBarSeverityConverter x:Key="StringToInfoBarSeverityConverter" />
     </Page.Resources>
 
-    <controls:SettingsPageControl x:Uid="General"
-                                  ModuleImageSource="ms-appx:///Assets/Modules/PT.png">
+    <controls:SettingsPageControl
+        x:Uid="General"
+        ModuleImageSource="ms-appx:///Assets/Modules/PT.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel Orientation="Vertical">
-                <controls:SettingsGroup x:Uid="General_Version" Margin="0,-32,0,0">
-                    <controls:Setting Header="{Binding PowerToysVersion}" Icon="&#xE895;">
-                        <controls:Setting.Description>
+                <controls:SettingsGroup
+                    x:Uid="General_Version"
+                    Margin="0,-32,0,0">
+                    <labs:SettingsCard
+                        Header="{Binding PowerToysVersion}"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xE895;}">
+                        <labs:SettingsCard.Description>
                             <StackPanel Orientation="Vertical">
-
                                 <TextBlock Style="{StaticResource SecondaryTextStyle}">
-                                <Run x:Uid="General_VersionLastChecked" />
-                                <Run Text="{Binding UpdateCheckedDate, Mode=OneWay}"/>
+                                    <Run x:Uid="General_VersionLastChecked" />
+                                    <Run Text="{Binding UpdateCheckedDate, Mode=OneWay}" />
                                 </TextBlock>
-                                <HyperlinkButton x:Uid="ReleaseNotes"
-                                                 NavigateUri="https://github.com/microsoft/PowerToys/releases/"
-                                                 Margin="0,2,0,0"/>
+                                <HyperlinkButton
+                                    x:Uid="ReleaseNotes"
+                                    Margin="0,2,0,0"
+                                    FontWeight="SemiBold"
+                                    NavigateUri="https://github.com/microsoft/PowerToys/releases/" />
+                            </StackPanel>
+                        </labs:SettingsCard.Description>
+                        <Grid Visibility="{Binding PowerToysUpdatingState, Mode=OneWay, Converter={StaticResource UpdateStateToBoolConverter}, ConverterParameter=UpToDate}">
+                            <StackPanel
+                                VerticalAlignment="Center"
+                                Orientation="Horizontal"
+                                Spacing="18"
+                                Visibility="{Binding Mode=OneWay, Path=IsNewVersionDownloading, Converter={StaticResource BoolToVisibilityConverter}}">
+                                <ProgressRing
+                                    Width="24"
+                                    Height="24" />
+                                <TextBlock
+                                    x:Uid="General_CheckingForUpdates"
+                                    VerticalAlignment="Center"
+                                    FontWeight="SemiBold"
+                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
                             </StackPanel>
-                        </controls:Setting.Description>
-                        <controls:Setting.ActionContent>
-                            <Grid Visibility="{Binding PowerToysUpdatingState, Mode=OneWay, Converter={StaticResource UpdateStateToBoolConverter}, ConverterParameter=UpToDate}">
-                                <StackPanel Visibility="{Binding Mode=OneWay, Path=IsNewVersionDownloading, Converter={StaticResource VisibleIfTrueConverter}}"
-                                            VerticalAlignment="Center"
-                                            Orientation="Horizontal"
-                                            Spacing="18">
-                                    <ProgressRing Height="24"
-                                                       Width="24"/>
-                                    <TextBlock x:Uid="General_CheckingForUpdates"
-                                               FontWeight="SemiBold"
-                                               VerticalAlignment="Center"
-                                               Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
-                                </StackPanel>
 
-                                <Button x:Uid="GeneralPage_CheckForUpdates"
-                                        Command="{Binding CheckForUpdatesEventHandler}"
-                                        IsEnabled="{Binding IsDownloadAllowed}"
-                                        Visibility="{Binding Mode=OneWay, Path=IsNewVersionDownloading, Converter={StaticResource NegationConverter}}"
-                                        HorizontalAlignment="Right"/>
-                            </Grid>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
+                            <Button
+                                x:Uid="GeneralPage_CheckForUpdates"
+                                HorizontalAlignment="Right"
+                                Command="{Binding CheckForUpdatesEventHandler}"
+                                IsEnabled="{Binding IsDownloadAllowed}"
+                                Visibility="{Binding Mode=OneWay, Path=IsNewVersionDownloading, Converter={StaticResource BoolNegationConverter}}" />
+                        </Grid>
+                    </labs:SettingsCard>
+                    <InfoBar
+                        x:Uid="General_UpToDate"
+                        IsClosable="False"
+                        IsOpen="{Binding IsNewVersionCheckedAndUpToDate, Mode=OneWay}"
+                        IsTabStop="{Binding IsNewVersionCheckedAndUpToDate, Mode=OneWay}"
+                        Severity="Success" />
 
-                    <InfoBar x:Uid="General_UpToDate"
-                                  IsClosable="False"
-                                  Severity="Success"
-                                  IsTabStop="{Binding IsNewVersionCheckedAndUpToDate, Mode=OneWay}"
-                                  IsOpen="{Binding IsNewVersionCheckedAndUpToDate, Mode=OneWay}"/>
-
-                    <!-- Network error while checking for new version -->
+ <!-- Network error while checking for new version -->
                     <InfoBar x:Uid="General_CantCheck"
                                   IsClosable="False"
                                   Severity="Error"
                                   IsTabStop="{Binding IsNoNetwork, Mode=OneWay}"
                                   IsOpen="{Binding IsNoNetwork, Mode=OneWay}"/>
 
-                    <!-- New version available -->
-                    <InfoBar x:Uid="General_NewVersionAvailable"
-                                  IsClosable="False"
-                                  Severity="Informational"
-                                  IsTabStop="{Binding PowerToysUpdatingState, Mode=OneWay, Converter={StaticResource UpdateStateToBoolConverter}, ConverterParameter=ReadyToDownload}"
-                                  IsOpen="{Binding PowerToysUpdatingState, Mode=OneWay, Converter={StaticResource UpdateStateToBoolConverter}, ConverterParameter=ReadyToDownload}"
-                                  Message="{Binding PowerToysNewAvailableVersion, Mode=OneWay}">
+                    <!--  New version available  -->
+                    <InfoBar
+                        x:Uid="General_NewVersionAvailable"
+                        IsClosable="False"
+                        IsOpen="{Binding PowerToysUpdatingState, Mode=OneWay, Converter={StaticResource UpdateStateToBoolConverter}, ConverterParameter=ReadyToDownload}"
+                        IsTabStop="{Binding PowerToysUpdatingState, Mode=OneWay, Converter={StaticResource UpdateStateToBoolConverter}, ConverterParameter=ReadyToDownload}"
+                        Message="{Binding PowerToysNewAvailableVersion, Mode=OneWay}"
+                        Severity="Informational">
+
                         <InfoBar.Content>
                             <StackPanel Spacing="16">
-                                <Button x:Uid="General_DownloadAndInstall"
-                                        Command="{Binding UpdateNowButtonEventHandler}"
-                                        IsEnabled="{Binding IsDownloadAllowed, Mode=OneWay}"
-                                        Visibility="{Binding Mode=OneWay, Path=IsNewVersionDownloading, Converter={StaticResource NegationConverter}}"/>
-
-                                <!-- In progress panel -->
-                                <StackPanel Visibility="{Binding Mode=OneWay, Path=IsNewVersionDownloading, Converter={StaticResource VisibleIfTrueConverter}}"
-                                            Orientation="Horizontal"
-                                            Spacing="18"
-                                            Margin="0,0,0,16">
-                                    <ProgressRing Height="24"
-                                                       Width="24"/>
-                                    <TextBlock x:Uid="General_Downloading"
-                                               FontWeight="SemiBold"
-                                               Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
-                                </StackPanel>
-                            </StackPanel>
-                        </InfoBar.Content>
-                        <InfoBar.ActionButton>
-                            <HyperlinkButton x:Uid="SeeWhatsNew"
-                                             Style="{StaticResource TextButtonStyle}"
-                                             NavigateUri="{Binding PowerToysNewAvailableVersionLink}"
-                                             HorizontalAlignment="Right" />
-                        </InfoBar.ActionButton>
-                    </InfoBar>
-
-
-                    <!-- Ready to install -->
-                    <InfoBar x:Uid="General_NewVersionReadyToInstall"
-                                  IsClosable="False"
-                                  Severity="Success"
-                                  IsTabStop="{Binding PowerToysUpdatingState, Mode=OneWay, Converter={StaticResource UpdateStateToBoolConverter}, ConverterParameter=ReadyToInstall}"
-                                  IsOpen="{Binding PowerToysUpdatingState, Mode=OneWay, Converter={StaticResource UpdateStateToBoolConverter}, ConverterParameter=ReadyToInstall}"
-                                  Message="{Binding PowerToysNewAvailableVersion}">
-                        <InfoBar.Content>
-                            <StackPanel Spacing="16">
-                                <Button x:Uid="General_InstallNow"
-                                        Command="{Binding UpdateNowButtonEventHandler}"
-                                        IsEnabled="{Binding IsDownloadAllowed, Mode=OneWay}"
-                                        Margin="0,0,0,16"/>
-                            </StackPanel>
-                        </InfoBar.Content>
-                        <InfoBar.ActionButton>
-                            <HyperlinkButton x:Uid="SeeWhatsNew"
-                                             Style="{StaticResource TextButtonStyle}"
-                                             NavigateUri="{Binding PowerToysNewAvailableVersionLink}"
-                                             HorizontalAlignment="Right" />
-                        </InfoBar.ActionButton>
-                    </InfoBar>
-
-
-
-                    <!-- Install failed  -->
-                    <InfoBar x:Uid="General_FailedToDownloadTheNewVersion"
-                                  IsClosable="False"
-                                  Severity="Error"
-                                  IsTabStop="{Binding PowerToysUpdatingState, Mode=OneWay, Converter={StaticResource UpdateStateToBoolConverter}, ConverterParameter=ErrorDownloading}"
-                                  IsOpen="{Binding PowerToysUpdatingState, Mode=OneWay, Converter={StaticResource UpdateStateToBoolConverter}, ConverterParameter=ErrorDownloading}"
-                                  Message="{Binding PowerToysNewAvailableVersion}">
-                        <InfoBar.Content>
-                            <StackPanel Spacing="16">
-                                <Button x:Uid="General_TryAgainToDownloadAndInstall"
+                                <Button
+                                    x:Uid="General_DownloadAndInstall"
                                     Command="{Binding UpdateNowButtonEventHandler}"
                                     IsEnabled="{Binding IsDownloadAllowed, Mode=OneWay}"
-                                    Visibility="{Binding Mode=OneWay, Path=IsNewVersionDownloading, Converter={StaticResource NegationConverter}}"/>
+                                    Visibility="{Binding Mode=OneWay, Path=IsNewVersionDownloading, Converter={StaticResource BoolNegationConverter}}" />
 
-                                <!-- In progress panel -->
-                                <StackPanel Visibility="{Binding Mode=OneWay, Path=IsNewVersionDownloading, Converter={StaticResource VisibleIfTrueConverter}}"
-                                        Orientation="Horizontal"
-                                        Spacing="18"
-                                        Margin="0,0,0,16">
-                                    <ProgressRing Height="24"
-                                                   Width="24"/>
-                                    <TextBlock x:Uid="General_Downloading"
-                                               FontWeight="SemiBold"
-                                           Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                                <!--  In progress panel  -->
+                                <StackPanel
+                                    Margin="0,0,0,16"
+                                    Orientation="Horizontal"
+                                    Spacing="18"
+                                    Visibility="{Binding Mode=OneWay, Path=IsNewVersionDownloading, Converter={StaticResource BoolToVisibilityConverter}}">
+                                    <ProgressRing
+                                        Width="24"
+                                        Height="24" />
+                                    <TextBlock
+                                        x:Uid="General_Downloading"
+                                        FontWeight="SemiBold"
+                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
                                 </StackPanel>
                             </StackPanel>
                         </InfoBar.Content>
                         <InfoBar.ActionButton>
-                            <HyperlinkButton x:Uid="SeeWhatsNew"
-                                             NavigateUri="{Binding PowerToysNewAvailableVersionLink}"
-                                             HorizontalAlignment="Right"
-                                             Style="{StaticResource TextButtonStyle}"/>
+                            <HyperlinkButton
+                                x:Uid="SeeWhatsNew"
+                                HorizontalAlignment="Right"
+                                NavigateUri="{Binding PowerToysNewAvailableVersionLink}"
+                                Style="{StaticResource TextButtonStyle}" />
                         </InfoBar.ActionButton>
                     </InfoBar>
 
-                    <controls:Setting x:Uid="GeneralPage_ToggleSwitch_AutoDownloadUpdates"
-                                      Margin="0,-6,0,0"
-                                      IsEnabled="{Binding AutoUpdatesEnabled}" 
-                                      Visibility="{Binding Mode=OneWay, Path=IsAdmin, Converter={StaticResource VisibleIfTrueConverter}}">
-                        <controls:Setting.ActionContent>
-                            <ToggleSwitch IsOn="{Binding Mode=TwoWay, Path=AutoDownloadUpdates}" x:Uid="ToggleSwitch"/>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
-                </controls:SettingsGroup>
 
+                    <!--  Ready to install  -->
+                    <InfoBar
+                        x:Uid="General_NewVersionReadyToInstall"
+                        IsClosable="False"
+                        IsOpen="{Binding PowerToysUpdatingState, Mode=OneWay, Converter={StaticResource UpdateStateToBoolConverter}, ConverterParameter=ReadyToInstall}"
+                        IsTabStop="{Binding PowerToysUpdatingState, Mode=OneWay, Converter={StaticResource UpdateStateToBoolConverter}, ConverterParameter=ReadyToInstall}"
+                        Message="{Binding PowerToysNewAvailableVersion}"
+                        Severity="Success">
+                        <InfoBar.Content>
+                            <Button
+                                x:Uid="General_InstallNow"
+                                Margin="0,0,0,16"
+                                Command="{Binding UpdateNowButtonEventHandler}"
+                                IsEnabled="{Binding IsDownloadAllowed, Mode=OneWay}" />
+                        </InfoBar.Content>
+                        <InfoBar.ActionButton>
+                            <HyperlinkButton
+                                x:Uid="SeeWhatsNew"
+                                HorizontalAlignment="Right"
+                                NavigateUri="{Binding PowerToysNewAvailableVersionLink}"
+                                Style="{StaticResource TextButtonStyle}" />
+                        </InfoBar.ActionButton>
+                    </InfoBar>
 
+                    <!--  Install failed  -->
+                    <InfoBar
+                        x:Uid="General_FailedToDownloadTheNewVersion"
+                        IsClosable="False"
+                        IsOpen="{Binding PowerToysUpdatingState, Mode=OneWay, Converter={StaticResource UpdateStateToBoolConverter}, ConverterParameter=ErrorDownloading}"
+                        IsTabStop="{Binding PowerToysUpdatingState, Mode=OneWay, Converter={StaticResource UpdateStateToBoolConverter}, ConverterParameter=ErrorDownloading}"
+                        Message="{Binding PowerToysNewAvailableVersion}"
+                        Severity="Error">
+                        <InfoBar.Content>
+                            <StackPanel Spacing="16">
+                                <Button
+                                    x:Uid="General_TryAgainToDownloadAndInstall"
+                                    Command="{Binding UpdateNowButtonEventHandler}"
+                                    IsEnabled="{Binding IsDownloadAllowed, Mode=OneWay}"
+                                    Visibility="{Binding Mode=OneWay, Path=IsNewVersionDownloading, Converter={StaticResource BoolNegationConverter}}" />
 
-                <controls:SettingsGroup x:Uid="Admin_Mode">
-                    <controls:SettingExpander IsExpanded="True">
-                        <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="Admin_Mode_Running_As" Icon="&#xE7EF;" Header="{Binding Mode=OneWay, Path=RunningAsText}" Style="{StaticResource ExpanderHeaderSettingStyle}">
-                                <controls:Setting.Description>
-                                    <HyperlinkButton NavigateUri="https://aka.ms/powertoysDetectedElevatedHelp" x:Uid="GeneralPage_ToggleSwitch_AlwaysRunElevated_Link"/>
-                                </controls:Setting.Description>
-                                <controls:Setting.ActionContent>
-                                    <Button x:Uid="GeneralPage_RestartAsAdmin_Button"
-                                            Command = "{Binding RestartElevatedButtonEventHandler}"
-                                            IsEnabled="{Binding Mode=OneWay, Path=IsAdminButtonEnabled}"/>
-                                </controls:Setting.ActionContent>
-                            </controls:Setting>
-                        </controls:SettingExpander.Header>
-                        <controls:SettingExpander.Content>
-                            <StackPanel Orientation="Vertical">
-                                <controls:Setting x:Uid="GeneralSettings_AlwaysRunAsAdminText" IsEnabled="{Binding Mode=OneWay, Path=IsElevated}" Style="{StaticResource ExpanderContentSettingStyle}">
-                                    <controls:Setting.ActionContent>
-                                        <ToggleSwitch IsOn="{Binding Mode=TwoWay, Path=RunElevated}" x:Uid="ToggleSwitch"/>
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-                                <InfoBar x:Uid="General_RunAsAdminRequired" 
-                                              Severity="Warning"
-                                              IsTabStop="{Binding Mode=OneWay, Path=IsElevated, Converter={StaticResource NegationConverter}}"
-                                              IsClosable="False"
-                                              IsOpen="{Binding Mode=OneWay, Path=IsElevated, Converter={StaticResource NegationConverter}}">
-                                </InfoBar>
-                            </StackPanel>
-                        </controls:SettingExpander.Content>
-                    </controls:SettingExpander>
-                </controls:SettingsGroup>
-
-
-
-                <controls:SettingsGroup IsEnabled="True" x:Uid="ShortcutGuide_Appearance_Behavior">
-                    <controls:Setting x:Uid="ColorModeHeader" Icon="&#xE790;">
-                        <controls:Setting.Description>
-                            <HyperlinkButton Click="OpenColorsSettings_Click"
-                                                     x:Uid="Windows_Color_Settings"/>
-                        </controls:Setting.Description>
-                        <controls:Setting.ActionContent>
-                            <ComboBox SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.ThemeIndex}" MinWidth="{StaticResource SettingActionControlMinWidth}">
-                                <ComboBoxItem x:Uid="Radio_Theme_Dark"/>
-                                <ComboBoxItem x:Uid="Radio_Theme_Light"/>
-                                <ComboBoxItem x:Uid="Radio_Theme_Default"/>
-                            </ComboBox>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
-                    <controls:Setting x:Uid="GeneralPage_RunAtStartUp">
-                        <controls:Setting.ActionContent>
-                            <ToggleSwitch IsOn="{Binding Mode=TwoWay, Path=Startup}" x:Uid="ToggleSwitch"/>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
-                </controls:SettingsGroup>
-
-                <!-- Start General_SettingsBackupAndRestore -->
-
-                <controls:SettingsGroup x:Uid="General_SettingsBackupAndRestoreTitle" Visibility="Visible">
-                    <controls:SettingExpander IsExpanded="True">
-                        <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="General_SettingsBackupAndRestore" Icon="&#xE777;" Style="{StaticResource ExpanderHeaderSettingStyle}">
-                                <controls:Setting.Description>
-                                    <TextBlock Style="{StaticResource SecondaryTextStyle}">
-                                                <Run x:Uid="General_SettingsBackupAndRestoreDescription" />
-                                    </TextBlock>
-                                </controls:Setting.Description>
-                                <controls:Setting.ActionContent>
-                                    <Grid Visibility="Visible">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="1*" />
-                                            <ColumnDefinition Width="1*" />
-                                        </Grid.ColumnDefinitions>
-                                        <Button Grid.Column="0" x:Uid="General_SettingsBackupAndRestore_ButtonBackup"
-                                        Command="{Binding BackupConfigsEventHandler}"
-                                        IsEnabled="True"
-                                        Visibility="Visible"
-                                        HorizontalAlignment="Right"/>
-
-                                        <Button Grid.Column="2" x:Uid="General_SettingsBackupAndRestore_ButtonRestore"
-                                        Command="{Binding RestoreConfigsEventHandler}"
-                                        IsEnabled="True"
-                                        Visibility="Visible"
-                                        HorizontalAlignment="Right"/>
-
-                                    </Grid>
-                                </controls:Setting.ActionContent>
-                            </controls:Setting>
-                        </controls:SettingExpander.Header>
-
-                        <controls:SettingExpander.Content>
-
-
-                            <StackPanel Orientation="Vertical">
-
-                                <controls:Setting x:Uid="General_SettingsBackupAndRestoreLocationText" Visibility="Visible" Style="{StaticResource ExpanderContentSettingStyle}">
-
-                                    <controls:Setting.ActionContent>
-
-                                        <Grid Padding="10,5,0,0">
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="Auto" />
-                                                <ColumnDefinition Width="*" />
-                                                <ColumnDefinition Width="Auto" />
-                                            </Grid.ColumnDefinitions>
-                                            <Grid.RowDefinitions>
-                                                <RowDefinition Height="Auto" />
-                                            </Grid.RowDefinitions>
-                                            <TextBlock MaxWidth="350" Grid.Row="0" Grid.Column="1" Text="{x:Bind Mode=TwoWay, Path=ViewModel.SettingsBackupAndRestoreDir}" IsTextSelectionEnabled="True" MinWidth="350" />
-                                            <Button Grid.Row="0" Grid.Column="2" x:Uid="General_SettingsBackupAndRestore_ButtonSelectLocation"
-                                        Command="{Binding SelectSettingBackupDirEventHandler}"
-                                        IsEnabled="True"
-                                        Visibility="Visible"
-                                        HorizontalAlignment="Left"/>
-
-                                        </Grid>
-
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-
-                                <controls:Setting x:Uid="General_SettingsBackupAndRestoreStatusInfo" Visibility="Visible" Style="{StaticResource ExpanderContentSettingStyle}"/>
-                                <StackPanel>
-
-
-
-                                    <Grid Padding="55,0,10,10">
-                                        <Grid.Resources >
-                                            <Style TargetType="Border" >
-                                                <Setter Property="Padding" Value="2,0,5,0" />
-                                            </Style>
-                                        </Grid.Resources>
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="Auto" />
-                                            <ColumnDefinition Width="Auto" />
-                                        </Grid.ColumnDefinitions>
-                                        <Grid.RowDefinitions>
-                                            <RowDefinition Height="1*" />
-                                            <RowDefinition Height="1*" />
-                                            <RowDefinition Height="1*" />
-                                            <RowDefinition Height="1*" />
-                                        </Grid.RowDefinitions>
-
-                                        <Border Grid.Row="0" Grid.Column="0">
-                                            <TextBlock Style="{StaticResource HeaderTextStyle}">
-                                                <Run x:Uid="General_SettingsBackupInfo_DateHeader" />
-                                            </TextBlock>
-
-                                        </Border>
-                                        <Border Grid.Row="0" Grid.Column="1">
-                                            <TextBlock Style="{StaticResource SecondaryTextStyle}">
-                                                <Run Text="{Binding LastSettingsBackupDate, Mode=OneWay}"/>
-                                            </TextBlock>
-                                        </Border>
-
-                                        <Border Grid.Row="1" Grid.Column="0">
-                                            <TextBlock Style="{StaticResource HeaderTextStyle}">
-                                                <Run x:Uid="General_SettingsBackupInfo_StatusHeader" />
-                                            </TextBlock>
-                                        </Border>
-                                        <Border Grid.Row="1" Grid.Column="1">
-                                            <StackPanel Orientation="Horizontal">
-                                                <TextBlock Style="{StaticResource SecondaryTextStyle}">                                                
-                                                <Run Text="{Binding CurrentSettingMatchText, Mode=OneWay}"/>
-                                                </TextBlock>
-
-                                                <TextBlock Padding="5,0,0,0" Style="{StaticResource SecondaryTextStyle}"><Hyperlink Click="UpdateBackupAndRestoreStatusText" TextDecorations="Underline">
-                                                    <Run x:Uid="General_SettingsBackupAndRestore_LinkRefresh" />
-                                                </Hyperlink></TextBlock>
-
-                                            </StackPanel>
-                                        </Border>
-
-                                        <Border Grid.Row="2" Grid.Column="0">
-                                            <TextBlock Style="{StaticResource HeaderTextStyle}">
-                                                <Run x:Uid="General_SettingsBackupInfo_SourceHeader" />
-                                            </TextBlock>
-                                        </Border>
-                                        <Border Grid.Row="2" Grid.Column="1">
-                                            <TextBlock Style="{StaticResource SecondaryTextStyle}">
-                                                <Run Text="{Binding LastSettingsBackupSource, Mode=OneWay}"/>
-                                            </TextBlock>
-                                        </Border>
-
-                                        <Border Grid.Row="3" Grid.Column="0">
-                                            <TextBlock Style="{StaticResource HeaderTextStyle}">
-                                                <Run x:Uid="General_SettingsBackupInfo_FileNameHeader" />
-                                            </TextBlock>
-                                        </Border>
-                                        <Border Grid.Row="3" Grid.Column="1">
-                                            <TextBlock Style="{StaticResource SecondaryTextStyle}">
-                                                <Run Text="{Binding LastSettingsBackupFileName, Mode=OneWay}"/>
-                                            </TextBlock>
-                                        </Border>
-                                    </Grid>
+                                <!--  In progress panel  -->
+                                <StackPanel
+                                    Margin="0,0,0,16"
+                                    Orientation="Horizontal"
+                                    Spacing="18"
+                                    Visibility="{Binding Mode=OneWay, Path=IsNewVersionDownloading, Converter={StaticResource BoolToVisibilityConverter}}">
+                                    <ProgressRing
+                                        Width="24"
+                                        Height="24" />
+                                    <TextBlock
+                                        x:Uid="General_Downloading"
+                                        FontWeight="SemiBold"
+                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
                                 </StackPanel>
                             </StackPanel>
-                        </controls:SettingExpander.Content>
-                    </controls:SettingExpander>
+                        </InfoBar.Content>
+                        <InfoBar.ActionButton>
+                            <HyperlinkButton
+                                x:Uid="SeeWhatsNew"
+                                HorizontalAlignment="Right"
+                                NavigateUri="{Binding PowerToysNewAvailableVersionLink}"
+                                Style="{StaticResource TextButtonStyle}" />
+                        </InfoBar.ActionButton>
+                    </InfoBar>
+
+                    <labs:SettingsCard
+                        x:Uid="GeneralPage_ToggleSwitch_AutoDownloadUpdates"
+                        Margin="0,-6,0,0"
+                        IsEnabled="{Binding AutoUpdatesEnabled}"
+                        Visibility="{Binding Mode=OneWay, Path=IsAdmin, Converter={StaticResource BoolToVisibilityConverter}}">
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            IsOn="{Binding Mode=TwoWay, Path=AutoDownloadUpdates}" />
+                    </labs:SettingsCard>
                 </controls:SettingsGroup>
 
-                <InfoBar x:Uid="General_SettingsBackupMessageResults"
-                                  IsClosable="False"
-                                  Severity="{Binding BackupRestoreMessageSeverity, Converter={StaticResource StringToInfoBarSeverityConverter}}"                         
-                                  IsTabStop="{Binding SettingsBackupRestoreMessageVisible, Mode=OneWay}"
-                                  IsOpen="{Binding SettingsBackupRestoreMessageVisible, Mode=OneWay}"                                  
-                                  Title="{Binding SettingsBackupMessage}"/>
-                <!-- End General_SettingsBackupAndRestore -->
+                <controls:SettingsGroup x:Uid="Admin_Mode">
+                    <labs:SettingsExpander
+                        x:Uid="Admin_Mode_Running_As"
+                        Header="{Binding Mode=OneWay, Path=RunningAsText}"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xE7EF;}"
+                        IsExpanded="True">
+                        <labs:SettingsExpander.Description>
+                            <HyperlinkButton
+                                x:Uid="GeneralPage_ToggleSwitch_AlwaysRunElevated_Link"
+                                NavigateUri="https://aka.ms/powertoysDetectedElevatedHelp" />
+                        </labs:SettingsExpander.Description>
+                        <Button
+                            x:Uid="GeneralPage_RestartAsAdmin_Button"
+                            Command="{Binding RestartElevatedButtonEventHandler}"
+                            IsEnabled="{Binding Mode=OneWay, Path=IsAdminButtonEnabled}" />
+                        <labs:SettingsExpander.Items>
+                            <labs:SettingsCard
+                                x:Uid="GeneralSettings_AlwaysRunAsAdminText"
+                                IsEnabled="{Binding Mode=OneWay, Path=IsElevated}">
+                                <ToggleSwitch
+                                    x:Uid="ToggleSwitch"
+                                    IsOn="{Binding Mode=TwoWay, Path=RunElevated}" />
+                            </labs:SettingsCard>
+                        </labs:SettingsExpander.Items>
+                    </labs:SettingsExpander>
+                </controls:SettingsGroup>
 
+                <controls:SettingsGroup
+                    x:Uid="ShortcutGuide_Appearance_Behavior"
+                    IsEnabled="True">
+                    <labs:SettingsCard
+                        x:Uid="ColorModeHeader"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xE790;}">
+                        <labs:SettingsCard.Description>
+                            <HyperlinkButton
+                                x:Uid="Windows_Color_Settings"
+                                Click="OpenColorsSettings_Click" />
+                        </labs:SettingsCard.Description>
+                        <ComboBox
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.ThemeIndex}">
+                            <ComboBoxItem x:Uid="Radio_Theme_Dark" />
+                            <ComboBoxItem x:Uid="Radio_Theme_Light" />
+                            <ComboBoxItem x:Uid="Radio_Theme_Default" />
+                        </ComboBox>
+                    </labs:SettingsCard>
+
+                    <labs:SettingsCard x:Uid="GeneralPage_RunAtStartUp">
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            IsOn="{Binding Mode=TwoWay, Path=Startup}" />
+                    </labs:SettingsCard>
+                </controls:SettingsGroup>
+
+                <controls:SettingsGroup
+                    x:Uid="General_SettingsBackupAndRestoreTitle"
+                    Visibility="Visible">
+                    <labs:SettingsExpander
+                        x:Uid="General_SettingsBackupAndRestore"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xE777;}">
+                        <StackPanel
+                            Orientation="Horizontal"
+                            Spacing="8">
+                            <Button
+                                x:Uid="General_SettingsBackupAndRestore_ButtonBackup"
+                                Command="{Binding BackupConfigsEventHandler}" />
+                            <Button
+                                x:Uid="General_SettingsBackupAndRestore_ButtonRestore"
+                                Command="{Binding RestoreConfigsEventHandler}" />
+                        </StackPanel>
+                        <labs:SettingsExpander.Items>
+                            <labs:SettingsCard x:Uid="General_SettingsBackupAndRestoreLocationText">
+                                <StackPanel
+                                    HorizontalAlignment="Right"
+                                    Orientation="Horizontal"
+                                    Spacing="8">
+                                    <TextBlock
+                                        x:Name="pathTextBlock"
+                                        Width="350"
+                                        HorizontalAlignment="Right"
+                                        VerticalAlignment="Center"
+                                        FontSize="12"
+                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                        IsTextSelectionEnabled="True"
+                                        Text="{x:Bind Mode=TwoWay, Path=ViewModel.SettingsBackupAndRestoreDir}"
+                                        TextAlignment="Right"
+                                        TextTrimming="CharacterEllipsis">
+                                        <ToolTipService.ToolTip>
+                                            <ToolTip IsEnabled="{Binding ElementName=pathTextBlock, Path=IsTextTrimmed}">
+                                                <TextBlock Text="{x:Bind Mode=TwoWay, Path=ViewModel.SettingsBackupAndRestoreDir}" />
+                                            </ToolTip>
+                                        </ToolTipService.ToolTip>
+                                    </TextBlock>
+                                    <Button
+                                        Command="{Binding SelectSettingBackupDirEventHandler}"
+                                        Content="&#xe8da;"
+                                        FontFamily="{ThemeResource SymbolThemeFontFamily}">
+                                        <ToolTipService.ToolTip>
+                                            <ToolTip>
+                                                <TextBlock x:Uid="General_SettingsBackupAndRestore_ButtonSelectLocation" />
+                                            </ToolTip>
+                                        </ToolTipService.ToolTip>
+                                    </Button>
+                                </StackPanel>
+                            </labs:SettingsCard>
+                            <labs:SettingsCard
+                                x:Uid="General_SettingsBackupAndRestoreStatusInfo"
+                                HorizontalContentAlignment="Left"
+                                ContentAlignment="Vertical">
+                                <labs:SettingsCard.Resources>
+                                    <Style TargetType="TextBlock">
+                                        <Setter Property="FontSize" Value="12" />
+                                    </Style>
+                                </labs:SettingsCard.Resources>
+                                <Grid
+                                    Margin="0,0,0,6"
+                                    ColumnSpacing="8">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <TextBlock x:Uid="General_SettingsBackupInfo_StatusHeader" />
+                                    <TextBlock
+                                        Grid.Column="1"
+                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}">
+                                        <Run Text="{Binding CurrentSettingMatchText, Mode=OneWay}" />
+                                        <Hyperlink
+                                            Click="UpdateBackupAndRestoreStatusText"
+                                            TextDecorations="Underline">
+                                            <Run x:Uid="General_SettingsBackupAndRestore_LinkRefresh" />
+                                        </Hyperlink>
+                                    </TextBlock>
+
+                                    <TextBlock
+                                        x:Uid="General_SettingsBackupInfo_FileNameHeader"
+                                        Grid.Row="1" />
+                                    <TextBlock
+                                        Grid.Row="1"
+                                        Grid.Column="1"
+                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                        Text="{Binding LastSettingsBackupFileName, Mode=OneWay}" />
+
+                                    <TextBlock
+                                        x:Uid="General_SettingsBackupInfo_SourceHeader"
+                                        Grid.Row="2" />
+                                    <TextBlock
+                                        Grid.Row="2"
+                                        Grid.Column="1"
+                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                        Text="{Binding LastSettingsBackupSource, Mode=OneWay}" />
+                                    <TextBlock
+                                        x:Uid="General_SettingsBackupInfo_DateHeader"
+                                        Grid.Row="3" />
+                                    <TextBlock
+                                        Grid.Row="3"
+                                        Grid.Column="1"
+                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                        Text="{Binding LastSettingsBackupDate, Mode=OneWay}" />
+                                </Grid>
+                            </labs:SettingsCard>
+                        </labs:SettingsExpander.Items>
+                    </labs:SettingsExpander>
+                </controls:SettingsGroup>
+
+                <InfoBar
+                    x:Uid="General_SettingsBackupMessageResults"
+                    Title="{Binding SettingsBackupMessage}"
+                    IsClosable="False"
+                    IsOpen="{Binding SettingsBackupRestoreMessageVisible, Mode=OneWay}"
+                    IsTabStop="{Binding SettingsBackupRestoreMessageVisible, Mode=OneWay}"
+                    Severity="{Binding BackupRestoreMessageSeverity, Converter={StaticResource StringToInfoBarSeverityConverter}}" />
             </StackPanel>
 
         </controls:SettingsPageControl.ModuleContent>
         <controls:SettingsPageControl.PrimaryLinks>
-            <controls:PageLink x:Uid="GeneralPage_Documentation" Link="https://aka.ms/PowerToysOverview"/>
-            <controls:PageLink x:Uid="General_Repository" Link="https://aka.ms/powertoys"/>
-            <controls:PageLink x:Uid="GeneralPage_ReportAbug" Link="https://aka.ms/powerToysReportBug"/>
-            <controls:PageLink x:Uid="GeneralPage_RequestAFeature_URL" Link="https://aka.ms/powerToysRequestFeature"/>
+            <controls:PageLink
+                x:Uid="GeneralPage_Documentation"
+                Link="https://aka.ms/PowerToysOverview" />
+            <controls:PageLink
+                x:Uid="General_Repository"
+                Link="https://aka.ms/powertoys" />
+            <controls:PageLink
+                x:Uid="GeneralPage_ReportAbug"
+                Link="https://aka.ms/powerToysReportBug" />
+            <controls:PageLink
+                x:Uid="GeneralPage_RequestAFeature_URL"
+                Link="https://aka.ms/powerToysRequestFeature" />
         </controls:SettingsPageControl.PrimaryLinks>
         <controls:SettingsPageControl.SecondaryLinks>
-            <controls:PageLink x:Uid="GeneralPage_PrivacyStatement_URL" Link="http://go.microsoft.com/fwlink/?LinkId=521839"/>
-            <controls:PageLink x:Uid="OpenSource_Notice" Link="https://github.com/microsoft/PowerToys/blob/main/NOTICE.md"/>
+            <controls:PageLink
+                x:Uid="GeneralPage_PrivacyStatement_URL"
+                Link="http://go.microsoft.com/fwlink/?LinkId=521839" />
+            <controls:PageLink
+                x:Uid="OpenSource_Notice"
+                Link="https://github.com/microsoft/PowerToys/blob/main/NOTICE.md" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
 </Page>
\ No newline at end of file
diff --git a/src/settings-ui/Settings.UI/Views/HostsPage.xaml b/src/settings-ui/Settings.UI/Views/HostsPage.xaml
index 6041d6d882..354ea752dc 100644
--- a/src/settings-ui/Settings.UI/Views/HostsPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/HostsPage.xaml
@@ -2,89 +2,85 @@
     x:Class="Microsoft.PowerToys.Settings.UI.Views.HostsPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Microsoft.PowerToys.Settings.UI.Views"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-    xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
-    mc:Ignorable="d"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:CommunityToolkit.WinUI.UI"
+    mc:Ignorable="d">
 
-    <Page.Resources>
-        <converters:BoolNegationConverter x:Key="BoolNegationConverter"/>
-    </Page.Resources>
-
-    <controls:SettingsPageControl x:Uid="Hosts" IsTabStop="False"
-                                  ModuleImageSource="ms-appx:///Assets/Modules/HostsFileEditor.png">
+    <controls:SettingsPageControl
+        x:Uid="Hosts"
+        ModuleImageSource="ms-appx:///Assets/Modules/AlwaysOnTop.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel Orientation="Vertical">
-
-                <controls:Setting x:Uid="Hosts_EnableToggleControl_HeaderText" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
-                    <controls:Setting.Icon>
-                        <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsHosts.png" ShowAsMonochrome="False" />
-                    </controls:Setting.Icon>
-                    <controls:Setting.ActionContent>
-                        <ToggleSwitch IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" x:Uid="ToggleSwitch"/>
-                    </controls:Setting.ActionContent>
-                </controls:Setting>
-
-                <InfoBar x:Uid="GPO_IsSettingForced"
-                    Severity="Informational"
+                <labs:SettingsCard
+                    x:Uid="Hosts_EnableToggleControl_HeaderText"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsHosts.png}"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
+                    <ToggleSwitch
+                        x:Uid="ToggleSwitch"
+                        IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                </labs:SettingsCard>
+                <InfoBar
+                    x:Uid="GPO_IsSettingForced"
                     IsClosable="False"
                     IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}"
-                    IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}" />
-
-                <controls:SettingsGroup x:Uid="Hosts_Activation_GroupSettings"
-                                        IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <Button x:Uid="Hosts_LaunchButton_Accessible"
-                            Style="{StaticResource SettingButtonStyle}" 
-                            Command="{x:Bind ViewModel.LaunchEventHandler}">
-                        <controls:Setting x:Uid="Hosts_LaunchButtonControl"
-                                          Style="{StaticResource ExpanderHeaderSettingStyle}"
-                                          Icon="&#xEA37;">
-                            <controls:Setting.ActionContent>
-                                <FontIcon Glyph="&#xE8A7;"
-                                          FontSize="18"
-                                          FontFamily="{ThemeResource SymbolThemeFontFamily}" />
-                            </controls:Setting.ActionContent>
-                        </controls:Setting>
-                    </Button>
-
-                    <controls:Setting x:Uid="Hosts_Toggle_LaunchAdministrator"
-                                  Icon="&#xE7EF;"
-                                  IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.LaunchAdministratorEnabled}">
-                        <controls:Setting.ActionContent>
-                            <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.LaunchAdministrator}" />
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
-
-                    <controls:Setting x:Uid="Hosts_Toggle_ShowStartupWarning"
-                                  Icon="&#xE7BA;"
-                                  IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                        <controls:Setting.ActionContent>
-                            <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.ShowStartupWarning}" />
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
+                    IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}"
+                    Severity="Informational" />
+                <controls:SettingsGroup
+                    x:Uid="Hosts_Activation_GroupSettings"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                    <labs:SettingsCard
+                        x:Uid="Hosts_LaunchButtonControl"
+                        ActionIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 FontSize=14,
+                                                 Glyph=&#xE8A7;}"
+                        Command="{x:Bind ViewModel.LaunchEventHandler}"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xEA37;}"
+                        IsClickEnabled="True" />
+                    <labs:SettingsCard
+                        x:Uid="Hosts_Toggle_LaunchAdministrator"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xE7EF;}"
+                        IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.LaunchAdministratorEnabled}">
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.LaunchAdministrator}" />
+                    </labs:SettingsCard>
+                    <labs:SettingsCard
+                        x:Uid="Hosts_Toggle_ShowStartupWarning"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xE7BA;}">
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.ShowStartupWarning}" />
+                    </labs:SettingsCard>
                 </controls:SettingsGroup>
 
-                <controls:SettingsGroup x:Uid="Hosts_File_GroupSettings"
-                                        IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <controls:Setting x:Uid="Hosts_AdditionalLinesPosition" Icon="&#xE8A5;" >
-                        <controls:Setting.ActionContent>
-                            <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                      SelectedIndex="{x:Bind Path=ViewModel.AdditionalLinesPosition, Mode=TwoWay}" >
-                                <ComboBoxItem x:Uid="Hosts_AdditionalLinesPosition_Top" />
-                                <ComboBoxItem x:Uid="Hosts_AdditionalLinesPosition_Bottom" />
-                            </ComboBox>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
+                <controls:SettingsGroup
+                    x:Uid="Hosts_File_GroupSettings"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                    <labs:SettingsCard
+                        x:Uid="Hosts_AdditionalLinesPosition"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xE8A5;}">
+                        <ComboBox
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            SelectedIndex="{x:Bind Path=ViewModel.AdditionalLinesPosition, Mode=TwoWay}">
+                            <ComboBoxItem x:Uid="Hosts_AdditionalLinesPosition_Top" />
+                            <ComboBoxItem x:Uid="Hosts_AdditionalLinesPosition_Bottom" />
+                        </ComboBox>
+                    </labs:SettingsCard>
                 </controls:SettingsGroup>
-
             </StackPanel>
         </controls:SettingsPageControl.ModuleContent>
 
         <controls:SettingsPageControl.PrimaryLinks>
-            <controls:PageLink x:Uid="LearnMore_Hosts" Link="https://aka.ms/PowerToysOverview_HostsFileEditor"/>
+            <controls:PageLink
+                x:Uid="LearnMore_Hosts"
+                Link="https://aka.ms/PowerToysOverview_HostsFileEditor" />
         </controls:SettingsPageControl.PrimaryLinks>
     </controls:SettingsPageControl>
 </Page>
diff --git a/src/settings-ui/Settings.UI/Views/ImageResizerPage.xaml b/src/settings-ui/Settings.UI/Views/ImageResizerPage.xaml
index cef4af472d..7b53a4f65a 100644
--- a/src/settings-ui/Settings.UI/Views/ImageResizerPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/ImageResizerPage.xaml
@@ -2,285 +2,323 @@
     x:Class="Microsoft.PowerToys.Settings.UI.Views.ImageResizerPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"    
-    xmlns:models="using:Microsoft.PowerToys.Settings.UI.Library"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:models="using:Microsoft.PowerToys.Settings.UI.Library"
     xmlns:toolkitconverters="using:CommunityToolkit.WinUI.UI.Converters"
-    mc:Ignorable="d"
-    AutomationProperties.LandmarkType="Main" x:Name="RootPage">
+    xmlns:ui="using:CommunityToolkit.WinUI.UI"
+    x:Name="RootPage"
+    AutomationProperties.LandmarkType="Main"
+    mc:Ignorable="d">
     <Page.Resources>
         <converters:ImageResizerFitToStringConverter x:Key="ImageResizerFitToStringConverter" />
         <converters:ImageResizerUnitToStringConverter x:Key="ImageResizerUnitToStringConverter" />
-        <toolkitconverters:BoolNegationConverter x:Key="BoolNegationConverter"/>
-        <toolkitconverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" TrueValue="Visible" FalseValue="Collapsed" />
-        <toolkitconverters:BoolToObjectConverter x:Key="BoolToComboBoxIndexConverter" TrueValue="0" FalseValue="1"/>
+        <toolkitconverters:BoolToObjectConverter
+            x:Key="BoolToComboBoxIndexConverter"
+            FalseValue="1"
+            TrueValue="0" />
     </Page.Resources>
-    <controls:SettingsPageControl x:Uid="ImageResizer"
-                                  ModuleImageSource="ms-appx:///Assets/Modules/ImageResizer.png">
+    <controls:SettingsPageControl
+        x:Uid="ImageResizer"
+        ModuleImageSource="ms-appx:///Assets/Modules/ImageResizer.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel>
+                <labs:SettingsCard
+                    x:Uid="ImageResizer_EnableToggle"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsImageResizer.png}"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
+                    <ToggleSwitch
+                        x:Uid="ToggleSwitch"
+                        IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                </labs:SettingsCard>
 
-                <controls:Setting IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}" x:Uid="ImageResizer_EnableToggle">
-                    <controls:Setting.Icon>
-                        <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsImageResizer.png" ShowAsMonochrome="False" />
-                    </controls:Setting.Icon>
-                    <controls:Setting.ActionContent>
-                        <ToggleSwitch IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" x:Uid="ToggleSwitch"/>
-                    </controls:Setting.ActionContent>
-                </controls:Setting>
-
-                <InfoBar x:Uid="GPO_IsSettingForced"
-                    Severity="Informational"
+                <InfoBar
+                    x:Uid="GPO_IsSettingForced"
                     IsClosable="False"
                     IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}"
-                    IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}" />
+                    IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}"
+                    Severity="Informational" />
 
-                <controls:SettingsGroup x:Uid="ImageResizer_CustomSizes" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <controls:Setting x:Uid="ImageResizer_Presets" Icon="&#xE792;">
-                        <controls:Setting.ActionContent>
-                            <Button x:Uid="ImageResizer_AddSizeButton" Click="AddSizeButton_Click" Style="{ThemeResource AccentButtonStyle}" />
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
-
-
-                    <ListView x:Name="ImagesSizesListView" 
-                      x:Uid="ImagesSizesListView"
-                      ItemsSource="{x:Bind ViewModel.Sizes, Mode=TwoWay}"
-                      SelectionMode="None"
-                      ContainerContentChanging="ImagesSizesListView_ContainerContentChanging">
+                <controls:SettingsGroup
+                    x:Uid="ImageResizer_CustomSizes"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                    <labs:SettingsCard
+                        x:Uid="ImageResizer_Presets"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xE792;}">
+                        <Button
+                            x:Uid="ImageResizer_AddSizeButton"
+                            Click="AddSizeButton_Click"
+                            Style="{ThemeResource AccentButtonStyle}" />
+                    </labs:SettingsCard>
+                    <ListView
+                        x:Name="ImagesSizesListView"
+                        x:Uid="ImagesSizesListView"
+                        ContainerContentChanging="ImagesSizesListView_ContainerContentChanging"
+                        ItemsSource="{x:Bind ViewModel.Sizes, Mode=TwoWay}"
+                        SelectionMode="None">
                         <ListView.ItemTemplate>
-                        <DataTemplate x:Name="SingleLineDataTemplate" x:DataType="models:ImageSize">
-                                <Grid AutomationProperties.Name="{x:Bind Name, Mode=OneWay}"
-                                  HorizontalAlignment="Stretch"
-                                  Background="{ThemeResource CardBackgroundBrush}"
-                                  BorderThickness="{ThemeResource CardBorderThickness}"
-                                  BorderBrush="{ThemeResource CardBorderBrush}"
-                                  CornerRadius="{ThemeResource ControlCornerRadius}"
-                                  Padding="0,0,16,0"
-                                  MinHeight="68">
-                                    <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="56" />
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
-                            
-                                <StackPanel Orientation="Vertical" VerticalAlignment="Center" Grid.Column="1" Margin="0,0,16,0">
-                                        <TextBlock Text="{x:Bind Name, Mode=OneWay}" FontWeight="SemiBold"
-                                       FontSize="16"/>
-                                    <StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="1" Margin="0,4,0,0">
-                                        <TextBlock Text="{x:Bind Fit, Mode=OneWay, Converter={StaticResource ImageResizerFitToStringConverter}}" Style="{ThemeResource SecondaryTextStyle}" Margin="0,0,4,0"/>
-                                        <TextBlock Text="{x:Bind Width, Mode=OneWay}" FontWeight="SemiBold" Margin="0,0,4,0"  Style="{ThemeResource SecondaryTextStyle}"/>
-                                        <TextBlock Text="&#xE947;" FontFamily="{ThemeResource SymbolThemeFontFamily}" FontSize="10" AutomationProperties.AccessibilityView="Raw" Visibility="{x:Bind Path=EnableEtraBoxes, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" Foreground="{ThemeResource SystemBaseMediumColor}" Margin="0,5,4,0"  Style="{ThemeResource SecondaryTextStyle}"/>
-                                        <TextBlock Text="{x:Bind Height, Mode=OneWay}" Visibility="{x:Bind Path=EnableEtraBoxes, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" FontWeight="SemiBold" Margin="0,0,4,0"  Style="{ThemeResource SecondaryTextStyle}"/>
-                                        <TextBlock Text="{x:Bind Unit, Mode=OneWay, Converter={StaticResource ImageResizerUnitToStringConverter},ConverterParameter=ToLower}" Foreground="{ThemeResource SystemBaseMediumColor}" Margin="0,0,4,0"  Style="{ThemeResource SecondaryTextStyle}"/>
-                                    </StackPanel>
-                                </StackPanel>
-
-                                <StackPanel Spacing="8" HorizontalAlignment="Right" Grid.Column="2" Orientation="Horizontal">
-                                    <Button 
-                                        x:Uid="EditButton"
-                                        Background="Transparent"
-                                        FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                        Width="40"
-                                        Height="36"
-                                        Content="&#xE70F;">
-                                        <ToolTipService.ToolTip>
-                                            <TextBlock x:Uid="EditTooltip"/>
-                                        </ToolTipService.ToolTip>
-                                        <Button.Flyout>
+                            <DataTemplate
+                                x:Name="SingleLineDataTemplate"
+                                x:DataType="models:ImageSize">
+                                <labs:SettingsCard Header="{x:Bind Name, Mode=OneWay}">
+                                    <labs:SettingsCard.Resources>
+                                        <x:Double x:Key="SettingsCardLeftIndention">42</x:Double>
+                                    </labs:SettingsCard.Resources>
+                                    <labs:SettingsCard.Description>
+                                        <StackPanel
+                                            Grid.Row="1"
+                                            Grid.Column="1"
+                                            Margin="0,4,0,0"
+                                            Orientation="Horizontal">
+                                            <TextBlock
+                                                Margin="0,0,4,0"
+                                                Style="{ThemeResource SecondaryTextStyle}"
+                                                Text="{x:Bind Fit, Mode=OneWay, Converter={StaticResource ImageResizerFitToStringConverter}}" />
+                                            <TextBlock
+                                                Margin="0,0,4,0"
+                                                FontWeight="SemiBold"
+                                                Style="{ThemeResource SecondaryTextStyle}"
+                                                Text="{x:Bind Width, Mode=OneWay}" />
+                                            <TextBlock
+                                                Margin="0,5,4,0"
+                                                AutomationProperties.AccessibilityView="Raw"
+                                                FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                                FontSize="10"
+                                                Foreground="{ThemeResource SystemBaseMediumColor}"
+                                                Style="{ThemeResource SecondaryTextStyle}"
+                                                Text="&#xE947;"
+                                                Visibility="{x:Bind Path=EnableEtraBoxes, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+                                            <TextBlock
+                                                Margin="0,0,4,0"
+                                                FontWeight="SemiBold"
+                                                Style="{ThemeResource SecondaryTextStyle}"
+                                                Text="{x:Bind Height, Mode=OneWay}"
+                                                Visibility="{x:Bind Path=EnableEtraBoxes, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+                                            <TextBlock
+                                                Margin="0,0,4,0"
+                                                Foreground="{ThemeResource SystemBaseMediumColor}"
+                                                Style="{ThemeResource SecondaryTextStyle}"
+                                                Text="{x:Bind Unit, Mode=OneWay, Converter={StaticResource ImageResizerUnitToStringConverter}, ConverterParameter=ToLower}" />
+                                        </StackPanel>
+                                    </labs:SettingsCard.Description>
+                                    <StackPanel
+                                        Grid.Column="2"
+                                        HorizontalAlignment="Right"
+                                        Orientation="Horizontal"
+                                        Spacing="8">
+                                        <Button
+                                            x:Uid="EditButton"
+                                            Width="40"
+                                            Height="36"
+                                            Content="&#xE70F;"
+                                            FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                            Style="{StaticResource SubtleButtonStyle}">
+                                            <ToolTipService.ToolTip>
+                                                <TextBlock x:Uid="EditTooltip" />
+                                            </ToolTipService.ToolTip>
+                                            <Button.Flyout>
                                                 <Flyout x:Uid="ImageResizer_EditSize">
-                                                    <StackPanel Spacing="16" Margin="0,12,0,0">
-                                                    <TextBox
-                                                        x:Uid="ImageResizer_Name"
-                                                        Text="{x:Bind Path=Name, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" 
-                                                        Width="240"
-                                                        HorizontalAlignment="Left"/>
+                                                    <StackPanel
+                                                        Margin="0,12,0,0"
+                                                        Spacing="16">
+                                                        <TextBox
+                                                            x:Uid="ImageResizer_Name"
+                                                            Width="240"
+                                                            HorizontalAlignment="Left"
+                                                            Text="{x:Bind Path=Name, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
-                                                    <ComboBox
-                                                        x:Uid="ImageResizer_Fit"
-                                                        SelectedIndex="{x:Bind Path=Fit, Mode=TwoWay}"
-                                                        Width="240"
-                                                        HorizontalAlignment="Left">
+                                                        <ComboBox
+                                                            x:Uid="ImageResizer_Fit"
+                                                            Width="240"
+                                                            HorizontalAlignment="Left"
+                                                            SelectedIndex="{x:Bind Path=Fit, Mode=TwoWay}">
                                                             <ComboBoxItem x:Uid="ImageResizer_Sizes_Fit_Fill" />
                                                             <ComboBoxItem x:Uid="ImageResizer_Sizes_Fit_Fit" />
                                                             <ComboBoxItem x:Uid="ImageResizer_Sizes_Fit_Stretch" />
-                                                    </ComboBox>
+                                                        </ComboBox>
 
-                                                    <StackPanel Spacing="8" Orientation="Horizontal">
-                                                        <NumberBox
-                                                            x:Uid="ImageResizer_Width"
-                                                            Value="{x:Bind Path=Width, Mode=TwoWay}" 
-                                                            Minimum="0"
-                                                            Width="116"
-                                                            SpinButtonPlacementMode="Compact"/>
+                                                        <StackPanel
+                                                            Orientation="Horizontal"
+                                                            Spacing="8">
+                                                            <NumberBox
+                                                                x:Uid="ImageResizer_Width"
+                                                                Width="116"
+                                                                Minimum="0"
+                                                                SpinButtonPlacementMode="Compact"
+                                                                Value="{x:Bind Path=Width, Mode=TwoWay}" />
 
-                                                        <NumberBox
-                                                            x:Uid="ImageResizer_Height"
-                                                            Value="{x:Bind Path=Height, Mode=TwoWay}" 
-                                                            Width="116"
-                                                            Minimum="0"
-                                                            SpinButtonPlacementMode="Compact"
-                                                            Visibility="{x:Bind Path=EnableEtraBoxes, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
+                                                            <NumberBox
+                                                                x:Uid="ImageResizer_Height"
+                                                                Width="116"
+                                                                Minimum="0"
+                                                                SpinButtonPlacementMode="Compact"
+                                                                Visibility="{x:Bind Path=EnableEtraBoxes, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                                                                Value="{x:Bind Path=Height, Mode=TwoWay}" />
 
+                                                        </StackPanel>
+                                                        <ComboBox
+                                                            x:Uid="ImageResizer_Size"
+                                                            Width="240"
+                                                            Margin="0,0,0,24"
+                                                            SelectedIndex="{Binding Path=Unit, Mode=TwoWay}">
+                                                            <ComboBoxItem x:Uid="ImageResizer_Sizes_Units_CM" />
+                                                            <ComboBoxItem x:Uid="ImageResizer_Sizes_Units_Inches" />
+                                                            <ComboBoxItem x:Uid="ImageResizer_Sizes_Units_Percent" />
+                                                            <ComboBoxItem x:Uid="ImageResizer_Sizes_Units_Pixels" />
+                                                        </ComboBox>
                                                     </StackPanel>
-                                                    <ComboBox x:Uid="ImageResizer_Size"
-                                                                  SelectedIndex="{Binding Path=Unit, Mode=TwoWay}"
-                                                                  Width="240"
-                                                              Margin="0,0,0,24">
-                                                        <ComboBoxItem x:Uid="ImageResizer_Sizes_Units_CM" />
-                                                        <ComboBoxItem x:Uid="ImageResizer_Sizes_Units_Inches" />
-                                                        <ComboBoxItem x:Uid="ImageResizer_Sizes_Units_Percent" />
-                                                        <ComboBoxItem x:Uid="ImageResizer_Sizes_Units_Pixels" />
-                                                    </ComboBox>
-                                                </StackPanel>
-                                            </Flyout>
-                                        </Button.Flyout>
+                                                </Flyout>
+                                            </Button.Flyout>
                                         </Button>
 
-                                    <Button x:Name="RemoveButton"
-                                        x:Uid="RemoveButton"
-                                        Background="Transparent"
-                                        FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                        Width="40"
-                                        Height="36"
-                                        Content="&#xE74D;"
-                                        Click="DeleteCustomSize"
-                                        CommandParameter="{Binding Id}">
-                                        <ToolTipService.ToolTip>
-                                            <TextBlock x:Uid="RemoveTooltip"/>
-                                        </ToolTipService.ToolTip>
-                                    </Button>
-                                </StackPanel>
-                             
-                            </Grid>
-         
-                        </DataTemplate>
-                    </ListView.ItemTemplate>
-                </ListView>
+                                        <Button
+                                            x:Name="RemoveButton"
+                                            x:Uid="RemoveButton"
+                                            Width="40"
+                                            Height="36"
+                                            Click="DeleteCustomSize"
+                                            CommandParameter="{Binding Id}"
+                                            Content="&#xE74D;"
+                                            FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                            Style="{StaticResource SubtleButtonStyle}">
+                                            <ToolTipService.ToolTip>
+                                                <TextBlock x:Uid="RemoveTooltip" />
+                                            </ToolTipService.ToolTip>
+                                        </Button>
+                                    </StackPanel>
+                                </labs:SettingsCard>
+                            </DataTemplate>
+                        </ListView.ItemTemplate>
+                    </ListView>
                 </controls:SettingsGroup>
 
+                <controls:SettingsGroup
+                    x:Uid="Encoding"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                    <labs:SettingsCard x:Uid="ImageResizer_FallBackEncoderText">
+                        <ComboBox
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            SelectedIndex="{x:Bind Path=ViewModel.Encoder, Mode=TwoWay}">
+                            <ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_PNG" />
+                            <ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_BMP" />
+                            <ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_JPEG" />
+                            <ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_TIFF" />
+                            <ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_WMPhoto" />
+                            <ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_GIF" />
+                        </ComboBox>
+                    </labs:SettingsCard>
 
-                <controls:SettingsGroup x:Uid="Encoding" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <controls:Setting x:Uid="ImageResizer_FallBackEncoderText">
-                        <controls:Setting.ActionContent>
-                            <ComboBox SelectedIndex="{x:Bind Path=ViewModel.Encoder, Mode=TwoWay}"
-                                      MinWidth="{StaticResource SettingActionControlMinWidth}">
-                                <ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_PNG" />
-                                <ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_BMP" />
-                                <ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_JPEG" />
-                                <ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_TIFF" />
-                                <ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_WMPhoto" />
-                                <ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_GIF" />
-                            </ComboBox>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
+                    <labs:SettingsCard x:Uid="ImageResizer_Encoding">
+                        <Slider
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            Maximum="100"
+                            Minimum="0"
+                            Value="{x:Bind Mode=TwoWay, Path=ViewModel.JPEGQualityLevel}" />
+                    </labs:SettingsCard>
 
-                    <controls:Setting x:Uid="ImageResizer_Encoding">
-                        <controls:Setting.ActionContent>
-                            <Slider
-                                Minimum="0"
-                                Maximum="100"
-                                Value="{x:Bind Mode=TwoWay, Path=ViewModel.JPEGQualityLevel}"
+                    <labs:SettingsCard x:Uid="ImageResizer_PNGInterlacing">
+                        <ComboBox
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.PngInterlaceOption}">
+                            <ComboBoxItem x:Uid="Default" />
+                            <ComboBoxItem x:Uid="On" />
+                            <ComboBoxItem x:Uid="Off" />
+                        </ComboBox>
+                    </labs:SettingsCard>
+
+                    <labs:SettingsCard x:Uid="ImageResizer_TIFFCompression">
+                        <ComboBox
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.TiffCompressOption}">
+                            <ComboBoxItem x:Uid="ImageResizer_ENCODER_TIFF_Default" />
+                            <ComboBoxItem x:Uid="ImageResizer_ENCODER_TIFF_None" />
+                            <ComboBoxItem x:Uid="ImageResizer_ENCODER_TIFF_CCITT3" />
+                            <ComboBoxItem x:Uid="ImageResizer_ENCODER_TIFF_CCITT4" />
+                            <ComboBoxItem x:Uid="ImageResizer_ENCODER_TIFF_LZW" />
+                            <ComboBoxItem x:Uid="ImageResizer_ENCODER_TIFF_RLE" />
+                            <ComboBoxItem x:Uid="ImageResizer_ENCODER_TIFF_Zip" />
+                        </ComboBox>
+                    </labs:SettingsCard>
+                </controls:SettingsGroup>
+
+                <controls:SettingsGroup
+                    x:Uid="File"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                    <labs:SettingsCard x:Uid="ImageResizer_FilenameFormatHeader">
+                        <StackPanel
+                            Orientation="Horizontal"
+                            Spacing="4">
+                            <TextBox
+                                x:Uid="ImageResizer_FilenameFormatPlaceholder"
                                 MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                HorizontalAlignment="Right"
-                            />
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
+                                Text="{x:Bind Mode=TwoWay, Path=ViewModel.FileName}" />
+                            <Button
+                                x:Uid="ImageResizer_FilenameParameters"
+                                Content="&#xE946;"
+                                FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                Style="{StaticResource SubtleButtonStyle}">
+                                <Button.Flyout>
+                                    <Flyout>
+                                        <TextBlock x:Name="FileFormatTextBlock">
+                                            <Run x:Uid="ImageResizer_FileFormatDescription" />
+                                            <LineBreak />
+                                            <LineBreak />
+                                            <Run FontWeight="Bold" Text="%1" />
+                                            <Run Text=" - " />
+                                            <Run x:Uid="ImageResizer_Formatting_Filename" />
+                                            <LineBreak />
+                                            <Run FontWeight="Bold" Text="%2" />
+                                            <Run Text=" - " />
+                                            <Run x:Uid="ImageResizer_Formatting_Sizename" />
+                                            <LineBreak />
+                                            <Run FontWeight="Bold" Text="%3" />
+                                            <Run Text=" - " />
+                                            <Run x:Uid="ImageResizer_Formatting_SelectedWidth" />
+                                            <LineBreak />
+                                            <Run FontWeight="Bold" Text="%4" />
+                                            <Run Text=" - " />
+                                            <Run x:Uid="ImageResizer_Formatting_SelectedHeight" />
+                                            <LineBreak />
+                                            <Run FontWeight="Bold" Text="%5" />
+                                            <Run Text=" - " />
+                                            <Run x:Uid="ImageResizer_Formatting_ActualWidth" />
+                                            <LineBreak />
+                                            <Run FontWeight="Bold" Text="%6" />
+                                            <Run Text=" - " />
+                                            <Run x:Uid="ImageResizer_Formatting_ActualHeight" />
+                                        </TextBlock>
+                                    </Flyout>
+                                </Button.Flyout>
+                            </Button>
+                        </StackPanel>
+                    </labs:SettingsCard>
 
-                    <controls:Setting x:Uid="ImageResizer_PNGInterlacing">
-                        <controls:Setting.ActionContent>
-                            <ComboBox SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.PngInterlaceOption}" MinWidth="{StaticResource SettingActionControlMinWidth}">
-                                <ComboBoxItem x:Uid="Default"/>
-                                <ComboBoxItem x:Uid="On"/>
-                                <ComboBoxItem x:Uid="Off"/>
-                            </ComboBox>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
-
-                    <controls:Setting x:Uid="ImageResizer_TIFFCompression">
-                        <controls:Setting.ActionContent>
-                            <ComboBox SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.TiffCompressOption}" MinWidth="{StaticResource SettingActionControlMinWidth}">
-                                <ComboBoxItem x:Uid="ImageResizer_ENCODER_TIFF_Default"/>
-                                <ComboBoxItem x:Uid="ImageResizer_ENCODER_TIFF_None"/>
-                                <ComboBoxItem x:Uid="ImageResizer_ENCODER_TIFF_CCITT3"/>
-                                <ComboBoxItem x:Uid="ImageResizer_ENCODER_TIFF_CCITT4"/>
-                                <ComboBoxItem x:Uid="ImageResizer_ENCODER_TIFF_LZW"/>
-                                <ComboBoxItem x:Uid="ImageResizer_ENCODER_TIFF_RLE"/>
-                                <ComboBoxItem x:Uid="ImageResizer_ENCODER_TIFF_Zip"/>
-                            </ComboBox>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
-
-                </controls:SettingsGroup>
-
-
-                <controls:SettingsGroup x:Uid="File" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-
-                    <controls:Setting x:Uid="ImageResizer_FilenameFormatHeader">
-                        <controls:Setting.ActionContent>
-                            <StackPanel Spacing="4" Orientation="Horizontal">
-                                <TextBox Text="{x:Bind Mode=TwoWay, Path=ViewModel.FileName}"
-                                         HorizontalAlignment="Right"
-                                         MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                         x:Uid="ImageResizer_FilenameFormatPlaceholder"/>
-                                <Button Content="&#xE946;" x:Uid="ImageResizer_FilenameParameters" Height="32" FontFamily="{ThemeResource SymbolThemeFontFamily}">
-                                    <Button.Flyout>
-                                        <Flyout>
-                                            <TextBlock x:Name="FileFormatTextBlock">
-                                                <Run x:Uid="ImageResizer_FileFormatDescription"/>
-                                                <LineBreak/>
-                                                <LineBreak/>
-                                                <Run Text="%1" FontWeight="Bold" />
-                                                <Run Text=" - "/>
-                                                <Run x:Uid="ImageResizer_Formatting_Filename" />
-                                                <LineBreak/>
-                                                <Run Text="%2" FontWeight="Bold" />
-                                                <Run Text=" - "/>
-                                                <Run x:Uid="ImageResizer_Formatting_Sizename"/>
-                                                <LineBreak/>
-                                                <Run Text="%3" FontWeight="Bold" />
-                                                <Run Text=" - "/>
-                                                <Run x:Uid="ImageResizer_Formatting_SelectedWidth"/>
-                                                <LineBreak/>
-                                                <Run Text="%4" FontWeight="Bold" />
-                                                <Run Text=" - "/>
-                                                <Run x:Uid="ImageResizer_Formatting_SelectedHeight"/>
-                                                <LineBreak/>
-                                                <Run Text="%5" FontWeight="Bold" />
-                                                <Run Text=" - "/>
-                                                <Run x:Uid="ImageResizer_Formatting_ActualWidth"/>
-                                                <LineBreak/>
-                                                <Run Text="%6" FontWeight="Bold" />
-                                                <Run Text=" - "/>
-                                                <Run x:Uid="ImageResizer_Formatting_ActualHeight"/>
-                                            </TextBlock>
-                                        </Flyout>
-                                    </Button.Flyout>
-                                </Button>
-                            </StackPanel>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
-
-                    <controls:Setting x:Uid="ImageResizer_FileModifiedDate">
-                        <controls:Setting.ActionContent>
-                            <ComboBox SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.KeepDateModified, Converter={StaticResource BoolToComboBoxIndexConverter}}" MinWidth="{StaticResource SettingActionControlMinWidth}">
-                                <ComboBoxItem x:Uid="ImageResizer_UseOriginalDate"/>
-                                <ComboBoxItem x:Uid="ImageResizer_UseResizeDate"/>
-                            </ComboBox>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
+                    <labs:SettingsCard x:Uid="ImageResizer_FileModifiedDate">
+                        <ComboBox
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.KeepDateModified, Converter={StaticResource ReverseBoolToComboBoxIndexConverter}}">
+                            <ComboBoxItem x:Uid="ImageResizer_UseOriginalDate" />
+                            <ComboBoxItem x:Uid="ImageResizer_UseResizeDate" />
+                        </ComboBox>
+                    </labs:SettingsCard>
                 </controls:SettingsGroup>
             </StackPanel>
 
         </controls:SettingsPageControl.ModuleContent>
 
         <controls:SettingsPageControl.PrimaryLinks>
-            <controls:PageLink x:Uid="LearnMore_ImageResizer" Link="https://aka.ms/PowerToysOverview_ImageResizer"/>
+            <controls:PageLink
+                x:Uid="LearnMore_ImageResizer"
+                Link="https://aka.ms/PowerToysOverview_ImageResizer" />
         </controls:SettingsPageControl.PrimaryLinks>
         <controls:SettingsPageControl.SecondaryLinks>
-            <controls:PageLink Text="Brice Lambson's ImageResizer" Link="https://github.com/bricelam/ImageResizer/"/>
+            <controls:PageLink
+                Link="https://github.com/bricelam/ImageResizer/"
+                Text="Brice Lambson's ImageResizer" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
 </Page>
\ No newline at end of file
diff --git a/src/settings-ui/Settings.UI/Views/KeyboardManagerPage.xaml b/src/settings-ui/Settings.UI/Views/KeyboardManagerPage.xaml
index c6fdab0f1e..c6a97e667c 100644
--- a/src/settings-ui/Settings.UI/Views/KeyboardManagerPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/KeyboardManagerPage.xaml
@@ -2,201 +2,219 @@
     x:Class="Microsoft.PowerToys.Settings.UI.Views.KeyboardManagerPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Microsoft.PowerToys.Settings.UI.Views"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-    xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
     xmlns:Lib="using:Microsoft.PowerToys.Settings.UI.Library"
-    mc:Ignorable="d"
-    AutomationProperties.LandmarkType="Main">
+    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:CommunityToolkit.WinUI.UI"
+    AutomationProperties.LandmarkType="Main"
+    mc:Ignorable="d">
 
     <Page.Resources>
-        <converters:BoolNegationConverter x:Key="BoolNegationConverter"/>
+        <converters:VisibleIfNotEmptyConverter x:Key="visibleIfNotEmptyConverter" />
 
-        <local:VisibleIfNotEmpty x:Key="visibleIfNotEmptyConverter" />
-      
-        <Style TargetType="ListViewItem" x:Name="KeysListViewContainerStyle">
-            <Setter Property="IsTabStop" Value="False"/>
+        <Style
+            x:Name="KeysListViewContainerStyle"
+            TargetType="ListViewItem">
+            <Setter Property="IsTabStop" Value="False" />
         </Style>
 
-
-        <DataTemplate x:Key="OriginalKeyTemplate" x:DataType="x:String">
-            <controls:KeyVisual Content="{Binding}" VisualType="SmallOutline" />
+        <DataTemplate
+            x:Key="OriginalKeyTemplate"
+            x:DataType="x:String">
+            <controls:KeyVisual
+                Content="{Binding}"
+                VisualType="SmallOutline" />
         </DataTemplate>
 
-        <DataTemplate x:Key="RemappedKeyTemplate" x:DataType="x:String">
-            <controls:KeyVisual Content="{Binding}" VisualType="Small" />
+        <DataTemplate
+            x:Key="RemappedKeyTemplate"
+            x:DataType="x:String">
+            <controls:KeyVisual
+                Content="{Binding}"
+                VisualType="Small" />
         </DataTemplate>
 
         <!--<DataTemplate x:Name="KeysListViewTemplate" x:DataType="Lib:KeysDataModel">
-            <StackPanel 
-                Name="KeyboardManager_RemappedKeysListItem" 
+            <StackPanel
+                Name="KeyboardManager_RemappedKeysListItem"
                 x:Uid="KeyboardManager_RemappedKeysListItem"
                 Orientation="Horizontal"
                 Height="56">
-            
+
             </StackPanel>
         </DataTemplate>-->
         <!--<DataTemplate x:Name="ShortcutKeysListViewTemplate" x:DataType="Lib:AppSpecificKeysDataModel">
-            <StackPanel 
-                Name="KeyboardManager_RemappedShortcutsListItem" 
+            <StackPanel
+                Name="KeyboardManager_RemappedShortcutsListItem"
                 x:Uid="KeyboardManager_RemappedShortcutsListItem"
                 Orientation="Horizontal"
                 Height="56">
-              
+
         </DataTemplate>-->
     </Page.Resources>
 
-    <controls:SettingsPageControl x:Uid="KeyboardManager"
-                                  ModuleImageSource="ms-appx:///Assets/Modules/KBM.png">
+    <controls:SettingsPageControl
+        x:Uid="KeyboardManager"
+        ModuleImageSource="ms-appx:///Assets/Modules/KBM.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel Orientation="Vertical">
-
-                <controls:Setting x:Uid="KeyboardManager_EnableToggle" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
-                    <controls:Setting.Icon>
-                        <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsKeyboardManager.png" ShowAsMonochrome="False" />
-                    </controls:Setting.Icon>
-                    <controls:Setting.ActionContent>
-                        <ToggleSwitch IsOn="{x:Bind Path=ViewModel.Enabled, Mode=TwoWay}" x:Uid="ToggleSwitch"/>
-                    </controls:Setting.ActionContent>
-                    <controls:Setting.Description>
+                <labs:SettingsCard
+                    x:Uid="KeyboardManager_EnableToggle"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsKeyboardManager.png}"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
+                    <ToggleSwitch
+                        x:Uid="ToggleSwitch"
+                        IsOn="{x:Bind ViewModel.Enabled, Mode=TwoWay}" />
+                    <labs:SettingsCard.Description>
                         <HyperlinkButton NavigateUri="https://aka.ms/powerToysCannotRemapKeys">
-                            <TextBlock x:Uid="KBM_KeysCannotBeRemapped" FontWeight="SemiBold" />
+                            <TextBlock
+                                x:Uid="KBM_KeysCannotBeRemapped"
+                                FontWeight="SemiBold" />
                         </HyperlinkButton>
-                    </controls:Setting.Description>
-                </controls:Setting>
-
-                <InfoBar x:Uid="GPO_IsSettingForced"
-                    Severity="Informational"
+                    </labs:SettingsCard.Description>
+                </labs:SettingsCard>
+                <InfoBar
+                    x:Uid="GPO_IsSettingForced"
                     IsClosable="False"
                     IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}"
-                    IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}" />
+                    IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}"
+                    Severity="Informational" />
 
-                <controls:SettingsGroup x:Uid="KeyboardManager_Keys" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.Enabled}">
+                <controls:SettingsGroup
+                    x:Uid="KeyboardManager_Keys"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.Enabled}">
+                    <labs:SettingsCard
+                        x:Uid="KeyboardManager_RemapKeyboardButton"
+                        ActionIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 FontSize=14,
+                                                 Glyph=&#xE8A7;}"
+                        Command="{Binding Path=RemapKeyboardCommand}"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xE92E;}"
+                        IsClickEnabled="True" />
 
-                    <Button x:Uid="KeyboardManager_RemapKeyboardButton_Accessible" Style="{StaticResource SettingButtonStyle}" Command="{Binding Path=RemapKeyboardCommand}">
-                        <controls:Setting x:Uid="KeyboardManager_RemapKeyboardButton" Style="{StaticResource ExpanderHeaderSettingStyle}" Icon="&#xE92E;">
-                            <controls:Setting.ActionContent>
-                                <FontIcon Glyph="&#xE8A7;" FontSize="18" FontFamily="{ThemeResource SymbolThemeFontFamily}" />
-                            </controls:Setting.ActionContent>
-                        </controls:Setting>
-                    </Button>
-
-                    <ListView x:Name="RemapKeysList"
-                              x:Uid="RemapKeysList"
-                              ItemsSource="{x:Bind Path=ViewModel.RemapKeys, Mode=OneWay}"
-                              SelectionMode="None"
-                              IsSwipeEnabled="False"
-                              Visibility="{x:Bind Path=ViewModel.RemapKeys, Mode=OneWay, Converter={StaticResource visibleIfNotEmptyConverter}}">
+                    <ListView
+                        x:Name="RemapKeysList"
+                        x:Uid="RemapKeysList"
+                        IsSwipeEnabled="False"
+                        ItemsSource="{x:Bind Path=ViewModel.RemapKeys, Mode=OneWay}"
+                        SelectionMode="None"
+                        Visibility="{x:Bind Path=ViewModel.RemapKeys, Mode=OneWay, Converter={StaticResource visibleIfNotEmptyConverter}}">
                         <ListView.ItemTemplate>
                             <DataTemplate x:DataType="Lib:KeysDataModel">
-                                <StackPanel Orientation="Horizontal"
-                                            HorizontalAlignment="Stretch"
-                                            Background="{ThemeResource CardBackgroundBrush}"
-                                            BorderThickness="{ThemeResource CardBorderThickness}"
-                                            BorderBrush="{ThemeResource CardBorderBrush}"
-                                            CornerRadius="{ThemeResource ControlCornerRadius}"
-                                            MinHeight="68">
-                                           
-                                    <ItemsControl Margin="52,0,0,0"
-                                                  ItemsSource="{x:Bind GetMappedOriginalKeys()}"
-                                                  ItemTemplate="{StaticResource OriginalKeyTemplate}"
-                                                  IsTabStop="False">
-                                        <ItemsControl.ItemsPanel>
-                                            <ItemsPanelTemplate>
-                                                <StackPanel Orientation="Horizontal" Spacing="4"/>
-                                            </ItemsPanelTemplate>
-                                        </ItemsControl.ItemsPanel>
-                                    </ItemsControl>
-                                    <TextBlock x:Uid="To"
-                                               Style="{StaticResource SecondaryTextStyle}"
-                                               VerticalAlignment="Center" 
-                                               Margin="8,0,8,0"/>
-
-                                    <ItemsControl Name="KeyboardManager_RemappedTo"
-                                                  x:Uid="KeyboardManager_RemappedTo"
-                                                  ItemsSource="{x:Bind GetMappedNewRemapKeys()}"
-                                                  ItemTemplate="{StaticResource RemappedKeyTemplate}"
-                                                  IsTabStop="False">
-                                        <ItemsControl.ItemsPanel>
-                                            <ItemsPanelTemplate>
-                                                <StackPanel Orientation="Horizontal" Spacing="4"/>
-                                            </ItemsPanelTemplate>
-                                        </ItemsControl.ItemsPanel>
-                                    </ItemsControl>
-                                </StackPanel>
+                                <labs:SettingsCard ContentAlignment="Left">
+                                    <StackPanel Orientation="Horizontal">
+                                        <ItemsControl
+                                            IsTabStop="False"
+                                            ItemTemplate="{StaticResource OriginalKeyTemplate}"
+                                            ItemsSource="{x:Bind GetMappedOriginalKeys()}">
+                                            <ItemsControl.ItemsPanel>
+                                                <ItemsPanelTemplate>
+                                                    <StackPanel
+                                                        Orientation="Horizontal"
+                                                        Spacing="4" />
+                                                </ItemsPanelTemplate>
+                                            </ItemsControl.ItemsPanel>
+                                        </ItemsControl>
+                                        <controls:IsEnabledTextBlock
+                                            x:Uid="To"
+                                            Margin="8,0,8,0"
+                                            VerticalAlignment="Center"
+                                            Style="{StaticResource SecondaryIsEnabledTextBlockStyle}" />
+                                        <ItemsControl
+                                            Name="KeyboardManager_RemappedTo"
+                                            x:Uid="KeyboardManager_RemappedTo"
+                                            IsTabStop="False"
+                                            ItemTemplate="{StaticResource RemappedKeyTemplate}"
+                                            ItemsSource="{x:Bind GetMappedNewRemapKeys()}">
+                                            <ItemsControl.ItemsPanel>
+                                                <ItemsPanelTemplate>
+                                                    <StackPanel
+                                                        Orientation="Horizontal"
+                                                        Spacing="4" />
+                                                </ItemsPanelTemplate>
+                                            </ItemsControl.ItemsPanel>
+                                        </ItemsControl>
+                                    </StackPanel>
+                                </labs:SettingsCard>
                             </DataTemplate>
                         </ListView.ItemTemplate>
                     </ListView>
                 </controls:SettingsGroup>
 
+                <controls:SettingsGroup
+                    x:Uid="KeyboardManager_Shortcuts"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.Enabled}">
+                    <labs:SettingsCard
+                        x:Uid="KeyboardManager_RemapShortcutsButton"
+                        ActionIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 FontSize=14,
+                                                 Glyph=&#xE8A7;}"
+                        Command="{Binding Path=EditShortcutCommand}"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xE92E;}"
+                        IsClickEnabled="True" />
 
-                <controls:SettingsGroup x:Uid="KeyboardManager_Shortcuts"   IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.Enabled}">
-                    <Button x:Uid="KeyboardManager_RemapShortcutsButton_Accessible" Style="{StaticResource SettingButtonStyle}" Command="{Binding Path=EditShortcutCommand}">
-                        <controls:Setting x:Uid="KeyboardManager_RemapShortcutsButton" Style="{StaticResource ExpanderHeaderSettingStyle}" Icon="&#xE92E;">
-                            <controls:Setting.ActionContent>
-                                <FontIcon Glyph="&#xE8A7;" FontSize="18" FontFamily="{ThemeResource SymbolThemeFontFamily}" />
-                            </controls:Setting.ActionContent>
-                        </controls:Setting>
-                    </Button>
-                    
-                    <ListView x:Name="RemapShortcutsList"
-                              x:Uid="RemapShortcutsList"
-                              ItemsSource="{x:Bind Path=ViewModel.RemapShortcuts, Mode=OneWay}"
-                              SelectionMode="None"
-                              IsSwipeEnabled="False"
-                              Visibility="{x:Bind Path=ViewModel.RemapShortcuts, Mode=OneWay, Converter={StaticResource visibleIfNotEmptyConverter}}">
+                    <ListView
+                        x:Name="RemapShortcutsList"
+                        x:Uid="RemapShortcutsList"
+                        IsSwipeEnabled="False"
+                        ItemsSource="{x:Bind Path=ViewModel.RemapShortcuts, Mode=OneWay}"
+                        SelectionMode="None"
+                        Visibility="{x:Bind Path=ViewModel.RemapShortcuts, Mode=OneWay, Converter={StaticResource visibleIfNotEmptyConverter}}">
                         <ListView.ItemTemplate>
                             <DataTemplate x:DataType="Lib:AppSpecificKeysDataModel">
-                                <StackPanel Orientation="Horizontal"
-                                            HorizontalAlignment="Stretch"
-                                            Background="{ThemeResource CardBackgroundBrush}"
-                                            BorderThickness="{ThemeResource CardBorderThickness}"
-                                            BorderBrush="{ThemeResource CardBorderBrush}"
-                                            CornerRadius="{ThemeResource ControlCornerRadius}"
-                                            MinHeight="68">
-
-                                    <ItemsControl Margin="52,0,0,0"
-                                                  ItemsSource="{x:Bind GetMappedOriginalKeys()}"
-                                                  ItemTemplate="{StaticResource OriginalKeyTemplate}"
-                                                  IsTabStop="False">
-                                        <ItemsControl.ItemsPanel>
-                                            <ItemsPanelTemplate>
-                                                <StackPanel Orientation="Horizontal" Spacing="4"/>
-                                            </ItemsPanelTemplate>
-                                        </ItemsControl.ItemsPanel>
-                                    </ItemsControl>
-                                    <TextBlock x:Uid="To"
-                                               Style="{StaticResource SecondaryTextStyle}"
-                                               VerticalAlignment="Center" 
-                                               Margin="8,0,8,0"/>
-
-                                    <ItemsControl Name="KeyboardManager_RemappedTo"
-                                                  x:Uid="KeyboardManager_RemappedTo"
-                                                  ItemsSource="{x:Bind GetMappedNewRemapKeys()}"
-                                                  ItemTemplate="{StaticResource RemappedKeyTemplate}"
-                                                  IsTabStop="False">
-                                        <ItemsControl.ItemsPanel>
-                                            <ItemsPanelTemplate>
-                                                <StackPanel Orientation="Horizontal" Spacing="4"/>
-                                            </ItemsPanelTemplate>
-                                        </ItemsControl.ItemsPanel>
-                                    </ItemsControl>
-
+                                <labs:SettingsCard ContentAlignment="Left">
                                     <StackPanel Orientation="Horizontal">
-                                        <Border VerticalAlignment="Center"
-                                                Padding="12,4,12,6"
-                                                Margin="16,0,0,0"
-                                                CornerRadius="12">
+                                        <ItemsControl
+                                            IsTabStop="False"
+                                            ItemTemplate="{StaticResource OriginalKeyTemplate}"
+                                            ItemsSource="{x:Bind GetMappedOriginalKeys()}">
+                                            <ItemsControl.ItemsPanel>
+                                                <ItemsPanelTemplate>
+                                                    <StackPanel
+                                                        Orientation="Horizontal"
+                                                        Spacing="4" />
+                                                </ItemsPanelTemplate>
+                                            </ItemsControl.ItemsPanel>
+                                        </ItemsControl>
+                                        <controls:IsEnabledTextBlock
+                                            x:Uid="To"
+                                            Margin="8,0,8,0"
+                                            VerticalAlignment="Center"
+                                            Style="{StaticResource SecondaryIsEnabledTextBlockStyle}" />
+
+                                        <ItemsControl
+                                            Name="KeyboardManager_RemappedTo"
+                                            x:Uid="KeyboardManager_RemappedTo"
+                                            IsTabStop="False"
+                                            ItemTemplate="{StaticResource RemappedKeyTemplate}"
+                                            ItemsSource="{x:Bind GetMappedNewRemapKeys()}">
+                                            <ItemsControl.ItemsPanel>
+                                                <ItemsPanelTemplate>
+                                                    <StackPanel
+                                                        Orientation="Horizontal"
+                                                        Spacing="4" />
+                                                </ItemsPanelTemplate>
+                                            </ItemsControl.ItemsPanel>
+                                        </ItemsControl>
+                                        <Border
+                                            Margin="16,0,0,0"
+                                            Padding="12,4,12,6"
+                                            VerticalAlignment="Center"
+                                            CornerRadius="12">
                                             <Border.Background>
-                                                <SolidColorBrush Color="{ThemeResource SystemAccentColor}"
-                                                                 Opacity="0.3"/>
+                                                <SolidColorBrush
+                                                    Opacity="0.3"
+                                                    Color="{ThemeResource SystemAccentColor}" />
                                             </Border.Background>
-                                            <TextBlock Text="{x:Bind TargetApp}"/>
+                                            <TextBlock Text="{x:Bind TargetApp}" />
                                         </Border>
                                     </StackPanel>
-                                </StackPanel>
+                                </labs:SettingsCard>
                             </DataTemplate>
                         </ListView.ItemTemplate>
                     </ListView>
@@ -204,7 +222,9 @@
             </StackPanel>
         </controls:SettingsPageControl.ModuleContent>
         <controls:SettingsPageControl.PrimaryLinks>
-            <controls:PageLink x:Uid="LearnMore_KBM" Link="https://aka.ms/PowerToysOverview_KeyboardManager"/>
+            <controls:PageLink
+                x:Uid="LearnMore_KBM"
+                Link="https://aka.ms/PowerToysOverview_KeyboardManager" />
         </controls:SettingsPageControl.PrimaryLinks>
     </controls:SettingsPageControl>
 </Page>
diff --git a/src/settings-ui/Settings.UI/Views/MeasureToolPage.xaml b/src/settings-ui/Settings.UI/Views/MeasureToolPage.xaml
index e08578b26d..96856f0ee0 100644
--- a/src/settings-ui/Settings.UI/Views/MeasureToolPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/MeasureToolPage.xaml
@@ -2,106 +2,108 @@
     x:Class="Microsoft.PowerToys.Settings.UI.Views.MeasureToolPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-    xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters" 
-    AutomationProperties.LandmarkType="Main">
-    <Page.Resources>
-        <converters:BoolNegationConverter x:Key="BoolNegationConverter"/>
-        <converters:BoolToObjectConverter x:Key="BoolToVisibilityConverter" TrueValue="Visible" FalseValue="Collapsed"/>
-    </Page.Resources>
-    
-    <controls:SettingsPageControl x:Uid="MeasureTool"
-                                  ModuleImageSource="ms-appx:///Assets/Modules/ScreenRuler.png">
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:CommunityToolkit.WinUI.UI"
+    AutomationProperties.LandmarkType="Main"
+    mc:Ignorable="d">
+
+    <controls:SettingsPageControl
+        x:Uid="MeasureTool"
+        ModuleImageSource="ms-appx:///Assets/Modules/ScreenRuler.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel Orientation="Vertical">
-
-                <controls:Setting x:Uid="MeasureTool_EnableMeasureTool" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
-                    <controls:Setting.Icon>
-                        <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsScreenRuler.png" ShowAsMonochrome="False" />
-                    </controls:Setting.Icon>
-                    <controls:Setting.ActionContent>
-                        <ToggleSwitch IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" x:Uid="ToggleSwitch" HorizontalAlignment="Right"/>
-                    </controls:Setting.ActionContent>
-                </controls:Setting>
-                <InfoBar x:Uid="GPO_IsSettingForced"
-                    Severity="Informational"
+                <labs:SettingsCard
+                    x:Uid="MeasureTool_EnableMeasureTool"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsScreenRuler.png}"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
+                    <ToggleSwitch
+                        x:Uid="ToggleSwitch"
+                        IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                </labs:SettingsCard>
+                <InfoBar
+                    x:Uid="GPO_IsSettingForced"
                     IsClosable="False"
                     IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}"
-                    IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}" />
+                    IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}"
+                    Severity="Informational" />
+                <controls:SettingsGroup
+                    x:Uid="MeasureTool_ActivationSettings"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                    <labs:SettingsCard
+                        x:Uid="MeasureTool_ActivationShortcut"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xEDA7;}">
+                        <controls:ShortcutControl
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            HotkeySettings="{x:Bind Path=ViewModel.ActivationShortcut, Mode=TwoWay}" />
+                    </labs:SettingsCard>
 
-                <controls:SettingsGroup x:Uid="MeasureTool_ActivationSettings" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <controls:Setting x:Uid="MeasureTool_ActivationShortcut" Icon="&#xEDA7;">
-                        <controls:Setting.ActionContent>
-                            <controls:ShortcutControl HotkeySettings="{x:Bind Path=ViewModel.ActivationShortcut, Mode=TwoWay}"
-                                                            MinWidth="{StaticResource SettingActionControlMinWidth}"/>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
                 </controls:SettingsGroup>
 
-                <controls:SettingsGroup x:Uid="MeasureTool_Settings" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-
-                    <controls:Setting x:Uid="MeasureTool_ContinuousCapture" Icon="&#xE7FB;">
-                        <controls:Setting.ActionContent>
-                            <ToggleSwitch IsOn="{x:Bind ViewModel.ContinuousCapture, Mode=TwoWay}" x:Uid="MeasureTool_ContinuousCapture_ToggleSwitch" />
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
+                <controls:SettingsGroup
+                    x:Uid="MeasureTool_Settings"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                    <labs:SettingsCard
+                        x:Uid="MeasureTool_ContinuousCapture"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xE7FB;}">
+                        <ToggleSwitch
+                            x:Uid="MeasureTool_ContinuousCapture_ToggleSwitch"
+                            IsOn="{x:Bind ViewModel.ContinuousCapture, Mode=TwoWay}" />
+                    </labs:SettingsCard>
                     <InfoBar
-                        Severity="Warning"
                         x:Uid="MeasureTool_ContinuousCapture_Information"
+                        IsClosable="False"
                         IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.ShowContinuousCaptureWarning}"
                         IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.ShowContinuousCaptureWarning}"
-                        IsClosable="False" />
-                    
-                    <controls:Setting x:Uid="MeasureTool_PerColorChannelEdgeDetection" Icon="&#xE7FB;">
-                        <controls:Setting.ActionContent>
-                            <ToggleSwitch
-                                    IsOn="{x:Bind ViewModel.PerColorChannelEdgeDetection, Mode=TwoWay}"
-                                    x:Uid="MeasureTool_PerColorChannelEdgeDetection_ToggleSwitch" />
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
-                    
-                    <controls:Setting x:Uid="MeasureTool_PixelTolerance">
-                        <controls:Setting.ActionContent>
-                            <Slider Minimum="0"
-                                    Maximum="255"
-                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                    Value="{x:Bind Mode=TwoWay, Path=ViewModel.PixelTolerance}"/>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
+                        Severity="Warning" />
 
-                    <!--<controls:Setting x:Uid="MeasureTool_UnitsOfMeasure" Icon="&#xECC6;">
-                        <controls:Setting.ActionContent>
-                            <ComboBox SelectedIndex="{x:Bind Path=ViewModel.UnitsOfMeasure, Mode=TwoWay}" MinWidth="{StaticResource SettingActionControlMinWidth}">
-                                <ComboBoxItem x:Uid="MeasureTool_UnitsOfMeasure_Pixels" />
-                                <ComboBoxItem x:Uid="MeasureTool_UnitsOfMeasure_Inches" />
-                                <ComboBoxItem x:Uid="MeasureTool_UnitsOfMeasure_Centimeters" />
-                            </ComboBox>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>-->
+                    <labs:SettingsCard
+                        x:Uid="MeasureTool_PerColorChannelEdgeDetection"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xE7FB;}">
+                        <ToggleSwitch
+                            x:Uid="MeasureTool_PerColorChannelEdgeDetection_ToggleSwitch"
+                            IsOn="{x:Bind ViewModel.PerColorChannelEdgeDetection, Mode=TwoWay}" />
+                    </labs:SettingsCard>
 
-                    <controls:Setting x:Uid="MeasureTool_DrawFeetOnCross">
-                        <controls:Setting.ActionContent>
-                            <ToggleSwitch IsOn="{x:Bind ViewModel.DrawFeetOnCross, Mode=TwoWay}" x:Uid="MeasureTool_DrawFeetOnCross_ToggleSwitch" />
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
+                    <labs:SettingsCard x:Uid="MeasureTool_PixelTolerance">
+                        <Slider
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            Maximum="255"
+                            Minimum="0"
+                            Value="{x:Bind Mode=TwoWay, Path=ViewModel.PixelTolerance}" />
+                    </labs:SettingsCard>
 
-                    <controls:Setting x:Uid="MeasureTool_MeasureCrossColor">
-                        <controls:Setting.ActionContent>
-                            <controls:ColorPickerButton SelectedColor="{x:Bind Path=ViewModel.CrossColor, Mode=TwoWay}" />
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
+                    <!--<labs:SettingsCard x:Uid="MeasureTool_UnitsOfMeasure" HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xECC6;}">
+                        <ComboBox SelectedIndex="{x:Bind Path=ViewModel.UnitsOfMeasure, Mode=TwoWay}" MinWidth="{StaticResource SettingActionControlMinWidth}">
+                            <ComboBoxItem x:Uid="MeasureTool_UnitsOfMeasure_Pixels" />
+                            <ComboBoxItem x:Uid="MeasureTool_UnitsOfMeasure_Inches" />
+                            <ComboBoxItem x:Uid="MeasureTool_UnitsOfMeasure_Centimeters" />
+                        </ComboBox>
+                    </labs:SettingsCard>-->
+
+                    <labs:SettingsCard x:Uid="MeasureTool_DrawFeetOnCross">
+                        <ToggleSwitch
+                            x:Uid="MeasureTool_DrawFeetOnCross_ToggleSwitch"
+                            IsOn="{x:Bind ViewModel.DrawFeetOnCross, Mode=TwoWay}" />
+                    </labs:SettingsCard>
+
+                    <labs:SettingsCard x:Uid="MeasureTool_MeasureCrossColor">
+                        <controls:ColorPickerButton SelectedColor="{x:Bind Path=ViewModel.CrossColor, Mode=TwoWay}" />
+                    </labs:SettingsCard>
                 </controls:SettingsGroup>
-
             </StackPanel>
         </controls:SettingsPageControl.ModuleContent>
         <controls:SettingsPageControl.PrimaryLinks>
-            <controls:PageLink x:Uid="LearnMore_MeasureTool" Link="https://aka.ms/PowerToysOverview_ScreenRuler"/>
+            <controls:PageLink
+                x:Uid="LearnMore_MeasureTool"
+                Link="https://aka.ms/PowerToysOverview_ScreenRuler" />
         </controls:SettingsPageControl.PrimaryLinks>
         <controls:SettingsPageControl.SecondaryLinks>
-            <controls:PageLink x:Uid="Attribution_Rooler" Link="https://github.com/peteblois/rooler"/>
+            <controls:PageLink
+                x:Uid="Attribution_Rooler"
+                Link="https://github.com/peteblois/rooler" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
 </Page>
diff --git a/src/settings-ui/Settings.UI/Views/MouseUtilsPage.xaml b/src/settings-ui/Settings.UI/Views/MouseUtilsPage.xaml
index 96a7ae079c..aa72024ee9 100644
--- a/src/settings-ui/Settings.UI/Views/MouseUtilsPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/MouseUtilsPage.xaml
@@ -2,335 +2,300 @@
     x:Class="Microsoft.PowerToys.Settings.UI.Views.MouseUtilsPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-    xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
     xmlns:localConverters="using:Microsoft.PowerToys.Settings.UI.Converters"
-    AutomationProperties.LandmarkType="Main">
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:CommunityToolkit.WinUI.UI"
+    AutomationProperties.LandmarkType="Main"
+    mc:Ignorable="d">
     <Page.Resources>
-        <converters:BoolNegationConverter x:Key="BoolNegationConverter"/>
-        <localConverters:FindMyMouseActivationShakeMouseIntToVisibilityConverter x:Key="FindMyMouseActivationShakeMouseIntToVisibilityConverter"/>
+        <localConverters:FindMyMouseActivationShakeMouseIntToVisibilityConverter x:Key="FindMyMouseActivationShakeMouseIntToVisibilityConverter" />
     </Page.Resources>
-    <controls:SettingsPageControl x:Uid="MouseUtils"
-                                  ModuleImageSource="ms-appx:///Assets/Modules/MouseUtils.png">
+    <controls:SettingsPageControl
+        x:Uid="MouseUtils"
+        ModuleImageSource="ms-appx:///Assets/Modules/MouseUtils.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel Orientation="Vertical">
                 <controls:SettingsGroup x:Uid="MouseUtils_FindMyMouse">
-                    <controls:Setting x:Uid="MouseUtils_Enable_FindMyMouse" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsFindMyMouseEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
-                        <controls:Setting.Icon>
-                            <BitmapIcon Height="24" Width="24" Margin="-4,0,0,0" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsFindMyMouse.png" ShowAsMonochrome="False" />
-                        </controls:Setting.Icon>
-                        <controls:Setting.ActionContent>
-                            <ToggleSwitch IsOn="{x:Bind ViewModel.IsFindMyMouseEnabled, Mode=TwoWay}" x:Uid="ToggleSwitch"/>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
-                    <InfoBar x:Uid="GPO_IsSettingForced"
-                        Severity="Informational"
+                    <labs:SettingsCard
+                        x:Uid="MouseUtils_Enable_FindMyMouse"
+                        HeaderIcon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsFindMyMouse.png}"
+                        IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsFindMyMouseEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            IsOn="{x:Bind ViewModel.IsFindMyMouseEnabled, Mode=TwoWay}" />
+                    </labs:SettingsCard>
+                    <InfoBar
+                        x:Uid="GPO_IsSettingForced"
                         IsClosable="False"
                         IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.IsFindMyMouseEnabledGpoConfigured}"
-                        IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsFindMyMouseEnabledGpoConfigured}" />
+                        IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsFindMyMouseEnabledGpoConfigured}"
+                        Severity="Informational" />
+                    <labs:SettingsExpander
+                        x:Uid="MouseUtils_FindMyMouse_ActivationMethod"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xE961;}"
+                        IsEnabled="{x:Bind ViewModel.IsFindMyMouseEnabled, Mode=OneWay}"
+                        IsExpanded="True">
+                        <ComboBox
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            SelectedIndex="{x:Bind Path=ViewModel.FindMyMouseActivationMethod, Mode=TwoWay}">
+                            <ComboBoxItem x:Uid="MouseUtils_FindMyMouse_ActivationDoubleControlPress" />
+                            <ComboBoxItem x:Uid="MouseUtils_FindMyMouse_ActivationShakeMouse" />
+                        </ComboBox>
+                        <labs:SettingsExpander.Items>
+                            <labs:SettingsCard
+                                x:Uid="MouseUtils_FindMyMouse_ShakingMinimumDistance"
+                                Visibility="{x:Bind Mode=OneWay, Path=ViewModel.FindMyMouseActivationMethod, Converter={StaticResource FindMyMouseActivationShakeMouseIntToVisibilityConverter}}">
+                                <NumberBox
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    LargeChange="1000"
+                                    Maximum="1000000"
+                                    Minimum="0"
+                                    SmallChange="100"
+                                    SpinButtonPlacementMode="Compact"
+                                    Value="{x:Bind Mode=TwoWay, Path=ViewModel.FindMyMouseShakingMinimumDistance}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard ContentAlignment="Left">
+                                <CheckBox
+                                    x:Uid="MouseUtils_Prevent_Activation_On_Game_Mode"
+                                    IsChecked="{x:Bind ViewModel.FindMyMouseDoNotActivateOnGameMode, Mode=TwoWay}" />
+                            </labs:SettingsCard>
+                        </labs:SettingsExpander.Items>
+                    </labs:SettingsExpander>
 
-                    <controls:SettingExpander IsEnabled="{x:Bind ViewModel.IsFindMyMouseEnabled, Mode=OneWay}" IsExpanded="True" >
-                        <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="MouseUtils_FindMyMouse_ActivationMethod"  Icon="&#xE961;" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsFindMyMouseEnabled}">
-                                <controls:Setting.ActionContent>
-                                    <ComboBox SelectedIndex="{x:Bind Path=ViewModel.FindMyMouseActivationMethod, Mode=TwoWay}" MinWidth="{StaticResource SettingActionControlMinWidth}">
-                                        <ComboBoxItem x:Uid="MouseUtils_FindMyMouse_ActivationDoubleControlPress" />
-                                        <ComboBoxItem x:Uid="MouseUtils_FindMyMouse_ActivationShakeMouse" />
-                                    </ComboBox>
-                                </controls:Setting.ActionContent>
-                            </controls:Setting>
-                        </controls:SettingExpander.Header>
-                        <controls:SettingExpander.Content>
-                            <StackPanel>
-                                <controls:Setting x:Uid="MouseUtils_FindMyMouse_ShakingMinimumDistance"  Style="{StaticResource ExpanderContentSettingStyle}" Visibility="{x:Bind Mode=OneWay, Path=ViewModel.FindMyMouseActivationMethod, Converter={StaticResource FindMyMouseActivationShakeMouseIntToVisibilityConverter}}">
-                                    <controls:Setting.ActionContent>
-                                        <NumberBox
-                                            Minimum="0"
-                                            Maximum="1000000"
-                                            Value="{x:Bind Mode=TwoWay, Path=ViewModel.FindMyMouseShakingMinimumDistance}"
-                                            MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                            SpinButtonPlacementMode="Compact"
-                                            HorizontalAlignment="Left"
-                                            SmallChange="100"
-                                            LargeChange="1000"
-                                        />
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-                                <CheckBox x:Uid="MouseUtils_Prevent_Activation_On_Game_Mode"
-                                          IsChecked="{x:Bind ViewModel.FindMyMouseDoNotActivateOnGameMode, Mode=TwoWay}"
-                                          Margin="{StaticResource ExpanderSettingMargin}"
-                                          IsEnabled="{x:Bind ViewModel.IsFindMyMouseEnabled, Mode=OneWay}" />
-                            </StackPanel>
-                        </controls:SettingExpander.Content>
-                    </controls:SettingExpander>
-                    <controls:SettingExpander IsEnabled="{x:Bind ViewModel.IsFindMyMouseEnabled, Mode=OneWay}" IsExpanded="False" >
-                        <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="ShortcutGuide_Appearance_Behavior" Icon="&#xEB3C;" />
-                        </controls:SettingExpander.Header>
-                        <controls:SettingExpander.Content>
-                            <StackPanel>
-                                <controls:Setting x:Uid="MouseUtils_FindMyMouse_OverlayOpacity" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsFindMyMouseEnabled}" Style="{StaticResource ExpanderContentSettingStyle}">
-                                    <controls:Setting.ActionContent>
-                                        <Slider Minimum="1"
-                                            Maximum="100"
-                                            MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                            Value="{x:Bind Mode=TwoWay, Path=ViewModel.FindMyMouseOverlayOpacity}"
-                                            HorizontalAlignment="Right"/>
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-                                <controls:Setting x:Uid="MouseUtils_FindMyMouse_BackgroundColor" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsFindMyMouseEnabled}" Style="{StaticResource ExpanderContentSettingStyle}">
-                                    <controls:Setting.ActionContent>
-                                        <controls:ColorPickerButton SelectedColor="{x:Bind Path=ViewModel.FindMyMouseBackgroundColor, Mode=TwoWay}" />
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-                                <controls:Setting x:Uid="MouseUtils_FindMyMouse_SpotlightColor" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsFindMyMouseEnabled}" Style="{StaticResource ExpanderContentSettingStyle}">
-                                    <controls:Setting.ActionContent>
-                                        <controls:ColorPickerButton SelectedColor="{x:Bind Path=ViewModel.FindMyMouseSpotlightColor, Mode=TwoWay}" />
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-                                <controls:Setting x:Uid="MouseUtils_FindMyMouse_SpotlightRadius" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsFindMyMouseEnabled}" Style="{StaticResource ExpanderContentSettingStyle}">
-                                    <controls:Setting.ActionContent>
-                                        <NumberBox Minimum="5"
-                                                    Value="{x:Bind Mode=TwoWay, Path=ViewModel.FindMyMouseSpotlightRadius}"
-                                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                                    SpinButtonPlacementMode="Compact"
-                                                    HorizontalAlignment="Left"
-                                                    SmallChange="1"
-                                                    LargeChange="10"/>
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-                                <controls:Setting x:Uid="MouseUtils_FindMyMouse_SpotlightInitialZoom" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsFindMyMouseEnabled}" Style="{StaticResource ExpanderContentSettingStyle}">
-                                    <controls:Setting.ActionContent>
-                                        <Slider Minimum="1"
-                                            Maximum="40"
-                                            MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                            Value="{x:Bind Mode=TwoWay, Path=ViewModel.FindMyMouseSpotlightInitialZoom}"
-                                            HorizontalAlignment="Right"/>
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-                                <controls:Setting x:Uid="MouseUtils_FindMyMouse_AnimationDurationMs" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsFindMyMouseEnabled}" Style="{StaticResource ExpanderContentSettingStyle}">
-                                    <controls:Setting.ActionContent>
-                                        <NumberBox Minimum="0"
-                                                    Value="{x:Bind Mode=TwoWay, Path=ViewModel.FindMyMouseAnimationDurationMs}"
-                                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                                    SpinButtonPlacementMode="Compact"
-                                                    HorizontalAlignment="Left"
-                                                    SmallChange="10"
-                                                    LargeChange="100"/>
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-                            </StackPanel>
-                        </controls:SettingExpander.Content>
-                    </controls:SettingExpander>
-                    <controls:SettingExpander IsExpanded="False">
-                        <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="MouseUtils_FindMyMouse_ExcludedApps" Icon="&#xECE4;" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsFindMyMouseEnabled}" Style="{StaticResource ExpanderHeaderSettingStyle}"/>
-                        </controls:SettingExpander.Header>
-                        <controls:SettingExpander.Content>
-                            <TextBox x:Uid="MouseUtils_FindMyMouse_ExcludedApps_TextBoxControl"
-                                    Margin="{StaticResource ExpanderSettingMargin}"
-                                    Text="{x:Bind Mode=TwoWay, Path=ViewModel.FindMyMouseExcludedApps, UpdateSourceTrigger=PropertyChanged}"
-                                    ScrollViewer.VerticalScrollBarVisibility ="Visible"
-                                    ScrollViewer.VerticalScrollMode="Enabled"
-                                    ScrollViewer.IsVerticalRailEnabled="True"
-                                    TextWrapping="Wrap"
-                                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsFindMyMouseEnabled}"
-                                    AcceptsReturn="True"
+                    <labs:SettingsExpander
+                        x:Uid="ShortcutGuide_Appearance_Behavior"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xEB3C;}"
+                        IsEnabled="{x:Bind ViewModel.IsFindMyMouseEnabled, Mode=OneWay}"
+                        IsExpanded="False">
+                        <labs:SettingsExpander.Items>
+                            <labs:SettingsCard x:Uid="MouseUtils_FindMyMouse_OverlayOpacity">
+                                <Slider
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    Maximum="100"
+                                    Minimum="1"
+                                    Value="{x:Bind Mode=TwoWay, Path=ViewModel.FindMyMouseOverlayOpacity}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard x:Uid="MouseUtils_FindMyMouse_BackgroundColor">
+                                <controls:ColorPickerButton SelectedColor="{x:Bind Path=ViewModel.FindMyMouseBackgroundColor, Mode=TwoWay}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard x:Uid="MouseUtils_FindMyMouse_SpotlightColor">
+                                <controls:ColorPickerButton SelectedColor="{x:Bind Path=ViewModel.FindMyMouseSpotlightColor, Mode=TwoWay}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard x:Uid="MouseUtils_FindMyMouse_SpotlightRadius">
+                                <NumberBox
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    LargeChange="10"
+                                    Minimum="5"
+                                    SmallChange="1"
+                                    SpinButtonPlacementMode="Compact"
+                                    Value="{x:Bind Mode=TwoWay, Path=ViewModel.FindMyMouseSpotlightRadius}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard x:Uid="MouseUtils_FindMyMouse_SpotlightInitialZoom">
+                                <Slider
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    Maximum="40"
+                                    Minimum="1"
+                                    Value="{x:Bind Mode=TwoWay, Path=ViewModel.FindMyMouseSpotlightInitialZoom}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard x:Uid="MouseUtils_FindMyMouse_AnimationDurationMs">
+                                <NumberBox
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    LargeChange="100"
+                                    Minimum="0"
+                                    SmallChange="10"
+                                    SpinButtonPlacementMode="Compact"
+                                    Value="{x:Bind Mode=TwoWay, Path=ViewModel.FindMyMouseAnimationDurationMs}" />
+                            </labs:SettingsCard>
+                        </labs:SettingsExpander.Items>
+                    </labs:SettingsExpander>
+
+                    <labs:SettingsExpander
+                        x:Uid="MouseUtils_FindMyMouse_ExcludedApps"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xECE4;}"
+                        IsEnabled="{x:Bind ViewModel.IsFindMyMouseEnabled, Mode=OneWay}">
+                        <labs:SettingsExpander.Items>
+                            <labs:SettingsCard ContentAlignment="Vertical" HorizontalContentAlignment="Stretch">
+                                <TextBox
+                                    x:Uid="MouseUtils_FindMyMouse_ExcludedApps_TextBoxControl"
                                     MinWidth="240"
-                                    MinHeight="160" />
-                        </controls:SettingExpander.Content>
-                    </controls:SettingExpander>
+                                    MinHeight="160"
+                                    AcceptsReturn="True"
+                                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsFindMyMouseEnabled}"
+                                    ScrollViewer.IsVerticalRailEnabled="True"
+                                    ScrollViewer.VerticalScrollBarVisibility="Visible"
+                                    ScrollViewer.VerticalScrollMode="Enabled"
+                                    Text="{x:Bind Mode=TwoWay, Path=ViewModel.FindMyMouseExcludedApps, UpdateSourceTrigger=PropertyChanged}"
+                                    TextWrapping="Wrap" />
+                            </labs:SettingsCard>
+                        </labs:SettingsExpander.Items>
+                    </labs:SettingsExpander>
                 </controls:SettingsGroup>
 
                 <controls:SettingsGroup x:Uid="MouseUtils_MouseHighlighter">
-                    <controls:Setting x:Uid="MouseUtils_Enable_MouseHighlighter" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsHighlighterEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
-                        <controls:Setting.Icon>
-                            <BitmapIcon Height="28" Width="28" Margin="-4,2,0,0" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsMouseHighlighter.png" ShowAsMonochrome="False" />
-                        </controls:Setting.Icon>
-                        <controls:Setting.ActionContent>
-                            <ToggleSwitch IsOn="{x:Bind ViewModel.IsMouseHighlighterEnabled, Mode=TwoWay}" x:Uid="ToggleSwitch"/>
-                                </controls:Setting.ActionContent>
-                            </controls:Setting>
-                    <InfoBar x:Uid="GPO_IsSettingForced"
-                        Severity="Informational"
+                    <labs:SettingsCard
+                        x:Uid="MouseUtils_Enable_MouseHighlighter"
+                        HeaderIcon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsMouseHighlighter.png}"
+                        IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsHighlighterEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            IsOn="{x:Bind ViewModel.IsMouseHighlighterEnabled, Mode=TwoWay}" />
+                    </labs:SettingsCard>
+                    <InfoBar
+                        x:Uid="GPO_IsSettingForced"
                         IsClosable="False"
                         IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.IsHighlighterEnabledGpoConfigured}"
-                        IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsHighlighterEnabledGpoConfigured}" />
-
-                    <controls:Setting x:Uid="MouseUtils_MouseHighlighter_ActivationShortcut" Icon="&#xEDA7;" IsEnabled="{x:Bind ViewModel.IsMouseHighlighterEnabled, Mode=OneWay}">
-                                    <controls:Setting.ActionContent>
-                                        <controls:ShortcutControl HotkeySettings="{x:Bind Path=ViewModel.MouseHighlighterActivationShortcut, Mode=TwoWay}"
-                                                            MinWidth="{StaticResource SettingActionControlMinWidth}"/>
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-
-                    <controls:SettingExpander IsEnabled="{x:Bind ViewModel.IsMouseHighlighterEnabled, Mode=OneWay}" IsExpanded="False" >
-                        <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="ShortcutGuide_Appearance_Behavior" Icon="&#xEB3C;" />
-                        </controls:SettingExpander.Header>
-                      
-
-                        <controls:SettingExpander.Content>
-
-                            <StackPanel>
-                                <controls:Setting x:Uid="MouseUtils_MouseHighlighter_PrimaryButtonClickColor" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsMouseHighlighterEnabled}" Style="{StaticResource ExpanderContentSettingStyle}">
-                                    <controls:Setting.ActionContent>
-                                        <controls:ColorPickerButton SelectedColor="{x:Bind Path=ViewModel.MouseHighlighterLeftButtonClickColor, Mode=TwoWay}" />
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-                             
-                                <controls:Setting x:Uid="MouseUtils_MouseHighlighter_SecondaryButtonClickColor" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsMouseHighlighterEnabled}" Style="{StaticResource ExpanderContentSettingStyle}">
-                                    <controls:Setting.ActionContent>
-                                        <controls:ColorPickerButton SelectedColor="{x:Bind Path=ViewModel.MouseHighlighterRightButtonClickColor, Mode=TwoWay}" />
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-                              
-                                <controls:Setting x:Uid="MouseUtils_MouseHighlighter_HighlightOpacity" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsMouseHighlighterEnabled}" Style="{StaticResource ExpanderContentSettingStyle}">
-                                    <controls:Setting.ActionContent>
-                                        <Slider Minimum="1"
-                                            Maximum="100"
-                                            MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                            Value="{x:Bind Mode=TwoWay, Path=ViewModel.MouseHighlighterOpacity}"
-                                            HorizontalAlignment="Right"/>
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-                               
-                                <controls:Setting x:Uid="MouseUtils_MouseHighlighter_HighlightRadius" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsMouseHighlighterEnabled}" Style="{StaticResource ExpanderContentSettingStyle}">
-                                    <controls:Setting.ActionContent>
-                                        <NumberBox Minimum="5"
-                                                    Value="{x:Bind Mode=TwoWay, Path=ViewModel.MouseHighlighterRadius}"
-                                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                                    SpinButtonPlacementMode="Compact"
-                                                    HorizontalAlignment="Left"
-                                                    SmallChange="1"
-                                                    LargeChange="10"/>
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-                            
-                                <controls:Setting x:Uid="MouseUtils_MouseHighlighter_FadeDelayMs" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsMouseHighlighterEnabled}" Style="{StaticResource ExpanderContentSettingStyle}">
-                                    <controls:Setting.ActionContent>
-                                        <NumberBox Minimum="100"
-                                                    Value="{x:Bind Mode=TwoWay, Path=ViewModel.MouseHighlighterFadeDelayMs}"
-                                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                                    SpinButtonPlacementMode="Compact"
-                                                    HorizontalAlignment="Left"
-                                                    SmallChange="10"
-                                                    LargeChange="100"/>
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-                           
-                                <controls:Setting x:Uid="MouseUtils_MouseHighlighter_FadeDurationMs" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsMouseHighlighterEnabled}" Style="{StaticResource ExpanderContentSettingStyle}">
-                                    <controls:Setting.ActionContent>
-                                        <NumberBox Minimum="100"
-                                                    Value="{x:Bind Mode=TwoWay, Path=ViewModel.MouseHighlighterFadeDurationMs}"
-                                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                                    SpinButtonPlacementMode="Compact"
-                                                    HorizontalAlignment="Left"
-                                                    SmallChange="10"
-                                                    LargeChange="100"/>
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-                            </StackPanel>
-            </controls:SettingExpander.Content>
-            </controls:SettingExpander>
+                        IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsHighlighterEnabledGpoConfigured}"
+                        Severity="Informational" />
+                    <labs:SettingsCard
+                        x:Uid="MouseUtils_MouseHighlighter_ActivationShortcut"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xEDA7;}"
+                        IsEnabled="{x:Bind ViewModel.IsMouseHighlighterEnabled, Mode=OneWay}">
+                        <controls:ShortcutControl
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            HotkeySettings="{x:Bind Path=ViewModel.MouseHighlighterActivationShortcut, Mode=TwoWay}" />
+                    </labs:SettingsCard>
+                    <labs:SettingsExpander
+                        x:Uid="ShortcutGuide_Appearance_Behavior"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xEB3C;}"
+                        IsEnabled="{x:Bind ViewModel.IsMouseHighlighterEnabled, Mode=OneWay}">
+                        <labs:SettingsExpander.Items>
+                            <labs:SettingsCard x:Uid="MouseUtils_MouseHighlighter_PrimaryButtonClickColor">
+                                <controls:ColorPickerButton SelectedColor="{x:Bind Path=ViewModel.MouseHighlighterLeftButtonClickColor, Mode=TwoWay}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard x:Uid="MouseUtils_MouseHighlighter_SecondaryButtonClickColor">
+                                <controls:ColorPickerButton SelectedColor="{x:Bind Path=ViewModel.MouseHighlighterRightButtonClickColor, Mode=TwoWay}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard x:Uid="MouseUtils_MouseHighlighter_HighlightOpacity">
+                                <Slider
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    Maximum="100"
+                                    Minimum="1"
+                                    Value="{x:Bind Mode=TwoWay, Path=ViewModel.MouseHighlighterOpacity}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard x:Uid="MouseUtils_MouseHighlighter_HighlightRadius">
+                                <NumberBox
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    LargeChange="10"
+                                    Minimum="5"
+                                    SmallChange="1"
+                                    SpinButtonPlacementMode="Compact"
+                                    Value="{x:Bind Mode=TwoWay, Path=ViewModel.MouseHighlighterRadius}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard x:Uid="MouseUtils_MouseHighlighter_FadeDelayMs">
+                                <NumberBox
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    LargeChange="100"
+                                    Minimum="100"
+                                    SmallChange="10"
+                                    SpinButtonPlacementMode="Compact"
+                                    Value="{x:Bind Mode=TwoWay, Path=ViewModel.MouseHighlighterFadeDelayMs}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard x:Uid="MouseUtils_MouseHighlighter_FadeDurationMs">
+                                <NumberBox
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    LargeChange="100"
+                                    Minimum="100"
+                                    SmallChange="10"
+                                    SpinButtonPlacementMode="Compact"
+                                    Value="{x:Bind Mode=TwoWay, Path=ViewModel.MouseHighlighterFadeDurationMs}" />
+                            </labs:SettingsCard>
+                        </labs:SettingsExpander.Items>
+                    </labs:SettingsExpander>
                 </controls:SettingsGroup>
 
                 <controls:SettingsGroup x:Uid="MouseUtils_MousePointerCrosshairs">
-                    <controls:Setting x:Uid="MouseUtils_Enable_MousePointerCrosshairs" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsMousePointerCrosshairsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
-                        <controls:Setting.Icon>
-                            <BitmapIcon Height="28" Width="28" Margin="-6,2,0,0" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsMouseCrosshairs.png" ShowAsMonochrome="False" />
-                        </controls:Setting.Icon>
-                        <controls:Setting.ActionContent>
-                            <ToggleSwitch IsOn="{x:Bind ViewModel.IsMousePointerCrosshairsEnabled, Mode=TwoWay}" x:Uid="ToggleSwitch"/>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
-                    <InfoBar x:Uid="GPO_IsSettingForced"
-                        Severity="Informational"
+                    <labs:SettingsCard
+                        x:Uid="MouseUtils_Enable_MousePointerCrosshairs"
+                        HeaderIcon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsMouseCrosshairs.png}"
+                        IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsMousePointerCrosshairsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            IsOn="{x:Bind ViewModel.IsMousePointerCrosshairsEnabled, Mode=TwoWay}" />
+                    </labs:SettingsCard>
+                    <InfoBar
+                        x:Uid="GPO_IsSettingForced"
                         IsClosable="False"
                         IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.IsMousePointerCrosshairsEnabledGpoConfigured}"
-                        IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsMousePointerCrosshairsEnabledGpoConfigured}" />
+                        IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsMousePointerCrosshairsEnabledGpoConfigured}"
+                        Severity="Informational" />
+                    <labs:SettingsCard
+                        x:Uid="MouseUtils_MousePointerCrosshairs_ActivationShortcut"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xEDA7;}"
+                        IsEnabled="{x:Bind ViewModel.IsMousePointerCrosshairsEnabled, Mode=OneWay}">
+                        <controls:ShortcutControl
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            HotkeySettings="{x:Bind Path=ViewModel.MousePointerCrosshairsActivationShortcut, Mode=TwoWay}" />
+                    </labs:SettingsCard>
 
-                    <controls:Setting x:Uid="MouseUtils_MousePointerCrosshairs_ActivationShortcut" Icon="&#xEDA7;" IsEnabled="{x:Bind ViewModel.IsMousePointerCrosshairsEnabled, Mode=OneWay}">
-                        <controls:Setting.ActionContent>
-                            <controls:ShortcutControl HotkeySettings="{x:Bind Path=ViewModel.MousePointerCrosshairsActivationShortcut, Mode=TwoWay}"
-                                                            MinWidth="{StaticResource SettingActionControlMinWidth}"/>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
-                    <controls:SettingExpander IsEnabled="{x:Bind ViewModel.IsMousePointerCrosshairsEnabled, Mode=OneWay}" IsExpanded="False" >
-                        <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="ShortcutGuide_Appearance_Behavior" Icon="&#xEB3C;" />
-                        </controls:SettingExpander.Header>
-                        <controls:SettingExpander.Content>
-                            <StackPanel>
-                                <controls:Setting x:Uid="MouseUtils_MousePointerCrosshairs_CrosshairsColor" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsMousePointerCrosshairsEnabled}" Style="{StaticResource ExpanderContentSettingStyle}">
-                                    <controls:Setting.ActionContent>
-                                        <controls:ColorPickerButton SelectedColor="{x:Bind Path=ViewModel.MousePointerCrosshairsColor, Mode=TwoWay}" />
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-                                <controls:Setting x:Uid="MouseUtils_MousePointerCrosshairs_CrosshairsOpacity" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsMousePointerCrosshairsEnabled}" Style="{StaticResource ExpanderContentSettingStyle}">
-                                    <controls:Setting.ActionContent>
-                                        <Slider Minimum="1"
-                                            Maximum="100"
-                                            MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                            Value="{x:Bind Mode=TwoWay, Path=ViewModel.MousePointerCrosshairsOpacity}"
-                                            HorizontalAlignment="Right"/>
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-                                <controls:Setting x:Uid="MouseUtils_MousePointerCrosshairs_CrosshairsRadius" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsMousePointerCrosshairsEnabled}" Style="{StaticResource ExpanderContentSettingStyle}">
-                                    <controls:Setting.ActionContent>
-                                        <NumberBox Minimum="1"
-                                                    Maximum="500"
-                                                    Value="{x:Bind Mode=TwoWay, Path=ViewModel.MousePointerCrosshairsRadius}"
-                                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                                    SpinButtonPlacementMode="Compact"
-                                                    HorizontalAlignment="Left"
-                                                    SmallChange="1"
-                                                    LargeChange="10"/>
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-                                <controls:Setting x:Uid="MouseUtils_MousePointerCrosshairs_CrosshairsThickness" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsMousePointerCrosshairsEnabled}" Style="{StaticResource ExpanderContentSettingStyle}">
-                                    <controls:Setting.ActionContent>
-                                        <NumberBox Minimum="1"
-                                                    Maximum="50"
-                                                    Value="{x:Bind Mode=TwoWay, Path=ViewModel.MousePointerCrosshairsThickness}"
-                                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                                    SpinButtonPlacementMode="Compact"
-                                                    HorizontalAlignment="Left"
-                                                    SmallChange="1"
-                                                    LargeChange="10"/>
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-                                <controls:Setting x:Uid="MouseUtils_MousePointerCrosshairs_CrosshairsBorderColor" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsMousePointerCrosshairsEnabled}" Style="{StaticResource ExpanderContentSettingStyle}">
-                                    <controls:Setting.ActionContent>
-                                        <controls:ColorPickerButton SelectedColor="{x:Bind Path=ViewModel.MousePointerCrosshairsBorderColor, Mode=TwoWay}" />
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-                                <controls:Setting x:Uid="MouseUtils_MousePointerCrosshairs_CrosshairsBorderSize" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsMousePointerCrosshairsEnabled}" Style="{StaticResource ExpanderContentSettingStyle}">
-                                    <controls:Setting.ActionContent>
-                                        <NumberBox Minimum="0"
-                                                    Maximum="50"
-                                                    Value="{x:Bind Mode=TwoWay, Path=ViewModel.MousePointerCrosshairsBorderSize}"
-                                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                                    SpinButtonPlacementMode="Compact"
-                                                    HorizontalAlignment="Left"
-                                                    SmallChange="1"
-                                                    LargeChange="2"/>
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-                            </StackPanel>
-                        </controls:SettingExpander.Content>
-                    </controls:SettingExpander>
+                    <labs:SettingsExpander
+                        x:Uid="ShortcutGuide_Appearance_Behavior"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xEB3C;}"
+                        IsEnabled="{x:Bind ViewModel.IsMousePointerCrosshairsEnabled, Mode=OneWay}">
+                        <labs:SettingsExpander.Items>
+                            <labs:SettingsCard x:Uid="MouseUtils_MousePointerCrosshairs_CrosshairsColor">
+                                <controls:ColorPickerButton SelectedColor="{x:Bind Path=ViewModel.MousePointerCrosshairsColor, Mode=TwoWay}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard x:Uid="MouseUtils_MousePointerCrosshairs_CrosshairsOpacity">
+                                <Slider
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    Maximum="100"
+                                    Minimum="1"
+                                    Value="{x:Bind Mode=TwoWay, Path=ViewModel.MousePointerCrosshairsOpacity}" />
+                            </labs:SettingsCard>
+
+                            <labs:SettingsCard x:Uid="MouseUtils_MousePointerCrosshairs_CrosshairsRadius">
+                                <NumberBox
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    LargeChange="10"
+                                    Maximum="500"
+                                    Minimum="1"
+                                    SmallChange="1"
+                                    SpinButtonPlacementMode="Compact"
+                                    Value="{x:Bind Mode=TwoWay, Path=ViewModel.MousePointerCrosshairsRadius}" />
+                            </labs:SettingsCard>
+
+                            <labs:SettingsCard x:Uid="MouseUtils_MousePointerCrosshairs_CrosshairsThickness">
+                                <NumberBox
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    LargeChange="10"
+                                    Maximum="50"
+                                    Minimum="1"
+                                    SmallChange="1"
+                                    SpinButtonPlacementMode="Compact"
+                                    Value="{x:Bind Mode=TwoWay, Path=ViewModel.MousePointerCrosshairsThickness}" />
+                            </labs:SettingsCard>
+
+                            <labs:SettingsCard x:Uid="MouseUtils_MousePointerCrosshairs_CrosshairsBorderColor">
+                                <controls:ColorPickerButton SelectedColor="{x:Bind Path=ViewModel.MousePointerCrosshairsBorderColor, Mode=TwoWay}" />
+                            </labs:SettingsCard>
+
+                            <labs:SettingsCard x:Uid="MouseUtils_MousePointerCrosshairs_CrosshairsBorderSize">
+                                <NumberBox
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    LargeChange="2"
+                                    Maximum="50"
+                                    Minimum="0"
+                                    SmallChange="1"
+                                    SpinButtonPlacementMode="Compact"
+                                    Value="{x:Bind Mode=TwoWay, Path=ViewModel.MousePointerCrosshairsBorderSize}" />
+                            </labs:SettingsCard>
+                        </labs:SettingsExpander.Items>
+                    </labs:SettingsExpander>
                 </controls:SettingsGroup>
             </StackPanel>
         </controls:SettingsPageControl.ModuleContent>
         <controls:SettingsPageControl.PrimaryLinks>
-            <controls:PageLink x:Uid="LearnMore_MouseUtils" Link="https://aka.ms/PowerToysOverview_MouseUtilities"/>
+            <controls:PageLink
+                x:Uid="LearnMore_MouseUtils"
+                Link="https://aka.ms/PowerToysOverview_MouseUtilities" />
         </controls:SettingsPageControl.PrimaryLinks>
         <controls:SettingsPageControl.SecondaryLinks>
-            <controls:PageLink Text="Raymond Chen's Find My Mouse" Link="https://devblogs.microsoft.com/oldnewthing/author/oldnewthing"/>
+            <controls:PageLink
+                Link="https://devblogs.microsoft.com/oldnewthing/author/oldnewthing"
+                Text="Raymond Chen's Find My Mouse" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
 </Page>
diff --git a/src/settings-ui/Settings.UI/Views/PowerAccentPage.xaml b/src/settings-ui/Settings.UI/Views/PowerAccentPage.xaml
index 4c88564196..a0765e9eb3 100644
--- a/src/settings-ui/Settings.UI/Views/PowerAccentPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/PowerAccentPage.xaml
@@ -1,139 +1,162 @@
 <Page
     x:Class="Microsoft.PowerToys.Settings.UI.Views.PowerAccentPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-    mc:Ignorable="d"
-    AutomationProperties.LandmarkType="Main">
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:CommunityToolkit.WinUI.UI"
+    AutomationProperties.LandmarkType="Main"
+    mc:Ignorable="d">
 
-    <Page.Resources>
-        <converters:BoolNegationConverter x:Key="BoolNegationConverter"/>
-    </Page.Resources>
-
-    <controls:SettingsPageControl x:Uid="QuickAccent" IsTabStop="False"
-                                  ModuleImageSource="ms-appx:///Assets/Modules/PowerAccent.png">
+    <controls:SettingsPageControl
+        x:Uid="QuickAccent"
+        IsTabStop="False"
+        ModuleImageSource="ms-appx:///Assets/Modules/PowerAccent.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel Orientation="Vertical">
+                <labs:SettingsCard
+                    x:Uid="QuickAccent_EnableQuickAccent"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsPowerAccent.png}"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
+                    <ToggleSwitch
+                        x:Uid="ToggleSwitch"
+                        IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                </labs:SettingsCard>
 
-                <controls:Setting x:Uid="QuickAccent_EnableQuickAccent" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
-                    <controls:Setting.Icon>
-                        <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerAccent.png" ShowAsMonochrome="False" />
-                    </controls:Setting.Icon>
-                    <controls:Setting.ActionContent>
-                        <ToggleSwitch IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" x:Uid="ToggleSwitch" HorizontalAlignment="Right"/>
-                    </controls:Setting.ActionContent>
-                </controls:Setting>
-                <InfoBar x:Uid="GPO_IsSettingForced"
-                    Severity="Informational"
+                <InfoBar
+                    x:Uid="GPO_IsSettingForced"
                     IsClosable="False"
                     IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}"
-                    IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}" />
+                    IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}"
+                    Severity="Informational" />
 
-                <controls:SettingsGroup x:Uid="QuickAccent_Activation_GroupSettings" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <controls:Setting x:Uid="QuickAccent_Activation_Shortcut" Icon="&#xEDA7;">
-                        <controls:Setting.ActionContent>
-                            <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                      SelectedIndex="{x:Bind Path=ViewModel.ActivationKey, Mode=TwoWay}" >
-                                <ComboBoxItem x:Uid="QuickAccent_Activation_Key_Arrows"/>
-                                <ComboBoxItem x:Uid="QuickAccent_Activation_Key_Space"/>
-                                <ComboBoxItem x:Uid="QuickAccent_Activation_Key_Either"/>
-                            </ComboBox>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
+                <controls:SettingsGroup
+                    x:Uid="QuickAccent_Activation_GroupSettings"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                    <labs:SettingsCard
+                        x:Uid="QuickAccent_Activation_Shortcut"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xEDA7;}">
+                        <ComboBox
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            SelectedIndex="{x:Bind Path=ViewModel.ActivationKey, Mode=TwoWay}">
+                            <ComboBoxItem x:Uid="QuickAccent_Activation_Key_Arrows" />
+                            <ComboBoxItem x:Uid="QuickAccent_Activation_Key_Space" />
+                            <ComboBoxItem x:Uid="QuickAccent_Activation_Key_Either" />
+                        </ComboBox>
+                    </labs:SettingsCard>
                 </controls:SettingsGroup>
 
-                <controls:SettingsGroup x:Uid="QuickAccent_Language" IsEnabled="{Binding Mode=OneWay, Path=IsEnabled}">
-                    <controls:Setting x:Uid="QuickAccent_SelectedLanguage" Icon="&#xF2B7;">
-                        <controls:Setting.ActionContent>
-                            <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                      SelectedIndex="{x:Bind Path=ViewModel.SelectedLangIndex, Mode=TwoWay}" >
-                                <!-- These should be in the same order as the array items in PowerAccentViewModel.cs -->
-                                <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_All"/>
-                                <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Currency"/>
-                                <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Croatian"/>
-                                <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Czech"/>
-                                <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Dutch"/>
-                                <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_French"/>
-                                <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_German"/>
-                                <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Hungarian"/>
-                                <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Icelandic"/>
-                                <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Italian"/>
-                                <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Maori"/>
-                                <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Pinyin"/>
-                                <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Polish"/>
-                                <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Portuguese"/>
-                                <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Romanian"/>
-                                <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Slovakian"/>
-                                <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Spanish"/>
-                                <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Swedish"/>
-                                <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Turkish"/>
-                                <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Welsh"/>
-                            </ComboBox>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
+                <controls:SettingsGroup
+                    x:Uid="QuickAccent_Language"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                    <labs:SettingsCard
+                        x:Uid="QuickAccent_SelectedLanguage"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xF2B7;}">
+                        <ComboBox
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            SelectedIndex="{x:Bind Path=ViewModel.SelectedLangIndex, Mode=TwoWay}">
+                            <!--  These should be in the same order as the array items in PowerAccentViewModel.cs  -->
+                            <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_All" />
+                            <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Currency" />
+                            <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Croatian" />
+                            <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Czech" />
+                            <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Dutch" />
+                            <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_French" />
+                            <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_German" />
+                            <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Hungarian" />
+                            <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Icelandic" />
+                            <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Italian" />
+                            <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Maori" />
+                            <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Pinyin" />
+                            <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Polish" />
+                            <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Portuguese" />
+                            <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Romanian" />
+                            <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Slovakian" />
+                            <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Spanish" />
+                            <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Swedish" />
+                            <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Turkish" />
+                            <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Welsh" />
+                        </ComboBox>
+                    </labs:SettingsCard>
                 </controls:SettingsGroup>
 
-                <controls:SettingsGroup x:Uid="QuickAccent_Toolbar" IsEnabled="{Binding Mode=OneWay, Path=IsEnabled}">
-                    <controls:Setting x:Uid="QuickAccent_ToolbarPosition" Icon="&#xEC12;">
-                        <controls:Setting.ActionContent>
-                            <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                      SelectedIndex="{x:Bind Path=ViewModel.ToolbarPositionIndex, Mode=TwoWay}" >
-                                <ComboBoxItem x:Uid="QuickAccent_ToolbarPosition_TopCenter"/>
-                                <ComboBoxItem x:Uid="QuickAccent_ToolbarPosition_BottomCenter"/>
-                                <ComboBoxItem x:Uid="QuickAccent_ToolbarPosition_Left"/>
-                                <ComboBoxItem x:Uid="QuickAccent_ToolbarPosition_Right"/>
-                                <ComboBoxItem x:Uid="QuickAccent_ToolbarPosition_TopRightCorner"/>
-                                <ComboBoxItem x:Uid="QuickAccent_ToolbarPosition_TopLeftCorner"/>
-                                <ComboBoxItem x:Uid="QuickAccent_ToolbarPosition_BottomRightCorner"/>
-                                <ComboBoxItem x:Uid="QuickAccent_ToolbarPosition_BottomLeftCorner"/>
-                                <ComboBoxItem x:Uid="QuickAccent_ToolbarPosition_Center"/>
-                            </ComboBox>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
+                <controls:SettingsGroup
+                    x:Uid="QuickAccent_Toolbar"
+                    IsEnabled="{Binding Mode=OneWay, Path=IsEnabled}">
+                    <labs:SettingsCard
+                        x:Uid="QuickAccent_ToolbarPosition"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xEC12;}">
+                        <ComboBox
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            SelectedIndex="{x:Bind Path=ViewModel.ToolbarPositionIndex, Mode=TwoWay}">
+                            <ComboBoxItem x:Uid="QuickAccent_ToolbarPosition_TopCenter" />
+                            <ComboBoxItem x:Uid="QuickAccent_ToolbarPosition_BottomCenter" />
+                            <ComboBoxItem x:Uid="QuickAccent_ToolbarPosition_Left" />
+                            <ComboBoxItem x:Uid="QuickAccent_ToolbarPosition_Right" />
+                            <ComboBoxItem x:Uid="QuickAccent_ToolbarPosition_TopRightCorner" />
+                            <ComboBoxItem x:Uid="QuickAccent_ToolbarPosition_TopLeftCorner" />
+                            <ComboBoxItem x:Uid="QuickAccent_ToolbarPosition_BottomRightCorner" />
+                            <ComboBoxItem x:Uid="QuickAccent_ToolbarPosition_BottomLeftCorner" />
+                            <ComboBoxItem x:Uid="QuickAccent_ToolbarPosition_Center" />
+                        </ComboBox>
+                    </labs:SettingsCard>
                 </controls:SettingsGroup>
-                
-                <controls:SettingsGroup x:Uid="QuickAccent_Behavior" IsEnabled="{Binding Mode=OneWay, Path=IsEnabled}">
-                    <controls:Setting x:Uid="QuickAccent_InputTimeMs" Icon="&#xE916;">
-                        <controls:Setting.ActionContent>
-                            <NumberBox Minimum="100"
-                                            Value="{x:Bind Mode=TwoWay, Path=ViewModel.InputTimeMs}"
-                                            MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                            SpinButtonPlacementMode="Compact"
-                                            HorizontalAlignment="Left"
-                                            SmallChange="10"
-                                            LargeChange="100"/>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
-                    <controls:SettingExpander IsExpanded="False">
-                        <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="QuickAccent_ExcludedApps" Icon="&#xECE4;" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}" Style="{StaticResource ExpanderHeaderSettingStyle}"/>
-                        </controls:SettingExpander.Header>
-                        <controls:SettingExpander.Content>
-                            <TextBox x:Uid="QuickAccent_ExcludedApps_TextBoxControl"
-                                    Margin="{StaticResource ExpanderSettingMargin}"
-                                    Text="{x:Bind Mode=TwoWay, Path=ViewModel.ExcludedApps, UpdateSourceTrigger=PropertyChanged}"
-                                    ScrollViewer.VerticalScrollBarVisibility ="Visible"
-                                    ScrollViewer.VerticalScrollMode="Enabled"
-                                    ScrollViewer.IsVerticalRailEnabled="True"
-                                    TextWrapping="Wrap"
-                                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"
-                                    AcceptsReturn="True"
+
+                <controls:SettingsGroup
+                    x:Uid="QuickAccent_Behavior"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                    <labs:SettingsCard
+                        x:Uid="QuickAccent_InputTimeMs"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xE916;}">
+                        <NumberBox
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            LargeChange="100"
+                            Minimum="100"
+                            SmallChange="10"
+                            SpinButtonPlacementMode="Compact"
+                            Value="{x:Bind Mode=TwoWay, Path=ViewModel.InputTimeMs}" />
+                    </labs:SettingsCard>
+
+                    <labs:SettingsExpander
+                        x:Uid="QuickAccent_ExcludedApps"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xECE4;}">
+                        <labs:SettingsExpander.Items>
+                            <labs:SettingsCard
+                                HorizontalContentAlignment="Stretch"
+                                ContentAlignment="Vertical">
+                                <TextBox
+                                    x:Uid="QuickAccent_ExcludedApps_TextBoxControl"
                                     MinWidth="240"
-                                    MinHeight="160" />
-                        </controls:SettingExpander.Content>
-                    </controls:SettingExpander>
+                                    MinHeight="160"
+                                    AcceptsReturn="True"
+                                    ScrollViewer.IsVerticalRailEnabled="True"
+                                    ScrollViewer.VerticalScrollBarVisibility="Visible"
+                                    ScrollViewer.VerticalScrollMode="Enabled"
+                                    Text="{x:Bind Mode=TwoWay, Path=ViewModel.ExcludedApps, UpdateSourceTrigger=PropertyChanged}"
+                                    TextWrapping="Wrap" />
+                            </labs:SettingsCard>
+                        </labs:SettingsExpander.Items>
+                    </labs:SettingsExpander>
                 </controls:SettingsGroup>
             </StackPanel>
         </controls:SettingsPageControl.ModuleContent>
 
         <controls:SettingsPageControl.PrimaryLinks>
-            <controls:PageLink x:Uid="LearnMore_QuickAccent" Link="https://aka.ms/PowerToysOverview_QuickAccent"/>
+            <controls:PageLink
+                x:Uid="LearnMore_QuickAccent"
+                Link="https://aka.ms/PowerToysOverview_QuickAccent" />
         </controls:SettingsPageControl.PrimaryLinks>
         <controls:SettingsPageControl.SecondaryLinks>
-            <controls:PageLink Text="Damien Leroy's PowerAccent" Link="https://github.com/damienleroy/PowerAccent"/>
+            <controls:PageLink
+                Link="https://github.com/damienleroy/PowerAccent"
+                Text="Damien Leroy's PowerAccent" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
 </Page>
diff --git a/src/settings-ui/Settings.UI/Views/PowerLauncherPage.xaml b/src/settings-ui/Settings.UI/Views/PowerLauncherPage.xaml
index e180743544..71ccb27a13 100644
--- a/src/settings-ui/Settings.UI/Views/PowerLauncherPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/PowerLauncherPage.xaml
@@ -1,63 +1,63 @@
 <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"
     xmlns:ViewModels="using:Microsoft.PowerToys.Settings.UI.ViewModels"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ic="using:Microsoft.Xaml.Interactions.Core"
-    xmlns:i="using:Microsoft.Xaml.Interactivity"
-    x:Class="Microsoft.PowerToys.Settings.UI.Views.PowerLauncherPage"
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-    xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
-    mc:Ignorable="d"
-    AutomationProperties.LandmarkType="Main">
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:i="using:Microsoft.Xaml.Interactivity"
+    xmlns:ic="using:Microsoft.Xaml.Interactions.Core"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:CommunityToolkit.WinUI.UI"
+    AutomationProperties.LandmarkType="Main"
+    mc:Ignorable="d">
 
-    <Page.Resources>
-        <converters:BoolToObjectConverter x:Key="BoolToVisibilityConverter" TrueValue="Visible" FalseValue="Collapsed"/>
-        <converters:BoolNegationConverter x:Key="BoolNegationConverter"/>
-    </Page.Resources>
-
-    <controls:SettingsPageControl x:Uid="PowerLauncher"
-                                  ModuleImageSource="ms-appx:///Assets/Modules/PowerLauncher.png">
+    <controls:SettingsPageControl
+        x:Uid="PowerLauncher"
+        ModuleImageSource="ms-appx:///Assets/Modules/PowerLauncher.png">
         <controls:SettingsPageControl.ModuleContent>
 
             <StackPanel Orientation="Vertical">
-                <controls:Setting x:Uid="PowerLauncher_EnablePowerLauncher" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
-                    <controls:Setting.Icon>
-                        <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerToysRun.png" ShowAsMonochrome="False" />
-                    </controls:Setting.Icon>
-                    <controls:Setting.ActionContent>
-                        <ToggleSwitch IsOn="{x:Bind ViewModel.EnablePowerLauncher, Mode=TwoWay}" x:Uid="ToggleSwitch"/>
-                    </controls:Setting.ActionContent>
-                </controls:Setting>
-                <InfoBar x:Uid="GPO_IsSettingForced"
-                    Severity="Informational"
+                <labs:SettingsCard
+                    x:Uid="QuickAccent_EnableQuickAccent"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsPowerToysRun.png}"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
+                    <ToggleSwitch
+                        x:Uid="ToggleSwitch"
+                        IsOn="{x:Bind ViewModel.EnablePowerLauncher, Mode=TwoWay}" />
+                </labs:SettingsCard>
+                <InfoBar
+                    x:Uid="GPO_IsSettingForced"
                     IsClosable="False"
                     IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}"
-                    IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}" />
+                    IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}"
+                    Severity="Informational" />
 
-                <controls:SettingsGroup x:Uid="Shortcut" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}">
-                    <controls:SettingExpander IsExpanded="True">
-                        <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="Activation_Shortcut" Icon="&#xEDA7;" Style="{StaticResource ExpanderHeaderSettingStyle}">
-                                <controls:Setting.ActionContent>
-                                    <controls:ShortcutControl HotkeySettings="{x:Bind Path=ViewModel.OpenPowerLauncher, Mode=TwoWay}"
-                                                              MinWidth="{StaticResource SettingActionControlMinWidth}"/>
-                                </controls:Setting.ActionContent>
-                            </controls:Setting>
-                        </controls:SettingExpander.Header>
-                        <controls:SettingExpander.Content>
-                            <StackPanel>
-                                <controls:CheckBoxWithDescriptionControl x:Uid="PowerLauncher_UseCentralizedKeyboardHook"
-                                                                         IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.UseCentralizedKeyboardHook}"
-                                                                         Margin="{StaticResource ExpanderSettingMargin}"/>
-                                <Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
-                                <CheckBox x:Uid="PowerLauncher_IgnoreHotkeysInFullScreen"
-                                          IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.IgnoreHotkeysInFullScreen}"
-                                          Margin="{StaticResource ExpanderSettingMargin}" />
-                            </StackPanel>
-                        </controls:SettingExpander.Content>
-                    </controls:SettingExpander>
+                <controls:SettingsGroup
+                    x:Uid="Shortcut"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}">
+                    <labs:SettingsExpander
+                        x:Uid="Activation_Shortcut"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xEDA7;}"
+                        IsExpanded="True">
+                        <controls:ShortcutControl
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            HotkeySettings="{x:Bind Path=ViewModel.OpenPowerLauncher, Mode=TwoWay}" />
+                        <labs:SettingsExpander.Items>
+                            <labs:SettingsCard ContentAlignment="Left">
+                                <controls:CheckBoxWithDescriptionControl
+                                    x:Uid="PowerLauncher_UseCentralizedKeyboardHook"
+                                    IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.UseCentralizedKeyboardHook}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard ContentAlignment="Left">
+                                <CheckBox
+                                    x:Uid="PowerLauncher_IgnoreHotkeysInFullScreen"
+                                    IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.IgnoreHotkeysInFullScreen}" />
+                            </labs:SettingsCard>
+                        </labs:SettingsExpander.Items>
+                    </labs:SettingsExpander>
                 </controls:SettingsGroup>
 
 
@@ -82,7 +82,7 @@
                                           IsEnabled="False"
                                         />-->
 
-                <!--<CheckBox x:Uid="PowerLauncher_OverrideWinRKey" 
+                <!--<CheckBox x:Uid="PowerLauncher_OverrideWinRKey"
                       Margin="{StaticResource SmallTopMargin}"
                       IsChecked="False"
                       IsEnabled="False"
@@ -94,106 +94,88 @@
                       IsEnabled="False"
                       />-->
 
+                <controls:SettingsGroup
+                    x:Uid="PowerLauncher_SearchResults"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}">
+                    <labs:SettingsExpander
+                        x:Uid="PowerLauncher_SearchQueryResultsWithDelay"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xec48;}"
+                        IsExpanded="True">
+                        <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.SearchQueryResultsWithDelay}" />
+                        <labs:SettingsExpander.Items>
+                            <labs:SettingsCard x:Uid="PowerLauncher_FastSearchInputDelayMs">
+                                <NumberBox
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    LargeChange="50"
+                                    Maximum="500"
+                                    Minimum="0"
+                                    SmallChange="10"
+                                    SpinButtonPlacementMode="Compact"
+                                    Value="{x:Bind Mode=TwoWay, Path=ViewModel.SearchInputDelayFast}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard
+                                x:Uid="PowerLauncher_SlowSearchInputDelayMs"
+                                IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.SearchQueryResultsWithDelay}">
+                                <NumberBox
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    LargeChange="50"
+                                    Maximum="1000"
+                                    Minimum="0"
+                                    SmallChange="10"
+                                    SpinButtonPlacementMode="Compact"
+                                    Value="{x:Bind Mode=TwoWay, Path=ViewModel.SearchInputDelay}" />
+                            </labs:SettingsCard>
+                        </labs:SettingsExpander.Items>
+                    </labs:SettingsExpander>
 
+                    <labs:SettingsExpander
+                        x:Uid="PowerLauncher_MaximumNumberOfResults"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xec8f;}"
+                        IsExpanded="True">
+                        <NumberBox
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            Minimum="1"
+                            SpinButtonPlacementMode="Compact"
+                            Value="{Binding Mode=TwoWay, Path=MaximumNumberOfResults}" />
+                        <labs:SettingsExpander.Items>
+                            <labs:SettingsCard ContentAlignment="Left">
+                                <CheckBox
+                                    x:Uid="PowerLauncher_ClearInputOnLaunch"
+                                    IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.ClearInputOnLaunch}" />
+                            </labs:SettingsCard>
+                        </labs:SettingsExpander.Items>
+                    </labs:SettingsExpander>
 
-                <controls:SettingsGroup x:Uid="PowerLauncher_SearchResults" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}">
-                    <controls:SettingExpander IsExpanded="True">
-                        <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="PowerLauncher_SearchQueryResultsWithDelay" Icon="&#xec48;" Style="{StaticResource ExpanderHeaderSettingStyle}" >
-                                <controls:Setting.ActionContent>
-                                    <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.SearchQueryResultsWithDelay}"/>
-                                </controls:Setting.ActionContent>
-                            </controls:Setting>
-                        </controls:SettingExpander.Header>
-                        <controls:SettingExpander.Content>
-                            <StackPanel>
-                                <controls:Setting x:Uid="PowerLauncher_FastSearchInputDelayMs" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.SearchQueryResultsWithDelay}" Style="{StaticResource ExpanderContentSettingStyle}">
-                                    <controls:Setting.ActionContent>
-                                        <NumberBox Minimum="0"
-                                            Maximum="500"
-                                            Value="{x:Bind Mode=TwoWay, Path=ViewModel.SearchInputDelayFast}"
-                                            MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                            SpinButtonPlacementMode="Compact"
-                                            HorizontalAlignment="Left"
-                                            SmallChange="10"
-                                            LargeChange="50"/>
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-                                
-                                <controls:Setting x:Uid="PowerLauncher_SlowSearchInputDelayMs" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.SearchQueryResultsWithDelay}" Style="{StaticResource ExpanderContentSettingStyle}">
-                                    <controls:Setting.ActionContent>
-                                        <NumberBox Minimum="0"
-                                            Maximum="1000"
-                                            Value="{x:Bind Mode=TwoWay, Path=ViewModel.SearchInputDelay}"
-                                            MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                            SpinButtonPlacementMode="Compact"
-                                            HorizontalAlignment="Left"
-                                            SmallChange="10"
-                                            LargeChange="50"/>
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-                            </StackPanel>
-                            
-                            
-                        </controls:SettingExpander.Content>
-                    </controls:SettingExpander>
-                    <controls:SettingExpander IsExpanded="True">
-                        <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="PowerLauncher_MaximumNumberOfResults" Icon="&#xec8f;" Style="{StaticResource ExpanderHeaderSettingStyle}">
-                                <controls:Setting.ActionContent>
-                                    <NumberBox Value="{Binding Mode=TwoWay, Path=MaximumNumberOfResults}"
-                                        MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                        SpinButtonPlacementMode="Compact"
-                                        Minimum="1"/>
-                                </controls:Setting.ActionContent>
-                            </controls:Setting>
-                        </controls:SettingExpander.Header>
-                        <controls:SettingExpander.Content>
-                            <CheckBox x:Uid="PowerLauncher_ClearInputOnLaunch" IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.ClearInputOnLaunch}" Margin="{StaticResource ExpanderSettingMargin}" />
-                        </controls:SettingExpander.Content>
-                    </controls:SettingExpander>
-
-                    <controls:SettingExpander IsExpanded="True">
-                        <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="PowerLauncher_SearchQueryTuningEnabled" Icon="&#xE8CB;" Style="{StaticResource ExpanderHeaderSettingStyle}" >
-                                <controls:Setting.ActionContent>
-                                    <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.SearchQueryTuningEnabled}"/>
-                                </controls:Setting.ActionContent>
-                            </controls:Setting>
-                        </controls:SettingExpander.Header>
-                        <controls:SettingExpander.Content>
-                            <StackPanel>
-                                <controls:Setting x:Uid="PowerLauncher_SearchClickedItemWeight" Style="{StaticResource ExpanderContentSettingStyle}" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.SearchQueryTuningEnabled}">
-                                    <controls:Setting.ActionContent>
-                                        <NumberBox Minimum="0"
-                                            Maximum="1000"
-                                            Value="{x:Bind Mode=TwoWay, Path=ViewModel.SearchClickedItemWeight}"
-                                            MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                            SpinButtonPlacementMode="Compact"
-                                            HorizontalAlignment="Left"
-                                            SmallChange="5"
-                                            LargeChange="50"/>
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-                                
-                                <!--<controls:Setting x:Uid="PowerLauncher_WaitForSlowResults" Style="{StaticResource ExpanderContentSettingStyle}">
-                                    <controls:Setting.ActionContent>
-                                        <CheckBox
-                                          IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.SearchWaitForSlowResults}"
-                                          Margin="{StaticResource ExpanderSettingMargin}" />
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>-->
-                                
-                                <Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
-                                <controls:CheckBoxWithDescriptionControl x:Uid="PowerLauncher_WaitForSlowResults"
-                                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.SearchQueryTuningEnabled}"
-                                    IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.SearchWaitForSlowResults}"
-                                    Margin="{StaticResource ExpanderSettingMargin}" />
-                                
-                            </StackPanel>
-                        </controls:SettingExpander.Content>
-                    </controls:SettingExpander>
-
+                    <labs:SettingsExpander
+                        x:Uid="PowerLauncher_SearchQueryTuningEnabled"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xE8CB;}"
+                        IsExpanded="True">
+                        <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.SearchQueryTuningEnabled}" />
+                        <labs:SettingsExpander.Items>
+                            <labs:SettingsCard
+                                x:Uid="PowerLauncher_SearchClickedItemWeight"
+                                IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.SearchQueryTuningEnabled}">
+                                <NumberBox
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    LargeChange="50"
+                                    Maximum="1000"
+                                    Minimum="0"
+                                    SmallChange="5"
+                                    SpinButtonPlacementMode="Compact"
+                                    Value="{x:Bind Mode=TwoWay, Path=ViewModel.SearchClickedItemWeight}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard
+                                ContentAlignment="Left"
+                                IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.SearchQueryTuningEnabled}">
+                                <controls:CheckBoxWithDescriptionControl
+                                    x:Uid="PowerLauncher_WaitForSlowResults"
+                                    IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.SearchWaitForSlowResults}" />
+                            </labs:SettingsCard>
+                        </labs:SettingsExpander.Items>
+                    </labs:SettingsExpander>
                 </controls:SettingsGroup>
 
                 <!--<ComboBox x:Uid="PowerLauncher_SearchResultPreference"
@@ -216,197 +198,274 @@
                       IsEnabled="False"
                       />-->
 
-                <controls:SettingsGroup x:Uid="Run_PositionAppearance_GroupSettings" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}">
-                    <controls:Setting x:Uid="Run_PositionHeader" Icon="&#xe78b;">
-                        <controls:Setting.ActionContent>
-                            <ComboBox SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.MonitorPositionIndex}" MinWidth="{StaticResource SettingActionControlMinWidth}">
-                                <ComboBoxItem x:Uid="Run_Radio_Position_Cursor"/>
-                                <ComboBoxItem x:Uid="Run_Radio_Position_Primary_Monitor"/>
-                                <ComboBoxItem x:Uid="Run_Radio_Position_Focus"/>
-                            </ComboBox>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
-
-                    <controls:Setting x:Uid="ColorModeHeader" Icon="&#xE790;">
-                        <controls:Setting.Description>
-                            <HyperlinkButton Click="OpenColorsSettings_Click"
-                                             x:Uid="Windows_Color_Settings"/>
-                        </controls:Setting.Description>
-                        <controls:Setting.ActionContent>
-                            <ComboBox SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.ThemeIndex}" MinWidth="{StaticResource SettingActionControlMinWidth}">
-                                <ComboBoxItem x:Uid="Radio_Theme_Dark"/>
-                                <ComboBoxItem x:Uid="Radio_Theme_Light"/>
-                                <ComboBoxItem x:Uid="Radio_Theme_Default"/>
-                            </ComboBox>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
+                <controls:SettingsGroup
+                    x:Uid="Run_PositionAppearance_GroupSettings"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}">
+                    <labs:SettingsCard
+                        x:Uid="Run_PositionHeader"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xe78b;}">
+                        <ComboBox
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.MonitorPositionIndex}">
+                            <ComboBoxItem x:Uid="Run_Radio_Position_Cursor" />
+                            <ComboBoxItem x:Uid="Run_Radio_Position_Primary_Monitor" />
+                            <ComboBoxItem x:Uid="Run_Radio_Position_Focus" />
+                        </ComboBox>
+                    </labs:SettingsCard>
 
+                    <labs:SettingsCard
+                        x:Uid="ColorModeHeader"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xE790;}">
+                        <labs:SettingsCard.Description>
+                            <HyperlinkButton
+                                x:Uid="Windows_Color_Settings"
+                                Click="OpenColorsSettings_Click" />
+                        </labs:SettingsCard.Description>
+                        <ComboBox
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.ThemeIndex}">
+                            <ComboBoxItem x:Uid="Radio_Theme_Dark" />
+                            <ComboBoxItem x:Uid="Radio_Theme_Light" />
+                            <ComboBoxItem x:Uid="Radio_Theme_Default" />
+                        </ComboBox>
+                    </labs:SettingsCard>
                 </controls:SettingsGroup>
 
-                <controls:SettingsGroup x:Uid="PowerLauncher_Plugins" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}">
+                <controls:SettingsGroup
+                    x:Uid="PowerLauncher_Plugins"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}">
 
-                    <InfoBar x:Uid="Run_ConflictingKeywordInfo"
-                                  Severity="Informational"
-                                  IsClosable="False"
-                                  IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}"
-                                  IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}">
+                    <InfoBar
+                        x:Uid="Run_ConflictingKeywordInfo"
+                        IsClosable="False"
+                        IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}"
+                        IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}"
+                        Severity="Informational">
                         <InfoBar.ActionButton>
-                            <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_PowerToysRun#direct-activation-commands"
-                                             x:Uid="Run_ConflictingKeywordInfo_Link"/>
+                            <HyperlinkButton
+                                x:Uid="Run_ConflictingKeywordInfo_Link"
+                                NavigateUri="https://aka.ms/PowerToysOverview_PowerToysRun#direct-activation-commands" />
                         </InfoBar.ActionButton>
                     </InfoBar>
 
-                    <controls:Setting x:Uid="Run_PluginUseDescription" Icon="&#xEA86;">
-                        <controls:Setting.ActionContent>
-                            <AutoSuggestBox x:Uid="PowerLauncher_SearchList"
-                                            QueryIcon="Find"
-                                            MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                            Text="{x:Bind ViewModel.SearchText, Mode=TwoWay}">
-                                <i:Interaction.Behaviors>
-                                    <ic:EventTriggerBehavior EventName="TextChanged">
-                                        <ic:InvokeCommandAction Command="{x:Bind ViewModel.SearchPluginsCommand}" />
-                                    </ic:EventTriggerBehavior>
-                                </i:Interaction.Behaviors>
-                            </AutoSuggestBox>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
-                    <InfoBar x:Uid="Run_AllPluginsDisabled"
-                                  Severity="Error"
-                                  IsTabStop="{x:Bind ViewModel.ShowAllPluginsDisabledWarning, Mode=OneWay}"
-                                  IsOpen="{x:Bind ViewModel.ShowAllPluginsDisabledWarning, Mode=OneWay}"
-                                  IsClosable="False" />
+                    <labs:SettingsCard
+                        x:Uid="Run_PluginUseDescription"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xEA86;}">
+                        <AutoSuggestBox
+                            x:Uid="PowerLauncher_SearchList"
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            QueryIcon="Find"
+                            Text="{x:Bind ViewModel.SearchText, Mode=TwoWay}">
+                            <i:Interaction.Behaviors>
+                                <ic:EventTriggerBehavior EventName="TextChanged">
+                                    <ic:InvokeCommandAction Command="{x:Bind ViewModel.SearchPluginsCommand}" />
+                                </ic:EventTriggerBehavior>
+                            </i:Interaction.Behaviors>
+                        </AutoSuggestBox>
+                    </labs:SettingsCard>
 
-                    <StackPanel Orientation="Horizontal" Visibility="{x:Bind ViewModel.ShowPluginsLoadingMessage, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
-                        <ProgressRing IsActive="True" Width="20" Height="20" Margin="18,18" />
-                        <TextBlock x:Uid="Run_PluginsLoading" Style="{ThemeResource SecondaryTextStyle}" VerticalAlignment="Center" />
+
+
+                    <InfoBar
+                        x:Uid="Run_AllPluginsDisabled"
+                        IsClosable="False"
+                        IsOpen="{x:Bind ViewModel.ShowAllPluginsDisabledWarning, Mode=OneWay}"
+                        IsTabStop="{x:Bind ViewModel.ShowAllPluginsDisabledWarning, Mode=OneWay}"
+                        Severity="Error" />
+
+                    <StackPanel
+                        Orientation="Horizontal"
+                        Visibility="{x:Bind ViewModel.ShowPluginsLoadingMessage, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+                        <ProgressRing
+                            Width="20"
+                            Height="20"
+                            Margin="18,18"
+                            IsActive="True" />
+                        <TextBlock
+                            x:Uid="Run_PluginsLoading"
+                            VerticalAlignment="Center"
+                            Style="{ThemeResource SecondaryTextStyle}" />
                     </StackPanel>
 
-                    <ListView ItemsSource="{x:Bind Path=ViewModel.Plugins, Mode=OneWay}"
-                              IsItemClickEnabled="False"
-                              SelectionMode="None"
-                              x:Name="PluginsListView">
-                        <ListView.ItemTemplate>
-                            <DataTemplate x:DataType="ViewModels:PowerLauncherPluginViewModel" x:DefaultBindMode="OneWay">
+                    <ItemsControl
+                        x:Name="PluginsListView"
+                        ItemsSource="{x:Bind Path=ViewModel.Plugins, Mode=OneWay}">
+                        <ItemsControl.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <StackPanel Spacing="2" />
+                            </ItemsPanelTemplate>
+                        </ItemsControl.ItemsPanel>
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate
+                                x:DataType="ViewModels:PowerLauncherPluginViewModel"
+                                x:DefaultBindMode="OneWay">
                                 <Grid>
-                                    <controls:SettingExpander>
-                                        <controls:SettingExpander.Header>
-                                            <controls:Setting Header="{x:Bind Path=Name}" Description="{x:Bind Description}" Style="{StaticResource ExpanderHeaderSettingStyle}">
-                                                <controls:Setting.Icon>
-                                                    <Image Source="{x:Bind IconPath}"
-                                                           Width="20"
-                                                           Height="20" />
-                                                </controls:Setting.Icon>
-                                                <controls:Setting.ActionContent>
-                                                    <StackPanel Orientation="Horizontal" Spacing="16" >
-
-                                                        <!-- todo(Stefan): InfoBadge not available
+                                    <labs:SettingsExpander
+                                        Description="{x:Bind Description}"
+                                        Header="{x:Bind Path=Name}">
+                                        <labs:SettingsExpander.HeaderIcon>
+                                            <BitmapIcon UriSource="{x:Bind IconPath}" />
+                                        </labs:SettingsExpander.HeaderIcon>
+                                        <StackPanel
+                                            Orientation="Horizontal"
+                                            Spacing="16">
+                                            <!-- todo(Stefan): InfoBadge not available
                                                         <InfoBadge AutomationProperties.AccessibilityView="Raw"
                                                                         Visibility="{x:Bind ShowBadgeOnPluginSettingError}"
                                                                         Style="{StaticResource CriticalIconInfoBadgeStyle}" />
-                                                        -->
+                                            -->
 
-                                                        <!-- Temporary badge replacement for InfoBadge control (htcfreek). (Normally you need one grid per icon group. But if you want to show two badges at the same place in a StackPanel you have to put all FontIcons into the same Grid.)-->
-                                                        <Grid>
-                                                            <!-- Error badge -->
-                                                            <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="{StaticResource InfoBarIconBackgroundGlyph}" Foreground="{ThemeResource InfoBarErrorSeverityIconBackground}" Visibility="{x:Bind ShowBadgeOnPluginSettingError}"/>
-                                                            <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="{StaticResource InfoBarErrorIconGlyph}" Foreground="{ThemeResource InfoBarErrorSeverityIconForeground}" Visibility="{x:Bind ShowBadgeOnPluginSettingError}"/>
-                                                        </Grid>
-                                                        
-                                                        <ToggleSwitch x:Uid="PowerLauncher_EnablePluginToggle"
-                                                                      IsOn="{x:Bind Path=Disabled, Converter={StaticResource BoolNegationConverter}, Mode=TwoWay}"/>
+                                            <!--  Temporary badge replacement for InfoBadge control (htcfreek). (Normally you need one grid per icon group. But if you want to show two badges at the same place in a StackPanel you have to put all FontIcons into the same Grid.)  -->
+                                            <Grid>
+                                                <!--  Error badge  -->
+                                                <FontIcon
+                                                    FontFamily="{StaticResource SymbolThemeFontFamily}"
+                                                    Foreground="{ThemeResource InfoBarErrorSeverityIconBackground}"
+                                                    Glyph="{StaticResource InfoBarIconBackgroundGlyph}"
+                                                    Visibility="{x:Bind ShowBadgeOnPluginSettingError}" />
+                                                <FontIcon
+                                                    FontFamily="{StaticResource SymbolThemeFontFamily}"
+                                                    Foreground="{ThemeResource InfoBarErrorSeverityIconForeground}"
+                                                    Glyph="{StaticResource InfoBarErrorIconGlyph}"
+                                                    Visibility="{x:Bind ShowBadgeOnPluginSettingError}" />
+                                            </Grid>
+
+                                            <ToggleSwitch
+                                                x:Uid="PowerLauncher_EnablePluginToggle"
+                                                IsOn="{x:Bind Path=Disabled, Converter={StaticResource BoolNegationConverter}, Mode=TwoWay}" />
+                                        </StackPanel>
+                                        <labs:SettingsExpander.Items>
+                                            <labs:SettingsCard
+                                                x:Uid="PowerLauncher_ActionKeyword"
+                                                IsEnabled="{x:Bind Enabled, Mode=OneWay}">
+                                                <TextBox
+                                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                                    Text="{x:Bind Path=ActionKeyword, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                                            </labs:SettingsCard>
+                                            <labs:SettingsCard
+                                                Padding="0,-4,0,0"
+                                                HorizontalContentAlignment="Left"
+                                                Background="{ThemeResource SystemFillColorCriticalBackgroundBrush}"
+                                                ContentAlignment="Vertical"
+                                                Visibility="{x:Bind ShowNotAccessibleWarning, Converter={StaticResource BoolToVisibilityConverter}}">
+                                                <InfoBar
+                                                    x:Uid="Run_NotAccessibleWarning"
+                                                    Margin="3,0,0,0"
+                                                    Background="Transparent"
+                                                    BorderBrush="Transparent"
+                                                    IsClosable="False"
+                                                    IsOpen="True"
+                                                    IsTabStop="{x:Bind ShowNotAccessibleWarning}"
+                                                    Severity="Error" />
+                                            </labs:SettingsCard>
+                                            <labs:SettingsCard
+                                                ContentAlignment="Left"
+                                                IsEnabled="{x:Bind Enabled, Mode=OneWay}">
+                                                <CheckBox
+                                                    Margin="0,-8,0,0"
+                                                    AutomationProperties.Name="{Binding ElementName=IncludeInGlobalResultTitle, Path=Text}"
+                                                    IsChecked="{x:Bind Path=IsGlobal, Mode=TwoWay}">
+                                                    <StackPanel Orientation="Vertical">
+                                                        <TextBlock
+                                                            x:Name="IncludeInGlobalResultTitle"
+                                                            x:Uid="PowerLauncher_IncludeInGlobalResultTitle" />
+                                                        <controls:IsEnabledTextBlock
+                                                            x:Uid="PowerLauncher_IncludeInGlobalResultDescription"
+                                                            FontSize="{StaticResource SecondaryTextFontSize}"
+                                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
                                                     </StackPanel>
-
-                                                </controls:Setting.ActionContent>
-                                            </controls:Setting>
-                                        </controls:SettingExpander.Header>
-                                        <controls:SettingExpander.Content>
-                                            <StackPanel>
-                                                <controls:Setting x:Uid="PowerLauncher_ActionKeyword" Style="{StaticResource ExpanderContentSettingStyle}" IsEnabled="{x:Bind Enabled, Mode=OneWay}">
-                                                    <controls:Setting.ActionContent>
-                                                        <TextBox Text="{x:Bind Path=ActionKeyword, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                                                 MinWidth="{StaticResource SettingActionControlMinWidth}" />
-                                                    </controls:Setting.ActionContent>
-                                                </controls:Setting>
-
-                                                <InfoBar Severity="Error" x:Uid="Run_NotAccessibleWarning"
-                                                              IsTabStop="{x:Bind ShowNotAccessibleWarning}"
-                                                              IsOpen="{x:Bind ShowNotAccessibleWarning}"
-                                                              IsClosable="False" />
-                                                <Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
-                                                
-                                                <StackPanel Orientation="Vertical">
-                                                    <CheckBox AutomationProperties.Name="{Binding ElementName=IncludeInGlobalResultTitle, Path=Text}"
-                                                          IsChecked="{x:Bind Path=IsGlobal, Mode=TwoWay}"
-                                                          IsEnabled="{x:Bind Enabled, Mode=OneWay}"
-                                                          Margin="{StaticResource ExpanderSettingMargin}">
-                                                        <StackPanel Orientation="Vertical">
-                                                            <TextBlock x:Name="IncludeInGlobalResultTitle"
-                                                                      x:Uid="PowerLauncher_IncludeInGlobalResultTitle" />
-                                                            <controls:IsEnabledTextBlock x:Uid="PowerLauncher_IncludeInGlobalResultDescription" 
-                                                                                         FontSize="{StaticResource SecondaryTextFontSize}"
-                                                                                         Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
-
-                                                        </StackPanel>
-                                                    </CheckBox>
-
-                                                    <controls:Setting x:Uid="PowerLauncher_PluginWeightBoost" 
-                                                                      Style="{StaticResource ExpanderContentSettingStyleTight}" 
-                                                                      IsEnabled="{x:Bind IsGlobalAndEnabled, Mode=OneWay}">
-                                                        <controls:Setting.ActionContent>
-                                                            <NumberBox Minimum="-1000"
-                                                                Maximum="1000"
-                                                                Value="{x:Bind Mode=TwoWay, Path=WeightBoost}"
-                                                                MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                                                SpinButtonPlacementMode="Compact"
-                                                                HorizontalAlignment="Left"
-                                                                SmallChange="10"
-                                                                LargeChange="50"/>
-                                                        </controls:Setting.ActionContent>
-                                                    </controls:Setting>
-                                                    
-                                                    
-                                                </StackPanel>
-
-                                                <ListView ItemsSource="{x:Bind Path=AdditionalOptions}"
-                                                          SelectionMode="None"
-                                                          IsEnabled="{x:Bind Enabled, Mode=OneWay}">
-
-                                                    <ListView.ItemTemplate>
+                                                </CheckBox>
+                                            </labs:SettingsCard>
+                                            <labs:SettingsCard
+                                                x:Uid="PowerLauncher_PluginWeightBoost"
+                                                IsEnabled="{x:Bind IsGlobalAndEnabled, Mode=OneWay}">
+                                                <NumberBox
+                                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                                    LargeChange="50"
+                                                    Maximum="1000"
+                                                    Minimum="-1000"
+                                                    SmallChange="10"
+                                                    SpinButtonPlacementMode="Compact"
+                                                    Value="{x:Bind Mode=TwoWay, Path=WeightBoost}" />
+                                            </labs:SettingsCard>
+                                            <labs:SettingsCard
+                                                MinHeight="0"
+                                                HorizontalContentAlignment="Stretch"
+                                                ContentAlignment="Vertical">
+                                                <labs:SettingsCard.Resources>
+                                                    <Thickness x:Key="SettingsCardPadding">0</Thickness>
+                                                    <Thickness x:Key="SettingsExpanderItemPadding">0,0,0,0</Thickness>
+                                                </labs:SettingsCard.Resources>
+                                                <ItemsControl
+                                                    Margin="0,-6,0,0"
+                                                    HorizontalAlignment="Stretch"
+                                                    HorizontalContentAlignment="Stretch"
+                                                    IsEnabled="{x:Bind Enabled, Mode=OneWay}"
+                                                    ItemsSource="{x:Bind Path=AdditionalOptions}">
+                                                    <ItemsControl.ItemTemplate>
                                                         <DataTemplate x:DataType="ViewModels:PluginAdditionalOptionViewModel">
-                                                            <StackPanel Orientation="Vertical">
-                                                                <Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
-                                                                <controls:CheckBoxWithDescriptionControl Header="{x:Bind Path=DisplayLabel}" Description="{x:Bind Path=DisplayDescription}"
-                                                                      IsChecked="{x:Bind Path=Value, Mode=TwoWay}" Margin="{StaticResource ExpanderSettingMargin}"/>
+                                                            <StackPanel
+                                                                HorizontalAlignment="Stretch"
+                                                                Orientation="Vertical">
+                                                                <labs:SettingsCard
+                                                                    MinHeight="0"
+                                                                    Margin="1"
+                                                                    Padding="0,6,0,12"
+                                                                    Background="Transparent"
+                                                                    BorderThickness="0,0,0,0"
+                                                                    ContentAlignment="Left"
+                                                                    CornerRadius="0">
+                                                                    <controls:CheckBoxWithDescriptionControl
+                                                                        Margin="56,0,0,0"
+                                                                        Description="{x:Bind Path=DisplayDescription}"
+                                                                        Header="{x:Bind Path=DisplayLabel}"
+                                                                        IsChecked="{x:Bind Path=Value, Mode=TwoWay}" />
+                                                                </labs:SettingsCard>
+                                                                <Rectangle
+                                                                    Height="1"
+                                                                    HorizontalAlignment="Stretch"
+                                                                    Fill="{ThemeResource CardStrokeColorDefaultBrush}" />
                                                             </StackPanel>
                                                         </DataTemplate>
-                                                    </ListView.ItemTemplate>
-                                                </ListView>
-
-                                                <Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
-                                                <TextBlock Opacity="{x:Bind DisabledOpacity}"
-                                                           HorizontalAlignment="Right"
-                                                           Style="{ThemeResource SecondaryTextStyle}"
-                                                           Margin="{StaticResource ExpanderSettingMargin}">
-                                                               <Run x:Uid="PowerLauncher_AuthoredBy" />
-                                                               <Run FontWeight="SemiBold" Text="{x:Bind Author}" />
+                                                    </ItemsControl.ItemTemplate>
+                                                </ItemsControl>
+                                            </labs:SettingsCard>
+                                            <labs:SettingsCard
+                                                MinHeight="0"
+                                                BorderThickness="0"
+                                                ContentAlignment="Right">
+                                                <TextBlock
+                                                    Opacity="{x:Bind DisabledOpacity}"
+                                                    Style="{ThemeResource SecondaryTextStyle}">
+                                                    <Run x:Uid="PowerLauncher_AuthoredBy" />
+                                                    <Run FontWeight="SemiBold" Text="{x:Bind Author}" />
                                                 </TextBlock>
-                                            </StackPanel>
-                                        </controls:SettingExpander.Content>
-                                    </controls:SettingExpander>
+                                            </labs:SettingsCard>
+                                        </labs:SettingsExpander.Items>
+                                    </labs:SettingsExpander>
                                 </Grid>
                             </DataTemplate>
-                        </ListView.ItemTemplate>
-                    </ListView>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
                 </controls:SettingsGroup>
             </StackPanel>
 
         </controls:SettingsPageControl.ModuleContent>
         <controls:SettingsPageControl.PrimaryLinks>
-            <controls:PageLink x:Uid="LearnMore_Run" Link="https://aka.ms/PowerToysOverview_PowerToysRun"/>
+            <controls:PageLink
+                x:Uid="LearnMore_Run"
+                Link="https://aka.ms/PowerToysOverview_PowerToysRun" />
         </controls:SettingsPageControl.PrimaryLinks>
         <controls:SettingsPageControl.SecondaryLinks>
-            <controls:PageLink Text="Wox" Link="https://github.com/Wox-launcher/Wox/"/>
-            <controls:PageLink Text="Beta Tadele's Window Walker" Link="https://github.com/betsegaw/windowwalker/"/>
+            <controls:PageLink
+                Link="https://github.com/Wox-launcher/Wox/"
+                Text="Wox" />
+            <controls:PageLink
+                Link="https://github.com/betsegaw/windowwalker/"
+                Text="Beta Tadele's Window Walker" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
 </Page>
\ No newline at end of file
diff --git a/src/settings-ui/Settings.UI/Views/PowerOcrPage.xaml b/src/settings-ui/Settings.UI/Views/PowerOcrPage.xaml
index 79578794ae..c0e4ec6a58 100644
--- a/src/settings-ui/Settings.UI/Views/PowerOcrPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/PowerOcrPage.xaml
@@ -3,61 +3,71 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-    xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:CommunityToolkit.WinUI.UI"
     AutomationProperties.LandmarkType="Main"
     mc:Ignorable="d">
 
-    <Page.Resources>
-        <converters:BoolNegationConverter x:Key="BoolNegationConverter"/>
-    </Page.Resources>
-
-    <controls:SettingsPageControl x:Uid="TextExtractor" ModuleImageSource="ms-appx:///Assets/Modules/PowerOCR.png">
+    <controls:SettingsPageControl
+        x:Uid="TextExtractor"
+        ModuleImageSource="ms-appx:///Assets/Modules/PowerOCR.png">
         <controls:SettingsPageControl.ModuleContent>
-            <StackPanel Orientation="Vertical">
-
-                <controls:Setting x:Uid="TextExtractor_EnableToggleControl_HeaderText" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
-                    <controls:Setting.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerOcr.png" />
-                    </controls:Setting.Icon>
-                    <controls:Setting.ActionContent>
-                        <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
-                    </controls:Setting.ActionContent>
-                </controls:Setting>
-                <InfoBar x:Uid="GPO_IsSettingForced"
-                    Severity="Informational"
+            <StackPanel
+                Orientation="Vertical"
+                Spacing="2">
+                <labs:SettingsCard
+                    x:Uid="TextExtractor_EnableToggleControl_HeaderText"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsPowerOcr.png}"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
+                    <ToggleSwitch
+                        x:Uid="ToggleSwitch"
+                        IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                </labs:SettingsCard>
+                <InfoBar
+                    x:Uid="GPO_IsSettingForced"
                     IsClosable="False"
                     IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}"
-                    IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}" />
-
-                <InfoBar x:Uid="TextExtractor_SupportedLanguages"
-                        Severity="Informational"
-                        IsClosable="False"
-                        IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"
-                        IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}" >
+                    IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}"
+                    Severity="Informational" />
+                <InfoBar
+                    x:Uid="TextExtractor_SupportedLanguages"
+                    IsClosable="False"
+                    IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"
+                    IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"
+                    Severity="Informational">
                     <InfoBar.ActionButton>
-                        <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_TextExtractor#supported-languages" x:Uid="TextExtractor_SupportedLanguages_Link"/>
+                        <HyperlinkButton
+                            x:Uid="TextExtractor_SupportedLanguages_Link"
+                            NavigateUri="https://aka.ms/PowerToysOverview_TextExtractor#supported-languages" />
                     </InfoBar.ActionButton>
                 </InfoBar>
 
-                <controls:SettingsGroup x:Uid="Shortcut" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <controls:Setting x:Uid="Activation_Shortcut" Icon="&#xEDA7;">
-                        <controls:Setting.ActionContent>
-                            <controls:ShortcutControl MinWidth="{StaticResource SettingActionControlMinWidth}" HotkeySettings="{x:Bind Path=ViewModel.ActivationShortcut, Mode=TwoWay}" />
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
-
+                <controls:SettingsGroup
+                    x:Uid="Shortcut"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                    <labs:SettingsCard
+                        x:Uid="Activation_Shortcut"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xEDA7;}">
+                        <controls:ShortcutControl
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            HotkeySettings="{x:Bind Path=ViewModel.ActivationShortcut, Mode=TwoWay}" />
+                    </labs:SettingsCard>
                 </controls:SettingsGroup>
-
             </StackPanel>
         </controls:SettingsPageControl.ModuleContent>
 
         <controls:SettingsPageControl.PrimaryLinks>
-            <controls:PageLink x:Uid="LearnMore_TextExtractor" Link="https://aka.ms/PowerToysOverview_TextExtractor" />
+            <controls:PageLink
+                x:Uid="LearnMore_TextExtractor"
+                Link="https://aka.ms/PowerToysOverview_TextExtractor" />
         </controls:SettingsPageControl.PrimaryLinks>
         <controls:SettingsPageControl.SecondaryLinks>
-            <controls:PageLink Text="Based upon Joseph Finney's Text Grab" Link="https://github.com/TheJoeFin/Text-Grab"/>
+            <controls:PageLink
+                Link="https://github.com/TheJoeFin/Text-Grab"
+                Text="Based upon Joseph Finney's Text Grab" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
 </Page>
diff --git a/src/settings-ui/Settings.UI/Views/PowerPreviewPage.xaml b/src/settings-ui/Settings.UI/Views/PowerPreviewPage.xaml
index 931a891d2b..d0c9232648 100644
--- a/src/settings-ui/Settings.UI/Views/PowerPreviewPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/PowerPreviewPage.xaml
@@ -2,196 +2,216 @@
     x:Class="Microsoft.PowerToys.Settings.UI.Views.PowerPreviewPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-    mc:Ignorable="d"
-    AutomationProperties.LandmarkType="Main">
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:CommunityToolkit.WinUI.UI"
+    AutomationProperties.LandmarkType="Main"
+    mc:Ignorable="d">
 
-    <Page.Resources>
-        <converters:BoolNegationConverter x:Key="BoolNegationConverter"/>
-        <converters:BoolToObjectConverter x:Key="BoolToVisibilityConverter" TrueValue="Collapsed" FalseValue="Visible"/>
-    </Page.Resources>
-
-    <controls:SettingsPageControl x:Uid="FileExplorerPreview"
-                                  ModuleImageSource="ms-appx:///Assets/Modules/PowerPreview.png">
+    <controls:SettingsPageControl
+        x:Uid="FileExplorerPreview"
+        ModuleImageSource="ms-appx:///Assets/Modules/PowerPreview.png">
         <controls:SettingsPageControl.ModuleContent>
-            
             <StackPanel Orientation="Vertical">
-
                 <controls:SettingsGroup x:Uid="FileExplorerPreview_PreviewPane">
-                    <InfoBar Severity="Warning"
-                                   x:Uid="FileExplorerPreview_PreviewHandlerOutlookIncompatibility"
-                                   IsOpen="True"
-                                   IsTabStop="True"
-                                   IsClosable="False"
-                                   />
-                    <controls:Setting x:Uid="FileExplorerPreview_ToggleSwitch_Preview_SVG" Icon="&#xE91B;" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsSVGRenderEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
-                        <controls:Setting.ActionContent>
-                            <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.SVGRenderIsEnabled}"
-                                          x:Uid="ToggleSwitch"/>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
-                    <InfoBar x:Uid="GPO_IsSettingForced"
-                        Severity="Informational"
+                    <InfoBar
+                        x:Uid="FileExplorerPreview_PreviewHandlerOutlookIncompatibility"
+                        IsClosable="False"
+                        IsOpen="True"
+                        IsTabStop="True"
+                        Severity="Warning" />
+                    <labs:SettingsCard
+                        x:Uid="FileExplorerPreview_ToggleSwitch_Preview_SVG"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xE91B;}"
+                        IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsSVGRenderEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.SVGRenderIsEnabled}" />
+                    </labs:SettingsCard>
+
+                    <InfoBar
+                        x:Uid="GPO_IsSettingForced"
                         IsClosable="False"
                         IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.IsSVGRenderEnabledGpoConfigured}"
-                        IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsSVGRenderEnabledGpoConfigured}" />
+                        IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsSVGRenderEnabledGpoConfigured}"
+                        Severity="Informational" />
 
-                    <controls:Setting x:Uid="FileExplorerPreview_ToggleSwitch_Preview_MD" Icon="&#xE943;" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsMDRenderEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
-                        <controls:Setting.ActionContent>
-                            <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.MDRenderIsEnabled}"
-                                          x:Uid="ToggleSwitch"/>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
-                    <InfoBar x:Uid="GPO_IsSettingForced"
-                        Severity="Informational"
+                    <labs:SettingsCard
+                        x:Uid="FileExplorerPreview_ToggleSwitch_Preview_MD"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xE943;}"
+                        IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsMDRenderEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.MDRenderIsEnabled}" />
+                    </labs:SettingsCard>
+
+                    <InfoBar
+                        x:Uid="GPO_IsSettingForced"
                         IsClosable="False"
                         IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.IsMDRenderEnabledGpoConfigured}"
-                        IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsMDRenderEnabledGpoConfigured}" />
+                        IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsMDRenderEnabledGpoConfigured}"
+                        Severity="Informational" />
 
-                    <controls:SettingExpander IsExpanded="False">
-                        <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="FileExplorerPreview_ToggleSwitch_Preview_Monaco" Icon="&#xE99A;" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsMonacoRenderEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
-                                <controls:Setting.ActionContent>
-                                    <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.MonacoRenderIsEnabled}"
-                                          x:Uid="ToggleSwitch"/>
-                                </controls:Setting.ActionContent>
-                            </controls:Setting>
-                        </controls:SettingExpander.Header>
 
-                        <controls:SettingExpander.Content>
-                            <StackPanel>
-                                <CheckBox x:Uid="FileExplorerPreview_ToggleSwitch_Monaco_Wrap_Text"
-                                          IsChecked="{x:Bind ViewModel.MonacoWrapText, Mode=TwoWay}"
-                                          Margin="{StaticResource ExpanderSettingMargin}"
-                                          IsEnabled="{x:Bind ViewModel.MonacoRenderIsEnabled, Mode=OneWay}" />
-                                <Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
-                                <controls:CheckBoxWithDescriptionControl x:Uid="FileExplorerPreview_ToggleSwitch_Monaco_Try_Format"
-                                                                         IsChecked="{x:Bind ViewModel.MonacoPreviewTryFormat, Mode=TwoWay}"
-                                                                         Margin="{StaticResource ExpanderSettingMargin}"
-                                                                         IsEnabled="{x:Bind ViewModel.MonacoRenderIsEnabled, Mode=OneWay}"/>
-                            </StackPanel>
-                        </controls:SettingExpander.Content>
-                    </controls:SettingExpander>
-                    <InfoBar x:Uid="GPO_IsSettingForced"
-                        Severity="Informational"
+                    <labs:SettingsExpander
+                        x:Uid="FileExplorerPreview_ToggleSwitch_Preview_Monaco"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xE99A;}"
+                        IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsMonacoRenderEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.MonacoRenderIsEnabled}" />
+                        <labs:SettingsExpander.Items>
+                            <labs:SettingsCard
+                                ContentAlignment="Left"
+                                IsEnabled="{x:Bind ViewModel.MonacoRenderIsEnabled, Mode=OneWay}">
+                                <CheckBox
+                                    x:Uid="FileExplorerPreview_ToggleSwitch_Monaco_Wrap_Text"
+                                    IsChecked="{x:Bind ViewModel.MonacoWrapText, Mode=TwoWay}" />
+                            </labs:SettingsCard>
+                            <labs:SettingsCard
+                                ContentAlignment="Left"
+                                IsEnabled="{x:Bind ViewModel.MonacoRenderIsEnabled, Mode=OneWay}">
+                                <controls:CheckBoxWithDescriptionControl
+                                    x:Uid="FileExplorerPreview_ToggleSwitch_Monaco_Try_Format"
+                                    IsChecked="{x:Bind ViewModel.MonacoPreviewTryFormat, Mode=TwoWay}"
+                                    IsEnabled="{x:Bind ViewModel.MonacoRenderIsEnabled, Mode=OneWay}" />
+                            </labs:SettingsCard>
+                        </labs:SettingsExpander.Items>
+                    </labs:SettingsExpander>
+
+                    <InfoBar
+                        x:Uid="GPO_IsSettingForced"
                         IsClosable="False"
                         IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.IsMonacoRenderEnabledGpoConfigured}"
-                        IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsMonacoRenderEnabledGpoConfigured}" />
+                        IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsMonacoRenderEnabledGpoConfigured}"
+                        Severity="Informational" />
 
-                    <controls:Setting x:Uid="FileExplorerPreview_ToggleSwitch_Preview_PDF" Icon="&#xEA90;" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsPDFRenderEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
-                        <controls:Setting.ActionContent>
-                            <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.PDFRenderIsEnabled}"
-                                          x:Uid="ToggleSwitch"/>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
-                    <InfoBar x:Uid="GPO_IsSettingForced"
-                        Severity="Informational"
+                    <labs:SettingsCard
+                        x:Uid="FileExplorerPreview_ToggleSwitch_Preview_PDF"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xEA90;}"
+                        IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsPDFRenderEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.PDFRenderIsEnabled}" />
+                    </labs:SettingsCard>
+                    <InfoBar
+                        x:Uid="GPO_IsSettingForced"
                         IsClosable="False"
                         IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.IsPDFRenderEnabledGpoConfigured}"
-                        IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsPDFRenderEnabledGpoConfigured}" />
-
-                    <controls:Setting x:Uid="FileExplorerPreview_ToggleSwitch_Preview_GCODE" Icon="&#xE914;" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsGCODERenderEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
-                        <controls:Setting.ActionContent>
-                            <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.GCODERenderIsEnabled}"
-                                          x:Uid="ToggleSwitch"/>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
-                    <InfoBar x:Uid="GPO_IsSettingForced"
-                        Severity="Informational"
+                        IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsPDFRenderEnabledGpoConfigured}"
+                        Severity="Informational" />
+                    <labs:SettingsCard
+                        x:Uid="FileExplorerPreview_ToggleSwitch_Preview_GCODE"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xE914;}"
+                        IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsGCODERenderEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.GCODERenderIsEnabled}" />
+                    </labs:SettingsCard>
+                    <InfoBar
+                        x:Uid="GPO_IsSettingForced"
                         IsClosable="False"
                         IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.IsGCODERenderEnabledGpoConfigured}"
-                        IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsGCODERenderEnabledGpoConfigured}" />
+                        IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsGCODERenderEnabledGpoConfigured}"
+                        Severity="Informational" />
                 </controls:SettingsGroup>
 
                 <controls:SettingsGroup x:Uid="FileExplorerPreview_IconThumbnail_GroupSettings">
-                    <InfoBar Severity="Informational"
-                                   x:Uid="FileExplorerPreview_RebootRequired"
-                                   IsOpen="True"
-                                   IsTabStop="True"
-                                   IsClosable="False"
-                                   />
-                    <InfoBar Severity="Warning"
-                                   x:Uid="FileExplorerPreview_ThumbnailsMightNotAppearOnRemoteFolders"
-                                   IsOpen="True"
-                                   IsTabStop="True"
-                                   IsClosable="False"
-                                   />
-                    <controls:Setting x:Uid="FileExplorerPreview_ToggleSwitch_Thumbnail_SVG" Icon="&#xE91B;" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsSVGThumbnailEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
-                        <controls:Setting.ActionContent>
-                            <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.SVGThumbnailIsEnabled}"
-                                          x:Uid="ToggleSwitch"/>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
-                    <InfoBar x:Uid="GPO_IsSettingForced"
-                        Severity="Informational"
+                    <InfoBar
+                        x:Uid="FileExplorerPreview_RebootRequired"
+                        IsClosable="False"
+                        IsOpen="True"
+                        IsTabStop="True"
+                        Severity="Informational" />
+                    <InfoBar
+                        x:Uid="FileExplorerPreview_ThumbnailsMightNotAppearOnRemoteFolders"
+                        IsClosable="False"
+                        IsOpen="True"
+                        IsTabStop="True"
+                        Severity="Warning" />
+                    <labs:SettingsCard
+                        x:Uid="FileExplorerPreview_ToggleSwitch_Thumbnail_SVG"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xE91B;}"
+                        IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsSVGThumbnailEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.SVGThumbnailIsEnabled}" />
+                    </labs:SettingsCard>
+                    <InfoBar
+                        x:Uid="GPO_IsSettingForced"
                         IsClosable="False"
                         IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.IsSVGThumbnailEnabledGpoConfigured}"
-                        IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsSVGThumbnailEnabledGpoConfigured}" />
-
-                    <controls:Setting x:Uid="FileExplorerPreview_ToggleSwitch_Thumbnail_PDF" Icon="&#xEA90;" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsPDFThumbnailEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
-                        <controls:Setting.ActionContent>
-                            <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.PDFThumbnailIsEnabled}"
-                                          x:Uid="ToggleSwitch"/>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
-                    <InfoBar x:Uid="GPO_IsSettingForced"
-                        Severity="Informational"
+                        IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsSVGThumbnailEnabledGpoConfigured}"
+                        Severity="Informational" />
+                    <labs:SettingsCard
+                        x:Uid="FileExplorerPreview_ToggleSwitch_Thumbnail_PDF"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xEA90;}"
+                        IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsPDFThumbnailEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.PDFThumbnailIsEnabled}" />
+                    </labs:SettingsCard>
+                    <InfoBar
+                        x:Uid="GPO_IsSettingForced"
                         IsClosable="False"
                         IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.IsPDFThumbnailEnabledGpoConfigured}"
-                        IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsPDFThumbnailEnabledGpoConfigured}" />
-
-                    <controls:Setting x:Uid="FileExplorerPreview_ToggleSwitch_Thumbnail_GCODE" Icon="&#xE914;" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsGCODEThumbnailEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
-                        <controls:Setting.ActionContent>
-                            <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.GCODEThumbnailIsEnabled}"
-                                          x:Uid="ToggleSwitch"/>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
-                    <InfoBar x:Uid="GPO_IsSettingForced"
-                        Severity="Informational"
+                        IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsPDFThumbnailEnabledGpoConfigured}"
+                        Severity="Informational" />
+                    <labs:SettingsCard
+                        x:Uid="FileExplorerPreview_ToggleSwitch_Thumbnail_GCODE"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xE914;}"
+                        IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsGCODEThumbnailEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.GCODEThumbnailIsEnabled}" />
+                    </labs:SettingsCard>
+                    <InfoBar
+                        x:Uid="GPO_IsSettingForced"
                         IsClosable="False"
                         IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.IsGCODEThumbnailEnabledGpoConfigured}"
-                        IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsGCODEThumbnailEnabledGpoConfigured}" />
+                        IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsGCODEThumbnailEnabledGpoConfigured}"
+                        Severity="Informational" />
 
-                    <controls:SettingExpander IsExpanded="False">
-                        <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="FileExplorerPreview_ToggleSwitch_Thumbnail_STL" Icon="&#xE914;" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsSTLThumbnailEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
-                                <controls:Setting.ActionContent>
-                                    <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.STLThumbnailIsEnabled}"
-                                          x:Uid="ToggleSwitch"/>
-                                </controls:Setting.ActionContent>
-                            </controls:Setting>
-                        </controls:SettingExpander.Header>
 
-                        <controls:SettingExpander.Content>
-                            <StackPanel>
-                                <controls:Setting x:Uid="FileExplorerPreview_Color_Thumbnail_STL" Style="{StaticResource ExpanderContentSettingStyle}">
-                                    <controls:Setting.ActionContent>
-                                        <controls:ColorPickerButton SelectedColor="{x:Bind Path=ViewModel.STLThumbnailColor, Mode=TwoWay}"
-                                                                    IsEnabled="{x:Bind ViewModel.STLThumbnailIsEnabled, Mode=OneWay}"/>
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-                            </StackPanel>
-                        </controls:SettingExpander.Content>
-                    </controls:SettingExpander>
-                    <InfoBar x:Uid="GPO_IsSettingForced"
-                        Severity="Informational"
+                    <labs:SettingsExpander
+                        x:Uid="FileExplorerPreview_ToggleSwitch_Thumbnail_STL"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xE914;}"
+                        IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsSTLThumbnailEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.STLThumbnailIsEnabled}" />
+                        <labs:SettingsExpander.Items>
+                            <labs:SettingsCard x:Uid="FileExplorerPreview_Color_Thumbnail_STL">
+                                <controls:ColorPickerButton
+                                    IsEnabled="{x:Bind ViewModel.STLThumbnailIsEnabled, Mode=OneWay}"
+                                    SelectedColor="{x:Bind Path=ViewModel.STLThumbnailColor, Mode=TwoWay}" />
+                            </labs:SettingsCard>
+                        </labs:SettingsExpander.Items>
+                    </labs:SettingsExpander>
+                    <InfoBar
+                        x:Uid="GPO_IsSettingForced"
                         IsClosable="False"
                         IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.IsSTLThumbnailEnabledGpoConfigured}"
-                        IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsSTLThumbnailEnabledGpoConfigured}" />
+                        IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsSTLThumbnailEnabledGpoConfigured}"
+                        Severity="Informational" />
                 </controls:SettingsGroup>
-
             </StackPanel>
         </controls:SettingsPageControl.ModuleContent>
 
         <controls:SettingsPageControl.PrimaryLinks>
-            <controls:PageLink x:Uid="LearnMore_PowerPreview" Link="https://aka.ms/PowerToysOverview_FileExplorerAddOns"/>
+            <controls:PageLink
+                x:Uid="LearnMore_PowerPreview"
+                Link="https://aka.ms/PowerToysOverview_FileExplorerAddOns" />
         </controls:SettingsPageControl.PrimaryLinks>
         <controls:SettingsPageControl.SecondaryLinks>
-            <controls:PageLink Text="Aaron Junker's work on developer file preview" Link="https://blog.aaron-junker.ch" />
-            <controls:PageLink Text="Pedro Lamas's work on G-Code and STL" Link="https://www.pedrolamas.com" />
+            <controls:PageLink
+                Link="https://blog.aaron-junker.ch"
+                Text="Aaron Junker's work on developer file preview" />
+            <controls:PageLink
+                Link="https://www.pedrolamas.com"
+                Text="Pedro Lamas's work on G-Code and STL" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
 </Page>
diff --git a/src/settings-ui/Settings.UI/Views/PowerRenamePage.xaml b/src/settings-ui/Settings.UI/Views/PowerRenamePage.xaml
index 9c2afb3d64..4462b7e464 100644
--- a/src/settings-ui/Settings.UI/Views/PowerRenamePage.xaml
+++ b/src/settings-ui/Settings.UI/Views/PowerRenamePage.xaml
@@ -2,109 +2,110 @@
     x:Class="Microsoft.PowerToys.Settings.UI.Views.PowerRenamePage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-    xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
-    mc:Ignorable="d"
-    AutomationProperties.LandmarkType="Main">
-    <Page.Resources>
-        <converters:BoolToObjectConverter x:Key="BoolToComboBoxIndexConverter" TrueValue="1" FalseValue="0"/>
-        <converters:BoolNegationConverter x:Key="BoolNegationConverter" />
-    </Page.Resources>
-    <controls:SettingsPageControl x:Uid="PowerRename"
-                                  ModuleImageSource="ms-appx:///Assets/Modules/PowerRename.png">
-        <controls:SettingsPageControl.ModuleContent>
-            <StackPanel Orientation="Vertical"
-                    x:Name="PowerRenameView"
-                    HorizontalAlignment="Stretch">
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:CommunityToolkit.WinUI.UI"
+    AutomationProperties.LandmarkType="Main"
+    mc:Ignorable="d">
 
-                <controls:Setting x:Uid="PowerRename_Toggle_Enable" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
-                    <controls:Setting.Icon>
-                        <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerRename.png" ShowAsMonochrome="False" />
-                    </controls:Setting.Icon>
-                    <controls:Setting.ActionContent>
-                        <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.IsEnabled}" x:Uid="ToggleSwitch"/>
-                    </controls:Setting.ActionContent>
-                </controls:Setting>
-                <InfoBar x:Uid="GPO_IsSettingForced"
-                    Severity="Informational"
+    <controls:SettingsPageControl
+        x:Uid="PowerRename"
+        ModuleImageSource="ms-appx:///Assets/Modules/PowerRename.png">
+        <controls:SettingsPageControl.ModuleContent>
+            <StackPanel
+                x:Name="PowerRenameView"
+                HorizontalAlignment="Stretch"
+                Orientation="Vertical">
+                <labs:SettingsCard
+                    x:Uid="PowerRename_Toggle_Enable"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsPowerRename.png}"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
+                    <ToggleSwitch
+                        x:Uid="ToggleSwitch"
+                        IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.IsEnabled}" />
+                </labs:SettingsCard>
+                <InfoBar
+                    x:Uid="GPO_IsSettingForced"
                     IsClosable="False"
                     IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}"
-                    IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}" />
-
-                <controls:SettingsGroup x:Uid="PowerRename_ShellIntegration" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <controls:SettingExpander IsExpanded="True">
-                        <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="PowerRename_Toggle_ContextMenu" Style="{StaticResource ExpanderHeaderSettingStyle}">
-                                <controls:Setting.ActionContent>
-                                    <ComboBox SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.EnabledOnContextExtendedMenu, Converter={StaticResource BoolToComboBoxIndexConverter}}" MinWidth="{StaticResource SettingActionControlMinWidth}">
-                                        <ComboBoxItem x:Uid="PowerRename_Toggle_StandardContextMenu" />
-                                        <ComboBoxItem x:Uid="PowerRename_Toggle_ExtendedContextMenu" />
-                                    </ComboBox>
-                                </controls:Setting.ActionContent>
-                            </controls:Setting>
-                        </controls:SettingExpander.Header>
-                        <controls:SettingExpander.Content>
-                            <StackPanel HorizontalAlignment="Stretch">
-                                <CheckBox x:Uid="PowerRename_Toggle_HideIcon"
-                                          IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.EnabledOnContextMenu, Converter={StaticResource BoolNegationConverter}}"
-                                          Margin="{StaticResource ExpanderSettingMargin}"/>
-                            </StackPanel>
-                        </controls:SettingExpander.Content>
-                    </controls:SettingExpander>
+                    IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}"
+                    Severity="Informational" />
+                <controls:SettingsGroup
+                    x:Uid="PowerRename_ShellIntegration"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                    <labs:SettingsExpander
+                        x:Uid="PowerRename_Toggle_ContextMenu"
+                        IsExpanded="True">
+                        <ComboBox
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.EnabledOnContextExtendedMenu, Converter={StaticResource BoolToComboBoxIndexConverter}}">
+                            <ComboBoxItem x:Uid="PowerRename_Toggle_StandardContextMenu" />
+                            <ComboBoxItem x:Uid="PowerRename_Toggle_ExtendedContextMenu" />
+                        </ComboBox>
+                        <labs:SettingsExpander.Items>
+                            <labs:SettingsCard ContentAlignment="Left">
+                                <CheckBox
+                                    x:Uid="PowerRename_Toggle_HideIcon"
+                                    IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.EnabledOnContextMenu, Converter={StaticResource BoolNegationConverter}}" />
+                            </labs:SettingsCard>
+                        </labs:SettingsExpander.Items>
+                    </labs:SettingsExpander>
                 </controls:SettingsGroup>
 
-                <controls:SettingsGroup x:Uid="PowerRename_AutoCompleteHeader" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <controls:SettingExpander IsExpanded="True">
-                        <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="PowerRename_Toggle_AutoComplete" Style="{StaticResource ExpanderHeaderSettingStyle}">
-                                <controls:Setting.ActionContent>
-                                    <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.MRUEnabled}" x:Uid="ToggleSwitch"/>
-                                </controls:Setting.ActionContent>
-                            </controls:Setting>
-                        </controls:SettingExpander.Header>
-                        <controls:SettingExpander.Content>
-                            <StackPanel HorizontalAlignment="Stretch">
-                                <controls:Setting x:Uid="PowerRename_Toggle_MaxDispListNum"
-                                                  Style="{StaticResource ExpanderContentSettingStyle}"
-                                                  IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.GlobalAndMruEnabled}">
-                                    <controls:Setting.ActionContent>
-                                        <NumberBox SpinButtonPlacementMode="Compact"
-                                            HorizontalAlignment="Left"
-                                            Value="{x:Bind Mode=TwoWay, Path=ViewModel.MaxDispListNum}"
-                                            Minimum="0"
-                                            Maximum="20"
-                                            MinWidth="{StaticResource SettingActionControlMinWidth}"/>  
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-                            </StackPanel>
-                        </controls:SettingExpander.Content>
-                    </controls:SettingExpander>
-                    <controls:Setting x:Uid="PowerRename_Toggle_RestoreFlagsOnLaunch" Icon="&#xe81c;">
-                        <controls:Setting.ActionContent>
-                            <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.RestoreFlagsOnLaunch}" x:Uid="ToggleSwitch"/>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
-                </controls:SettingsGroup>
-              
+                <controls:SettingsGroup
+                    x:Uid="PowerRename_AutoCompleteHeader"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                    <labs:SettingsExpander
+                        x:Uid="PowerRename_Toggle_AutoComplete"
+                        IsExpanded="True">
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.MRUEnabled}" />
+                        <labs:SettingsExpander.Items>
+                            <labs:SettingsCard
+                                x:Uid="PowerRename_Toggle_MaxDispListNum"
+                                IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.GlobalAndMruEnabled}">
+                                <NumberBox
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    Maximum="20"
+                                    Minimum="0"
+                                    SpinButtonPlacementMode="Compact"
+                                    Value="{x:Bind Mode=TwoWay, Path=ViewModel.MaxDispListNum}" />
+                            </labs:SettingsCard>
+                        </labs:SettingsExpander.Items>
+                    </labs:SettingsExpander>
 
-                <controls:SettingsGroup x:Uid="PowerRename_BehaviorHeader" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <controls:Setting x:Uid="PowerRename_Toggle_UseBoostLib">
-                        <controls:Setting.ActionContent>
-                            <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.UseBoostLib}" x:Uid="ToggleSwitch"/>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
+                    <labs:SettingsCard
+                        x:Uid="PowerRename_Toggle_RestoreFlagsOnLaunch"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xe81c;}">
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.RestoreFlagsOnLaunch}" />
+                    </labs:SettingsCard>
+                </controls:SettingsGroup>
+                <controls:SettingsGroup
+                    x:Uid="PowerRename_BehaviorHeader"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                    <labs:SettingsCard x:Uid="PowerRename_Toggle_UseBoostLib">
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.UseBoostLib}" />
+                    </labs:SettingsCard>
                 </controls:SettingsGroup>
             </StackPanel>
-
         </controls:SettingsPageControl.ModuleContent>
 
         <controls:SettingsPageControl.PrimaryLinks>
-            <controls:PageLink x:Uid="LearnMore_PowerRename" Link="https://aka.ms/PowerToysOverview_PowerRename"/>
+            <controls:PageLink
+                x:Uid="LearnMore_PowerRename"
+                Link="https://aka.ms/PowerToysOverview_PowerRename" />
         </controls:SettingsPageControl.PrimaryLinks>
         <controls:SettingsPageControl.SecondaryLinks>
-            <controls:PageLink Text="Chris Davis's SmartRenamer" Link="https://github.com/chrdavis/SmartRename"/>
+            <controls:PageLink
+                Link="https://github.com/chrdavis/SmartRename"
+                Text="Chris Davis's SmartRenamer" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
 </Page>
diff --git a/src/settings-ui/Settings.UI/Views/ShellPage.xaml b/src/settings-ui/Settings.UI/Views/ShellPage.xaml
index 16f3d1ad3f..22e99f75e5 100644
--- a/src/settings-ui/Settings.UI/Views/ShellPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/ShellPage.xaml
@@ -7,6 +7,7 @@
     xmlns:i="using:Microsoft.Xaml.Interactivity"
     xmlns:ic="using:Microsoft.Xaml.Interactions.Core"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:CommunityToolkit.WinUI.UI"
     xmlns:views="using:Microsoft.PowerToys.Settings.UI.Views"
     HighContrastAdjustment="None"
     mc:Ignorable="d">
@@ -21,7 +22,9 @@
         </ic:EventTriggerBehavior>
     </i:Interaction.Behaviors>
 
-    <Grid x:Name="RootGrid" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+    <Grid
+        x:Name="RootGrid"
+        Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
 
         <NavigationView
             x:Name="navigationView"
@@ -35,129 +38,112 @@
             PaneOpened="NavigationView_PaneOpened"
             SelectedItem="{x:Bind ViewModel.Selected, Mode=OneWay}">
             <NavigationView.Resources>
-                <SolidColorBrush x:Key="NavigationViewContentBackground" Color="Transparent" />
-                <SolidColorBrush x:Key="NavigationViewContentGridBorderBrush" Color="Transparent" />
-
+                <SolidColorBrush
+                    x:Key="NavigationViewContentBackground"
+                    Color="Transparent" />
+                <SolidColorBrush
+                    x:Key="NavigationViewContentGridBorderBrush"
+                    Color="Transparent" />
             </NavigationView.Resources>
             <NavigationView.MenuItems>
-                <NavigationViewItem x:Uid="Shell_General" helpers:NavHelper.NavigateTo="views:GeneralPage">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsSettings.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
+                <NavigationViewItem
+                    x:Uid="Shell_General"
+                    helpers:NavHelper.NavigateTo="views:GeneralPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsSettings.png}" />
 
-                <NavigationViewItem x:Uid="Shell_AlwaysOnTop" helpers:NavHelper.NavigateTo="views:AlwaysOnTopPage">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsAlwaysOnTop.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
+                <NavigationViewItem
+                    x:Uid="Shell_AlwaysOnTop"
+                    helpers:NavHelper.NavigateTo="views:AlwaysOnTopPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsAlwaysOnTop.png}" />
 
-                <NavigationViewItem x:Uid="Shell_Awake" helpers:NavHelper.NavigateTo="views:AwakePage">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsAwake.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
+                <NavigationViewItem
+                    x:Uid="Shell_Awake"
+                    helpers:NavHelper.NavigateTo="views:AwakePage"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsAwake.png}" />
 
-                <NavigationViewItem x:Uid="Shell_ColorPicker" helpers:NavHelper.NavigateTo="views:ColorPickerPage">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsColorPicker.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
+                <NavigationViewItem
+                    x:Uid="Shell_ColorPicker"
+                    helpers:NavHelper.NavigateTo="views:ColorPickerPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsColorPicker.png}" />
 
-                <NavigationViewItem x:Uid="Shell_FancyZones" helpers:NavHelper.NavigateTo="views:FancyZonesPage">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsFancyZones.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
+                <NavigationViewItem
+                    x:Uid="Shell_FancyZones"
+                    helpers:NavHelper.NavigateTo="views:FancyZonesPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsFancyZones.png}" />
+                <NavigationViewItem
+                    x:Uid="Shell_FileLocksmith"
+                    helpers:NavHelper.NavigateTo="views:FileLocksmithPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsFileLocksmith.png}" />
+                <NavigationViewItem
+                    x:Uid="Shell_PowerPreview"
+                    helpers:NavHelper.NavigateTo="views:PowerPreviewPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsFileExplorerPreview.png}" />
 
-                <NavigationViewItem x:Uid="Shell_FileLocksmith" helpers:NavHelper.NavigateTo="views:FileLocksmithPage">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsFileLocksmith.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
+                <NavigationViewItem
+                    x:Uid="Shell_Hosts"
+                    helpers:NavHelper.NavigateTo="views:HostsPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsHosts.png}" />
 
-                <NavigationViewItem x:Uid="Shell_PowerPreview" helpers:NavHelper.NavigateTo="views:PowerPreviewPage">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsFileExplorerPreview.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
+                <NavigationViewItem
+                    x:Uid="Shell_ImageResizer"
+                    helpers:NavHelper.NavigateTo="views:ImageResizerPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsImageResizer.png}" />
 
-                <NavigationViewItem x:Uid="Shell_Hosts" helpers:NavHelper.NavigateTo="views:HostsPage">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsHosts.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
+                <NavigationViewItem
+                    x:Uid="Shell_KeyboardManager"
+                    helpers:NavHelper.NavigateTo="views:KeyboardManagerPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsKeyboardManager.png}" />
 
-                <NavigationViewItem x:Uid="Shell_ImageResizer" helpers:NavHelper.NavigateTo="views:ImageResizerPage">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsImageResizer.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
+                <NavigationViewItem
+                    x:Uid="Shell_MouseUtilities"
+                    helpers:NavHelper.NavigateTo="views:MouseUtilsPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsMouseUtils.png}" />
 
-                <NavigationViewItem x:Uid="Shell_KeyboardManager" helpers:NavHelper.NavigateTo="views:KeyboardManagerPage">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsKeyboardManager.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
+                <NavigationViewItem
+                    x:Uid="Shell_PowerRename"
+                    helpers:NavHelper.NavigateTo="views:PowerRenamePage"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsPowerRename.png}" />
+                <NavigationViewItem
+                    x:Uid="Shell_PowerLauncher"
+                    helpers:NavHelper.NavigateTo="views:PowerLauncherPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsPowerToysRun.png}" />
 
-                <NavigationViewItem x:Uid="Shell_MouseUtilities" helpers:NavHelper.NavigateTo="views:MouseUtilsPage">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsMouseUtils.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
+                <NavigationViewItem
+                    x:Uid="Shell_QuickAccent"
+                    helpers:NavHelper.NavigateTo="views:PowerAccentPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsPowerAccent.png}" />
 
-                <NavigationViewItem x:Uid="Shell_PowerRename" helpers:NavHelper.NavigateTo="views:PowerRenamePage">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerRename.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
-                <NavigationViewItem x:Uid="Shell_PowerLauncher" helpers:NavHelper.NavigateTo="views:PowerLauncherPage">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerToysRun.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
-                <NavigationViewItem x:Uid="Shell_QuickAccent" helpers:NavHelper.NavigateTo="views:PowerAccentPage">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerAccent.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
-                <NavigationViewItem x:Uid="Shell_MeasureTool" helpers:NavHelper.NavigateTo="views:MeasureToolPage">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsScreenRuler.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
-                <NavigationViewItem x:Uid="Shell_ShortcutGuide" helpers:NavHelper.NavigateTo="views:ShortcutGuidePage">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsShortcutGuide.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
-                <NavigationViewItem x:Uid="Shell_TextExtractor" helpers:NavHelper.NavigateTo="views:PowerOcrPage">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerOcr.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
+                <NavigationViewItem
+                    x:Uid="Shell_MeasureTool"
+                    helpers:NavHelper.NavigateTo="views:MeasureToolPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsScreenRuler.png}" />
+
+                <NavigationViewItem
+                    x:Uid="Shell_ShortcutGuide"
+                    helpers:NavHelper.NavigateTo="views:ShortcutGuidePage"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsShortcutGuide.png}" />
+
+                <NavigationViewItem
+                    x:Uid="Shell_TextExtractor"
+                    helpers:NavHelper.NavigateTo="views:PowerOcrPage"
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsPowerOcr.png}" />
 
                 <NavigationViewItem
                     x:Uid="Shell_VideoConference"
                     helpers:NavHelper.NavigateTo="views:VideoConferencePage"
-                    IsEnabled="{x:Bind ViewModel.IsVideoConferenceBuild, Mode=OneWay}">
-                    <NavigationViewItem.Icon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsVideoConferenceMute.png" />
-                    </NavigationViewItem.Icon>
-                </NavigationViewItem>
+                    Icon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsVideoConferenceMute.png}"
+                    IsEnabled="{x:Bind ViewModel.IsVideoConferenceBuild, Mode=OneWay}" />
             </NavigationView.MenuItems>
             <NavigationView.PaneFooter>
                 <StackPanel Orientation="Vertical">
-                    <NavigationViewItem x:Uid="OOBE_NavViewItem" Tapped="OOBEItem_Tapped">
-                        <NavigationViewItem.Icon>
-                            <FontIcon Glyph="&#xF133;" />
-                        </NavigationViewItem.Icon>
-                    </NavigationViewItem>
-                    <NavigationViewItem x:Uid="Feedback_NavViewItem" Tapped="FeedbackItem_Tapped">
-                        <NavigationViewItem.Icon>
-                            <FontIcon Glyph="&#xED15;" />
-                        </NavigationViewItem.Icon>
-                    </NavigationViewItem>
+                    <NavigationViewItem
+                        x:Uid="OOBE_NavViewItem"
+                        Icon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xF133;}"
+                        Tapped="OOBEItem_Tapped" />
+                    <NavigationViewItem
+                        x:Uid="Feedback_NavViewItem"
+                        Icon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xED15;}"
+                        Tapped="FeedbackItem_Tapped" />
                 </StackPanel>
             </NavigationView.PaneFooter>
             <i:Interaction.Behaviors>
diff --git a/src/settings-ui/Settings.UI/Views/ShortcutGuidePage.xaml b/src/settings-ui/Settings.UI/Views/ShortcutGuidePage.xaml
index 9a13ed3bc4..e9ce5ecab2 100644
--- a/src/settings-ui/Settings.UI/Views/ShortcutGuidePage.xaml
+++ b/src/settings-ui/Settings.UI/Views/ShortcutGuidePage.xaml
@@ -2,144 +2,154 @@
     x:Class="Microsoft.PowerToys.Settings.UI.Views.ShortcutGuidePage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-    xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
-    mc:Ignorable="d"
-    AutomationProperties.LandmarkType="Main">
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:CommunityToolkit.WinUI.UI"
+    AutomationProperties.LandmarkType="Main"
+    mc:Ignorable="d">
 
-    <Page.Resources>
-        <converters:StringFormatConverter x:Key="StringFormatConverter"/>
-        <converters:BoolNegationConverter x:Key="BoolNegationConverter"/>
-        <converters:BoolToObjectConverter x:Key="BoolToComboBoxIndexConverter" TrueValue="1" FalseValue="0"/>
-        <converters:BoolToVisibilityConverter x:Key="TrueToVisibleConverter" TrueValue="Visible" FalseValue="Collapsed"/>
-        <converters:BoolToVisibilityConverter x:Key="FalseToVisibleConverter" TrueValue="Collapsed" FalseValue="Visible"/>
-    </Page.Resources>
-
-    <controls:SettingsPageControl x:Uid="ShortcutGuide"
-                                  ModuleImageSource="ms-appx:///Assets/Modules/ShortcutGuide.png">
+    <controls:SettingsPageControl
+        x:Uid="ShortcutGuide"
+        ModuleImageSource="ms-appx:///Assets/Modules/ShortcutGuide.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel Orientation="Vertical">
-                <controls:Setting x:Uid="ShortcutGuide_Enable" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
-                    <controls:Setting.Icon>
-                        <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsShortcutGuide.png" ShowAsMonochrome="False" />
-                    </controls:Setting.Icon>
-                    <controls:Setting.ActionContent>
-                        <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.IsEnabled}" x:Uid="ToggleSwitch"/>
-                    </controls:Setting.ActionContent>
-                </controls:Setting>
-                <InfoBar x:Uid="GPO_IsSettingForced"
-                    Severity="Informational"
+                <labs:SettingsCard
+                    x:Uid="ShortcutGuide_Enable"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsShortcutGuide.png}"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured, Converter={StaticResource BoolNegationConverter}}">
+                    <ToggleSwitch
+                        x:Uid="ToggleSwitch"
+                        IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.IsEnabled}" />
+                </labs:SettingsCard>
+                <InfoBar
+                    x:Uid="GPO_IsSettingForced"
                     IsClosable="False"
                     IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}"
-                    IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}" />
+                    IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}"
+                    Severity="Informational" />
+                <controls:SettingsGroup
+                    x:Uid="Shortcut"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                    <labs:SettingsCard x:Uid="ShortcutGuide_ActivationMethod">
+                        <ComboBox
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.UseLegacyPressWinKeyBehavior, Converter={StaticResource BoolToComboBoxIndexConverter}}">
+                            <ComboBoxItem x:Uid="Radio_ShortcutGuide_ActivationMethod_CustomizedShortcut" />
+                            <ComboBoxItem x:Uid="Radio_ShortcutGuide_ActivationMethod_LongPressWindowsKey" />
+                        </ComboBox>
+                    </labs:SettingsCard>
 
-                <controls:SettingsGroup x:Uid="Shortcut" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                    <labs:SettingsCard
+                        x:Uid="Activation_Shortcut"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xEDA7;}"
+                        Visibility="{x:Bind Mode=OneWay, Path=ViewModel.UseLegacyPressWinKeyBehavior, Converter={StaticResource ReverseBoolToVisibilityConverter}}">
+                        <controls:ShortcutControl
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            HotkeySettings="{x:Bind Path=ViewModel.OpenShortcutGuide, Mode=TwoWay}" />
+                    </labs:SettingsCard>
 
-                    <controls:Setting x:Uid="ShortcutGuide_ActivationMethod">
-                        <controls:Setting.ActionContent>
-                            <ComboBox SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.UseLegacyPressWinKeyBehavior, Converter={StaticResource BoolToComboBoxIndexConverter}}" MinWidth="{StaticResource SettingActionControlMinWidth}">
-                                <ComboBoxItem x:Uid="Radio_ShortcutGuide_ActivationMethod_CustomizedShortcut"/>
-                                <ComboBoxItem x:Uid="Radio_ShortcutGuide_ActivationMethod_LongPressWindowsKey"/>
-                            </ComboBox>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
+                    <labs:SettingsCard
+                        x:Uid="ShortcutGuide_PressTimeForGlobalWindowsShortcuts"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xE916;}"
+                        Visibility="{x:Bind Mode=OneWay, Path=ViewModel.UseLegacyPressWinKeyBehavior, Converter={StaticResource BoolToVisibilityConverter}}">
+                        <NumberBox
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            LargeChange="100"
+                            Minimum="100"
+                            SmallChange="50"
+                            SpinButtonPlacementMode="Compact"
+                            Value="{x:Bind Mode=TwoWay, Path=ViewModel.PressTime}" />
+                    </labs:SettingsCard>
 
-                    <controls:Setting x:Uid="Activation_Shortcut" Icon="&#xEDA7;" Visibility="{x:Bind Mode=OneWay, Path=ViewModel.UseLegacyPressWinKeyBehavior, Converter={StaticResource FalseToVisibleConverter}}">
-                        <controls:Setting.ActionContent>
-                            <controls:ShortcutControl HotkeySettings="{x:Bind Path=ViewModel.OpenShortcutGuide, Mode=TwoWay}"
-                                                    MinWidth="{StaticResource SettingActionControlMinWidth}"/>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
-
-                    <controls:Setting x:Uid="ShortcutGuide_PressTimeForGlobalWindowsShortcuts" Icon="&#xE916;" Visibility="{x:Bind Mode=OneWay, Path=ViewModel.UseLegacyPressWinKeyBehavior, Converter={StaticResource TrueToVisibleConverter}}">
-                        <controls:Setting.ActionContent>
-                            <NumberBox
-                                Minimum="100"
-                                Value="{x:Bind Mode=TwoWay, Path=ViewModel.PressTime}"
-                                MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                SpinButtonPlacementMode="Compact"
-                                HorizontalAlignment="Left"
-                                SmallChange="50"
-                                LargeChange="100"
-                            />
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
-
-                    <controls:Setting x:Uid="ShortcutGuide_PressTimeForTaskbarIconShortcuts" Icon="&#xE916;" Visibility="{x:Bind Mode=OneWay, Path=ViewModel.UseLegacyPressWinKeyBehavior, Converter={StaticResource TrueToVisibleConverter}}">
-                        <controls:Setting.ActionContent>
-                            <NumberBox
-                                Minimum="100"
-                                Value="{x:Bind Mode=TwoWay, Path=ViewModel.DelayTime}"
-                                MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                SpinButtonPlacementMode="Compact"
-                                HorizontalAlignment="Left"
-                                SmallChange="50"
-                                LargeChange="100"
-                            />
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
+                    <labs:SettingsCard
+                        x:Uid="ShortcutGuide_PressTimeForTaskbarIconShortcuts"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xE916;}"
+                        Visibility="{x:Bind Mode=OneWay, Path=ViewModel.UseLegacyPressWinKeyBehavior, Converter={StaticResource BoolToVisibilityConverter}}">
+                        <NumberBox
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            LargeChange="100"
+                            Minimum="100"
+                            SmallChange="50"
+                            SpinButtonPlacementMode="Compact"
+                            Value="{x:Bind Mode=TwoWay, Path=ViewModel.DelayTime}" />
+                    </labs:SettingsCard>
 
                     <InfoBar
                         x:Uid="ShortcutGuide_PressWinKeyWarning"
-                        Severity="Warning"
-                        IsTabStop="True"
                         IsClosable="False"
-                        IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.UseLegacyPressWinKeyBehavior}"
                         IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"
-                    />
+                        IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.UseLegacyPressWinKeyBehavior}"
+                        IsTabStop="True"
+                        Severity="Warning" />
                 </controls:SettingsGroup>
 
-                <controls:SettingsGroup x:Uid="ShortcutGuide_Appearance_Behavior" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <controls:Setting x:Uid="ColorModeHeader" Icon="&#xE790;">
-                        <controls:Setting.Description>
-                            <HyperlinkButton Click="OpenColorsSettings_Click"
-                                            x:Uid="Windows_Color_Settings"/>
-                        </controls:Setting.Description>
-                        <controls:Setting.ActionContent>
-                            <ComboBox SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.ThemeIndex}" MinWidth="{StaticResource SettingActionControlMinWidth}">
-                                <ComboBoxItem x:Uid="Radio_Theme_Dark"/>
-                                <ComboBoxItem x:Uid="Radio_Theme_Light"/>
-                                <ComboBoxItem x:Uid="Radio_Theme_Default"/>
-                            </ComboBox>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
+                <controls:SettingsGroup
+                    x:Uid="ShortcutGuide_Appearance_Behavior"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                    <labs:SettingsCard
+                        x:Uid="ColorModeHeader"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xE790;}">
+                        <labs:SettingsCard.Description>
+                            <HyperlinkButton
+                                x:Uid="Windows_Color_Settings"
+                                Click="OpenColorsSettings_Click" />
+                        </labs:SettingsCard.Description>
+                        <ComboBox
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.ThemeIndex}">
+                            <ComboBoxItem x:Uid="Radio_Theme_Dark" />
+                            <ComboBoxItem x:Uid="Radio_Theme_Light" />
+                            <ComboBoxItem x:Uid="Radio_Theme_Default" />
+                        </ComboBox>
+                    </labs:SettingsCard>
 
-
-                    <controls:Setting x:Uid="ShortcutGuide_OverlayOpacity">
-                        <controls:Setting.ActionContent>
-                            <Slider Minimum="0"
-                                    Maximum="100"
-                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                    Value="{x:Bind Mode=TwoWay, Path=ViewModel.OverlayOpacity}"/>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
+                    <labs:SettingsCard x:Uid="ShortcutGuide_OverlayOpacity">
+                        <Slider
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            Maximum="100"
+                            Minimum="0"
+                            Value="{x:Bind Mode=TwoWay, Path=ViewModel.OverlayOpacity}" />
+                    </labs:SettingsCard>
                 </controls:SettingsGroup>
 
-                <controls:SettingsGroup x:Uid="ExcludedApps" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <controls:SettingExpander IsExpanded="True">
-                        <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="ShortcutGuide_DisabledApps" Icon="&#xECE4;" Style="{StaticResource ExpanderHeaderSettingStyle}"/>
-                        </controls:SettingExpander.Header>
-                        <controls:SettingExpander.Content>
-                            <TextBox x:Uid="ShortcutGuide_DisabledApps_TextBoxControl"
-                                    Margin="{StaticResource ExpanderSettingMargin}"
-                                    Text="{x:Bind Mode=TwoWay, Path=ViewModel.DisabledApps, UpdateSourceTrigger=PropertyChanged}"
-                                    ScrollViewer.VerticalScrollBarVisibility ="Visible"
-                                    ScrollViewer.VerticalScrollMode="Enabled"
-                                    ScrollViewer.IsVerticalRailEnabled="True"
-                                    TextWrapping="Wrap"
-                                    AcceptsReturn="True"
+                <controls:SettingsGroup
+                    x:Uid="ExcludedApps"
+                    IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
+                    <labs:SettingsExpander
+                        x:Uid="ShortcutGuide_DisabledApps"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
+                                                 Glyph=&#xECE4;}"
+                        IsExpanded="True">
+                        <labs:SettingsExpander.Items>
+                            <labs:SettingsCard
+                                HorizontalContentAlignment="Stretch"
+                                ContentAlignment="Vertical">
+                                <TextBox
+                                    x:Uid="ShortcutGuide_DisabledApps_TextBoxControl"
                                     MinWidth="240"
-                                    MinHeight="160" />
-                        </controls:SettingExpander.Content>
-                    </controls:SettingExpander>
+                                    MinHeight="160"
+                                    AcceptsReturn="True"
+                                    ScrollViewer.IsVerticalRailEnabled="True"
+                                    ScrollViewer.VerticalScrollBarVisibility="Visible"
+                                    ScrollViewer.VerticalScrollMode="Enabled"
+                                    Text="{x:Bind Mode=TwoWay, Path=ViewModel.DisabledApps, UpdateSourceTrigger=PropertyChanged}"
+                                    TextWrapping="Wrap" />
+                            </labs:SettingsCard>
+                        </labs:SettingsExpander.Items>
+                    </labs:SettingsExpander>
                 </controls:SettingsGroup>
             </StackPanel>
         </controls:SettingsPageControl.ModuleContent>
         <controls:SettingsPageControl.PrimaryLinks>
-            <controls:PageLink x:Uid="LearnMore_ShortcutGuide" Link="https://aka.ms/PowerToysOverview_ShortcutGuide"/>
+            <controls:PageLink
+                x:Uid="LearnMore_ShortcutGuide"
+                Link="https://aka.ms/PowerToysOverview_ShortcutGuide" />
         </controls:SettingsPageControl.PrimaryLinks>
     </controls:SettingsPageControl>
 </Page>
\ No newline at end of file
diff --git a/src/settings-ui/Settings.UI/Views/VideoConference.xaml b/src/settings-ui/Settings.UI/Views/VideoConference.xaml
index 22c5b2e253..63ca138408 100644
--- a/src/settings-ui/Settings.UI/Views/VideoConference.xaml
+++ b/src/settings-ui/Settings.UI/Views/VideoConference.xaml
@@ -1,189 +1,185 @@
 <Page
     x:Class="Microsoft.PowerToys.Settings.UI.Views.VideoConferencePage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-    xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters" 
+    xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:CommunityToolkit.WinUI.UI"
     mc:Ignorable="d">
 
     <Page.Resources>
-        <converters:StringVisibilityConverter x:Name="EmptyToCollapsedConverter" EmptyValue="Collapsed" NotEmptyValue="Visible"/>
-        <converters:BoolToObjectConverter x:Key="BoolToVisibilityConverter" TrueValue="Collapsed" FalseValue="Visible"/>
+        <converters:StringVisibilityConverter
+            x:Name="EmptyToCollapsedConverter"
+            EmptyValue="Collapsed"
+            NotEmptyValue="Visible" />
     </Page.Resources>
-    
-    <controls:SettingsPageControl x:Uid="VideoConference"
-                                  ModuleImageSource="ms-appx:///Assets/Modules/VideoConference.png">
+
+    <controls:SettingsPageControl
+        x:Uid="VideoConference"
+        ModuleImageSource="ms-appx:///Assets/Modules/VideoConference.png">
         <controls:SettingsPageControl.ModuleContent>
 
             <StackPanel Orientation="Vertical">
-            
                 <InfoBar
-                    Severity="Error"
                     x:Uid="VideoConference_DeprecationWarning"
+                    IsClosable="False"
                     IsOpen="True"
                     IsTabStop="True"
-                    IsClosable="False">
+                    Severity="Error">
                     <InfoBar.ActionButton>
-                        <HyperlinkButton 
-                                x:Uid="VideoConference_DeprecationWarningButton"
-                                Style="{StaticResource TextButtonStyle}"
-                                NavigateUri="https://github.com/microsoft/PowerToys/issues/21473"
-                                HorizontalAlignment="Right" />
+                        <HyperlinkButton
+                            x:Uid="VideoConference_DeprecationWarningButton"
+                            HorizontalAlignment="Right"
+                            NavigateUri="https://github.com/microsoft/PowerToys/issues/21473"
+                            Style="{StaticResource TextButtonStyle}" />
                     </InfoBar.ActionButton>
                 </InfoBar>
-                
-                <controls:Setting x:Uid="VideoConference_Enable" IsEnabled="{ Binding Mode=OneWay, Path=CanUserChangeEnabledState }">
-                    <controls:Setting.Icon>
-                        <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsVideoConferenceMute.png" ShowAsMonochrome="False" />
-                    </controls:Setting.Icon>
-                    <controls:Setting.ActionContent>
-                        <ToggleSwitch IsOn="{Binding Mode=TwoWay, Path=IsEnabled}" x:Uid="ToggleSwitch"/>
-                    </controls:Setting.ActionContent>
-                </controls:Setting>
+
+                <labs:SettingsCard
+                    x:Uid="VideoConference_Enable"
+                    HeaderIcon="{ui:BitmapIcon Source=/Assets/FluentIcons/FluentIconsVideoConferenceMute.png}"
+                    IsEnabled="{Binding Mode=OneWay, Path=IsElevated}">
+                    <ToggleSwitch
+                        x:Uid="ToggleSwitch"
+                        IsOn="{Binding Mode=TwoWay, Path=IsEnabled}" />
+                </labs:SettingsCard>
                 <InfoBar
-                    Severity="Warning"
                     x:Uid="VideoConference_RunAsAdminRequired"
+                    IsClosable="False"
                     IsOpen="True"
                     IsTabStop="True"
-                    IsClosable="False"
-                    Visibility="{Binding Mode=OneWay, Path=IsElevated, Converter={StaticResource BoolToVisibilityConverter}}" />
-                <InfoBar x:Uid="GPO_IsSettingForced"
-                    Severity="Informational"
+                    Severity="Warning"
+                    Visibility="{Binding Mode=OneWay, Path=IsElevated, Converter={StaticResource ReverseBoolToVisibilityConverter}}" />
+                <InfoBar
+                    x:Uid="GPO_IsSettingForced"
                     IsClosable="False"
                     IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}"
-                    IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}" />
+                    IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabledGpoConfigured}"
+                    Severity="Informational" />
+                <controls:SettingsGroup
+                    x:Uid="VideoConference_Shortcuts"
+                    IsEnabled="{Binding Mode=OneWay, Path=IsEnabled}">
+                    <labs:SettingsCard x:Uid="VideoConference_CameraAndMicrophoneMuteHotkeyControl_Header">
+                        <controls:ShortcutControl
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            HotkeySettings="{x:Bind Path=ViewModel.CameraAndMicrophoneMuteHotkey, Mode=TwoWay}" />
+                    </labs:SettingsCard>
 
-                <controls:SettingsGroup x:Uid="VideoConference_Shortcuts" IsEnabled="{Binding Mode=OneWay, Path=IsEnabled}">
-                    <controls:Setting x:Uid="VideoConference_CameraAndMicrophoneMuteHotkeyControl_Header">
-                        <controls:Setting.ActionContent>
-                            <controls:ShortcutControl HotkeySettings="{x:Bind Path=ViewModel.CameraAndMicrophoneMuteHotkey, Mode=TwoWay}"
-                                                            MinWidth="{StaticResource SettingActionControlMinWidth}"/>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
-
-                    <controls:Setting x:Uid="VideoConference_MicrophoneMuteHotkeyControl_Header">
-                        <controls:Setting.ActionContent>
-                            <controls:ShortcutControl HotkeySettings="{x:Bind Path=ViewModel.MicrophoneMuteHotkey, Mode=TwoWay}"
-                                                      MinWidth="{StaticResource SettingActionControlMinWidth}"/>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
-
-                    <controls:Setting x:Uid="VideoConference_CameraMuteHotkeyControl_Header">
-                        <controls:Setting.ActionContent>
-                            <controls:ShortcutControl HotkeySettings="{x:Bind Path=ViewModel.CameraMuteHotkey, Mode=TwoWay}"
-                                                      MinWidth="{StaticResource SettingActionControlMinWidth}"/>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
+                    <labs:SettingsCard x:Uid="VideoConference_MicrophoneMuteHotkeyControl_Header">
+                        <controls:ShortcutControl
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            HotkeySettings="{x:Bind Path=ViewModel.MicrophoneMuteHotkey, Mode=TwoWay}" />
+                    </labs:SettingsCard>
 
+                    <labs:SettingsCard x:Uid="VideoConference_CameraMuteHotkeyControl_Header">
+                        <controls:ShortcutControl
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            HotkeySettings="{x:Bind Path=ViewModel.CameraMuteHotkey, Mode=TwoWay}" />
+                    </labs:SettingsCard>
                 </controls:SettingsGroup>
 
-                <controls:SettingsGroup x:Uid="VideoConference_Microphone" IsEnabled="{Binding Mode=OneWay, Path=IsEnabled}">
-
-                    <controls:Setting x:Uid="VideoConference_SelectedMicrophone" Icon="&#xE720;">
-                        <controls:Setting.ActionContent>
-                            <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                      SelectedIndex="{Binding Path=SelectedMicrophoneIndex, Mode=TwoWay}"
-                                      ItemsSource="{Binding MicrophoneNames, Mode=OneTime}"/>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
+                <controls:SettingsGroup
+                    x:Uid="VideoConference_Microphone"
+                    IsEnabled="{Binding Mode=OneWay, Path=IsEnabled}">
+                    <labs:SettingsCard
+                        x:Uid="VideoConference_SelectedMicrophone"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xE720;}">
+                        <ComboBox
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            ItemsSource="{Binding MicrophoneNames, Mode=OneTime}"
+                            SelectedIndex="{Binding Path=SelectedMicrophoneIndex, Mode=TwoWay}" />
+                    </labs:SettingsCard>
                 </controls:SettingsGroup>
 
-
-                <controls:SettingsGroup x:Uid="VideoConference_Camera" IsEnabled="{Binding Mode=OneWay, Path=IsEnabled}">
-
-                    <controls:SettingExpander IsExpanded="True">
-                        <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="VideoConference_SelectedCamera" Icon="&#xE960;">
-                                <controls:Setting.ActionContent>
-                                    <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                              SelectedIndex="{Binding Path=SelectedCameraIndex, Mode=TwoWay}"
-                                              ItemsSource="{Binding CameraNames, Mode=OneTime}"
-                                              IsEnabled="{ Binding Mode=TwoWay, Path=IsEnabled}"/>
-                                </controls:Setting.ActionContent>
-                            </controls:Setting>
-                        </controls:SettingExpander.Header>
-                        <controls:SettingExpander.Content>
-                            <StackPanel Orientation="Vertical">
-                                <controls:Setting x:Uid="VideoConference_CameraOverlayImagePathHeader" Style="{StaticResource ExpanderContentSettingStyle}">
-                                    <controls:Setting.ActionContent>
-                                        <StackPanel Orientation="Vertical">
-                                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-                                                <Button x:Uid="VideoConference_CameraOverlayImageBrowse"
-                                                        Command="{Binding Mode=OneWay, Path=SelectOverlayImage}" />
-
-                                                <Button x:Uid="VideoConference_CameraOverlayImageClear"
-                                                        Margin="8,0,0,0"
-                                                        Visibility="{Binding Path=CameraImageOverlayPath, Mode=OneWay, Converter={StaticResource EmptyToCollapsedConverter}}"
-                                                        Command="{Binding Mode=OneWay, Path=ClearOverlayImage}"/>
-                                                                    
-                                            </StackPanel>
-                                          
-                                        </StackPanel>
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-                                <Border CornerRadius="4" Visibility="{Binding Path=CameraImageOverlayPath, Mode=OneWay, Converter={StaticResource EmptyToCollapsedConverter}}" Margin="56, 8, 40, 20" HorizontalAlignment="Right" MaxHeight="100">
-                                    <Image x:Uid="VideoConference_CameraOverlayImageAlt"
-                                           ToolTipService.ToolTip="{Binding Mode=OneWay, Path=CameraImageOverlayPath}"
-                                           Source="{Binding Mode=OneWay, Path=CameraImageOverlayPath}"/>
+                <controls:SettingsGroup
+                    x:Uid="VideoConference_Camera"
+                    IsEnabled="{Binding Mode=OneWay, Path=IsEnabled}">
+                    <labs:SettingsExpander
+                        x:Uid="VideoConference_SelectedCamera"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xE960;}"
+                        IsExpanded="True">
+                        <ComboBox
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            IsEnabled="{Binding Mode=TwoWay, Path=IsEnabled}"
+                            ItemsSource="{Binding CameraNames, Mode=OneTime}"
+                            SelectedIndex="{Binding Path=SelectedCameraIndex, Mode=TwoWay}" />
+                        <labs:SettingsExpander.Items>
+                            <labs:SettingsCard x:Uid="VideoConference_CameraOverlayImagePathHeader">
+                                <StackPanel
+                                    Orientation="Horizontal"
+                                    Spacing="8">
+                                    <Button
+                                        x:Uid="VideoConference_CameraOverlayImageBrowse"
+                                        Command="{Binding Mode=OneWay, Path=SelectOverlayImage}" />
+                                    <Button
+                                        x:Uid="VideoConference_CameraOverlayImageClear"
+                                        Command="{Binding Mode=OneWay, Path=ClearOverlayImage}"
+                                        Visibility="{Binding Path=CameraImageOverlayPath, Mode=OneWay, Converter={StaticResource EmptyToCollapsedConverter}}" />
+                                </StackPanel>
+                            </labs:SettingsCard>
+                            <labs:SettingsCard>
+                                <Border
+                                    MaxHeight="100"
+                                    HorizontalAlignment="Right"
+                                    CornerRadius="4"
+                                    Visibility="{Binding Path=CameraImageOverlayPath, Mode=OneWay, Converter={StaticResource EmptyToCollapsedConverter}}">
+                                    <Image
+                                        x:Uid="VideoConference_CameraOverlayImageAlt"
+                                        Source="{Binding Mode=OneWay, Path=CameraImageOverlayPath}"
+                                        ToolTipService.ToolTip="{Binding Mode=OneWay, Path=CameraImageOverlayPath}" />
                                 </Border>
-                            </StackPanel>
-                        </controls:SettingExpander.Content>
-                    </controls:SettingExpander>
-
+                            </labs:SettingsCard>
+                        </labs:SettingsExpander.Items>
+                    </labs:SettingsExpander>
                 </controls:SettingsGroup>
 
-
-
-
-                <controls:SettingsGroup x:Uid="VideoConference_Toolbar" IsEnabled="{Binding Mode=OneWay, Path=IsEnabled}">
-
-                    <controls:SettingExpander IsExpanded="True">
-                        <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="VideoConference_ToolbarPosition">
-                                <controls:Setting.ActionContent>
-                                    <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}" SelectedIndex="{ Binding Mode=TwoWay, Path=ToolbarPositionIndex}">
-                                        <ComboBoxItem x:Uid="VideoConference_ToolbarPosition_TopLeftCorner"/>
-                                        <ComboBoxItem x:Uid="VideoConference_ToolbarPosition_TopCenter"/>
-                                        <ComboBoxItem x:Uid="VideoConference_ToolbarPosition_TopRightCorner"/>
-                                        <ComboBoxItem x:Uid="VideoConference_ToolbarPosition_BottomLeftCorner"/>
-                                        <ComboBoxItem x:Uid="VideoConference_ToolbarPosition_BottomCenter"/>
-                                        <ComboBoxItem x:Uid="VideoConference_ToolbarPosition_BottomRightCorner"/>
-                                    </ComboBox>
-                                </controls:Setting.ActionContent>
-                            </controls:Setting>
-                        </controls:SettingExpander.Header>
-                        <controls:SettingExpander.Content>
-                            <StackPanel Orientation="Vertical">
-                                <controls:Setting x:Uid="VideoConference_ToolbarMonitor" Style="{StaticResource ExpanderContentSettingStyle}">
-                                    <controls:Setting.ActionContent>
-                                        <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}" SelectedIndex="{ Binding Mode=TwoWay, Path=ToolbarMonitorIndex}">
-                                            <ComboBoxItem x:Uid="VideoConference_ToolbarMonitor_Main"/>
-                                            <ComboBoxItem x:Uid="VideoConference_ToolbarMonitor_All"/>
-                                        </ComboBox>
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-                                <Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
-                                <controls:Setting x:Uid="VideoConference_ToolbarHide" Style="{StaticResource ExpanderContentSettingStyle}">
-                                    <controls:Setting.ActionContent>
-                                        <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}" SelectedIndex="{ Binding Mode=TwoWay, Path=ToolbarHideIndex}">
-                                            <ComboBoxItem x:Uid="VideoConference_ToolbarHideNever"/>
-                                            <ComboBoxItem x:Uid="VideoConference_ToolbarHideUnmuted"/>
-                                            <ComboBoxItem x:Uid="VideoConference_ToolbarHideMuted"/>
-                                        </ComboBox>
-                                    </controls:Setting.ActionContent>
-                                </controls:Setting>
-                            </StackPanel>
-                        </controls:SettingExpander.Content>
-                    </controls:SettingExpander>
-
+                <controls:SettingsGroup
+                    x:Uid="VideoConference_Toolbar"
+                    IsEnabled="{Binding Mode=OneWay, Path=IsEnabled}">
+                    <labs:SettingsExpander
+                        x:Uid="VideoConference_ToolbarPosition"
+                        IsExpanded="True">
+                        <ComboBox
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            SelectedIndex="{Binding Mode=TwoWay, Path=ToolbarPositionIndex}">
+                            <ComboBoxItem x:Uid="VideoConference_ToolbarPosition_TopLeftCorner" />
+                            <ComboBoxItem x:Uid="VideoConference_ToolbarPosition_TopCenter" />
+                            <ComboBoxItem x:Uid="VideoConference_ToolbarPosition_TopRightCorner" />
+                            <ComboBoxItem x:Uid="VideoConference_ToolbarPosition_BottomLeftCorner" />
+                            <ComboBoxItem x:Uid="VideoConference_ToolbarPosition_BottomCenter" />
+                            <ComboBoxItem x:Uid="VideoConference_ToolbarPosition_BottomRightCorner" />
+                        </ComboBox>
+                        <labs:SettingsExpander.Items>
+                            <labs:SettingsCard x:Uid="VideoConference_ToolbarMonitor">
+                                <ComboBox
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    SelectedIndex="{Binding Mode=TwoWay, Path=ToolbarMonitorIndex}">
+                                    <ComboBoxItem x:Uid="VideoConference_ToolbarMonitor_Main" />
+                                    <ComboBoxItem x:Uid="VideoConference_ToolbarMonitor_All" />
+                                </ComboBox>
+                            </labs:SettingsCard>
+                            <labs:SettingsCard x:Uid="VideoConference_ToolbarHide">
+                                <ComboBox
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    SelectedIndex="{Binding Mode=TwoWay, Path=ToolbarHideIndex}">
+                                    <ComboBoxItem x:Uid="VideoConference_ToolbarHideNever" />
+                                    <ComboBoxItem x:Uid="VideoConference_ToolbarHideUnmuted" />
+                                    <ComboBoxItem x:Uid="VideoConference_ToolbarHideMuted" />
+                                </ComboBox>
+                            </labs:SettingsCard>
+                        </labs:SettingsExpander.Items>
+                    </labs:SettingsExpander>
                 </controls:SettingsGroup>
             </StackPanel>
         </controls:SettingsPageControl.ModuleContent>
 
         <controls:SettingsPageControl.PrimaryLinks>
-            <controls:PageLink x:Uid="LearnMore_VCM" Link="https://aka.ms/PowerToysOverview_VideoConference"/>
+            <controls:PageLink
+                x:Uid="LearnMore_VCM"
+                Link="https://aka.ms/PowerToysOverview_VideoConference" />
         </controls:SettingsPageControl.PrimaryLinks>
     </controls:SettingsPageControl>
 </Page>