diff --git a/Directory.Build.targets b/Directory.Build.targets
new file mode 100644
index 0000000000..66a8733ce6
--- /dev/null
+++ b/Directory.Build.targets
@@ -0,0 +1,3 @@
+<Project>
+  <Sdk Name="Microsoft.Build.CopyOnWrite" Version="1.0.282" />
+</Project>
\ No newline at end of file
diff --git a/PowerToys.sln b/PowerToys.sln
index 21c1848742..81257cd738 100644
--- a/PowerToys.sln
+++ b/PowerToys.sln
@@ -177,6 +177,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		src\.editorconfig = src\.editorconfig
 		.vsconfig = .vsconfig
 		Directory.Build.props = Directory.Build.props
+		Directory.Build.targets = Directory.Build.targets
 		Directory.Packages.props = Directory.Packages.props
 		Solution.props = Solution.props
 	EndProjectSection
diff --git a/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/App.xaml b/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/App.xaml
index ae8ef32742..d4b0dc7bbc 100644
--- a/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/App.xaml
+++ b/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/App.xaml
@@ -12,21 +12,66 @@
                 <!--  Other merged dictionaries here  -->
             </ResourceDictionary.MergedDictionaries>
 
-            <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 ControlFillColorDisabled}" />
+            <ResourceDictionary.ThemeDictionaries>
+                <ResourceDictionary x:Key="Default">
+                    <StaticResource x:Key="SubtleButtonBackground" ResourceKey="SubtleFillColorTransparent" />
+                    <StaticResource x:Key="SubtleButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondary" />
+                    <StaticResource x:Key="SubtleButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiary" />
+                    <StaticResource x:Key="SubtleButtonBackgroundDisabled" ResourceKey="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}" />
+                    <StaticResource x:Key="SubtleButtonBorderBrush" ResourceKey="SubtleFillColorTransparent" />
+                    <StaticResource x:Key="SubtleButtonBorderBrushPointerOver" ResourceKey="SubtleFillColorSecondary" />
+                    <StaticResource x:Key="SubtleButtonBorderBrushPressed" ResourceKey="SubtleFillColorTertiary" />
+                    <StaticResource x:Key="SubtleButtonBorderBrushDisabled" ResourceKey="SubtleFillColorTransparent" />
+
+                    <StaticResource x:Key="SubtleButtonForeground" ResourceKey="TextFillColorPrimary" />
+                    <StaticResource x:Key="SubtleButtonForegroundPointerOver" ResourceKey="TextFillColorPrimary" />
+                    <StaticResource x:Key="SubtleButtonForegroundPressed" ResourceKey="TextFillColorSecondary" />
+                    <StaticResource x:Key="SubtleButtonForegroundDisabled" ResourceKey="TextFillColorDisabled" />
+                </ResourceDictionary>
+
+                <ResourceDictionary x:Key="Light">
+                    <StaticResource x:Key="SubtleButtonBackground" ResourceKey="SubtleFillColorTransparent" />
+                    <StaticResource x:Key="SubtleButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondary" />
+                    <StaticResource x:Key="SubtleButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiary" />
+                    <StaticResource x:Key="SubtleButtonBackgroundDisabled" ResourceKey="SubtleFillColorTransparent" />
+
+                    <StaticResource x:Key="SubtleButtonBorderBrush" ResourceKey="SubtleFillColorTransparent" />
+                    <StaticResource x:Key="SubtleButtonBorderBrushPointerOver" ResourceKey="SubtleFillColorSecondary" />
+                    <StaticResource x:Key="SubtleButtonBorderBrushPressed" ResourceKey="SubtleFillColorTertiary" />
+                    <StaticResource x:Key="SubtleButtonBorderBrushDisabled" ResourceKey="SubtleFillColorTransparent" />
+
+                    <StaticResource x:Key="SubtleButtonForeground" ResourceKey="TextFillColorPrimary" />
+                    <StaticResource x:Key="SubtleButtonForegroundPointerOver" ResourceKey="TextFillColorPrimary" />
+                    <StaticResource x:Key="SubtleButtonForegroundPressed" ResourceKey="TextFillColorSecondary" />
+                    <StaticResource x:Key="SubtleButtonForegroundDisabled" ResourceKey="TextFillColorDisabled" />
+                </ResourceDictionary>
+
+                <ResourceDictionary x:Key="HighContrast">
+                    <StaticResource x:Key="SubtleButtonBackground" ResourceKey="SystemColorWindowColorBrush" />
+                    <StaticResource x:Key="SubtleButtonBackgroundPointerOver" ResourceKey="SystemColorHighlightTextColorBrush" />
+                    <StaticResource x:Key="SubtleButtonBackgroundPressed" ResourceKey="SystemColorWindowColorBrush" />
+                    <StaticResource x:Key="SubtleButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+
+                    <StaticResource x:Key="SubtleButtonBorderBrush" ResourceKey="SystemColorWindowColorBrush" />
+                    <StaticResource x:Key="SubtleButtonBorderBrushPointerOver" ResourceKey="SystemColorHighlightColorBrush" />
+                    <StaticResource x:Key="SubtleButtonBorderBrushPressed" ResourceKey="SystemColorHighlightColorBrush" />
+                    <StaticResource x:Key="SubtleButtonBorderBrushDisabled" ResourceKey="SystemColorGrayTextColor" />
+
+                    <StaticResource x:Key="SubtleButtonForeground" ResourceKey="SystemColorButtonTextColorBrush" />
+                    <StaticResource x:Key="SubtleButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+                    <StaticResource x:Key="SubtleButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+                    <StaticResource x:Key="SubtleButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+                </ResourceDictionary>
+
+            </ResourceDictionary.ThemeDictionaries>
 
             <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="BorderBrush" Value="{ThemeResource SubtleButtonBorderBrush}" />
+                <Setter Property="BorderThickness" Value="{ThemeResource ButtonBorderThemeThickness}" />
                 <Setter Property="Padding" Value="{StaticResource ButtonPadding}" />
                 <Setter Property="HorizontalAlignment" Value="Left" />
                 <Setter Property="VerticalAlignment" Value="Center" />
@@ -53,11 +98,11 @@
                                 Content="{TemplateBinding Content}"
                                 ContentTemplate="{TemplateBinding ContentTemplate}"
                                 ContentTransitions="{TemplateBinding ContentTransitions}"
-                                CornerRadius="{TemplateBinding CornerRadius}">
+                                CornerRadius="{TemplateBinding CornerRadius}"
+                                Foreground="{TemplateBinding Foreground}">
                                 <ContentPresenter.BackgroundTransition>
                                     <BrushTransition Duration="0:0:0.083" />
                                 </ContentPresenter.BackgroundTransition>
-
                                 <VisualStateManager.VisualStateGroups>
                                     <VisualStateGroup x:Name="CommonStates">
                                         <VisualState x:Name="Normal" />
@@ -66,6 +111,9 @@
                                                 <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
                                                     <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBackgroundPointerOver}" />
                                                 </ObjectAnimationUsingKeyFrames>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushPointerOver}" />
+                                                </ObjectAnimationUsingKeyFrames>
                                                 <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
                                                     <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundPointerOver}" />
                                                 </ObjectAnimationUsingKeyFrames>
@@ -74,12 +122,14 @@
                                                 <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="BorderBrush">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushPressed}" />
+                                                </ObjectAnimationUsingKeyFrames>
                                                 <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
                                                     <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundPressed}" />
                                                 </ObjectAnimationUsingKeyFrames>
@@ -88,12 +138,14 @@
                                                 <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="BorderBrush">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushDisabled}" />
+                                                </ObjectAnimationUsingKeyFrames>
                                                 <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
                                                     <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundDisabled}" />
                                                 </ObjectAnimationUsingKeyFrames>
diff --git a/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/Views/MainPage.xaml b/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/Views/MainPage.xaml
index 312929be4a..9857626f5d 100644
--- a/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/Views/MainPage.xaml
+++ b/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/Views/MainPage.xaml
@@ -635,7 +635,8 @@
                             <Flyout
                                 x:Name="AddVariableFlyout"
                                 Closed="AddVariableFlyout_Closed"
-                                Placement="Right">
+                                Placement="Right"
+                                ShouldConstrainToRootBounds="False">
                                 <Grid Width="320" Height="480">
                                     <Grid.RowDefinitions>
                                         <RowDefinition Height="Auto" />
diff --git a/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/App.xaml b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/App.xaml
index 5e22eda94e..99233539ff 100644
--- a/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/App.xaml
+++ b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/App.xaml
@@ -10,24 +10,67 @@
                 <!--  Other merged dictionaries here  -->
             </ResourceDictionary.MergedDictionaries>
 
-            <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}" />
+            <ResourceDictionary.ThemeDictionaries>
+                <ResourceDictionary x:Key="Default">
+                    <StaticResource x:Key="SubtleButtonBackground" ResourceKey="SubtleFillColorTransparent" />
+                    <StaticResource x:Key="SubtleButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondary" />
+                    <StaticResource x:Key="SubtleButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiary" />
+                    <StaticResource x:Key="SubtleButtonBackgroundDisabled" ResourceKey="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}" />
+                    <StaticResource x:Key="SubtleButtonBorderBrush" ResourceKey="SubtleFillColorTransparent" />
+                    <StaticResource x:Key="SubtleButtonBorderBrushPointerOver" ResourceKey="SubtleFillColorSecondary" />
+                    <StaticResource x:Key="SubtleButtonBorderBrushPressed" ResourceKey="SubtleFillColorTertiary" />
+                    <StaticResource x:Key="SubtleButtonBorderBrushDisabled" ResourceKey="SubtleFillColorTransparent" />
+
+                    <StaticResource x:Key="SubtleButtonForeground" ResourceKey="TextFillColorPrimary" />
+                    <StaticResource x:Key="SubtleButtonForegroundPointerOver" ResourceKey="TextFillColorPrimary" />
+                    <StaticResource x:Key="SubtleButtonForegroundPressed" ResourceKey="TextFillColorSecondary" />
+                    <StaticResource x:Key="SubtleButtonForegroundDisabled" ResourceKey="TextFillColorDisabled" />
+                </ResourceDictionary>
+
+                <ResourceDictionary x:Key="Light">
+                    <StaticResource x:Key="SubtleButtonBackground" ResourceKey="SubtleFillColorTransparent" />
+                    <StaticResource x:Key="SubtleButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondary" />
+                    <StaticResource x:Key="SubtleButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiary" />
+                    <StaticResource x:Key="SubtleButtonBackgroundDisabled" ResourceKey="SubtleFillColorTransparent" />
+
+                    <StaticResource x:Key="SubtleButtonBorderBrush" ResourceKey="SubtleFillColorTransparent" />
+                    <StaticResource x:Key="SubtleButtonBorderBrushPointerOver" ResourceKey="SubtleFillColorSecondary" />
+                    <StaticResource x:Key="SubtleButtonBorderBrushPressed" ResourceKey="SubtleFillColorTertiary" />
+                    <StaticResource x:Key="SubtleButtonBorderBrushDisabled" ResourceKey="SubtleFillColorTransparent" />
+
+                    <StaticResource x:Key="SubtleButtonForeground" ResourceKey="TextFillColorPrimary" />
+                    <StaticResource x:Key="SubtleButtonForegroundPointerOver" ResourceKey="TextFillColorPrimary" />
+                    <StaticResource x:Key="SubtleButtonForegroundPressed" ResourceKey="TextFillColorSecondary" />
+                    <StaticResource x:Key="SubtleButtonForegroundDisabled" ResourceKey="TextFillColorDisabled" />
+                </ResourceDictionary>
+
+                <ResourceDictionary x:Key="HighContrast">
+                    <StaticResource x:Key="SubtleButtonBackground" ResourceKey="SystemColorWindowColorBrush" />
+                    <StaticResource x:Key="SubtleButtonBackgroundPointerOver" ResourceKey="SystemColorHighlightTextColorBrush" />
+                    <StaticResource x:Key="SubtleButtonBackgroundPressed" ResourceKey="SystemColorWindowColorBrush" />
+                    <StaticResource x:Key="SubtleButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+
+                    <StaticResource x:Key="SubtleButtonBorderBrush" ResourceKey="SystemColorWindowColorBrush" />
+                    <StaticResource x:Key="SubtleButtonBorderBrushPointerOver" ResourceKey="SystemColorHighlightColorBrush" />
+                    <StaticResource x:Key="SubtleButtonBorderBrushPressed" ResourceKey="SystemColorHighlightColorBrush" />
+                    <StaticResource x:Key="SubtleButtonBorderBrushDisabled" ResourceKey="SystemColorGrayTextColor" />
+
+                    <StaticResource x:Key="SubtleButtonForeground" ResourceKey="SystemColorButtonTextColorBrush" />
+                    <StaticResource x:Key="SubtleButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+                    <StaticResource x:Key="SubtleButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+                    <StaticResource x:Key="SubtleButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+                </ResourceDictionary>
+
+            </ResourceDictionary.ThemeDictionaries>
 
             <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="BorderBrush" Value="{ThemeResource SubtleButtonBorderBrush}" />
+                <Setter Property="BorderThickness" Value="{ThemeResource ButtonBorderThemeThickness}" />
+                <Setter Property="Padding" Value="{StaticResource ButtonPadding}" />
                 <Setter Property="HorizontalAlignment" Value="Left" />
                 <Setter Property="VerticalAlignment" Value="Center" />
                 <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
@@ -53,11 +96,11 @@
                                 Content="{TemplateBinding Content}"
                                 ContentTemplate="{TemplateBinding ContentTemplate}"
                                 ContentTransitions="{TemplateBinding ContentTransitions}"
-                                CornerRadius="{TemplateBinding CornerRadius}">
+                                CornerRadius="{TemplateBinding CornerRadius}"
+                                Foreground="{TemplateBinding Foreground}">
                                 <ContentPresenter.BackgroundTransition>
                                     <BrushTransition Duration="0:0:0.083" />
                                 </ContentPresenter.BackgroundTransition>
-
                                 <VisualStateManager.VisualStateGroups>
                                     <VisualStateGroup x:Name="CommonStates">
                                         <VisualState x:Name="Normal" />
@@ -66,6 +109,9 @@
                                                 <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
                                                     <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBackgroundPointerOver}" />
                                                 </ObjectAnimationUsingKeyFrames>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushPointerOver}" />
+                                                </ObjectAnimationUsingKeyFrames>
                                                 <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
                                                     <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundPointerOver}" />
                                                 </ObjectAnimationUsingKeyFrames>
@@ -74,12 +120,14 @@
                                                 <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="BorderBrush">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushPressed}" />
+                                                </ObjectAnimationUsingKeyFrames>
                                                 <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
                                                     <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundPressed}" />
                                                 </ObjectAnimationUsingKeyFrames>
@@ -88,12 +136,14 @@
                                                 <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="BorderBrush">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushDisabled}" />
+                                                </ObjectAnimationUsingKeyFrames>
                                                 <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
                                                     <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundDisabled}" />
                                                 </ObjectAnimationUsingKeyFrames>
@@ -110,7 +160,6 @@
                     </Setter.Value>
                 </Setter>
             </Style>
-
         </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/src/modules/Hosts/Hosts/HostsXAML/App.xaml b/src/modules/Hosts/Hosts/HostsXAML/App.xaml
index 43592ea817..7d19cc0d8d 100644
--- a/src/modules/Hosts/Hosts/HostsXAML/App.xaml
+++ b/src/modules/Hosts/Hosts/HostsXAML/App.xaml
@@ -11,24 +11,66 @@
             </ResourceDictionary.MergedDictionaries>
 
 
-            <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 ControlFillColorDisabled}" />
+            <ResourceDictionary.ThemeDictionaries>
+                <ResourceDictionary x:Key="Default">
+                    <StaticResource x:Key="SubtleButtonBackground" ResourceKey="SubtleFillColorTransparent" />
+                    <StaticResource x:Key="SubtleButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondary" />
+                    <StaticResource x:Key="SubtleButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiary" />
+                    <StaticResource x:Key="SubtleButtonBackgroundDisabled" ResourceKey="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}" />
+                    <StaticResource x:Key="SubtleButtonBorderBrush" ResourceKey="SubtleFillColorTransparent" />
+                    <StaticResource x:Key="SubtleButtonBorderBrushPointerOver" ResourceKey="SubtleFillColorSecondary" />
+                    <StaticResource x:Key="SubtleButtonBorderBrushPressed" ResourceKey="SubtleFillColorTertiary" />
+                    <StaticResource x:Key="SubtleButtonBorderBrushDisabled" ResourceKey="SubtleFillColorTransparent" />
 
-            <SolidColorBrush x:Key="WindowCaptionBackground">Transparent</SolidColorBrush>
-            <SolidColorBrush x:Key="WindowCaptionBackgroundDisabled">Transparent</SolidColorBrush>
+                    <StaticResource x:Key="SubtleButtonForeground" ResourceKey="TextFillColorPrimary" />
+                    <StaticResource x:Key="SubtleButtonForegroundPointerOver" ResourceKey="TextFillColorPrimary" />
+                    <StaticResource x:Key="SubtleButtonForegroundPressed" ResourceKey="TextFillColorSecondary" />
+                    <StaticResource x:Key="SubtleButtonForegroundDisabled" ResourceKey="TextFillColorDisabled" />
+                </ResourceDictionary>
+
+                <ResourceDictionary x:Key="Light">
+                    <StaticResource x:Key="SubtleButtonBackground" ResourceKey="SubtleFillColorTransparent" />
+                    <StaticResource x:Key="SubtleButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondary" />
+                    <StaticResource x:Key="SubtleButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiary" />
+                    <StaticResource x:Key="SubtleButtonBackgroundDisabled" ResourceKey="SubtleFillColorTransparent" />
+
+                    <StaticResource x:Key="SubtleButtonBorderBrush" ResourceKey="SubtleFillColorTransparent" />
+                    <StaticResource x:Key="SubtleButtonBorderBrushPointerOver" ResourceKey="SubtleFillColorSecondary" />
+                    <StaticResource x:Key="SubtleButtonBorderBrushPressed" ResourceKey="SubtleFillColorTertiary" />
+                    <StaticResource x:Key="SubtleButtonBorderBrushDisabled" ResourceKey="SubtleFillColorTransparent" />
+
+                    <StaticResource x:Key="SubtleButtonForeground" ResourceKey="TextFillColorPrimary" />
+                    <StaticResource x:Key="SubtleButtonForegroundPointerOver" ResourceKey="TextFillColorPrimary" />
+                    <StaticResource x:Key="SubtleButtonForegroundPressed" ResourceKey="TextFillColorSecondary" />
+                    <StaticResource x:Key="SubtleButtonForegroundDisabled" ResourceKey="TextFillColorDisabled" />
+                </ResourceDictionary>
+
+                <ResourceDictionary x:Key="HighContrast">
+                    <StaticResource x:Key="SubtleButtonBackground" ResourceKey="SystemColorWindowColorBrush" />
+                    <StaticResource x:Key="SubtleButtonBackgroundPointerOver" ResourceKey="SystemColorHighlightTextColorBrush" />
+                    <StaticResource x:Key="SubtleButtonBackgroundPressed" ResourceKey="SystemColorWindowColorBrush" />
+                    <StaticResource x:Key="SubtleButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+
+                    <StaticResource x:Key="SubtleButtonBorderBrush" ResourceKey="SystemColorWindowColorBrush" />
+                    <StaticResource x:Key="SubtleButtonBorderBrushPointerOver" ResourceKey="SystemColorHighlightColorBrush" />
+                    <StaticResource x:Key="SubtleButtonBorderBrushPressed" ResourceKey="SystemColorHighlightColorBrush" />
+                    <StaticResource x:Key="SubtleButtonBorderBrushDisabled" ResourceKey="SystemColorGrayTextColor" />
+
+                    <StaticResource x:Key="SubtleButtonForeground" ResourceKey="SystemColorButtonTextColorBrush" />
+                    <StaticResource x:Key="SubtleButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+                    <StaticResource x:Key="SubtleButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+                    <StaticResource x:Key="SubtleButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+                </ResourceDictionary>
+
+            </ResourceDictionary.ThemeDictionaries>
 
             <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="BorderBrush" Value="{ThemeResource SubtleButtonBorderBrush}" />
+                <Setter Property="BorderThickness" Value="{ThemeResource ButtonBorderThemeThickness}" />
                 <Setter Property="Padding" Value="{StaticResource ButtonPadding}" />
                 <Setter Property="HorizontalAlignment" Value="Left" />
                 <Setter Property="VerticalAlignment" Value="Center" />
@@ -55,11 +97,11 @@
                                 Content="{TemplateBinding Content}"
                                 ContentTemplate="{TemplateBinding ContentTemplate}"
                                 ContentTransitions="{TemplateBinding ContentTransitions}"
-                                CornerRadius="{TemplateBinding CornerRadius}">
+                                CornerRadius="{TemplateBinding CornerRadius}"
+                                Foreground="{TemplateBinding Foreground}">
                                 <ContentPresenter.BackgroundTransition>
                                     <BrushTransition Duration="0:0:0.083" />
                                 </ContentPresenter.BackgroundTransition>
-
                                 <VisualStateManager.VisualStateGroups>
                                     <VisualStateGroup x:Name="CommonStates">
                                         <VisualState x:Name="Normal" />
@@ -68,6 +110,9 @@
                                                 <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
                                                     <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBackgroundPointerOver}" />
                                                 </ObjectAnimationUsingKeyFrames>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushPointerOver}" />
+                                                </ObjectAnimationUsingKeyFrames>
                                                 <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
                                                     <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundPointerOver}" />
                                                 </ObjectAnimationUsingKeyFrames>
@@ -76,12 +121,14 @@
                                                 <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="BorderBrush">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushPressed}" />
+                                                </ObjectAnimationUsingKeyFrames>
                                                 <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
                                                     <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundPressed}" />
                                                 </ObjectAnimationUsingKeyFrames>
@@ -90,12 +137,14 @@
                                                 <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="BorderBrush">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushDisabled}" />
+                                                </ObjectAnimationUsingKeyFrames>
                                                 <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
                                                     <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundDisabled}" />
                                                 </ObjectAnimationUsingKeyFrames>
diff --git a/src/modules/Hosts/Hosts/HostsXAML/Views/MainPage.xaml b/src/modules/Hosts/Hosts/HostsXAML/Views/MainPage.xaml
index 27ddd09a71..16a6ec5c61 100644
--- a/src/modules/Hosts/Hosts/HostsXAML/Views/MainPage.xaml
+++ b/src/modules/Hosts/Hosts/HostsXAML/Views/MainPage.xaml
@@ -80,7 +80,7 @@
                                           FontSize=16}"
                     Style="{StaticResource SubtleButtonStyle}">
                     <Button.Flyout>
-                        <Flyout>
+                        <Flyout ShouldConstrainToRootBounds="False">
                             <StackPanel
                                 Width="320"
                                 HorizontalAlignment="Stretch"
diff --git a/src/modules/keyboardmanager/Directory.Build.targets b/src/modules/keyboardmanager/Directory.Build.targets
index d37c24b655..dfcf63e016 100644
--- a/src/modules/keyboardmanager/Directory.Build.targets
+++ b/src/modules/keyboardmanager/Directory.Build.targets
@@ -1,4 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
+
   <Target Name="GenerateResourceFiles" BeforeTargets="PrepareForBuild">
     <Exec Command="powershell -NonInteractive -executionpolicy Unrestricted $(SolutionDir)tools\build\convert-resx-to-rc.ps1 ..\dll resource.base.h resource.h KeyboardManager.base.rc KeyboardManager.rc" />
   </Target>
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/Storage/Win32ProgramRepositoryTest.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/Storage/Win32ProgramRepositoryTest.cs
index 0d4aafb094..4cb1b0510f 100644
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/Storage/Win32ProgramRepositoryTest.cs
+++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/Storage/Win32ProgramRepositoryTest.cs
@@ -7,10 +7,10 @@ using System.Diagnostics;
 using System.IO;
 using System.IO.Abstractions;
 using System.Linq;
-using Microsoft.Plugin.Program.Programs;
 using Microsoft.Plugin.Program.Storage;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
+using Wox.Infrastructure;
 using Wox.Infrastructure.FileSystemHelper;
 using Wox.Infrastructure.Storage;
 using Win32Program = Microsoft.Plugin.Program.Programs.Win32Program;
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/IShellLinkHelper.cs b/src/modules/launcher/Wox.Infrastructure/IShellLinkHelper.cs
similarity index 90%
rename from src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/IShellLinkHelper.cs
rename to src/modules/launcher/Wox.Infrastructure/IShellLinkHelper.cs
index 45b7e64083..6422e108ce 100644
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/IShellLinkHelper.cs
+++ b/src/modules/launcher/Wox.Infrastructure/IShellLinkHelper.cs
@@ -2,7 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace Microsoft.Plugin.Program.Programs
+namespace Wox.Infrastructure
 {
     public interface IShellLinkHelper
     {
diff --git a/src/modules/launcher/Wox.Infrastructure/Image/WindowsThumbnailProvider.cs b/src/modules/launcher/Wox.Infrastructure/Image/WindowsThumbnailProvider.cs
index bcd645d1a4..4dd9481678 100644
--- a/src/modules/launcher/Wox.Infrastructure/Image/WindowsThumbnailProvider.cs
+++ b/src/modules/launcher/Wox.Infrastructure/Image/WindowsThumbnailProvider.cs
@@ -82,7 +82,19 @@ namespace Wox.Infrastructure.Image
 
         public static BitmapSource GetThumbnail(string fileName, int width, int height, ThumbnailOptions options)
         {
-            IntPtr hBitmap = GetHBitmap(Path.GetFullPath(fileName), width, height, options);
+            IntPtr hBitmap = IntPtr.Zero;
+            if (Path.GetExtension(fileName).Equals(".lnk", StringComparison.OrdinalIgnoreCase))
+            {
+                // If the file has a '.lnk' extension, it is a shortcut file. Use the shellLinkHelper to retrieve the actual target file path from the shortcut.
+                IShellLinkHelper shellLinkHelper = new ShellLinkHelper();
+
+                string targetFilePath = shellLinkHelper.RetrieveTargetPath(fileName);
+                hBitmap = ExtractIconToHBitmap(targetFilePath);
+            }
+            else
+            {
+                hBitmap = GetHBitmap(Path.GetFullPath(fileName), width, height, options);
+            }
 
             try
             {
@@ -119,7 +131,7 @@ namespace Wox.Infrastructure.Image
 
                 HResult hr = ((IShellItemImageFactory)nativeShellItem).GetImage(nativeSize, options, out hBitmap);
 
-            // if extracting image thumbnail and failed, extract shell icon
+                // if extracting image thumbnail and failed, extract shell icon
                 if (options == ThumbnailOptions.ThumbnailOnly && hr == HResult.ExtractionFailed)
                 {
                     hr = ((IShellItemImageFactory)nativeShellItem).GetImage(nativeSize, ThumbnailOptions.IconOnly, out hBitmap);
@@ -146,6 +158,19 @@ namespace Wox.Infrastructure.Image
             }
         }
 
+        public static IntPtr ExtractIconToHBitmap(string fileName)
+        {
+            // Extracts the icon associated with the file
+            using (System.Drawing.Icon thumbnailIcon = System.Drawing.Icon.ExtractAssociatedIcon(fileName))
+            {
+                // Convert to Bitmap
+                using (System.Drawing.Bitmap bitmap = thumbnailIcon.ToBitmap())
+                {
+                    return bitmap.GetHbitmap();
+                }
+            }
+        }
+
         private static bool logReportedAdobeReaderDetected; // Keep track if Adobe Reader detection has been logged yet.
         private static bool logReportedErrorInDetectingAdobeReader; // Keep track if we reported an exception while trying to detect Adobe Reader yet.
         private static bool adobeReaderDetectionLastResult; // The last result when Adobe Reader detection has read the registry.
diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/ShellLinkHelper.cs b/src/modules/launcher/Wox.Infrastructure/ShellLinkHelper.cs
similarity index 97%
rename from src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/ShellLinkHelper.cs
rename to src/modules/launcher/Wox.Infrastructure/ShellLinkHelper.cs
index a664e7fc69..2dd2b24096 100644
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/ShellLinkHelper.cs
+++ b/src/modules/launcher/Wox.Infrastructure/ShellLinkHelper.cs
@@ -7,10 +7,9 @@ using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.ComTypes;
 using System.Text;
 using Accessibility;
-using Microsoft.Plugin.Program.Logger;
 using Wox.Plugin.Logger;
 
-namespace Microsoft.Plugin.Program.Programs
+namespace Wox.Infrastructure
 {
     public class ShellLinkHelper : IShellLinkHelper
     {
@@ -142,7 +141,7 @@ namespace Microsoft.Plugin.Program.Programs
             }
             catch (System.IO.FileNotFoundException ex)
             {
-                ProgramLogger.Exception("Path could not be retrieved", ex, GetType(), path);
+                Log.Exception("Path could not be retrieved", ex, GetType(), path);
                 return string.Empty;
             }
 
@@ -165,7 +164,7 @@ namespace Microsoft.Plugin.Program.Programs
                     ((IShellLinkW)link).GetDescription(buffer, MAX_PATH);
                     Description = buffer.ToString();
                 }
-                catch (Exception e)
+                catch (System.Exception e)
                 {
                     Log.Exception($"Failed to fetch description for {target}, {e.Message}", e, GetType());
                     Description = string.Empty;
diff --git a/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.xaml b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.xaml
index 17b7ac9fab..c3c30cbeb9 100644
--- a/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.xaml
+++ b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.xaml
@@ -217,7 +217,7 @@
                         FontFamily="{ThemeResource SymbolThemeFontFamily}"
                         Visibility="{Binding ElementName=checkBox_regex, Path=IsChecked}">
                         <Button.Flyout>
-                            <Flyout x:Name="RegExFlyout">
+                            <Flyout x:Name="RegExFlyout" ShouldConstrainToRootBounds="False">
                                 <Grid>
                                     <Grid.RowDefinitions>
                                         <RowDefinition Height="28" />
diff --git a/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/MarkdownPreviewHandlerTest.cs b/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/MarkdownPreviewHandlerTest.cs
index 33dfeb29cc..773bfe65b4 100644
--- a/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/MarkdownPreviewHandlerTest.cs
+++ b/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/MarkdownPreviewHandlerTest.cs
@@ -17,7 +17,7 @@ namespace MarkdownPreviewHandlerUnitTests
     public class MarkdownPreviewHandlerTest
     {
         // A long timeout is needed. WebView2 can take a long time to load the first time in some CI systems.
-        private static readonly int HardTimeoutInMilliseconds = 30000;
+        private static readonly int HardTimeoutInMilliseconds = 60000;
         private static readonly int SleepTimeInMilliseconds = 200;
 
         [TestMethod]
diff --git a/src/modules/previewpane/UnitTests-SvgPreviewHandler/SvgPreviewControlTests.cs b/src/modules/previewpane/UnitTests-SvgPreviewHandler/SvgPreviewControlTests.cs
index d6a6f911ff..2636970e31 100644
--- a/src/modules/previewpane/UnitTests-SvgPreviewHandler/SvgPreviewControlTests.cs
+++ b/src/modules/previewpane/UnitTests-SvgPreviewHandler/SvgPreviewControlTests.cs
@@ -4,9 +4,7 @@
 
 using System;
 using System.Drawing;
-using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.ComTypes;
-using System.Text;
 using System.Threading;
 using System.Windows.Forms;
 using Microsoft.PowerToys.PreviewHandler.Svg;
@@ -22,7 +20,7 @@ namespace SvgPreviewHandlerUnitTests
     public class SvgPreviewControlTests
     {
         // A long timeout is needed. WebView2 can take a long time to load the first time in some CI systems.
-        private static readonly int HardTimeoutInMilliseconds = 30000;
+        private static readonly int HardTimeoutInMilliseconds = 60000;
         private static readonly int SleepTimeInMilliseconds = 200;
 
         [TestMethod]
diff --git a/src/settings-ui/Directory.Build.targets b/src/settings-ui/Directory.Build.targets
index 742af06995..d8e2e4e8ce 100644
--- a/src/settings-ui/Directory.Build.targets
+++ b/src/settings-ui/Directory.Build.targets
@@ -1,4 +1,5 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
 
   <Target Name="IncrementalClean" />
 
diff --git a/src/settings-ui/Settings.UI/Helpers/ModuleHelper.cs b/src/settings-ui/Settings.UI/Helpers/ModuleHelper.cs
index b78c118b49..25d5fb4f59 100644
--- a/src/settings-ui/Settings.UI/Helpers/ModuleHelper.cs
+++ b/src/settings-ui/Settings.UI/Helpers/ModuleHelper.cs
@@ -5,6 +5,8 @@
 using global::PowerToys.GPOWrapper;
 using ManagedCommon;
 using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Views;
+using Windows.UI;
 
 namespace Microsoft.PowerToys.Settings.UI.Helpers
 {
@@ -129,5 +131,69 @@ namespace Microsoft.PowerToys.Settings.UI.Helpers
                 default: return GpoRuleConfigured.Unavailable;
             }
         }
+
+        public static Color GetModuleAccentColor(ModuleType moduleType)
+        {
+            return moduleType switch
+            {
+                ModuleType.AlwaysOnTop => Color.FromArgb(255, 74, 196, 242), // #4ac4f2
+                ModuleType.Awake => Color.FromArgb(255, 40, 177, 233), // #28b1e9
+                ModuleType.ColorPicker => Color.FromArgb(255, 7, 129, 211), // #0781d3
+                ModuleType.CropAndLock => Color.FromArgb(255, 32, 166, 228), // #20a6e4
+                ModuleType.EnvironmentVariables => Color.FromArgb(255, 16, 132, 208), // #1084d0
+                ModuleType.FancyZones => Color.FromArgb(255, 65, 209, 247), // #41d1f7
+                ModuleType.FileLocksmith => Color.FromArgb(255, 245, 161, 20), // #f5a114
+                ModuleType.FindMyMouse => Color.FromArgb(255, 104, 109, 112), // #686d70
+                ModuleType.Hosts => Color.FromArgb(255, 16, 132, 208), // #1084d0
+                ModuleType.ImageResizer => Color.FromArgb(255, 85, 207, 248), // #55cff8
+                ModuleType.KeyboardManager => Color.FromArgb(255, 224, 231, 238), // #e0e7ee
+                ModuleType.MouseHighlighter => Color.FromArgb(255, 17, 126, 199), // #117ec7
+                ModuleType.MouseJump => Color.FromArgb(255, 240, 240, 239), // #f0f0ef
+                ModuleType.MousePointerCrosshairs => Color.FromArgb(255, 25, 115, 182), // #1973b6
+                ModuleType.MouseWithoutBorders => Color.FromArgb(255, 31, 164, 227), // #1fa4e3
+                ModuleType.PastePlain => Color.FromArgb(255, 243, 156, 16), // #f39c10
+                ModuleType.Peek => Color.FromArgb(255, 255, 214, 103), // #ffd667
+                ModuleType.PowerRename => Color.FromArgb(255, 43, 186, 243), // #2bbaf3
+                ModuleType.PowerLauncher => Color.FromArgb(255, 51, 191, 240), // #33bff0
+                ModuleType.PowerAccent => Color.FromArgb(255, 84, 89, 92), // #54595c
+                ModuleType.RegistryPreview => Color.FromArgb(255, 17, 80, 138), // #11508a
+                ModuleType.MeasureTool => Color.FromArgb(255, 135, 144, 153), // #879099
+                ModuleType.ShortcutGuide => Color.FromArgb(255, 193, 202, 209), // #c1cad1
+                ModuleType.PowerOCR => Color.FromArgb(255, 24, 153, 224), // #1899e0
+                _ => Color.FromArgb(255, 255, 255, 255), // never called, all values listed above
+            };
+        }
+
+        public static System.Type GetModulePageType(ModuleType moduleType)
+        {
+            return moduleType switch
+            {
+                ModuleType.AlwaysOnTop => typeof(AlwaysOnTopPage),
+                ModuleType.Awake => typeof(AwakePage),
+                ModuleType.ColorPicker => typeof(ColorPickerPage),
+                ModuleType.CropAndLock => typeof(CropAndLockPage),
+                ModuleType.EnvironmentVariables => typeof(EnvironmentVariablesPage),
+                ModuleType.FancyZones => typeof(FancyZonesPage),
+                ModuleType.FileLocksmith => typeof(FileLocksmithPage),
+                ModuleType.FindMyMouse => typeof(MouseUtilsPage),
+                ModuleType.Hosts => typeof(HostsPage),
+                ModuleType.ImageResizer => typeof(ImageResizerPage),
+                ModuleType.KeyboardManager => typeof(KeyboardManagerPage),
+                ModuleType.MouseHighlighter => typeof(MouseUtilsPage),
+                ModuleType.MouseJump => typeof(MouseUtilsPage),
+                ModuleType.MousePointerCrosshairs => typeof(MouseUtilsPage),
+                ModuleType.MouseWithoutBorders => typeof(MouseWithoutBordersPage),
+                ModuleType.PastePlain => typeof(PastePlainPage),
+                ModuleType.Peek => typeof(PeekPage),
+                ModuleType.PowerRename => typeof(PowerRenamePage),
+                ModuleType.PowerLauncher => typeof(PowerLauncherPage),
+                ModuleType.PowerAccent => typeof(PowerAccentPage),
+                ModuleType.RegistryPreview => typeof(RegistryPreviewPage),
+                ModuleType.MeasureTool => typeof(MeasureToolPage),
+                ModuleType.ShortcutGuide => typeof(ShortcutGuidePage),
+                ModuleType.PowerOCR => typeof(PowerOcrPage),
+                _ => typeof(DashboardPage), // never called, all values listed above
+            };
+        }
     }
 }
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/AlphaColorPickerButton.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/AlphaColorPickerButton.xaml
index 0eaf6916b4..7571434778 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/AlphaColorPickerButton.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/AlphaColorPickerButton.xaml
@@ -26,7 +26,7 @@
                 </Border.Background>
             </Border>
             <DropDownButton.Flyout>
-                <Flyout>
+                <Flyout ShouldConstrainToRootBounds="False">
                     <ColorPicker
                         IsAlphaEnabled="True"
                         IsAlphaSliderVisible="True"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorPickerButton.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorPickerButton.xaml
index 29920b778e..cd4d0b6ac3 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorPickerButton.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorPickerButton.xaml
@@ -26,7 +26,7 @@
                 </Border.Background>
             </Border>
             <DropDownButton.Flyout>
-                <Flyout>
+                <Flyout ShouldConstrainToRootBounds="False">
                     <ColorPicker
                         IsAlphaEnabled="False"
                         IsAlphaSliderVisible="False"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Styles/Button.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Styles/Button.xaml
index 4c470915d9..a64117889c 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Styles/Button.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Styles/Button.xaml
@@ -1,22 +1,65 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <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}" />
+    <ResourceDictionary.ThemeDictionaries>
+        <ResourceDictionary x:Key="Default">
+            <StaticResource x:Key="SubtleButtonBackground" ResourceKey="SubtleFillColorTransparent" />
+            <StaticResource x:Key="SubtleButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondary" />
+            <StaticResource x:Key="SubtleButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiary" />
+            <StaticResource x:Key="SubtleButtonBackgroundDisabled" ResourceKey="SubtleFillColorTransparent" />
+
+            <StaticResource x:Key="SubtleButtonBorderBrush" ResourceKey="SubtleFillColorTransparent" />
+            <StaticResource x:Key="SubtleButtonBorderBrushPointerOver" ResourceKey="SubtleFillColorSecondary" />
+            <StaticResource x:Key="SubtleButtonBorderBrushPressed" ResourceKey="SubtleFillColorTertiary" />
+            <StaticResource x:Key="SubtleButtonBorderBrushDisabled" ResourceKey="SubtleFillColorTransparent" />
+
+            <StaticResource x:Key="SubtleButtonForeground" ResourceKey="TextFillColorPrimary" />
+            <StaticResource x:Key="SubtleButtonForegroundPointerOver" ResourceKey="TextFillColorPrimary" />
+            <StaticResource x:Key="SubtleButtonForegroundPressed" ResourceKey="TextFillColorSecondary" />
+            <StaticResource x:Key="SubtleButtonForegroundDisabled" ResourceKey="TextFillColorDisabled" />
+        </ResourceDictionary>
+
+        <ResourceDictionary x:Key="Light">
+            <StaticResource x:Key="SubtleButtonBackground" ResourceKey="SubtleFillColorTransparent" />
+            <StaticResource x:Key="SubtleButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondary" />
+            <StaticResource x:Key="SubtleButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiary" />
+            <StaticResource x:Key="SubtleButtonBackgroundDisabled" ResourceKey="SubtleFillColorTransparent" />
+
+            <StaticResource x:Key="SubtleButtonBorderBrush" ResourceKey="SubtleFillColorTransparent" />
+            <StaticResource x:Key="SubtleButtonBorderBrushPointerOver" ResourceKey="SubtleFillColorSecondary" />
+            <StaticResource x:Key="SubtleButtonBorderBrushPressed" ResourceKey="SubtleFillColorTertiary" />
+            <StaticResource x:Key="SubtleButtonBorderBrushDisabled" ResourceKey="SubtleFillColorTransparent" />
+
+            <StaticResource x:Key="SubtleButtonForeground" ResourceKey="TextFillColorPrimary" />
+            <StaticResource x:Key="SubtleButtonForegroundPointerOver" ResourceKey="TextFillColorPrimary" />
+            <StaticResource x:Key="SubtleButtonForegroundPressed" ResourceKey="TextFillColorSecondary" />
+            <StaticResource x:Key="SubtleButtonForegroundDisabled" ResourceKey="TextFillColorDisabled" />
+        </ResourceDictionary>
+
+        <ResourceDictionary x:Key="HighContrast">
+            <StaticResource x:Key="SubtleButtonBackground" ResourceKey="SystemColorWindowColorBrush" />
+            <StaticResource x:Key="SubtleButtonBackgroundPointerOver" ResourceKey="SystemColorHighlightTextColorBrush" />
+            <StaticResource x:Key="SubtleButtonBackgroundPressed" ResourceKey="SystemColorWindowColorBrush" />
+            <StaticResource x:Key="SubtleButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
+
+            <StaticResource x:Key="SubtleButtonBorderBrush" ResourceKey="SystemColorWindowColorBrush" />
+            <StaticResource x:Key="SubtleButtonBorderBrushPointerOver" ResourceKey="SystemColorHighlightColorBrush" />
+            <StaticResource x:Key="SubtleButtonBorderBrushPressed" ResourceKey="SystemColorHighlightColorBrush" />
+            <StaticResource x:Key="SubtleButtonBorderBrushDisabled" ResourceKey="SystemColorGrayTextColor" />
+
+            <StaticResource x:Key="SubtleButtonForeground" ResourceKey="SystemColorButtonTextColorBrush" />
+            <StaticResource x:Key="SubtleButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
+            <StaticResource x:Key="SubtleButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
+            <StaticResource x:Key="SubtleButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+        </ResourceDictionary>
+
+    </ResourceDictionary.ThemeDictionaries>
 
     <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="BorderBrush" Value="{ThemeResource SubtleButtonBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{ThemeResource ButtonBorderThemeThickness}" />
         <Setter Property="Padding" Value="{StaticResource ButtonPadding}" />
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="VerticalAlignment" Value="Center" />
@@ -43,11 +86,11 @@
                         Content="{TemplateBinding Content}"
                         ContentTemplate="{TemplateBinding ContentTemplate}"
                         ContentTransitions="{TemplateBinding ContentTransitions}"
-                        CornerRadius="{TemplateBinding CornerRadius}">
+                        CornerRadius="{TemplateBinding CornerRadius}"
+                        Foreground="{TemplateBinding Foreground}">
                         <ContentPresenter.BackgroundTransition>
                             <BrushTransition Duration="0:0:0.083" />
                         </ContentPresenter.BackgroundTransition>
-
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualState x:Name="Normal" />
@@ -56,6 +99,9 @@
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBackgroundPointerOver}" />
                                         </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundPointerOver}" />
                                         </ObjectAnimationUsingKeyFrames>
@@ -64,12 +110,14 @@
                                         <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="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundPressed}" />
                                         </ObjectAnimationUsingKeyFrames>
@@ -78,12 +126,14 @@
                                         <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="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundDisabled}" />
                                         </ObjectAnimationUsingKeyFrames>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Themes/Colors.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Themes/Colors.xaml
index 9bcb4de2da..4655f80971 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Themes/Colors.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Themes/Colors.xaml
@@ -14,8 +14,8 @@
         </ResourceDictionary>
 
         <ResourceDictionary x:Key="HighContrast">
-            <SolidColorBrush x:Key="InfoBarInformationalSeverityBackgroundBrush" Color="#FF34424d" />
-            <SolidColorBrush x:Key="SolidBackgroundBrush" Color="Black" />
+            <SolidColorBrush x:Key="InfoBarInformationalSeverityBackgroundBrush" Color="{StaticResource SystemColorWindowColor}" />
+            <SolidColorBrush x:Key="SolidBackgroundBrush" Color="{StaticResource SystemColorWindowTextColor}" />
             <Color x:Key="InfoBarInformationalSeverityIconBackground">#FF5fb2f2</Color>
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml
index cac07b5bfd..6e9c34d613 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml
@@ -1,4 +1,4 @@
-<Page
+<Page
     x:Class="Microsoft.PowerToys.Settings.UI.Views.DashboardPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -101,7 +101,10 @@
         <DataTemplate x:Key="ModuleItemKBMTemplate" x:DataType="viewmodels:DashboardModuleKBMItem">
             <Button x:Uid="DashboardKBMShowMappingsButton" HorizontalAlignment="Stretch">
                 <Button.Flyout>
-                    <Flyout x:Name="DetailsFlyout" Placement="Bottom">
+                    <Flyout
+                        x:Name="DetailsFlyout"
+                        Placement="Bottom"
+                        ShouldConstrainToRootBounds="False">
                         <StackPanel Orientation="Vertical" Spacing="4">
                             <ItemsControl ItemsSource="{x:Bind Path=RemapKeys, Mode=OneWay}">
                                 <ItemsControl.ItemsPanel>
@@ -300,77 +303,86 @@
                     </ItemsRepeater.Layout>
                     <ItemsRepeater.ItemTemplate>
                         <DataTemplate x:DataType="viewmodels:DashboardListItem">
-                            <Grid
-                                Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-                                BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-                                BorderThickness="1"
-                                CornerRadius="{StaticResource OverlayCornerRadius}"
-                                RowSpacing="0">
-                                <Grid.RowDefinitions>
-                                    <RowDefinition />
-                                    <RowDefinition />
-                                </Grid.RowDefinitions>
-                                <Border Grid.RowSpan="2" Opacity="0.05">
-                                    <Border.Background>
-                                        <LinearGradientBrush StartPoint="0,0" EndPoint="1,3">
-                                            <GradientStop Offset="0.5" Color="{x:Bind AccentColor, Mode=OneWay}" />
-                                            <GradientStop Offset="0.9" Color="Transparent" />
-                                        </LinearGradientBrush>
-                                    </Border.Background>
-                                </Border>
-                                <Grid Margin="16,8,16,0" ColumnSpacing="12">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto" />
-                                        <ColumnDefinition Width="*" />
-                                        <ColumnDefinition Width="Auto" />
-                                        <ColumnDefinition Width="Auto" />
-                                    </Grid.ColumnDefinitions>
-                                    <Image Width="20" Margin="0,0,0,0">
-                                        <Image.Source>
-                                            <BitmapImage UriSource="{x:Bind Icon, Mode=OneWay}" />
-                                        </Image.Source>
-                                    </Image>
-                                    <TextBlock
-                                        Grid.Column="1"
-                                        VerticalAlignment="Center"
-                                        FontWeight="SemiBold"
-                                        Text="{x:Bind Label, Mode=OneWay}"
-                                        TextTrimming="CharacterEllipsis" />
-                                    <FontIcon
-                                        Grid.Column="2"
-                                        Width="20"
-                                        Margin="0,0,-12,0"
-                                        FontSize="16"
-                                        Glyph="&#xE72E;"
-                                        Visibility="{x:Bind IsLocked, Converter={StaticResource BoolToInvertedVisibilityConverter}, ConverterParameter=True, Mode=OneWay}">
-                                        <ToolTipService.ToolTip>
-                                            <TextBlock x:Uid="GPO_IsSettingForcedText" TextWrapping="WrapWholeWords" />
-                                        </ToolTipService.ToolTip>
-                                    </FontIcon>
-                                    <ToggleSwitch
-                                        Grid.Column="3"
-                                        Margin="0,-2,0,0"
-                                        HorizontalAlignment="Right"
-                                        IsEnabled="{x:Bind IsLocked, Converter={StaticResource BoolNegationConverter}, ConverterParameter=True, Mode=OneWay}"
-                                        IsOn="{x:Bind IsEnabled, Mode=TwoWay}"
-                                        OffContent=""
-                                        OnContent=""
-                                        Style="{StaticResource RightAlignedCompactToggleSwitchStyle}" />
-                                </Grid>
+                            <Button
+                                Padding="0"
+                                HorizontalAlignment="Stretch"
+                                HorizontalContentAlignment="Stretch"
+                                Background="Transparent"
+                                BorderThickness="0"
+                                Click="DashboardListItemClick"
+                                Tag="{x:Bind Tag, Mode=OneWay}">
+                                <Grid
+                                    Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                                    BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                                    BorderThickness="1"
+                                    CornerRadius="{StaticResource OverlayCornerRadius}"
+                                    RowSpacing="0">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition />
+                                        <RowDefinition />
+                                    </Grid.RowDefinitions>
+                                    <Border Grid.RowSpan="2" Opacity="0.05">
+                                        <Border.Background>
+                                            <LinearGradientBrush StartPoint="0,0" EndPoint="1,3">
+                                                <GradientStop Offset="0.5" Color="{x:Bind AccentColor, Mode=OneWay}" />
+                                                <GradientStop Offset="0.9" Color="Transparent" />
+                                            </LinearGradientBrush>
+                                        </Border.Background>
+                                    </Border>
+                                    <Grid Margin="16,8,16,0" ColumnSpacing="12">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="Auto" />
+                                        </Grid.ColumnDefinitions>
+                                        <Image Width="20" Margin="0,0,0,0">
+                                            <Image.Source>
+                                                <BitmapImage UriSource="{x:Bind Icon, Mode=OneWay}" />
+                                            </Image.Source>
+                                        </Image>
+                                        <TextBlock
+                                            Grid.Column="1"
+                                            VerticalAlignment="Center"
+                                            FontWeight="SemiBold"
+                                            Text="{x:Bind Label, Mode=OneWay}"
+                                            TextTrimming="CharacterEllipsis" />
+                                        <FontIcon
+                                            Grid.Column="2"
+                                            Width="20"
+                                            Margin="0,0,-12,0"
+                                            FontSize="16"
+                                            Glyph="&#xE72E;"
+                                            Visibility="{x:Bind IsLocked, Converter={StaticResource BoolToInvertedVisibilityConverter}, ConverterParameter=True, Mode=OneWay}">
+                                            <ToolTipService.ToolTip>
+                                                <TextBlock x:Uid="GPO_IsSettingForcedText" TextWrapping="WrapWholeWords" />
+                                            </ToolTipService.ToolTip>
+                                        </FontIcon>
+                                        <ToggleSwitch
+                                            Grid.Column="3"
+                                            Margin="0,-2,0,0"
+                                            HorizontalAlignment="Right"
+                                            IsEnabled="{x:Bind IsLocked, Converter={StaticResource BoolNegationConverter}, ConverterParameter=True, Mode=OneWay}"
+                                            IsOn="{x:Bind IsEnabled, Mode=TwoWay}"
+                                            OffContent=""
+                                            OnContent=""
+                                            Style="{StaticResource RightAlignedCompactToggleSwitchStyle}" />
+                                    </Grid>
 
-                                <ItemsControl
-                                    Grid.Row="1"
-                                    Margin="16,8,16,16"
-                                    ItemTemplateSelector="{StaticResource ModuleItemTemplateSelector}"
-                                    ItemsSource="{x:Bind DashboardModuleItems, Mode=OneWay}"
-                                    Visibility="{x:Bind IsEnabled, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
-                                    <ItemsControl.ItemsPanel>
-                                        <ItemsPanelTemplate>
-                                            <StackPanel Spacing="4" />
-                                        </ItemsPanelTemplate>
-                                    </ItemsControl.ItemsPanel>
-                                </ItemsControl>
-                            </Grid>
+                                    <ItemsControl
+                                        Grid.Row="1"
+                                        Margin="16,8,16,16"
+                                        ItemTemplateSelector="{StaticResource ModuleItemTemplateSelector}"
+                                        ItemsSource="{x:Bind DashboardModuleItems, Mode=OneWay}"
+                                        Visibility="{x:Bind IsEnabled, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
+                                        <ItemsControl.ItemsPanel>
+                                            <ItemsPanelTemplate>
+                                                <StackPanel Spacing="4" />
+                                            </ItemsPanelTemplate>
+                                        </ItemsControl.ItemsPanel>
+                                    </ItemsControl>
+                                </Grid>
+                            </Button>
                         </DataTemplate>
                     </ItemsRepeater.ItemTemplate>
                 </ItemsRepeater>
@@ -389,53 +401,62 @@
                     </ItemsRepeater.Layout>
                     <ItemsRepeater.ItemTemplate>
                         <DataTemplate x:DataType="viewmodels:DashboardListItem">
-                            <Grid
-                                Padding="16,12"
-                                Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-                                BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-                                BorderThickness="1"
-                                CornerRadius="{StaticResource OverlayCornerRadius}"
-                                RowSpacing="12">
-                                <Grid ColumnSpacing="12">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto" />
-                                        <ColumnDefinition Width="*" />
-                                        <ColumnDefinition Width="Auto" />
-                                        <ColumnDefinition Width="Auto" />
-                                    </Grid.ColumnDefinitions>
-                                    <Image Width="20">
-                                        <Image.Source>
-                                            <BitmapImage UriSource="{x:Bind Icon, Mode=OneWay}" />
-                                        </Image.Source>
-                                    </Image>
-                                    <TextBlock
-                                        Grid.Column="1"
-                                        VerticalAlignment="Center"
-                                        FontWeight="SemiBold"
-                                        Text="{x:Bind Label, Mode=OneWay}"
-                                        TextTrimming="CharacterEllipsis" />
-                                    <FontIcon
-                                        Grid.Column="2"
-                                        Width="20"
-                                        Margin="0,0,-12,0"
-                                        FontSize="16"
-                                        Glyph="&#xE72E;"
-                                        Visibility="{x:Bind IsLocked, Converter={StaticResource BoolToInvertedVisibilityConverter}, ConverterParameter=True, Mode=OneWay}">
-                                        <ToolTipService.ToolTip>
-                                            <TextBlock x:Uid="GPO_IsSettingForcedText" TextWrapping="WrapWholeWords" />
-                                        </ToolTipService.ToolTip>
-                                    </FontIcon>
-                                    <ToggleSwitch
-                                        Grid.Column="3"
-                                        Margin="0,-2,0,0"
-                                        HorizontalAlignment="Right"
-                                        IsEnabled="{x:Bind IsLocked, Converter={StaticResource BoolNegationConverter}, ConverterParameter=True, Mode=OneWay}"
-                                        IsOn="{x:Bind IsEnabled, Mode=TwoWay}"
-                                        OffContent=""
-                                        OnContent=""
-                                        Style="{StaticResource RightAlignedCompactToggleSwitchStyle}" />
+                            <Button
+                                Padding="0"
+                                HorizontalAlignment="Stretch"
+                                HorizontalContentAlignment="Stretch"
+                                Background="Transparent"
+                                BorderThickness="0"
+                                Click="DashboardListItemClick"
+                                Tag="{x:Bind Tag, Mode=OneWay}">
+                                <Grid
+                                    Padding="16,12"
+                                    Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                                    BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                                    BorderThickness="1"
+                                    CornerRadius="{StaticResource OverlayCornerRadius}"
+                                    RowSpacing="12">
+                                    <Grid ColumnSpacing="12">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="Auto" />
+                                        </Grid.ColumnDefinitions>
+                                        <Image Width="20">
+                                            <Image.Source>
+                                                <BitmapImage UriSource="{x:Bind Icon, Mode=OneWay}" />
+                                            </Image.Source>
+                                        </Image>
+                                        <TextBlock
+                                            Grid.Column="1"
+                                            VerticalAlignment="Center"
+                                            FontWeight="SemiBold"
+                                            Text="{x:Bind Label, Mode=OneWay}"
+                                            TextTrimming="CharacterEllipsis" />
+                                        <FontIcon
+                                            Grid.Column="2"
+                                            Width="20"
+                                            Margin="0,0,-12,0"
+                                            FontSize="16"
+                                            Glyph="&#xE72E;"
+                                            Visibility="{x:Bind IsLocked, Converter={StaticResource BoolToInvertedVisibilityConverter}, ConverterParameter=True, Mode=OneWay}">
+                                            <ToolTipService.ToolTip>
+                                                <TextBlock x:Uid="GPO_IsSettingForcedText" TextWrapping="WrapWholeWords" />
+                                            </ToolTipService.ToolTip>
+                                        </FontIcon>
+                                        <ToggleSwitch
+                                            Grid.Column="3"
+                                            Margin="0,-2,0,0"
+                                            HorizontalAlignment="Right"
+                                            IsEnabled="{x:Bind IsLocked, Converter={StaticResource BoolNegationConverter}, ConverterParameter=True, Mode=OneWay}"
+                                            IsOn="{x:Bind IsEnabled, Mode=TwoWay}"
+                                            OffContent=""
+                                            OnContent=""
+                                            Style="{StaticResource RightAlignedCompactToggleSwitchStyle}" />
+                                    </Grid>
                                 </Grid>
-                            </Grid>
+                            </Button>
                         </DataTemplate>
                     </ItemsRepeater.ItemTemplate>
                 </ItemsRepeater>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml.cs
index 77ffbff1ab..4130f94f8a 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml.cs
@@ -49,5 +49,10 @@ namespace Microsoft.PowerToys.Settings.UI.Views
         {
             ViewModel.SWVersionButtonClicked();
         }
+
+        private void DashboardListItemClick(object sender, RoutedEventArgs e)
+        {
+            ViewModel.DashboardListItemClick(sender);
+        }
     }
 }
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
index 07e415dd14..dd21099ba4 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
@@ -236,17 +236,18 @@
                         </StackPanel>
                         <controls:SettingsExpander.Items>
                             <controls:SettingsCard x:Uid="General_SettingsBackupAndRestoreLocationText">
-                                <StackPanel
-                                    HorizontalAlignment="Right"
-                                    Orientation="Horizontal"
-                                    Spacing="8">
+                                <Grid ColumnSpacing="8">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*" />
+                                        <ColumnDefinition Width="Auto" />
+                                    </Grid.ColumnDefinitions>
                                     <TextBlock
                                         x:Name="pathTextBlock"
                                         VerticalAlignment="Center"
                                         Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                                         IsTextSelectionEnabled="True"
                                         Text="{x:Bind Mode=TwoWay, Path=ViewModel.SettingsBackupAndRestoreDir}"
-                                        TextTrimming="CharacterEllipsis">
+                                        TextWrapping="Wrap">
                                         <ToolTipService.ToolTip>
                                             <ToolTip IsEnabled="{Binding ElementName=pathTextBlock, Path=IsTextTrimmed}">
                                                 <TextBlock Text="{x:Bind Mode=TwoWay, Path=ViewModel.SettingsBackupAndRestoreDir}" />
@@ -254,6 +255,7 @@
                                         </ToolTipService.ToolTip>
                                     </TextBlock>
                                     <Button
+                                        Grid.Column="1"
                                         Command="{Binding SelectSettingBackupDirEventHandler}"
                                         Content="&#xe8da;"
                                         FontFamily="{ThemeResource SymbolThemeFontFamily}">
@@ -263,15 +265,18 @@
                                             </ToolTip>
                                         </ToolTipService.ToolTip>
                                     </Button>
-                                </StackPanel>
+                                </Grid>
                             </controls:SettingsCard>
                             <controls:SettingsCard
                                 x:Uid="General_SettingsBackupAndRestoreStatusInfo"
                                 HorizontalContentAlignment="Left"
                                 ContentAlignment="Vertical">
-                                <Grid Margin="0,0,0,6" ColumnSpacing="8">
+                                <Grid
+                                    Margin="0,0,0,6"
+                                    ColumnSpacing="36"
+                                    RowSpacing="4">
                                     <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto" MinWidth="{StaticResource SettingActionControlMinWidth}" />
+                                        <ColumnDefinition Width="Auto" />
                                         <ColumnDefinition Width="*" />
                                     </Grid.ColumnDefinitions>
                                     <Grid.RowDefinitions>
@@ -281,7 +286,10 @@
                                         <RowDefinition Height="Auto" />
                                     </Grid.RowDefinitions>
                                     <TextBlock x:Uid="General_SettingsBackupInfo_StatusHeader" />
-                                    <TextBlock Grid.Column="1" Foreground="{ThemeResource TextFillColorSecondaryBrush}">
+                                    <TextBlock
+                                        Grid.Column="1"
+                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                        TextWrapping="WrapWholeWords">
                                         <Run Text="{Binding CurrentSettingMatchText, Mode=OneWay}" />
                                         <Hyperlink Click="UpdateBackupAndRestoreStatusText" TextDecorations="Underline">
                                             <Run x:Uid="General_SettingsBackupAndRestore_LinkRefresh" />
@@ -293,20 +301,23 @@
                                         Grid.Row="1"
                                         Grid.Column="1"
                                         Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                        Text="{Binding LastSettingsBackupFileName, Mode=OneWay}" />
+                                        Text="{Binding LastSettingsBackupFileName, Mode=OneWay}"
+                                        TextWrapping="WrapWholeWords" />
 
                                     <TextBlock x:Uid="General_SettingsBackupInfo_SourceHeader" Grid.Row="2" />
                                     <TextBlock
                                         Grid.Row="2"
                                         Grid.Column="1"
                                         Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                        Text="{Binding LastSettingsBackupSource, Mode=OneWay}" />
+                                        Text="{Binding LastSettingsBackupSource, Mode=OneWay}"
+                                        TextWrapping="WrapWholeWords" />
                                     <TextBlock x:Uid="General_SettingsBackupInfo_DateHeader" Grid.Row="3" />
                                     <TextBlock
                                         Grid.Row="3"
                                         Grid.Column="1"
                                         Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                        Text="{Binding LastSettingsBackupDate, Mode=OneWay}" />
+                                        Text="{Binding LastSettingsBackupDate, Mode=OneWay}"
+                                        TextWrapping="WrapWholeWords" />
                                 </Grid>
                             </controls:SettingsCard>
                         </controls:SettingsExpander.Items>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml
index f59d888a57..775f7da4cc 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml
@@ -77,7 +77,6 @@
                                                 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}}" />
@@ -89,7 +88,6 @@
                                                 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>
@@ -110,8 +108,8 @@
                                                 <TextBlock x:Uid="EditTooltip" />
                                             </ToolTipService.ToolTip>
                                             <Button.Flyout>
-                                                <Flyout x:Uid="ImageResizer_EditSize">
-                                                    <StackPanel Margin="0,12,0,0" Spacing="16">
+                                                <Flyout x:Uid="ImageResizer_EditSize" ShouldConstrainToRootBounds="False">
+                                                    <StackPanel Spacing="16">
                                                         <TextBox
                                                             x:Uid="ImageResizer_Name"
                                                             Width="240"
@@ -148,7 +146,6 @@
                                                         <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" />
@@ -235,7 +232,7 @@
                                 FontFamily="{ThemeResource SymbolThemeFontFamily}"
                                 Style="{StaticResource SubtleButtonStyle}">
                                 <Button.Flyout>
-                                    <Flyout>
+                                    <Flyout ShouldConstrainToRootBounds="False">
                                         <TextBlock x:Name="FileFormatTextBlock">
                                             <Run x:Uid="ImageResizer_FileFormatDescription" />
                                             <LineBreak />
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml
index ed162dc073..96c5848889 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml
@@ -288,8 +288,8 @@
                                     <TextBlock x:Uid="EditTooltip" />
                                 </ToolTipService.ToolTip>
                                 <Button.Flyout>
-                                    <Flyout x:Uid="MouseJumpThumbnailSize_Edit">
-                                        <StackPanel Margin="0,12,0,0" Spacing="16">
+                                    <Flyout x:Uid="MouseJumpThumbnailSize_Edit" ShouldConstrainToRootBounds="False">
+                                        <StackPanel Spacing="16">
                                             <NumberBox
                                                 x:Uid="MouseUtils_MouseJump_ThumbnailSize_Edit_Width"
                                                 Width="140"
diff --git a/src/settings-ui/Settings.UI/ViewModels/DashboardViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/DashboardViewModel.cs
index 75ac631c75..73e6588b0f 100644
--- a/src/settings-ui/Settings.UI/ViewModels/DashboardViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/DashboardViewModel.cs
@@ -78,7 +78,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                 IsLocked = gpo == GpoRuleConfigured.Enabled || gpo == GpoRuleConfigured.Disabled,
                 Icon = ModuleHelper.GetModuleTypeFluentIconName(moduleType),
                 EnabledChangedCallback = EnabledChangedOnUI,
-                AccentColor = GetModuleAccentColor(moduleType),
+                AccentColor = ModuleHelper.GetModuleAccentColor(moduleType),
                 DashboardModuleItems = GetModuleItems(moduleType),
             });
             if (moduleType == ModuleType.KeyboardManager && gpo != GpoRuleConfigured.Disabled)
@@ -88,38 +88,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             }
         }
 
-        private Color GetModuleAccentColor(ModuleType moduleType)
-        {
-            return moduleType switch
-            {
-                ModuleType.AlwaysOnTop => Color.FromArgb(255, 74, 196, 242), // #4ac4f2
-                ModuleType.Awake => Color.FromArgb(255, 40, 177, 233), // #28b1e9
-                ModuleType.ColorPicker => Color.FromArgb(255, 7, 129, 211), // #0781d3
-                ModuleType.CropAndLock => Color.FromArgb(255, 32, 166, 228), // #20a6e4
-                ModuleType.EnvironmentVariables => Color.FromArgb(255, 16, 132, 208), // #1084d0
-                ModuleType.FancyZones => Color.FromArgb(255, 65, 209, 247), // #41d1f7
-                ModuleType.FileLocksmith => Color.FromArgb(255, 245, 161, 20), // #f5a114
-                ModuleType.FindMyMouse => Color.FromArgb(255, 104, 109, 112), // #686d70
-                ModuleType.Hosts => Color.FromArgb(255, 16, 132, 208), // #1084d0
-                ModuleType.ImageResizer => Color.FromArgb(255, 85, 207, 248), // #55cff8
-                ModuleType.KeyboardManager => Color.FromArgb(255, 224, 231, 238), // #e0e7ee
-                ModuleType.MouseHighlighter => Color.FromArgb(255, 17, 126, 199), // #117ec7
-                ModuleType.MouseJump => Color.FromArgb(255, 240, 240, 239), // #f0f0ef
-                ModuleType.MousePointerCrosshairs => Color.FromArgb(255, 25, 115, 182), // #1973b6
-                ModuleType.MouseWithoutBorders => Color.FromArgb(255, 31, 164, 227), // #1fa4e3
-                ModuleType.PastePlain => Color.FromArgb(255, 243, 156, 16), // #f39c10
-                ModuleType.Peek => Color.FromArgb(255, 255, 214, 103), // #ffd667
-                ModuleType.PowerRename => Color.FromArgb(255, 43, 186, 243), // #2bbaf3
-                ModuleType.PowerLauncher => Color.FromArgb(255, 51, 191, 240), // #33bff0
-                ModuleType.PowerAccent => Color.FromArgb(255, 84, 89, 92), // #54595c
-                ModuleType.RegistryPreview => Color.FromArgb(255, 17, 80, 138), // #11508a
-                ModuleType.MeasureTool => Color.FromArgb(255, 135, 144, 153), // #879099
-                ModuleType.ShortcutGuide => Color.FromArgb(255, 193, 202, 209), // #c1cad1
-                ModuleType.PowerOCR => Color.FromArgb(255, 24, 153, 224), // #1899e0
-                _ => Color.FromArgb(255, 255, 255, 255), // never called, all values listed above
-            };
-        }
-
         private void LoadKBMSettingsFromJson()
         {
             KeyboardManagerProfile kbmProfile = GetKBMProfile();
@@ -528,5 +496,23 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             var actionName = "Launch";
             SendConfigMSG("{\"action\":{\"RegistryPreview\":{\"action_name\":\"" + actionName + "\", \"value\":\"\"}}}");
         }
+
+        internal void DashboardListItemClick(object sender)
+        {
+            Button button = sender as Button;
+            if (button == null)
+            {
+                return;
+            }
+
+            if (!(button.Tag is ModuleType))
+            {
+                return;
+            }
+
+            ModuleType moduleType = (ModuleType)button.Tag;
+
+            NavigationService.Navigate(ModuleHelper.GetModulePageType(moduleType));
+        }
     }
 }