diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
index 5547f5b4a2..bd4c70e2ef 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
@@ -269,16 +269,16 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.10</Version>
+      <Version>6.2.12</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp.UI">
-      <Version>6.1.1</Version>
+      <Version>7.0.2</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls">
-      <Version>6.1.1</Version>
+      <Version>7.0.2</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Win32.UI.XamlApplication">
-      <Version>6.1.2</Version>
+      <Version>6.1.3</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.UI.Xaml">
       <Version>2.6.0-prerelease.210623001</Version>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Styles/Button.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Styles/Button.xaml
index 8a20e47cb3..0416382a05 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Styles/Button.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Styles/Button.xaml
@@ -2,73 +2,11 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <Style x:Key="AddItemAppBarButtonStyle" TargetType="AppBarButton">
-        <Setter Property="Background" Value="{ThemeResource AppBarButtonBackground}"/>
-        <Setter Property="Foreground" Value="{ThemeResource AppBarButtonForeground}"/>
-        <Setter Property="BorderBrush" Value="{ThemeResource AppBarButtonBorderBrush}"/>
-        <Setter Property="Width" Value="Auto"/>
+    <!--<Style x:Key="SettingButtonStyle" TargetType="Button" BasedOn="{StaticResource DefaultButtonStyle}" >
+        <Setter Property="BorderBrush" Value="{ThemeResource CardBorderBrush}" />
+        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+        <Setter Property="Padding" Value="16,0,16,0" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="MaxWidth" Value="500"/>
-        <Setter Property="VerticalAlignment" Value="Top"/>
-        <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}"/>
-        <Setter Property="FontWeight" Value="Normal"/>
-        <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}"/>
-        <Setter Property="AllowFocusOnInteraction" Value="False"/>
-        <Setter Property="KeyboardAcceleratorPlacementMode" Value="Hidden"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="AppBarButton">
-                    <Grid x:Name="Root" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{TemplateBinding CornerRadius}" MinWidth="{TemplateBinding MinWidth}">
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal"/>
-                                <VisualState x:Name="PointerOver">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Root" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemListLowColor}"/>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <PointerUpThemeAnimation Storyboard.TargetName="ContentRoot"/>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Pressed">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Root" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemListMediumColor}"/>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <PointerDownThemeAnimation Storyboard.TargetName="ContentRoot"/>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Disabled">
-                                    <VisualState.Setters>
-                                        <Setter Target="Root.Background" Value="{ThemeResource AppBarButtonBackgroundDisabled}"/>
-                                        <Setter Target="AppBarButtonInnerBorder.BorderBrush" Value="{ThemeResource AppBarButtonBorderBrushDisabled}"/>
-                                        <Setter Target="Content.Foreground" Value="{ThemeResource AppBarButtonForegroundDisabled}"/>
-                                        <Setter Target="TextLabel.Foreground" Value="{ThemeResource AppBarButtonForegroundDisabled}"/>
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-
-
-
-                        <Grid x:Name="ContentRoot">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="320"/>
-                            </Grid.ColumnDefinitions>
-                            <Border x:Name="AppBarButtonInnerBorder" Margin="10" CornerRadius="4" Height="40" Width="40" Background="{ThemeResource ButtonBackground}">
-                                <ContentPresenter x:Name="Content" Content="{TemplateBinding Icon}" Foreground="{TemplateBinding Foreground}" RenderTransformOrigin="0.5,0.5">
-                                    <ContentPresenter.RenderTransform>
-                                        <CompositeTransform ScaleX="0.8" ScaleY="0.8"/>
-                                    </ContentPresenter.RenderTransform>
-                                </ContentPresenter>
-                            </Border>
-
-                            <TextBlock x:Name="TextLabel" Grid.Column="1" AutomationProperties.AccessibilityView="Raw" Foreground="{TemplateBinding Foreground}" Margin="0,-2,0,0" VerticalAlignment="Center" FontSize="14" Text="{TemplateBinding Label}"/>
-                        </Grid>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+    </Style>-->
 </ResourceDictionary>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Themes/SettingsExpanderStyles.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Themes/SettingsExpanderStyles.xaml
index 170096a569..d0f4b37fed 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Themes/SettingsExpanderStyles.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Themes/SettingsExpanderStyles.xaml
@@ -32,12 +32,11 @@
     </Style>
 
     <!-- Setting expander style -->
-    <Style x:Key="SettingsExpanderStyle" TargetType="muxc:Expander">
+    <Style TargetType="muxc: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>
-
 </ResourceDictionary>
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
index f1a391e094..61ac5b6f09 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
@@ -92,15 +92,15 @@
 
 
                 <controls:SettingsGroup x:Uid="KeyboardManager_Keys" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.Enabled}">
-                    <controls:Setting x:Uid="KeyboardManager_RemapKeys" Icon="&#xE92E;">
-                        <controls:Setting.ActionContent>
-                            <Button x:Uid="KeyboardManager_RemapKeyboardButton"
-                                    Command="{Binding Path=RemapKeyboardCommand}"
-                                    Style="{StaticResource AccentButtonStyle}"
-                                    IsEnabled="{x:Bind Path=ViewModel.Enabled, Mode=OneWay}"/>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
-                    
+
+                    <!--<Button Style="{StaticResource SettingButtonStyle}" Command="{Binding Path=RemapKeyboardCommand}">
+                        <controls:Setting x:Uid="KeyboardManager_RemapKeyboardButton" Style="{StaticResource ExpanderHeaderSettingStyle}" Icon="&#xE92E;">
+                            <controls:Setting.ActionContent>
+                                <FontIcon Glyph="&#xE8A7;" FontFamily="{ThemeResource SymbolThemeFontFamily}" />
+                            </controls:Setting.ActionContent>
+                        </controls:Setting>
+                    </Button>-->
+
                     <ListView x:Name="RemapKeysList"
                               x:Uid="RemapKeysList"
                               ItemsSource="{x:Bind Path=ViewModel.RemapKeys, Mode=OneWay}"
@@ -151,17 +151,14 @@
 
 
                 <controls:SettingsGroup x:Uid="KeyboardManager_Shortcuts"   IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.Enabled}">
-                    <controls:Setting x:Uid="KeyboardManager_RemapShortcuts" Icon="&#xEDA7;">
-                        <controls:Setting.ActionContent>
-                            <Button x:Uid="KeyboardManager_RemapShortcutsButton"
-                                    Command="{Binding Path=EditShortcutCommand}"
-                                    Style="{StaticResource AccentButtonStyle}"
-                                    IsEnabled="{x:Bind Path=ViewModel.Enabled, Mode=OneWay}"/>
-                        </controls:Setting.ActionContent>
-                    </controls:Setting>
-
-
-
+                    <!--<Button Style="{StaticResource SettingButtonStyle}" Command="{Binding Path=EditShortcutCommand}">
+                        <controls:Setting x:Uid="KeyboardManager_RemapShortcutsButton" Style="{StaticResource ExpanderHeaderSettingStyle}" Icon="&#xE92E;">
+                            <controls:Setting.ActionContent>
+                                <FontIcon Glyph="&#xEDA7;" FontFamily="{ThemeResource SymbolThemeFontFamily}" />
+                            </controls:Setting.ActionContent>
+                        </controls:Setting>
+                    </Button>-->
+                    
                     <ListView x:Name="RemapShortcutsList"
                               x:Uid="RemapShortcutsList"
                               ItemsSource="{x:Bind Path=ViewModel.RemapShortcuts, Mode=OneWay}"