From a02a95896ebb9d4b1cdd2bf2501a7d33b9f92b7f Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sat, 1 Jun 2024 03:08:14 +0900
Subject: [PATCH 1/8] - Adjust Accent Button Style

---
 .../Resources/CustomControlTemplate.xaml      | 59 +++++++++++++++++++
 Flow.Launcher/Resources/Dark.xaml             | 15 +++--
 Flow.Launcher/Resources/Light.xaml            |  6 +-
 .../SettingPages/Views/SettingsPaneAbout.xaml | 20 ++++---
 4 files changed, 86 insertions(+), 14 deletions(-)

diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index a53e61f8c..b3a26ab0a 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -1642,6 +1642,65 @@
 
     <Style BasedOn="{StaticResource DefaultButtonStyle}" TargetType="Button" />
 
+    <Style
+        x:Key="AccentButtonStyle"
+        BasedOn="{StaticResource DefaultButtonStyle}"
+        TargetType="Button">
+        <Setter Property="Foreground" Value="{DynamicResource AccentButtonForeground}" />
+        <Setter Property="Background" Value="{DynamicResource AccentButtonBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrush}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+
+                    <Border
+                        x:Name="Background"
+                        Background="{TemplateBinding Background}"
+                        CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}"
+                        SnapsToDevicePixels="True">
+                        <Border x:Name="Overlay">
+                            <Border
+                                x:Name="Border"
+                                Margin="1"
+                                Padding="{TemplateBinding Padding}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="0 0 0 1"
+                                CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}">
+                                <ContentPresenter
+                                    x:Name="ContentPresenter"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    Focusable="False"
+                                    RecognizesAccessKey="True"
+                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                    TextElement.Foreground="{TemplateBinding Foreground}" />
+                            </Border>
+                        </Border>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Background" Property="Background" Value="{DynamicResource AccentButtonBackgroundPointerOver}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushPointerOver}" />
+                            <Setter TargetName="Overlay" Property="Background" Value="{DynamicResource AccentButtonBorderBGPointerOver}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource AccentButtonForegroundPointerOver}" />
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="Background" Property="Background" Value="{DynamicResource AccentButtonBackgroundPressed}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushPressed}" />
+                            <Setter TargetName="Overlay" Property="Background" Value="{DynamicResource AccentButtonBorderBGPressed}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource AccentButtonForegroundPressed}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="Background" Property="Background" Value="{DynamicResource AccentButtonBackgroundDisabled}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushDisabled}" />
+                            <Setter TargetName="Overlay" Property="Background" Value="transparent" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource AccentButtonForegroundDisabled}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
     <!--  - Custom Toggle Switch from modern wpf for left label  -->
     <system:TimeSpan x:Key="RepositionDelay">0:0:0.033</system:TimeSpan>
diff --git a/Flow.Launcher/Resources/Dark.xaml b/Flow.Launcher/Resources/Dark.xaml
index a910108e8..2cdec3844 100644
--- a/Flow.Launcher/Resources/Dark.xaml
+++ b/Flow.Launcher/Resources/Dark.xaml
@@ -1605,18 +1605,23 @@
 
     <!--  Resources for AccentButtonStyle  -->
     <m:StaticResource x:Key="AccentButtonBackground" ResourceKey="SystemAccentColorLight2Brush" />
-    <m:StaticResource x:Key="AccentButtonBackgroundPointerOver" ResourceKey="SystemAccentColorLight1Brush" />
-    <m:StaticResource x:Key="AccentButtonBackgroundPressed" ResourceKey="SystemAccentColorDark1Brush" />
+    <m:StaticResource x:Key="AccentButtonBackgroundPointerOver" ResourceKey="SystemAccentColorLight2Brush" />
+    <m:StaticResource x:Key="AccentButtonBackgroundPressed" ResourceKey="SystemAccentColorLight2Brush" />
     <m:StaticResource x:Key="AccentButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
-    <m:StaticResource x:Key="AccentButtonForeground" ResourceKey="Color01B" />
-    <m:StaticResource x:Key="AccentButtonForegroundPointerOver" ResourceKey="Color01B" />
-    <m:StaticResource x:Key="AccentButtonForegroundPressed" ResourceKey="Color23B" />
+    <m:StaticResource x:Key="AccentButtonForeground" ResourceKey="SystemControlForegroundAltHighBrush" />
+    <m:StaticResource x:Key="AccentButtonForegroundPointerOver" ResourceKey="SystemControlForegroundAltMediumHighBrush" />
+    <m:StaticResource x:Key="AccentButtonForegroundPressed" ResourceKey="SystemControlForegroundListLowBrush" />
     <m:StaticResource x:Key="AccentButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
     <m:StaticResource x:Key="AccentButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
     <m:StaticResource x:Key="AccentButtonBorderBrushPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
     <m:StaticResource x:Key="AccentButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="AccentButtonBorderBGPointerOver" ResourceKey="AccentButtonOverlayPointerOver" />
+    <m:StaticResource x:Key="AccentButtonBorderBGPressed" ResourceKey="AccentButtonOverlayPressed" />
     <m:StaticResource x:Key="AccentButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
 
+    <SolidColorBrush x:Key="AccentButtonOverlayPointerOver" Color="#32555555" />
+    <SolidColorBrush x:Key="AccentButtonOverlayPressed" Color="#52555555" />
+
     <sys:Boolean x:Key="UseSystemFocusVisuals">True</sys:Boolean>
     <sys:Boolean x:Key="IsApplicationFocusVisualKindReveal">False</sys:Boolean>
 
diff --git a/Flow.Launcher/Resources/Light.xaml b/Flow.Launcher/Resources/Light.xaml
index 906430343..715621aaf 100644
--- a/Flow.Launcher/Resources/Light.xaml
+++ b/Flow.Launcher/Resources/Light.xaml
@@ -1608,9 +1608,11 @@
     <m:StaticResource x:Key="AccentButtonForegroundPointerOver" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
     <m:StaticResource x:Key="AccentButtonForegroundPressed" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
     <m:StaticResource x:Key="AccentButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
-    <m:StaticResource x:Key="AccentButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
-    <m:StaticResource x:Key="AccentButtonBorderBrushPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="AccentButtonBorderBrush" ResourceKey="SystemAccentColorDark2Brush" />
+    <m:StaticResource x:Key="AccentButtonBorderBrushPointerOver" ResourceKey="SystemAccentColorDark2Brush" />
     <m:StaticResource x:Key="AccentButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+    <m:StaticResource x:Key="AccentButtonBorderBGPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
+    <m:StaticResource x:Key="AccentButtonBorderBGPressed" ResourceKey="SystemControlForegroundTransparentBrush" />
     <m:StaticResource x:Key="AccentButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
 
     <sys:Boolean x:Key="UseSystemFocusVisuals">True</sys:Boolean>
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
index 15afd7741..e7e1b8757 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
@@ -43,7 +43,7 @@
                             TextDecorations="None">
                             <TextBlock
                                 Padding="10 5"
-                                Foreground="White"
+                                Foreground="{StaticResource SystemControlForegroundAltHighBrush}"
                                 Text="{DynamicResource BecomeASponsor}" />
                         </Hyperlink>
                     </Button>
@@ -51,7 +51,7 @@
             </cc:Card>
 
             <cc:Card Title="{DynamicResource releaseNotes}" Icon="&#xe8fd;">
-                <cc:HyperLink Uri="{Binding ReleaseNotes}" Text="{DynamicResource releaseNotes}" />
+                <cc:HyperLink Text="{DynamicResource releaseNotes}" Uri="{Binding ReleaseNotes}" />
             </cc:Card>
 
             <cc:Card
@@ -59,15 +59,21 @@
                 Margin="0 14 0 0"
                 Icon="&#xeb41;">
                 <StackPanel Orientation="Horizontal">
-                    <cc:HyperLink Margin="0 0 12 0" Uri="{Binding Website}" Text="{DynamicResource website}" />
-                    <cc:HyperLink Uri="{Binding Github}" Text="{DynamicResource github}" />
+                    <cc:HyperLink
+                        Margin="0 0 12 0"
+                        Text="{DynamicResource website}"
+                        Uri="{Binding Website}" />
+                    <cc:HyperLink Text="{DynamicResource github}" Uri="{Binding Github}" />
                 </StackPanel>
             </cc:Card>
 
             <cc:Card Title="{DynamicResource documentation}" Icon="&#xe82f;">
                 <StackPanel Orientation="Horizontal">
-                    <cc:HyperLink Margin="0 0 12 0" Uri="{Binding Documentation}" Text="{DynamicResource documentation}" />
-                    <cc:HyperLink Uri="{Binding Website}" Text="{DynamicResource website}" />
+                    <cc:HyperLink
+                        Margin="0 0 12 0"
+                        Text="{DynamicResource documentation}"
+                        Uri="{Binding Documentation}" />
+                    <cc:HyperLink Text="{DynamicResource website}" Uri="{Binding Website}" />
                 </StackPanel>
             </cc:Card>
 
@@ -75,7 +81,7 @@
                 Title="{DynamicResource icons}"
                 Margin="0 14 0 0"
                 Icon="&#xE8FE;">
-                <cc:HyperLink Uri="https://icons8.com/" Text="icons8.com" />
+                <cc:HyperLink Text="icons8.com" Uri="https://icons8.com/" />
             </cc:Card>
 
             <cc:Card Title="{DynamicResource devtool}" Icon="&#xf12b;">

From 41b9068dd7229b9b08d9416f246687f30eb8d5d7 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sat, 1 Jun 2024 04:17:05 +0900
Subject: [PATCH 2/8] - Adjust item margins - Add subtext for "hideOnStartup"

---
 Flow.Launcher/Languages/en.xaml               |  1 +
 .../Views/SettingsPaneGeneral.xaml            | 24 +++++++++++--------
 .../SettingPages/Views/SettingsPaneTheme.xaml | 17 +++++++------
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 28b516757..50096b5c1 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -75,6 +75,7 @@
     <system:String x:Key="autoUpdates">Auto Update</system:String>
     <system:String x:Key="select">Select</system:String>
     <system:String x:Key="hideOnStartup">Hide Flow Launcher on startup</system:String>
+    <system:String x:Key="hideOnStartupToolTip">Flow Launcher starts out hidden in the tray.</system:String>
     <system:String x:Key="hideNotifyIcon">Hide tray icon</system:String>
     <system:String x:Key="hideNotifyIconToolTip">When the icon is hidden from the tray, the Settings menu can be opened by right-clicking on the search window.</system:String>
     <system:String x:Key="querySearchPrecision">Query Search Precision</system:String>
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
index 6b301e33a..a2b1a58a4 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
@@ -36,14 +36,17 @@
                     OnContent="{DynamicResource enable}" />
             </cc:Card>
 
-            <cc:Card Title="{DynamicResource hideOnStartup}" Icon="&#xed1a;">
+            <cc:Card
+                Title="{DynamicResource hideOnStartup}"
+                Icon="&#xed1a;"
+                Sub="{DynamicResource hideOnStartupToolTip}">
                 <ui:ToggleSwitch
                     IsOn="{Binding Settings.HideOnStartup}"
                     OffContent="{DynamicResource disable}"
                     OnContent="{DynamicResource enable}" />
             </cc:Card>
 
-            <cc:Card Title="{DynamicResource hideFlowLauncherWhenLoseFocus}" Margin="0 30 0 0">
+            <cc:Card Title="{DynamicResource hideFlowLauncherWhenLoseFocus}" Margin="0 14 0 0">
                 <ui:ToggleSwitch
                     IsOn="{Binding Settings.HideWhenDeactivated}"
                     OffContent="{DynamicResource disable}"
@@ -57,7 +60,7 @@
                     OnContent="{DynamicResource enable}" />
             </cc:Card>
 
-            <cc:CardGroup Margin="0 30 0 0">
+            <cc:CardGroup Margin="0 14 0 0">
                 <cc:Card Title="{DynamicResource SearchWindowPosition}" Icon="&#xe7f4;">
                     <StackPanel Orientation="Horizontal">
                         <ComboBox
@@ -121,6 +124,7 @@
 
             <cc:Card
                 Title="{DynamicResource ignoreHotkeysOnFullscreen}"
+                Margin="0 14 0 0"
                 Icon="&#xe7fc;"
                 Sub="{DynamicResource ignoreHotkeysOnFullscreenToolTip}">
                 <ui:ToggleSwitch
@@ -131,7 +135,7 @@
 
             <cc:Card
                 Title="{DynamicResource AlwaysPreview}"
-                Margin="0 30 0 0"
+                Margin="0 14 0 0"
                 Icon="&#xe8a1;"
                 Sub="{DynamicResource AlwaysPreviewToolTip}">
                 <ui:ToggleSwitch
@@ -143,7 +147,7 @@
 
             <cc:Card
                 Title="{DynamicResource autoUpdates}"
-                Margin="0 30 0 0"
+                Margin="0 14 0 0"
                 Icon="&#xecc5;">
                 <ui:ToggleSwitch
                     IsOn="{Binding AutoUpdates}"
@@ -161,7 +165,7 @@
                     OnContent="{DynamicResource enable}" />
             </cc:Card>
 
-            <cc:CardGroup Margin="0 30 0 0">
+            <cc:CardGroup Margin="0 14 0 0">
                 <cc:Card Title="{DynamicResource querySearchPrecision}" Sub="{DynamicResource querySearchPrecisionToolTip}">
                     <ComboBox
                         MaxWidth="200"
@@ -182,7 +186,7 @@
 
             <cc:Card
                 Title="{DynamicResource defaultFileManager}"
-                Margin="0 30 0 0"
+                Margin="0 14 0 0"
                 Icon="&#xe838;"
                 Sub="{DynamicResource defaultFileManagerToolTip}">
                 <Button
@@ -205,7 +209,7 @@
                     Content="{Binding Settings.CustomBrowser.Name}" />
             </cc:Card>
 
-            <cc:Card Title="{DynamicResource pythonFilePath}" Margin="0 30 0 0">
+            <cc:Card Title="{DynamicResource pythonFilePath}" Margin="0 14 0 0">
                 <StackPanel Orientation="Horizontal">
                     <TextBox
                         Width="300"
@@ -235,7 +239,7 @@
 
             <cc:Card
                 Title="{DynamicResource typingStartEn}"
-                Margin="0 30 0 0"
+                Margin="0 14 0 0"
                 Icon="&#xe8d3;"
                 Sub="{DynamicResource typingStartEnTooltip}">
                 <ui:ToggleSwitch
@@ -257,7 +261,7 @@
 
             <cc:Card
                 Title="{DynamicResource language}"
-                Margin="0 30 0 0"
+                Margin="0 14 0 0"
                 Icon="&#xf2b7;">
                 <ComboBox
                     MaxWidth="200"
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
index 08b49e745..03f65e2d1 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
@@ -368,7 +368,7 @@
             <!--  Drop shadow effect  -->
             <cc:Card
                 Title="{DynamicResource queryWindowShadowEffect}"
-                Margin="0 4 0 0"
+                Margin="0 8 0 0"
                 Icon="&#xeb91;"
                 Sub="{DynamicResource shadowEffectCPUUsage}">
                 <ui:ToggleSwitch
@@ -515,7 +515,7 @@
             <!--  Fonts and icons  -->
             <cc:Card
                 Title="{DynamicResource useGlyphUI}"
-                Margin="0 6 0 0"
+                Margin="0 14 0 0"
                 Icon="&#xf6b8;"
                 Sub="{DynamicResource useGlyphUIEffect}">
                 <ui:ToggleSwitch
@@ -525,7 +525,7 @@
             </cc:Card>
 
             <!--  Time and date  -->
-            <cc:CardGroup Margin="0 11 0 0">
+            <cc:CardGroup Margin="0 14 0 0">
                 <cc:Card Title="{DynamicResource Clock}" Icon="&#xec92;">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
@@ -570,7 +570,7 @@
             </cc:CardGroup>
 
             <!--  Animation  -->
-            <cc:CardGroup Margin="0 11 0 0">
+            <cc:CardGroup Margin="0 14 0 0">
                 <cc:Card
                     Title="{DynamicResource Animation}"
                     Icon="&#xedb5;"
@@ -607,7 +607,7 @@
             </cc:CardGroup>
 
             <!--  SFX  -->
-            <cc:CardGroup Margin="0 11 0 0">
+            <cc:CardGroup Margin="0 14 0 0">
                 <cc:Card
                     Title="{DynamicResource SoundEffect}"
                     Icon="&#xe7f5;"
@@ -678,7 +678,7 @@
             <!--  Settings color scheme  -->
             <cc:Card
                 Title="{DynamicResource ColorScheme}"
-                Margin="0 11 0 0"
+                Margin="0 14 0 0"
                 Icon="&#xe793;">
                 <ComboBox
                     MinWidth="180"
@@ -691,7 +691,10 @@
             </cc:Card>
 
             <!--  Theme folder  -->
-            <cc:Card Title="{DynamicResource ThemeFolder}" Icon="&#xe838;">
+            <cc:Card
+                Title="{DynamicResource ThemeFolder}"
+                Margin="0 14 0 0"
+                Icon="&#xe838;">
                 <Button
                     MinWidth="180"
                     Command="{Binding OpenThemesFolderCommand}"

From 90416c1afa1fd78468ac73334f878388a0e30f95 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sat, 1 Jun 2024 04:19:16 +0900
Subject: [PATCH 3/8] Adjust "Fixed Window Height" string

---
 Flow.Launcher/Languages/en.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 50096b5c1..11ab73662 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -57,7 +57,7 @@
     <system:String x:Key="LastQuerySelected">Select last Query</system:String>
     <system:String x:Key="LastQueryEmpty">Empty last Query</system:String>
     <system:String x:Key="KeepMaxResults">Fixed Window Height</system:String>
-    <system:String x:Key="KeepMaxResultsToolTip">The window height will not be resizeable by dragging</system:String>
+    <system:String x:Key="KeepMaxResultsToolTip">The window height is not adjustable by dragging.</system:String>
     <system:String x:Key="maxShowResults">Maximum results shown</system:String>
     <system:String x:Key="maxShowResultsToolTip">You can also quickly adjust this by using CTRL+Plus and CTRL+Minus.</system:String>
     <system:String x:Key="ignoreHotkeysOnFullscreen">Ignore hotkeys in fullscreen mode</system:String>

From 7fb52e6271359a55019ab0db2bfca0a08c714e9e Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sat, 1 Jun 2024 18:34:17 +0900
Subject: [PATCH 4/8] - Add User Setting Folder in about - Adjust ToggleSwitch
 VisualFocus

---
 Flow.Launcher/Languages/en.xaml               |  3 ++
 .../Resources/CustomControlTemplate.xaml      | 17 ++++++++++-
 .../ViewModels/SettingsPaneAboutViewModel.cs  |  9 ++++++
 .../SettingPages/Views/SettingsPaneAbout.xaml | 30 +++++++++++--------
 4 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 11ab73662..fc26774c4 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -280,6 +280,9 @@
     <system:String x:Key="clearlogfolder">Clear Logs</system:String>
     <system:String x:Key="clearlogfolderMessage">Are you sure you want to delete all logs?</system:String>
     <system:String x:Key="welcomewindow">Wizard</system:String>
+    <system:String x:Key="userdatapath">User Data Location</system:String>
+    <system:String x:Key="userdatapathToolTip">Installed plugins and user settings are saved in the User data folder. This location may vary depending on whether you are in portable mode or not.</system:String>
+    <system:String x:Key="userdatapathButton">Open Folder</system:String>
 
     <!--  FileManager Setting Dialog  -->
     <system:String x:Key="fileManagerWindow">Select File Manager</system:String>
diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index b3a26ab0a..cb93daf27 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -1702,6 +1702,21 @@
         </Setter>
     </Style>
 
+    <Style x:Key="{x:Static SystemParameters.FocusVisualStyleKey}">
+        <Setter Property="Control.Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Border
+                        Margin="-3"
+                        BorderBrush="{DynamicResource Color05B}"
+                        BorderThickness="2"
+                        CornerRadius="5"
+                        SnapsToDevicePixels="true" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <!--  - Custom Toggle Switch from modern wpf for left label  -->
     <system:TimeSpan x:Key="RepositionDelay">0:0:0.033</system:TimeSpan>
     <KeyTime x:Key="RepositionDuration">0:0:0.367</KeyTime>
@@ -1716,7 +1731,7 @@
         <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
         <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
         <Setter Property="FocusVisualStyle" Value="{DynamicResource {x:Static SystemParameters.FocusVisualStyleKey}}" />
-        <Setter Property="ui:FocusVisualHelper.FocusVisualMargin" Value="-7,-3,-7,-3" />
+        <Setter Property="ui:FocusVisualHelper.FocusVisualMargin" Value="-43,-3,-4,-3" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ui:ToggleSwitch">
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
index b6563d3e5..0ed2090f1 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
@@ -80,6 +80,15 @@ public partial class SettingsPaneAboutViewModel : BaseModel
         PluginManager.API.OpenDirectory(Path.Combine(DataLocation.DataDirectory(), Constant.Settings));
     }
 
+    [RelayCommand]
+    private void OpenParentOfSettingsFolder(object parameter)
+    {
+        string settingsFolderPath = Path.Combine(DataLocation.DataDirectory(), Constant.Settings);
+        string parentFolderPath = Path.GetDirectoryName(settingsFolderPath);
+        PluginManager.API.OpenDirectory(parentFolderPath);
+    }
+
+
     [RelayCommand]
     private void OpenLogsFolder()
     {
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
index e7e1b8757..e33fee02b 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
@@ -26,7 +26,6 @@
                 Text="{DynamicResource about}"
                 TextAlignment="left" />
 
-
             <cc:Card
                 Title="{Binding Version}"
                 Icon="&#xe946;"
@@ -54,6 +53,17 @@
                 <cc:HyperLink Text="{DynamicResource releaseNotes}" Uri="{Binding ReleaseNotes}" />
             </cc:Card>
 
+
+            <cc:Card
+                Title="{DynamicResource userdatapath}"
+                Margin="0 14 0 0"
+                Icon="&#xEC25;;"
+                Sub="{DynamicResource userdatapathToolTip}">
+                <StackPanel Orientation="Horizontal">
+                    <Button Command="{Binding OpenParentOfSettingsFolderCommand}" Content="{DynamicResource userdatapathButton}" />
+                </StackPanel>
+            </cc:Card>
+
             <cc:Card
                 Title="{DynamicResource website}"
                 Margin="0 14 0 0"
@@ -63,28 +73,22 @@
                         Margin="0 0 12 0"
                         Text="{DynamicResource website}"
                         Uri="{Binding Website}" />
-                    <cc:HyperLink Text="{DynamicResource github}" Uri="{Binding Github}" />
-                </StackPanel>
-            </cc:Card>
-
-            <cc:Card Title="{DynamicResource documentation}" Icon="&#xe82f;">
-                <StackPanel Orientation="Horizontal">
                     <cc:HyperLink
                         Margin="0 0 12 0"
                         Text="{DynamicResource documentation}"
                         Uri="{Binding Documentation}" />
-                    <cc:HyperLink Text="{DynamicResource website}" Uri="{Binding Website}" />
+                    <cc:HyperLink Text="{DynamicResource github}" Uri="{Binding Github}" />
                 </StackPanel>
             </cc:Card>
 
-            <cc:Card
-                Title="{DynamicResource icons}"
-                Margin="0 14 0 0"
-                Icon="&#xE8FE;">
+            <cc:Card Title="{DynamicResource icons}" Icon="&#xE8FE;">
                 <cc:HyperLink Text="icons8.com" Uri="https://icons8.com/" />
             </cc:Card>
 
-            <cc:Card Title="{DynamicResource devtool}" Icon="&#xf12b;">
+            <cc:Card
+                Title="{DynamicResource devtool}"
+                Margin="0 12 0 0"
+                Icon="&#xf12b;">
                 <StackPanel Orientation="Horizontal">
                     <Button
                         Margin="0 0 12 0"

From e5a0203520857d1a7301f34820287f050cf9c6bd Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sat, 1 Jun 2024 18:54:52 +0900
Subject: [PATCH 5/8] - Adjust Focus Style - Adjust Sidebar Width (for long
 menu name)

---
 .../Resources/CustomControlTemplate.xaml      |  4 ++--
 Flow.Launcher/SettingWindow.xaml              | 19 +++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index cb93daf27..fddbf6381 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -1707,10 +1707,10 @@
             <Setter.Value>
                 <ControlTemplate>
                     <Border
-                        Margin="-3"
+                        Margin="0"
                         BorderBrush="{DynamicResource Color05B}"
                         BorderThickness="2"
-                        CornerRadius="5"
+                        CornerRadius="6"
                         SnapsToDevicePixels="true" />
                 </ControlTemplate>
             </Setter.Value>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 6194db201..8b2cb8167 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -53,12 +53,12 @@
                     Grid.Column="0"
                     Width="16"
                     Height="16"
-                    Margin="10,4,4,4"
+                    Margin="10 4 4 4"
                     Source="/Images/app.png" />
                 <TextBlock
                     Grid.Row="0"
                     Grid.Column="1"
-                    Margin="4,0,0,0"
+                    Margin="4 0 0 0"
                     VerticalAlignment="Center"
                     FontSize="12"
                     Foreground="{DynamicResource Color05B}"
@@ -111,8 +111,8 @@
                     </Path>
                 </Button>
                 <Button
-                    Grid.Row="0"
                     Name="RestoreButton"
+                    Grid.Row="0"
                     Grid.Column="3"
                     Click="OnMaximizeRestoreButtonClick"
                     Style="{StaticResource TitleBarButtonStyle}">
@@ -161,24 +161,23 @@
                     Grid.Row="1"
                     Grid.Column="0"
                     Grid.ColumnSpan="5"
-                    Margin="0,0,0,0"
+                    Margin="0 0 0 0"
                     HorizontalAlignment="Stretch"
                     VerticalAlignment="Stretch"
                     AlwaysShowHeader="False"
                     Background="{DynamicResource Color01B}"
-                    ExpandedModeThresholdWidth="300"
                     IsBackButtonVisible="Collapsed"
+                    IsBackEnabled="False"
                     IsPaneToggleButtonVisible="False"
                     IsSettingsVisible="False"
                     IsTabStop="False"
-                    OpenPaneLength="230"
+                    OpenPaneLength="240"
                     PaneDisplayMode="Left"
-                    IsBackEnabled="False"
                     SelectionChanged="NavigationView_SelectionChanged">
                     <ui:NavigationView.HeaderTemplate>
                         <DataTemplate>
                             <TextBlock
-                                Margin="-8,18,0,5"
+                                Margin="-8 18 0 5"
                                 VerticalAlignment="Center"
                                 FontSize="30"
                                 FontWeight="Medium"
@@ -187,7 +186,7 @@
                         </DataTemplate>
                     </ui:NavigationView.HeaderTemplate>
                     <ui:NavigationView.PaneCustomContent>
-                        <Grid Margin="0,35,0,0" HorizontalAlignment="Center">
+                        <Grid Margin="0 35 0 0" HorizontalAlignment="Center">
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="50" />
                                 <RowDefinition Height="27" />
@@ -201,7 +200,7 @@
                                 Source="images/app.png" />
                             <TextBlock
                                 Grid.Row="1"
-                                Margin="0,12,0,0"
+                                Margin="0 12 0 0"
                                 Style="{StaticResource TabMenu}"
                                 Text="Flow Launcher"
                                 TextAlignment="Center" />

From cd32751f58d6f02a108b86386087b836a02c5f73 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sun, 2 Jun 2024 00:16:01 +0900
Subject: [PATCH 6/8] Fix Fullscreen Layout

---
 Flow.Launcher/Resources/CustomControlTemplate.xaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index fddbf6381..3d599aaed 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -74,7 +74,8 @@
         <Setter Property="BorderThickness" Value="1" />
         <Style.Triggers>
             <DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}, Path=WindowState}" Value="Maximized">
-                <Setter Property="BorderThickness" Value="1" />
+                <Setter Property="BorderThickness" Value="0" />
+                <Setter Property="Padding" Value="6" />
             </DataTrigger>
         </Style.Triggers>
     </Style>

From 4c3db63bc5c8639b53c2b0ab6d4c5c3730f45863 Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Mon, 3 Jun 2024 14:02:31 +1000
Subject: [PATCH 7/8] update wording

---
 Flow.Launcher/Languages/en.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index fc26774c4..968f862a3 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -75,7 +75,7 @@
     <system:String x:Key="autoUpdates">Auto Update</system:String>
     <system:String x:Key="select">Select</system:String>
     <system:String x:Key="hideOnStartup">Hide Flow Launcher on startup</system:String>
-    <system:String x:Key="hideOnStartupToolTip">Flow Launcher starts out hidden in the tray.</system:String>
+    <system:String x:Key="hideOnStartupToolTip">Flow Launcher search window is hidden in the tray after starting up.</system:String>
     <system:String x:Key="hideNotifyIcon">Hide tray icon</system:String>
     <system:String x:Key="hideNotifyIconToolTip">When the icon is hidden from the tray, the Settings menu can be opened by right-clicking on the search window.</system:String>
     <system:String x:Key="querySearchPrecision">Query Search Precision</system:String>

From 10076dd2e522ad40c6c69998831cf14c68adb68a Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Mon, 3 Jun 2024 14:06:13 +1000
Subject: [PATCH 8/8] update wording

---
 Flow.Launcher/Languages/en.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 968f862a3..83831a398 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -281,7 +281,7 @@
     <system:String x:Key="clearlogfolderMessage">Are you sure you want to delete all logs?</system:String>
     <system:String x:Key="welcomewindow">Wizard</system:String>
     <system:String x:Key="userdatapath">User Data Location</system:String>
-    <system:String x:Key="userdatapathToolTip">Installed plugins and user settings are saved in the User data folder. This location may vary depending on whether you are in portable mode or not.</system:String>
+    <system:String x:Key="userdatapathToolTip">User settings and installed plugins are saved in the user data folder. This location may vary depending on whether it's in portable mode or not.</system:String>
     <system:String x:Key="userdatapathButton">Open Folder</system:String>
 
     <!--  FileManager Setting Dialog  -->