From f8d82f3f9b5388bf22b2eb3ea93ec9f38fee6c77 Mon Sep 17 00:00:00 2001
From: DB P <onesound@oooz.net>
Date: Sat, 12 Apr 2025 08:57:04 +0900
Subject: [PATCH 01/18] Change default query font size Change showPlaceholder
 to true from false

---
 Flow.Launcher.Infrastructure/UserSettings/Settings.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index e304a1b5040..e1c6fbd1fb0 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -82,7 +82,7 @@ public string Theme
         /* Appearance Settings. It should be separated from the setting later.*/
         public double WindowHeightSize { get; set; } = 42;
         public double ItemHeightSize { get; set; } = 58;
-        public double QueryBoxFontSize { get; set; } = 20;
+        public double QueryBoxFontSize { get; set; } = 18;
         public double ResultItemFontSize { get; set; } = 16;
         public double ResultSubItemFontSize { get; set; } = 13;
         public string QueryBoxFont { get; set; } = FontFamily.GenericSansSerif.Name;
@@ -114,7 +114,7 @@ public string Theme
         public double? SettingWindowLeft { get; set; } = null;
         public WindowState SettingWindowState { get; set; } = WindowState.Normal;
 
-        bool _showPlaceholder { get; set; } = false;
+        bool _showPlaceholder { get; set; } = true;
         public bool ShowPlaceholder
         {
             get => _showPlaceholder;

From 6264447057adcabf96773e09bbd0bff0b51fdcab Mon Sep 17 00:00:00 2001
From: DB P <onesound@oooz.net>
Date: Sat, 12 Apr 2025 12:45:40 +0900
Subject: [PATCH 02/18] Change theme reset value

---
 .../SettingPages/ViewModels/SettingsPaneThemeViewModel.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
index f78704ef2d5..aa8ab7c4c37 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
@@ -494,7 +494,7 @@ public void Reset()
     {
         SelectedQueryBoxFont = new FontFamily(DefaultFont);
         SelectedQueryBoxFontFaces = new FamilyTypeface { Stretch = FontStretches.Normal, Weight = FontWeights.Normal, Style = FontStyles.Normal };
-        QueryBoxFontSize = 20;
+        QueryBoxFontSize = 18;
 
         SelectedResultFont = new FontFamily(DefaultFont);
         SelectedResultFontFaces = new FamilyTypeface { Stretch = FontStretches.Normal, Weight = FontWeights.Normal, Style = FontStyles.Normal };

From 1b8336bd266e0763cbef20707fe4402e57757bf7 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sat, 12 Apr 2025 14:05:03 +0900
Subject: [PATCH 03/18] Adjust Theme Color

---
 Flow.Launcher/Resources/Light.xaml      | 4 ++--
 Flow.Launcher/Themes/Circle System.xaml | 4 ++--
 Flow.Launcher/Themes/Win11Light.xaml    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Flow.Launcher/Resources/Light.xaml b/Flow.Launcher/Resources/Light.xaml
index aaa23c8e2d5..f6a5444b333 100644
--- a/Flow.Launcher/Resources/Light.xaml
+++ b/Flow.Launcher/Resources/Light.xaml
@@ -18,9 +18,9 @@
     <SolidColorBrush x:Key="HotkeyForeground" Color="#51000000" />
     <SolidColorBrush x:Key="HotkeySelectedForeground" Color="#51000000" />
     <SolidColorBrush x:Key="ClockDateForeground" Color="#44000000" />
-    <Color x:Key="ItemSelectedBackgroundColorBrush">#0C000000</Color>
+    <Color x:Key="ItemSelectedBackgroundColorBrush">#7EFFFFFF</Color>
 
-    <SolidColorBrush x:Key="Color00B" Color="#fbfbfb" />
+    <SolidColorBrush x:Key="Color00B" Color="#CEFAFAFA" />
     <SolidColorBrush x:Key="Color01B" Color="#f3f3f3" />
     <SolidColorBrush x:Key="Color02B" Color="#ffffff" />
     <SolidColorBrush x:Key="Color03B" Color="#e5e5e5" />
diff --git a/Flow.Launcher/Themes/Circle System.xaml b/Flow.Launcher/Themes/Circle System.xaml
index 24c7bd65bc8..9fb43b645ae 100644
--- a/Flow.Launcher/Themes/Circle System.xaml	
+++ b/Flow.Launcher/Themes/Circle System.xaml	
@@ -14,8 +14,8 @@
     </ResourceDictionary.MergedDictionaries>
     <system:Boolean x:Key="ThemeBlurEnabled">True</system:Boolean>
     <system:String x:Key="SystemBG">Auto</system:String>
-    <Color x:Key="LightBG">#E5E6E6E6</Color>
-    <Color x:Key="DarkBG">#DF1F1F1F</Color>
+    <Color x:Key="LightBG">#CEFAFAFA</Color>
+    <Color x:Key="DarkBG">#D6202020</Color>
     <Style
         x:Key="ItemGlyph"
         BasedOn="{StaticResource BaseGlyphStyle}"
diff --git a/Flow.Launcher/Themes/Win11Light.xaml b/Flow.Launcher/Themes/Win11Light.xaml
index a08b8eef92a..2027915f89c 100644
--- a/Flow.Launcher/Themes/Win11Light.xaml
+++ b/Flow.Launcher/Themes/Win11Light.xaml
@@ -14,8 +14,8 @@
     </ResourceDictionary.MergedDictionaries>
     <system:Boolean x:Key="ThemeBlurEnabled">True</system:Boolean>
     <system:String x:Key="SystemBG">Auto</system:String>
-    <Color x:Key="LightBG">#BFFAFAFA</Color>
-    <Color x:Key="DarkBG">#DD202020</Color>
+    <Color x:Key="LightBG">#CEFAFAFA</Color>
+    <Color x:Key="DarkBG">#D6202020</Color>
     <Style
         x:Key="BulletStyle"
         BasedOn="{StaticResource BaseBulletStyle}"

From 13aa475f022d48da044eeb7931f56fc3e07223a2 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sat, 12 Apr 2025 15:13:15 +0900
Subject: [PATCH 04/18] - Change default font logic

---
 .../UserSettings/Settings.cs                  | 28 ++++++++++++++++---
 .../ViewModels/SettingsPaneThemeViewModel.cs  |  4 ++-
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index e1c6fbd1fb0..442ab5d8051 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -1,6 +1,8 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Diagnostics;
 using System.Drawing;
+using System.Globalization;
 using System.Text.Json.Serialization;
 using System.Windows;
 using CommunityToolkit.Mvvm.DependencyInjection;
@@ -10,6 +12,7 @@
 using Flow.Launcher.Plugin;
 using Flow.Launcher.Plugin.SharedModels;
 using Flow.Launcher.ViewModel;
+using SystemFonts = System.Windows.SystemFonts;
 
 namespace Flow.Launcher.Infrastructure.UserSettings
 {
@@ -34,6 +37,24 @@ public void Save()
         }
 
         private string language = Constant.SystemLanguageCode;
+        public static string GetSystemDefaultFont()
+        {
+            try
+            {
+                var font = SystemFonts.MessageFontFamily;
+                
+                if (font.FamilyNames.TryGetValue(System.Windows.Markup.XmlLanguage.GetLanguage("en-US"), out var englishName))
+                {
+                    return englishName;
+                }
+                return font.Source ?? "Segoe UI";
+            }
+            catch
+            {
+                return "Segoe UI";
+            }
+        }
+        
         private string _theme = Constant.DefaultTheme;
         public string Hotkey { get; set; } = $"{KeyConstant.Alt} + {KeyConstant.Space}";
         public string OpenResultModifiers { get; set; } = KeyConstant.Alt;
@@ -85,15 +106,15 @@ public string Theme
         public double QueryBoxFontSize { get; set; } = 18;
         public double ResultItemFontSize { get; set; } = 16;
         public double ResultSubItemFontSize { get; set; } = 13;
-        public string QueryBoxFont { get; set; } = FontFamily.GenericSansSerif.Name;
+        public string QueryBoxFont { get; set; } = GetSystemDefaultFont();
         public string QueryBoxFontStyle { get; set; }
         public string QueryBoxFontWeight { get; set; }
         public string QueryBoxFontStretch { get; set; }
-        public string ResultFont { get; set; } = FontFamily.GenericSansSerif.Name;
+        public string ResultFont { get; set; } = GetSystemDefaultFont();
         public string ResultFontStyle { get; set; }
         public string ResultFontWeight { get; set; }
         public string ResultFontStretch { get; set; }
-        public string ResultSubFont { get; set; } = FontFamily.GenericSansSerif.Name;
+        public string ResultSubFont { get; set; } = GetSystemDefaultFont();
         public string ResultSubFontStyle { get; set; }
         public string ResultSubFontWeight { get; set; }
         public string ResultSubFontStretch { get; set; }
@@ -140,7 +161,6 @@ public string PlaceholderText
                 }
             }
         }
-
         public int CustomExplorerIndex { get; set; } = 0;
 
         [JsonIgnore]
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
index aa8ab7c4c37..ee6dfdbe812 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Windows;
 using System.Globalization;
 using System.IO;
@@ -21,7 +22,7 @@ namespace Flow.Launcher.SettingPages.ViewModels;
 
 public partial class SettingsPaneThemeViewModel : BaseModel
 {
-    private const string DefaultFont = "Segoe UI";
+    private string DefaultFont = Settings.GetSystemDefaultFont();
     public string BackdropSubText => !Win32Helper.IsBackdropSupported() ? App.API.GetTranslation("BackdropTypeDisabledToolTip") : ""; 
     public Settings Settings { get; }
     private readonly Theme _theme = Ioc.Default.GetRequiredService<Theme>();
@@ -507,4 +508,5 @@ public void Reset()
         WindowHeightSize = 42;
         ItemHeightSize = 58;
     }
+   
 }

From 051b6bbbef2f9782016a6d0ffc27e91e15e1d7fc Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sat, 12 Apr 2025 15:24:25 +0900
Subject: [PATCH 05/18] Add a message stating that the backdrop is not applied
 to the Preview

---
 Flow.Launcher/Languages/en.xaml                                 | 1 +
 .../SettingPages/ViewModels/SettingsPaneThemeViewModel.cs       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index d2549bd9152..b736d89005e 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -226,6 +226,7 @@
     <system:String x:Key="Clock">Clock</system:String>
     <system:String x:Key="Date">Date</system:String>
     <system:String x:Key="BackdropType">Backdrop Type</system:String>
+    <system:String x:Key="BackdropTypeToolTip">You can configure the type of backdrop effect. Please note that it will not be reflected in the preview.</system:String>
     <system:String x:Key="BackdropTypeDisabledToolTip">Backdrop supported starting from Windows 11 build 22000 and above</system:String>
     <system:String x:Key="BackdropTypesNone">None</system:String>
     <system:String x:Key="BackdropTypesAcrylic">Acrylic</system:String>
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
index ee6dfdbe812..568392908ad 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
@@ -23,7 +23,7 @@ namespace Flow.Launcher.SettingPages.ViewModels;
 public partial class SettingsPaneThemeViewModel : BaseModel
 {
     private string DefaultFont = Settings.GetSystemDefaultFont();
-    public string BackdropSubText => !Win32Helper.IsBackdropSupported() ? App.API.GetTranslation("BackdropTypeDisabledToolTip") : ""; 
+    public string BackdropSubText => !Win32Helper.IsBackdropSupported() ? App.API.GetTranslation("BackdropTypeDisabledToolTip") : App.API.GetTranslation("BackdropTypeToolTip"); 
     public Settings Settings { get; }
     private readonly Theme _theme = Ioc.Default.GetRequiredService<Theme>();
 

From 49e00555fa9bf7a30caf28e96ec371dbdd7cf103 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sat, 12 Apr 2025 17:05:54 +0900
Subject: [PATCH 06/18] Adjust backdrop info

---
 Flow.Launcher/Languages/en.xaml                     |  2 +-
 .../ViewModels/SettingsPaneThemeViewModel.cs        |  2 +-
 .../SettingPages/Views/SettingsPaneTheme.xaml       | 13 ++++++++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index b736d89005e..6d63c41ed1f 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -226,7 +226,7 @@
     <system:String x:Key="Clock">Clock</system:String>
     <system:String x:Key="Date">Date</system:String>
     <system:String x:Key="BackdropType">Backdrop Type</system:String>
-    <system:String x:Key="BackdropTypeToolTip">You can configure the type of backdrop effect. Please note that it will not be reflected in the preview.</system:String>
+    <system:String x:Key="BackdropInfo">The backdrop effect is not applied in the preview.</system:String>
     <system:String x:Key="BackdropTypeDisabledToolTip">Backdrop supported starting from Windows 11 build 22000 and above</system:String>
     <system:String x:Key="BackdropTypesNone">None</system:String>
     <system:String x:Key="BackdropTypesAcrylic">Acrylic</system:String>
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
index 568392908ad..ee6dfdbe812 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
@@ -23,7 +23,7 @@ namespace Flow.Launcher.SettingPages.ViewModels;
 public partial class SettingsPaneThemeViewModel : BaseModel
 {
     private string DefaultFont = Settings.GetSystemDefaultFont();
-    public string BackdropSubText => !Win32Helper.IsBackdropSupported() ? App.API.GetTranslation("BackdropTypeDisabledToolTip") : App.API.GetTranslation("BackdropTypeToolTip"); 
+    public string BackdropSubText => !Win32Helper.IsBackdropSupported() ? App.API.GetTranslation("BackdropTypeDisabledToolTip") : ""; 
     public Settings Settings { get; }
     private readonly Theme _theme = Ioc.Default.GetRequiredService<Theme>();
 
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
index 49306cd2df1..1e01354b711 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
@@ -305,7 +305,7 @@
                         <StackPanel VerticalAlignment="Center" DockPanel.Dock="Left">
                             <Border
                                 Width="400"
-                                Margin="40 30 0 30"
+                                Margin="40 30 0 10"
                                 SnapsToDevicePixels="True"
                                 Style="{DynamicResource PreviewWindowBorderStyle}">
                                 <Border BorderThickness="0" Style="{DynamicResource WindowRadius}">
@@ -370,6 +370,17 @@
                                     </Grid>
                                 </Border>
                             </Border>
+                            <Border
+                                Margin="0 0 0 20"
+                                Padding="8 4 8 4"
+                                HorizontalAlignment="Center"
+                                Background="#89000000"
+                                CornerRadius="4">
+                                <TextBlock
+                                    FontSize="10"
+                                    Foreground="#62FFFFFF"
+                                    Text="{DynamicResource BackdropInfo}" />
+                            </Border>
                         </StackPanel>
                     </DockPanel>
                 </Border>

From 2cf7f97a8b1f9268754a77a070434217f4fea04e Mon Sep 17 00:00:00 2001
From: DB P <onesound@oooz.net>
Date: Sun, 13 Apr 2025 07:37:55 +0900
Subject: [PATCH 07/18] Add Import Function

---
 Flow.Launcher.Core/Resource/Theme.cs          |  2 +-
 Flow.Launcher/Languages/en.xaml               |  3 ++
 .../ViewModels/SettingsPaneThemeViewModel.cs  | 54 ++++++++++++++++++-
 .../SettingPages/Views/SettingsPaneTheme.xaml | 11 +++-
 4 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/Flow.Launcher.Core/Resource/Theme.cs b/Flow.Launcher.Core/Resource/Theme.cs
index 59e76e2d2e9..26fbfb1b4d4 100644
--- a/Flow.Launcher.Core/Resource/Theme.cs
+++ b/Flow.Launcher.Core/Resource/Theme.cs
@@ -324,7 +324,7 @@ private ResourceDictionary GetResourceDictionary(string theme)
             return dict;
         }
 
-        private ResourceDictionary GetCurrentResourceDictionary()
+        public ResourceDictionary GetCurrentResourceDictionary()
         {
             return GetResourceDictionary(_settings.Theme);
         }
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 6d63c41ed1f..f3a64576726 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -199,6 +199,9 @@
     <system:String x:Key="resultItemFont">Result Title Font</system:String>
     <system:String x:Key="resultSubItemFont">Result Subtitle Font</system:String>
     <system:String x:Key="resetCustomize">Reset</system:String>
+    <system:String x:Key="resetCustomizeToolTip">Reset to the recommended font and size settings.</system:String>
+    <system:String x:Key="ImportThemeSize">Import Theme Size</system:String>
+    <system:String x:Key="ImportThemeSizeToolTip">If a size value intended by the theme designer is available, it will be retrieved and applied.</system:String>
     <system:String x:Key="CustomizeToolTip">Customize</system:String>
     <system:String x:Key="windowMode">Window Mode</system:String>
     <system:String x:Key="opacity">Opacity</system:String>
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
index ee6dfdbe812..7bc18652920 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
@@ -17,6 +17,7 @@
 using Flow.Launcher.ViewModel;
 using ModernWpf;
 using ThemeManagerForColorSchemeSwitch = ModernWpf.ThemeManager;
+using System.Windows.Controls;
 
 namespace Flow.Launcher.SettingPages.ViewModels;
 
@@ -508,5 +509,56 @@ public void Reset()
         WindowHeightSize = 42;
         ItemHeightSize = 58;
     }
-   
+    
+    [RelayCommand]
+    private void Import()
+    {
+        var resourceDictionary = _theme.GetCurrentResourceDictionary();
+        
+        if (resourceDictionary["QueryBoxStyle"] is Style queryBoxStyle)
+        {
+            var fontSizeSetter = queryBoxStyle.Setters
+                .OfType<Setter>()
+                .FirstOrDefault(setter => setter.Property == TextBox.FontSizeProperty);
+            if (fontSizeSetter?.Value is double fontSize)
+            {
+                QueryBoxFontSize = fontSize;
+            }
+            
+            var heightSetter = queryBoxStyle.Setters
+                .OfType<Setter>()
+                .FirstOrDefault(setter => setter.Property == FrameworkElement.HeightProperty);
+            if (heightSetter?.Value is double height)
+            {
+                WindowHeightSize = height;
+            }
+        }
+        
+        if (resourceDictionary["ResultItemHeight"] is double resultItemHeight)
+        {
+            ItemHeightSize = resultItemHeight;
+        }
+        
+        if (resourceDictionary["ItemTitleStyle"] is Style itemTitleStyle)
+        {
+            var fontSizeSetter = itemTitleStyle.Setters
+                .OfType<Setter>()
+                .FirstOrDefault(setter => setter.Property == TextBlock.FontSizeProperty);
+            if (fontSizeSetter?.Value is double fontSize)
+            {
+                ResultItemFontSize = fontSize;
+            }
+        }
+        
+        if (resourceDictionary["ItemSubTitleStyle"] is Style itemSubTitleStyle)
+        {
+            var fontSizeSetter = itemSubTitleStyle.Setters
+                .OfType<Setter>()
+                .FirstOrDefault(setter => setter.Property == TextBlock.FontSizeProperty);
+            if (fontSizeSetter?.Value is double fontSize)
+            {
+                ResultSubItemFontSize = fontSize;
+            }
+        }
+    }
 }
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
index 1e01354b711..b08d92a6991 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
@@ -256,10 +256,17 @@
                                 BorderThickness="1"
                                 Style="{StaticResource SettingSeparatorStyle}" />
                             <Button
-                                Margin="8"
+                                Margin="12 4 12 8"
+                                HorizontalAlignment="Stretch"
+                                Command="{Binding ImportCommand}"
+                                Content="{DynamicResource ImportThemeSize}"
+                                ToolTip="{DynamicResource ImportThemeSizeToolTip}" />
+                            <Button
+                                Margin="12 4 12 8"
                                 HorizontalAlignment="Stretch"
                                 Command="{Binding ResetCommand}"
-                                Content="{DynamicResource resetCustomize}" />
+                                Content="{DynamicResource resetCustomize}"
+                                ToolTip="{DynamicResource resetCustomizeToolTip}" />
                         </StackPanel>
                     </ScrollViewer>
                 </Border>

From 6ab2df62c2c3515928ecb4f5fd26ccb7814bba6f Mon Sep 17 00:00:00 2001
From: DB P <onesound@oooz.net>
Date: Sun, 13 Apr 2025 08:01:32 +0900
Subject: [PATCH 08/18] Change to prioritize Noto Sans font if it is available.

---
 .../UserSettings/Settings.cs                  | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index 442ab5d8051..447c1a303c7 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -3,8 +3,10 @@
 using System.Diagnostics;
 using System.Drawing;
 using System.Globalization;
+using System.Linq;
 using System.Text.Json.Serialization;
 using System.Windows;
+using System.Windows.Media;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.Infrastructure.Hotkey;
 using Flow.Launcher.Infrastructure.Logger;
@@ -41,12 +43,32 @@ public static string GetSystemDefaultFont()
         {
             try
             {
+                var systemLanguage = CultureInfo.CurrentCulture.Name;
                 var font = SystemFonts.MessageFontFamily;
-                
+
+                // Set Noto Sans as default font for specific languages
+                switch (systemLanguage)
+                {
+                    case "ko-KR":
+                        if (Fonts.SystemFontFamilies.Any(f => f.Source.Equals("Noto Sans KR")))
+                            return "Noto Sans KR";
+                        break;
+                    case "ja-JP":
+                        if (Fonts.SystemFontFamilies.Any(f => f.Source.Equals("Noto Sans JP")))
+                            return "Noto Sans JP";
+                        break;
+                    case "zh-CN":
+                    case "zh-Hans":
+                        if (Fonts.SystemFontFamilies.Any(f => f.Source.Equals("Noto Sans SC")))
+                            return "Noto Sans SC";
+                        break;
+                }
+
                 if (font.FamilyNames.TryGetValue(System.Windows.Markup.XmlLanguage.GetLanguage("en-US"), out var englishName))
                 {
                     return englishName;
                 }
+
                 return font.Source ?? "Segoe UI";
             }
             catch

From 06b105b515b5cc269e840263e0a74bc77e2cd0da Mon Sep 17 00:00:00 2001
From: DB P <onesound@oooz.net>
Date: Sun, 13 Apr 2025 08:02:22 +0900
Subject: [PATCH 09/18] Adjust Query Font Size

---
 Flow.Launcher.Infrastructure/UserSettings/Settings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index 447c1a303c7..2ad0319d1af 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -125,7 +125,7 @@ public string Theme
         /* Appearance Settings. It should be separated from the setting later.*/
         public double WindowHeightSize { get; set; } = 42;
         public double ItemHeightSize { get; set; } = 58;
-        public double QueryBoxFontSize { get; set; } = 18;
+        public double QueryBoxFontSize { get; set; } = 16;
         public double ResultItemFontSize { get; set; } = 16;
         public double ResultSubItemFontSize { get; set; } = 13;
         public string QueryBoxFont { get; set; } = GetSystemDefaultFont();

From 5ebe2d8fb1fe4a89900448bf86f2d09116b747de Mon Sep 17 00:00:00 2001
From: DB P <onesound@oooz.net>
Date: Sun, 13 Apr 2025 08:02:22 +0900
Subject: [PATCH 10/18] Adjust Query Font Size

---
 Flow.Launcher.Infrastructure/UserSettings/Settings.cs           | 2 +-
 .../SettingPages/ViewModels/SettingsPaneThemeViewModel.cs       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index 447c1a303c7..2ad0319d1af 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -125,7 +125,7 @@ public string Theme
         /* Appearance Settings. It should be separated from the setting later.*/
         public double WindowHeightSize { get; set; } = 42;
         public double ItemHeightSize { get; set; } = 58;
-        public double QueryBoxFontSize { get; set; } = 18;
+        public double QueryBoxFontSize { get; set; } = 16;
         public double ResultItemFontSize { get; set; } = 16;
         public double ResultSubItemFontSize { get; set; } = 13;
         public string QueryBoxFont { get; set; } = GetSystemDefaultFont();
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
index 7bc18652920..d62fd906b35 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
@@ -496,7 +496,7 @@ public void Reset()
     {
         SelectedQueryBoxFont = new FontFamily(DefaultFont);
         SelectedQueryBoxFontFaces = new FamilyTypeface { Stretch = FontStretches.Normal, Weight = FontWeights.Normal, Style = FontStyles.Normal };
-        QueryBoxFontSize = 18;
+        QueryBoxFontSize = 16;
 
         SelectedResultFont = new FontFamily(DefaultFont);
         SelectedResultFontFaces = new FamilyTypeface { Stretch = FontStretches.Normal, Weight = FontWeights.Normal, Style = FontStyles.Normal };

From 664cbb5a58cf53b88837eafe5abc942b8158cafc Mon Sep 17 00:00:00 2001
From: DB P <onesound@oooz.net>
Date: Sun, 13 Apr 2025 08:27:04 +0900
Subject: [PATCH 11/18] Apply Noto Sans fonts based on system language with
 dynamic mapping

---
 .../UserSettings/Settings.cs                  | 57 +++++++++++++------
 1 file changed, 40 insertions(+), 17 deletions(-)

diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index 2ad0319d1af..895ec1ecd17 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -39,31 +39,48 @@ public void Save()
         }
 
         private string language = Constant.SystemLanguageCode;
+        private static readonly Dictionary<string, string> LanguageToNotoSans = new()
+        {
+            { "ko", "Noto Sans KR" },
+            { "ja", "Noto Sans JP" },
+            { "zh-CN", "Noto Sans SC" },
+            { "zh-SG", "Noto Sans SC" },
+            { "zh-Hans", "Noto Sans SC" },
+            { "zh-TW", "Noto Sans TC" },
+            { "zh-HK", "Noto Sans TC" },
+            { "zh-MO", "Noto Sans TC" },
+            { "zh-Hant", "Noto Sans TC" },
+            { "th", "Noto Sans Thai" },
+            { "ar", "Noto Sans Arabic" },
+            { "he", "Noto Sans Hebrew" },
+            { "hi", "Noto Sans Devanagari" },
+            { "bn", "Noto Sans Bengali" },
+            { "ta", "Noto Sans Tamil" },
+            { "el", "Noto Sans Greek" },
+            { "ru", "Noto Sans" },
+            { "en", "Noto Sans" },
+            { "fr", "Noto Sans" },
+            { "de", "Noto Sans" },
+            { "es", "Noto Sans" },
+            { "pt", "Noto Sans" }
+        };
+
         public static string GetSystemDefaultFont()
         {
             try
             {
-                var systemLanguage = CultureInfo.CurrentCulture.Name;
-                var font = SystemFonts.MessageFontFamily;
+                var culture = CultureInfo.CurrentCulture;
+                var language = culture.Name; // e.g., "zh-TW"
+                var langPrefix = language.Split('-')[0]; // e.g., "zh"
 
-                // Set Noto Sans as default font for specific languages
-                switch (systemLanguage)
+                // First, try to find by full name, and if not found, fallback to prefix
+                if (TryGetNotoFont(language, out var notoFont) || TryGetNotoFont(langPrefix, out notoFont))
                 {
-                    case "ko-KR":
-                        if (Fonts.SystemFontFamilies.Any(f => f.Source.Equals("Noto Sans KR")))
-                            return "Noto Sans KR";
-                        break;
-                    case "ja-JP":
-                        if (Fonts.SystemFontFamilies.Any(f => f.Source.Equals("Noto Sans JP")))
-                            return "Noto Sans JP";
-                        break;
-                    case "zh-CN":
-                    case "zh-Hans":
-                        if (Fonts.SystemFontFamilies.Any(f => f.Source.Equals("Noto Sans SC")))
-                            return "Noto Sans SC";
-                        break;
+                    if (Fonts.SystemFontFamilies.Any(f => f.Source.Equals(notoFont)))
+                        return notoFont;
                 }
 
+                var font = SystemFonts.MessageFontFamily;
                 if (font.FamilyNames.TryGetValue(System.Windows.Markup.XmlLanguage.GetLanguage("en-US"), out var englishName))
                 {
                     return englishName;
@@ -76,6 +93,11 @@ public static string GetSystemDefaultFont()
                 return "Segoe UI";
             }
         }
+
+        private static bool TryGetNotoFont(string langKey, out string notoFont)
+        {
+            return LanguageToNotoSans.TryGetValue(langKey, out notoFont);
+        }
         
         private string _theme = Constant.DefaultTheme;
         public string Hotkey { get; set; } = $"{KeyConstant.Alt} + {KeyConstant.Space}";
@@ -527,4 +549,5 @@ public enum BackdropTypes
         Mica,
         MicaAlt
     }
+    
 }

From 6b267c430975b24f74095836a5af6c42db3806f9 Mon Sep 17 00:00:00 2001
From: DB P <onesound@oooz.net>
Date: Sun, 13 Apr 2025 08:37:37 +0900
Subject: [PATCH 12/18] Adjust Button Margin

---
 Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
index b08d92a6991..b5f74b36856 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
@@ -256,13 +256,13 @@
                                 BorderThickness="1"
                                 Style="{StaticResource SettingSeparatorStyle}" />
                             <Button
-                                Margin="12 4 12 8"
+                                Margin="12 8 12 4"
                                 HorizontalAlignment="Stretch"
                                 Command="{Binding ImportCommand}"
                                 Content="{DynamicResource ImportThemeSize}"
                                 ToolTip="{DynamicResource ImportThemeSizeToolTip}" />
                             <Button
-                                Margin="12 4 12 8"
+                                Margin="12 4 12 12"
                                 HorizontalAlignment="Stretch"
                                 Command="{Binding ResetCommand}"
                                 Content="{DynamicResource resetCustomize}"

From 74d6eed20b4d22f5bd62df705473e0968cf67794 Mon Sep 17 00:00:00 2001
From: DB P <onesound@oooz.net>
Date: Sun, 13 Apr 2025 10:18:47 +0900
Subject: [PATCH 13/18] Adjust Combobox Control

---
 Flow.Launcher/Resources/CustomControlTemplate.xaml | 9 +++++----
 Flow.Launcher/Resources/Dark.xaml                  | 3 ++-
 Flow.Launcher/Resources/Light.xaml                 | 6 +++++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 1ff6ca49c17..7db579d42ff 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -1103,7 +1103,8 @@
                             IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}"
                             Placement="Bottom"
                             PlacementTarget="{Binding ElementName=Background}"
-                            PopupAnimation="None">
+                            PopupAnimation="None"
+                            VerticalOffset="-1">
                             <Popup.PlacementRectangle>
                                 <MultiBinding>
                                     <MultiBinding.Converter>
@@ -1127,7 +1128,7 @@
                                     CornerRadius="{DynamicResource OverlayCornerRadius}">
                                     <Border
                                         Padding="{DynamicResource ComboBoxDropdownBorderPadding}"
-                                        BorderBrush="{DynamicResource ComboBoxDropDownBorderBrush}"
+                                        BorderBrush="{DynamicResource CustomComboBorder}"
                                         BorderThickness="{DynamicResource ComboBoxDropdownBorderThickness}"
                                         CornerRadius="{Binding ElementName=PopupBorder, Path=CornerRadius}">
                                         <ScrollViewer
@@ -1157,8 +1158,8 @@
                         <!--  Pressed  -->
                         <Trigger SourceName="ToggleButton" Property="IsPressed" Value="True">
                             <Setter TargetName="Background" Property="Background" Value="{DynamicResource CustomComboPressedBG}" />
-                            <Setter TargetName="Background" Property="BorderThickness" Value="0" />
-                            <Setter TargetName="Background" Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushPressed}" />
+                            <Setter TargetName="Background" Property="BorderThickness" Value="0 0 0 1" />
+                            <Setter TargetName="Background" Property="BorderBrush" Value="{DynamicResource CustomComboPressedOutLine}" />
                             <Setter TargetName="OutLine" Property="BorderBrush" Value="{DynamicResource CustomComboPressedOutLine}" />
                             <Setter TargetName="OutLine" Property="BorderThickness" Value="{DynamicResource PressedCustomComboOutlineThickness}" />
                             <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource CustomComboPressedText}" />
diff --git a/Flow.Launcher/Resources/Dark.xaml b/Flow.Launcher/Resources/Dark.xaml
index 594a92fbe11..1d18787cd1b 100644
--- a/Flow.Launcher/Resources/Dark.xaml
+++ b/Flow.Launcher/Resources/Dark.xaml
@@ -159,6 +159,7 @@
     <m:StaticResource x:Key="CustomComboOutline" ResourceKey="Color13B" />
     <m:StaticResource x:Key="CustomComboInline" ResourceKey="Color21B" />
     <m:StaticResource x:Key="PopUpBorderBG" ResourceKey="Color07B" />
+    <SolidColorBrush x:Key="CustomComboBorder" Color="#3f3f3f" />
     <m:StaticResource x:Key="CustomComboHoverBG" ResourceKey="Color22B" />
     <m:StaticResource x:Key="CustomComboPressedBG" ResourceKey="Color23B" />
     <m:StaticResource x:Key="CustomComboPressedOutLine" ResourceKey="Color19B" />
@@ -171,7 +172,7 @@
 
     <Thickness x:Key="CustomComboOutlineThickness">1,1,1,1</Thickness>
     <Thickness x:Key="CustomComboInlineThickness">0,0,0,0</Thickness>
-    <Thickness x:Key="PressedCustomComboOutlineThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="PressedCustomComboOutlineThickness">1,1,1,0</Thickness>
     <Thickness x:Key="DisabledCustomComboOutlineThickness">1,1,1,1</Thickness>
 
 
diff --git a/Flow.Launcher/Resources/Light.xaml b/Flow.Launcher/Resources/Light.xaml
index f6a5444b333..b2d051429fd 100644
--- a/Flow.Launcher/Resources/Light.xaml
+++ b/Flow.Launcher/Resources/Light.xaml
@@ -153,6 +153,10 @@
     <m:StaticResource x:Key="CustomComboOutline" ResourceKey="Color13B" />
     <m:StaticResource x:Key="CustomComboInline" ResourceKey="Color21B" />
     <m:StaticResource x:Key="PopUpBorderBG" ResourceKey="Color07B" />
+    <SolidColorBrush
+        x:Key="CustomComboBorder"
+        Opacity="0.14"
+        Color="#000000" />
     <m:StaticResource x:Key="CustomComboHoverBG" ResourceKey="Color07B" />
     <m:StaticResource x:Key="CustomComboPressedBG" ResourceKey="Color07B" />
     <m:StaticResource x:Key="CustomComboPressedOutLine" ResourceKey="Color13B" />
@@ -165,7 +169,7 @@
 
     <Thickness x:Key="CustomComboOutlineThickness">1,1,1,0</Thickness>
     <Thickness x:Key="CustomComboInlineThickness">0,0,0,2</Thickness>
-    <Thickness x:Key="PressedCustomComboOutlineThickness">1,1,1,1</Thickness>
+    <Thickness x:Key="PressedCustomComboOutlineThickness">1,1,1,0</Thickness>
     <Thickness x:Key="DisabledCustomComboOutlineThickness">1,1,1,1</Thickness>
 
 

From c828c33a6921aa933afe0e24119e1f2ff7270e85 Mon Sep 17 00:00:00 2001
From: DB P <onesound@oooz.net>
Date: Sun, 13 Apr 2025 11:47:07 +0900
Subject: [PATCH 14/18] Change Combobox design Adjust Colors

---
 .../Resources/CustomControlTemplate.xaml      | 48 +++++++++++++------
 Flow.Launcher/Resources/Dark.xaml             |  8 +++-
 Flow.Launcher/Resources/Light.xaml            |  7 +++
 .../Views/SettingsPaneGeneral.xaml            |  1 +
 Flow.Launcher/Themes/Win11Light.xaml          |  2 +-
 5 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 7db579d42ff..ef85e8724b7 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -755,17 +755,33 @@
                 <ControlTemplate TargetType="ComboBoxItem">
                     <Border
                         x:Name="LayoutRoot"
+                        Margin="0 2 0 2"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="4"
                         SnapsToDevicePixels="True">
-                        <ContentPresenter
-                            x:Name="ContentPresenter"
-                            Margin="{TemplateBinding Padding}"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                            TextElement.Foreground="{TemplateBinding Foreground}" />
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
+                            <Border
+                                x:Name="ComboBullet"
+                                Grid.Column="0"
+                                Width="3"
+                                Height="14"
+                                Background="Transparent"
+                                CornerRadius="2" />
+                            <ContentPresenter
+                                x:Name="ContentPresenter"
+                                Grid.Column="1"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                TextElement.Foreground="{TemplateBinding Foreground}" />
+                        </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
                         <MultiTrigger>
@@ -773,7 +789,7 @@
                                 <Condition Property="IsSelected" Value="False" />
                                 <Condition Property="IsMouseOver" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="LayoutRoot" Property="Background" Value="{DynamicResource ComboBoxItemBackgroundPointerOver}" />
+                            <Setter TargetName="LayoutRoot" Property="Background" Value="{DynamicResource CustomComboItemHoverBG}" />
                             <Setter TargetName="LayoutRoot" Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushPointerOver}" />
                             <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ComboBoxItemForegroundPointerOver}" />
                         </MultiTrigger>
@@ -792,7 +808,8 @@
                                 <Condition Property="IsSelected" Value="True" />
                                 <Condition Property="IsFocused" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="LayoutRoot" Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelected}" />
+                            <Setter TargetName="ComboBullet" Property="Background" Value="{StaticResource SystemControlBackgroundAccentBrush}" />
+                            <Setter TargetName="LayoutRoot" Property="Background" Value="{DynamicResource CustomComboItemHoverBG}" />
                             <Setter TargetName="LayoutRoot" Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushSelected}" />
                             <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ComboBoxItemForegroundSelected}" />
                         </MultiTrigger>
@@ -802,7 +819,8 @@
                                 <Condition Property="IsSelected" Value="True" />
                                 <Condition Property="IsFocused" Value="False" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="LayoutRoot" Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelectedUnfocused}" />
+                            <Setter TargetName="ComboBullet" Property="Background" Value="{StaticResource SystemControlBackgroundAccentBrush}" />
+                            <Setter TargetName="LayoutRoot" Property="Background" Value="{DynamicResource CustomComboItemHoverBG}" />
                             <Setter TargetName="LayoutRoot" Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushSelectedUnfocused}" />
                             <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ComboBoxItemForegroundSelectedUnfocused}" />
                         </MultiTrigger>
@@ -822,7 +840,7 @@
                                 <Condition Property="IsSelected" Value="True" />
                                 <Condition Property="IsMouseOver" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="LayoutRoot" Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelectedPointerOver}" />
+                            <Setter TargetName="LayoutRoot" Property="Background" Value="{DynamicResource CustomComboItemSelectedHoverBG}" />
                             <Setter TargetName="LayoutRoot" Property="BorderBrush" Value="{DynamicResource ComboBoxItemBorderBrushSelectedPointerOver}" />
                             <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ComboBoxItemForegroundSelectedPointerOver}" />
                         </MultiTrigger>
@@ -1124,10 +1142,10 @@
                                 <Border
                                     x:Name="PopupBorder"
                                     HorizontalAlignment="Stretch"
-                                    Background="{DynamicResource PopUpBorderBG}"
-                                    CornerRadius="{DynamicResource OverlayCornerRadius}">
+                                    Background="{DynamicResource CustomPopUpBorderBG}"
+                                    CornerRadius="5">
                                     <Border
-                                        Padding="{DynamicResource ComboBoxDropdownBorderPadding}"
+                                        Padding="5"
                                         BorderBrush="{DynamicResource CustomComboBorder}"
                                         BorderThickness="{DynamicResource ComboBoxDropdownBorderThickness}"
                                         CornerRadius="{Binding ElementName=PopupBorder, Path=CornerRadius}">
@@ -1138,7 +1156,7 @@
                                             IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
                                             VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
                                             <ItemsPresenter
-                                                Margin="{DynamicResource ComboBoxDropdownContentMargin}"
+                                                Margin="0"
                                                 KeyboardNavigation.DirectionalNavigation="Contained"
                                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                                         </ScrollViewer>
diff --git a/Flow.Launcher/Resources/Dark.xaml b/Flow.Launcher/Resources/Dark.xaml
index 1d18787cd1b..6661b406cd8 100644
--- a/Flow.Launcher/Resources/Dark.xaml
+++ b/Flow.Launcher/Resources/Dark.xaml
@@ -20,6 +20,7 @@
     <SolidColorBrush x:Key="ClockDateForeground" Color="#26FFFFFF" />
     <Color x:Key="ItemSelectedBackgroundColorBrush">#198F8F8F</Color>
 
+    <SolidColorBrush x:Key="BasicSystemAccentColor" Color="{m:DynamicColor SystemAccentColorLight1}" />
 
     <SolidColorBrush x:Key="Color00B" Color="#2b2b2b" />
     <SolidColorBrush x:Key="Color01B" Color="#202020" />
@@ -159,9 +160,14 @@
     <m:StaticResource x:Key="CustomComboOutline" ResourceKey="Color13B" />
     <m:StaticResource x:Key="CustomComboInline" ResourceKey="Color21B" />
     <m:StaticResource x:Key="PopUpBorderBG" ResourceKey="Color07B" />
+    <SolidColorBrush x:Key="CustomPopUpBorderBG" Color="#373737" />
     <SolidColorBrush x:Key="CustomComboBorder" Color="#3f3f3f" />
     <m:StaticResource x:Key="CustomComboHoverBG" ResourceKey="Color22B" />
     <m:StaticResource x:Key="CustomComboPressedBG" ResourceKey="Color23B" />
+
+    <SolidColorBrush x:Key="CustomComboItemHoverBG" Color="#4E4E4E" />
+    <SolidColorBrush x:Key="CustomComboItemSelectedHoverBG" Color="#484848" />
+
     <m:StaticResource x:Key="CustomComboPressedOutLine" ResourceKey="Color19B" />
     <m:StaticResource x:Key="CustomComboPressedText" ResourceKey="Color08B" />
     <m:StaticResource x:Key="CustomComboDisabledBG" ResourceKey="Color07B" />
@@ -172,7 +178,7 @@
 
     <Thickness x:Key="CustomComboOutlineThickness">1,1,1,1</Thickness>
     <Thickness x:Key="CustomComboInlineThickness">0,0,0,0</Thickness>
-    <Thickness x:Key="PressedCustomComboOutlineThickness">1,1,1,0</Thickness>
+    <Thickness x:Key="PressedCustomComboOutlineThickness">1,1,1,1</Thickness>
     <Thickness x:Key="DisabledCustomComboOutlineThickness">1,1,1,1</Thickness>
 
 
diff --git a/Flow.Launcher/Resources/Light.xaml b/Flow.Launcher/Resources/Light.xaml
index b2d051429fd..381e2267357 100644
--- a/Flow.Launcher/Resources/Light.xaml
+++ b/Flow.Launcher/Resources/Light.xaml
@@ -20,6 +20,8 @@
     <SolidColorBrush x:Key="ClockDateForeground" Color="#44000000" />
     <Color x:Key="ItemSelectedBackgroundColorBrush">#7EFFFFFF</Color>
 
+    <SolidColorBrush x:Key="BasicSystemAccentColor" Color="{m:DynamicColor SystemAccentColor}" />
+
     <SolidColorBrush x:Key="Color00B" Color="#CEFAFAFA" />
     <SolidColorBrush x:Key="Color01B" Color="#f3f3f3" />
     <SolidColorBrush x:Key="Color02B" Color="#ffffff" />
@@ -153,12 +155,17 @@
     <m:StaticResource x:Key="CustomComboOutline" ResourceKey="Color13B" />
     <m:StaticResource x:Key="CustomComboInline" ResourceKey="Color21B" />
     <m:StaticResource x:Key="PopUpBorderBG" ResourceKey="Color07B" />
+    <SolidColorBrush x:Key="CustomPopUpBorderBG" Color="#f6f6f6" />
     <SolidColorBrush
         x:Key="CustomComboBorder"
         Opacity="0.14"
         Color="#000000" />
     <m:StaticResource x:Key="CustomComboHoverBG" ResourceKey="Color07B" />
     <m:StaticResource x:Key="CustomComboPressedBG" ResourceKey="Color07B" />
+
+    <SolidColorBrush x:Key="CustomComboItemHoverBG" Color="#E5E5E5" />
+    <SolidColorBrush x:Key="CustomComboItemSelectedHoverBG" Color="#D9D9D9" />
+
     <m:StaticResource x:Key="CustomComboPressedOutLine" ResourceKey="Color13B" />
     <m:StaticResource x:Key="CustomComboPressedText" ResourceKey="Color08B" />
     <m:StaticResource x:Key="CustomComboDisabledBG" ResourceKey="Color07B" />
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
index 4782d356ef3..d45d28d8bba 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
@@ -194,6 +194,7 @@
 
                 <cc:Card Title="{DynamicResource lastQueryMode}" Sub="{DynamicResource lastQueryModeToolTip}">
                     <ComboBox
+                        MinWidth="210"
                         DisplayMemberPath="Display"
                         ItemsSource="{Binding LastQueryModes}"
                         SelectedValue="{Binding Settings.LastQueryMode}"
diff --git a/Flow.Launcher/Themes/Win11Light.xaml b/Flow.Launcher/Themes/Win11Light.xaml
index 2027915f89c..4e3115b6dfa 100644
--- a/Flow.Launcher/Themes/Win11Light.xaml
+++ b/Flow.Launcher/Themes/Win11Light.xaml
@@ -31,7 +31,7 @@
         <Setter Property="Width" Value="4" />
         <Setter Property="Height" Value="38" />
         <Setter Property="CornerRadius" Value="2" />
-        <Setter Property="Background" Value="{StaticResource SystemAccentColorLight1Brush}" />
+        <Setter Property="Background" Value="{DynamicResource BasicSystemAccentColor}" />
     </Style>
     <Style
         x:Key="ItemGlyph"

From 4ed9137858855329c63515a9a9556d1597958258 Mon Sep 17 00:00:00 2001
From: DB P <onesound@oooz.net>
Date: Sun, 13 Apr 2025 12:26:01 +0900
Subject: [PATCH 15/18] - Move some value to base.xaml - Adjust themes

---
 Flow.Launcher/ResultListBox.xaml              |  4 --
 .../SettingPages/Views/SettingsPaneTheme.xaml |  2 +-
 Flow.Launcher/Themes/Base.xaml                |  8 +++
 Flow.Launcher/Themes/SlimLight.xaml           | 66 ++++++++++++-------
 Flow.Launcher/Themes/Win11Light.xaml          |  9 ++-
 5 files changed, 58 insertions(+), 31 deletions(-)

diff --git a/Flow.Launcher/ResultListBox.xaml b/Flow.Launcher/ResultListBox.xaml
index 4c3bd1d120f..3744e0449ff 100644
--- a/Flow.Launcher/ResultListBox.xaml
+++ b/Flow.Launcher/ResultListBox.xaml
@@ -174,8 +174,6 @@
                             <TextBlock
                                 x:Name="Title"
                                 Grid.Row="0"
-                                Margin="0 0 0 1"
-                                VerticalAlignment="Bottom"
                                 DockPanel.Dock="Left"
                                 FontSize="{Binding Settings.ResultItemFontSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                 IsEnabled="False"
@@ -194,8 +192,6 @@
                             <TextBlock
                                 x:Name="SubTitle"
                                 Grid.Row="1"
-                                Margin="0 1 0 0"
-                                VerticalAlignment="Top"
                                 FontSize="{Binding Settings.ResultSubItemFontSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                 IsEnabled="False"
                                 Style="{DynamicResource ItemSubTitleStyle}"
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
index b5f74b36856..8d8ca21b65c 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
@@ -378,7 +378,7 @@
                                 </Border>
                             </Border>
                             <Border
-                                Margin="0 0 0 20"
+                                Margin="0 0 0 30"
                                 Padding="8 4 8 4"
                                 HorizontalAlignment="Center"
                                 Background="#89000000"
diff --git a/Flow.Launcher/Themes/Base.xaml b/Flow.Launcher/Themes/Base.xaml
index 35d1f9a41e6..1844e25be37 100644
--- a/Flow.Launcher/Themes/Base.xaml
+++ b/Flow.Launcher/Themes/Base.xaml
@@ -180,9 +180,13 @@
     <Style x:Key="BaseItemTitleStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#FFFFF8" />
         <Setter Property="FontSize" Value="16" />
+        <Setter Property="Margin" Value="0 0 0 1" />
+        <Setter Property="VerticalAlignment" Value="Bottom" />
     </Style>
     <Style x:Key="BaseItemSubTitleStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#D9D9D4" />
+        <Setter Property="Margin" Value="0 1 0 0" />
+        <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="FontSize" Value="13" />
         <Style.Triggers>
             <DataTrigger Binding="{Binding ElementName=SubTitle, UpdateSourceTrigger=PropertyChanged, Path=Text.Length}" Value="0">
@@ -215,10 +219,14 @@
     <Style x:Key="BaseItemTitleSelectedStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#FFFFF8" />
         <Setter Property="FontSize" Value="16" />
+        <Setter Property="Margin" Value="0 0 0 1" />
+        <Setter Property="VerticalAlignment" Value="Bottom" />
     </Style>
     <Style x:Key="BaseItemSubTitleSelectedStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#D9D9D4" />
         <Setter Property="FontSize" Value="13" />
+        <Setter Property="Margin" Value="0 1 0 0" />
+        <Setter Property="VerticalAlignment" Value="Top" />
         <Style.Triggers>
             <DataTrigger Binding="{Binding ElementName=SubTitle, UpdateSourceTrigger=PropertyChanged, Path=Text.Length}" Value="0">
                 <Setter Property="Height" Value="0" />
diff --git a/Flow.Launcher/Themes/SlimLight.xaml b/Flow.Launcher/Themes/SlimLight.xaml
index b59cb0978c8..ab7632f1227 100644
--- a/Flow.Launcher/Themes/SlimLight.xaml
+++ b/Flow.Launcher/Themes/SlimLight.xaml
@@ -11,23 +11,23 @@
         <Setter Property="Width" Value="46" />
     </Style>
     <Style x:Key="ImageIconStyle" TargetType="{x:Type Image}">
-        <Setter Property="Height" Value="24" />
-        <Setter Property="Width" Value="24" />
+        <Setter Property="Height" Value="20" />
+        <Setter Property="Width" Value="20" />
     </Style>
     <Style
         x:Key="ItemGlyph"
         BasedOn="{StaticResource BaseGlyphStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="24" />
-        <Setter Property="Width" Value="24" />
-        <Setter Property="Height" Value="24" />
+        <Setter Property="FontSize" Value="20" />
+        <Setter Property="Width" Value="20" />
+        <Setter Property="Height" Value="20" />
         <Setter Property="Foreground" Value="#100f0f" />
     </Style>
     <Style
         x:Key="QueryBoxStyle"
         BasedOn="{StaticResource BaseQueryBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="Padding" Value="0,0,42,0" />
+        <Setter Property="Padding" Value="0 0 42 0" />
         <Setter Property="Foreground" Value="#282728" />
         <Setter Property="FontSize" Value="16" />
         <Setter Property="Height" Value="24" />
@@ -37,7 +37,7 @@
         x:Key="QuerySuggestionBoxStyle"
         BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="Padding" Value="0,0,42,0" />
+        <Setter Property="Padding" Value="0 0 42 0" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Height" Value="24" />
         <Setter Property="FontSize" Value="16" />
@@ -50,7 +50,7 @@
         TargetType="{x:Type Border}">
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="BorderBrush" Value="#bcbabd" />
-        <Setter Property="Background" Value="#edebee" />
+        <Setter Property="Background" Value="#FAFAFA" />
         <Setter Property="CornerRadius" Value="6" />
         <Setter Property="UseLayoutRounding" Value="True" />
     </Style>
@@ -68,6 +68,7 @@
         x:Key="ItemTitleStyle"
         BasedOn="{StaticResource BaseItemTitleStyle}"
         TargetType="{x:Type TextBlock}">
+        <Setter Property="Margin" Value="0" />
         <Setter Property="FontSize" Value="14" />
         <Setter Property="Foreground" Value="#100f0f" />
     </Style>
@@ -75,6 +76,7 @@
         x:Key="ItemSubTitleStyle"
         BasedOn="{StaticResource BaseItemSubTitleStyle}"
         TargetType="{x:Type TextBlock}">
+        <Setter Property="Margin" Value="0" />
         <Setter Property="FontSize" Value="10" />
         <Setter Property="Foreground" Value="#8f8d90" />
     </Style>
@@ -84,7 +86,7 @@
         TargetType="{x:Type Rectangle}">
         <Setter Property="Fill" Value="#dedcde" />
         <Setter Property="Height" Value="1" />
-        <Setter Property="Margin" Value="0,0,0,4" />
+        <Setter Property="Margin" Value="0 0 0 4" />
     </Style>
     <Style x:Key="HighlightStyle" />
     <Style
@@ -92,6 +94,7 @@
         BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
         TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="14" />
+        <Setter Property="Margin" Value="0" />
         <Setter Property="Foreground" Value="#100f0f" />
     </Style>
     <Style
@@ -99,6 +102,7 @@
         BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
         TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="10" />
+        <Setter Property="Margin" Value="0" />
         <Setter Property="Foreground" Value="#8f8d90" />
     </Style>
     <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#d6d4d7</SolidColorBrush>
@@ -113,7 +117,7 @@
                 <ControlTemplate TargetType="{x:Type Thumb}">
                     <Border
                         Width="4"
-                        Margin="0,0,2,0"
+                        Margin="0 0 2 0"
                         Background="#878687"
                         BorderBrush="Transparent"
                         BorderThickness="0"
@@ -136,33 +140,49 @@
         <Setter Property="Height" Value="24" />
     </Style>
     <Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
-        <Setter Property="Background" Value="#edebee" />
         <Setter Property="Width" Value="24" />
         <Setter Property="Height" Value="24" />
-        <Setter Property="Margin" Value="0,0,8,0" />
+        <Setter Property="Margin" Value="0 0 8 0" />
         <Setter Property="HorizontalAlignment" Value="Right" />
     </Style>
     <Style x:Key="PluginActivationIcon" TargetType="{x:Type Image}">
         <Setter Property="Width" Value="24" />
         <Setter Property="Height" Value="24" />
-        <Setter Property="Margin" Value="0,0,8,0" />
+        <Setter Property="Margin" Value="0 0 8 0" />
         <Setter Property="HorizontalAlignment" Value="Right" />
         <Setter Property="VerticalAlignment" Value="Center" />
     </Style>
 
     <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="12" />
+        <Setter Property="FontSize" Value="9" />
         <Setter Property="Foreground" Value="#8f8d90" />
     </Style>
     <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="12" />
+        <Setter Property="FontSize" Value="9" />
         <Setter Property="Foreground" Value="#8f8d90" />
     </Style>
+    <Style
+        x:Key="ItemHotkeyBGStyle"
+        BasedOn="{StaticResource BaseItemHotkeyBGStyle}"
+        TargetType="{x:Type Border}">
+        <Setter Property="Margin" Value="6 0 6 0" />
+        <Setter Property="Padding" Value="4 2 4 2" />
+        <Setter Property="CornerRadius" Value="2" />
+    </Style>
+    <Style
+        x:Key="ItemHotkeyBGSelectedStyle"
+        BasedOn="{StaticResource BaseItemHotkeyBGSelectedStyle}"
+        TargetType="{x:Type Border}">
+        <Setter Property="Margin" Value="6 0 6 0" />
+        <Setter Property="Padding" Value="4 2 4 2" />
+        <Setter Property="CornerRadius" Value="2" />
+    </Style>
+
     <Style x:Key="ItemGlyphSelectedStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#100f0f" />
-        <Setter Property="Width" Value="24" />
-        <Setter Property="Height" Value="24" />
-        <Setter Property="FontSize" Value="24" />
+        <Setter Property="Width" Value="20" />
+        <Setter Property="Height" Value="20" />
+        <Setter Property="FontSize" Value="20" />
     </Style>
     <CornerRadius x:Key="ItemRadius">6</CornerRadius>
     <Thickness x:Key="ItemMargin">4 0 4 0</Thickness>
@@ -172,7 +192,7 @@
         BasedOn="{StaticResource ClockPanel}"
         TargetType="{x:Type StackPanel}">
         <Setter Property="Orientation" Value="Horizontal" />
-        <Setter Property="Margin" Value="0,0,42,0" />
+        <Setter Property="Margin" Value="0 0 42 0" />
     </Style>
     <Style
         x:Key="ClockBox"
@@ -180,11 +200,11 @@
         TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="14" />
         <Setter Property="Foreground" Value="#bebebe" />
-        <Setter Property="Margin" Value="0,0,10,0" />
+        <Setter Property="Margin" Value="0 0 10 0" />
         <Style.Triggers>
             <DataTrigger Binding="{Binding ElementName=DateBox, Path=Visibility}" Value="Visible">
                 <Setter Property="FontSize" Value="14" />
-                <Setter Property="Margin" Value="0,0,10,3" />
+                <Setter Property="Margin" Value="0 0 10 3" />
             </DataTrigger>
         </Style.Triggers>
 
@@ -198,7 +218,7 @@
         <Style.Triggers>
             <DataTrigger Binding="{Binding ElementName=ClockBox, Path=Visibility}" Value="Visible">
                 <Setter Property="FontSize" Value="14" />
-                <Setter Property="Margin" Value="0,0,0,3" />
+                <Setter Property="Margin" Value="0 0 0 3" />
             </DataTrigger>
         </Style.Triggers>
     </Style>
@@ -206,7 +226,7 @@
         x:Key="PreviewBorderStyle"
         BasedOn="{StaticResource BasePreviewBorderStyle}"
         TargetType="{x:Type Border}">
-        <Setter Property="Margin" Value="0,0,10,8" />
+        <Setter Property="Margin" Value="0 0 10 8" />
         <Setter Property="BorderBrush" Value="#dedcde" />
     </Style>
     <Style
diff --git a/Flow.Launcher/Themes/Win11Light.xaml b/Flow.Launcher/Themes/Win11Light.xaml
index 4e3115b6dfa..a8aeffd3d59 100644
--- a/Flow.Launcher/Themes/Win11Light.xaml
+++ b/Flow.Launcher/Themes/Win11Light.xaml
@@ -48,7 +48,7 @@
         <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
         <Setter Property="CaretBrush" Value="{DynamicResource Color05B}" />
         <Setter Property="SelectionBrush" Value="{StaticResource SystemAccentColorLight1Brush}" />
-        <Setter Property="FontSize" Value="18" />
+        <Setter Property="FontSize" Value="16" />
         <Setter Property="Height" Value="42" />
     </Style>
 
@@ -59,7 +59,7 @@
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Padding" Value="0 0 50 0" />
         <Setter Property="Height" Value="42" />
-        <Setter Property="FontSize" Value="18" />
+        <Setter Property="FontSize" Value="16" />
         <Setter Property="Foreground" Value="{DynamicResource QuerySuggestionBoxForeground}" />
     </Style>
 
@@ -79,7 +79,9 @@
     <Style
         x:Key="PendingLineStyle"
         BasedOn="{StaticResource BasePendingLineStyle}"
-        TargetType="{x:Type Line}" />
+        TargetType="{x:Type Line}">
+        <Setter Property="Stroke" Value="{DynamicResource BasicSystemAccentColor}" />
+    </Style>
 
     <!--  Item Style  -->
     <Style
@@ -188,6 +190,7 @@
     <CornerRadius x:Key="ItemRadius">5</CornerRadius>
     <Thickness x:Key="ItemMargin">10 0 10 0</Thickness>
     <Thickness x:Key="ResultMargin">0 10 0 10</Thickness>
+    <system:Double x:Key="ResultItemHeight">58</system:Double>
     <Style
         x:Key="ClockPanel"
         BasedOn="{StaticResource ClockPanel}"

From 3d96a368ffcadf7a58a079e8c18ac9f97e670f17 Mon Sep 17 00:00:00 2001
From: DB P <onesound@oooz.net>
Date: Sun, 13 Apr 2025 14:20:57 +0900
Subject: [PATCH 16/18] Fix Preview CornerRadius (Get BasedOn Style)

---
 Flow.Launcher.Core/Resource/Theme.cs | 35 +++++++++++++++++++---------
 Flow.Launcher/SettingWindow.xaml     |  2 +-
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/Flow.Launcher.Core/Resource/Theme.cs b/Flow.Launcher.Core/Resource/Theme.cs
index 26fbfb1b4d4..3276854ed11 100644
--- a/Flow.Launcher.Core/Resource/Theme.cs
+++ b/Flow.Launcher.Core/Resource/Theme.cs
@@ -771,22 +771,18 @@ private void ApplyPreviewBackground(Color? bgColor = null)
         {
             if (bgColor == null) return;
 
-            // Copy the existing WindowBorderStyle
+            // Create a new Style for the preview
             var previewStyle = new Style(typeof(Border));
-            if (Application.Current.Resources.Contains("WindowBorderStyle"))
+
+            // Get the original WindowBorderStyle
+            if (Application.Current.Resources.Contains("WindowBorderStyle") &&
+                Application.Current.Resources["WindowBorderStyle"] is Style originalStyle)
             {
-                if (Application.Current.Resources["WindowBorderStyle"] is Style originalStyle)
-                {
-                    foreach (var setter in originalStyle.Setters.OfType<Setter>())
-                    {
-                        previewStyle.Setters.Add(new Setter(setter.Property, setter.Value));
-                    }
-                }
+                // Copy the original style, including the base style if it exists
+                CopyStyle(originalStyle, previewStyle);
             }
 
             // Apply background color (remove transparency in color)
-            // WPF does not allow the use of an acrylic brush within the window's internal area,
-            // so transparency effects are not applied to the preview.
             Color backgroundColor = Color.FromRgb(bgColor.Value.R, bgColor.Value.G, bgColor.Value.B);
             previewStyle.Setters.Add(new Setter(Border.BackgroundProperty, new SolidColorBrush(backgroundColor)));
 
@@ -797,9 +793,26 @@ private void ApplyPreviewBackground(Color? bgColor = null)
                 previewStyle.Setters.Add(new Setter(Border.CornerRadiusProperty, new CornerRadius(5)));
                 previewStyle.Setters.Add(new Setter(Border.BorderThicknessProperty, new Thickness(1)));
             }
+
+            // Set the new style to the resource
             Application.Current.Resources["PreviewWindowBorderStyle"] = previewStyle;
         }
 
+        private void CopyStyle(Style originalStyle, Style targetStyle)
+        {
+            // If the style is based on another style, copy the base style first
+            if (originalStyle.BasedOn != null)
+            {
+                CopyStyle(originalStyle.BasedOn, targetStyle);
+            }
+
+            // Copy the setters from the original style
+            foreach (var setter in originalStyle.Setters.OfType<Setter>())
+            {
+                targetStyle.Setters.Add(new Setter(setter.Property, setter.Value));
+            }
+        }
+
         private void ColorizeWindow(string theme, BackdropTypes backdropType)
         {
             var dict = GetThemeResourceDictionary(theme);
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 6d629de6329..ab27b235a2c 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -19,9 +19,9 @@
     MouseDown="window_MouseDown"
     ResizeMode="CanResize"
     SnapsToDevicePixels="True"
-    UseLayoutRounding="True"
     StateChanged="Window_StateChanged"
     Top="{Binding SettingWindowTop, Mode=TwoWay}"
+    UseLayoutRounding="True"
     WindowStartupLocation="Manual"
     mc:Ignorable="d">
     <WindowChrome.WindowChrome>

From e4fbce47bd56cb349053740d7cb62e5708e0989d Mon Sep 17 00:00:00 2001
From: DB P <onesound@oooz.net>
Date: Sun, 13 Apr 2025 14:50:27 +0900
Subject: [PATCH 17/18] Adjust Scrollbar color and win11light theme

---
 Flow.Launcher/Resources/Dark.xaml    | 2 +-
 Flow.Launcher/Resources/Light.xaml   | 2 +-
 Flow.Launcher/Themes/Win11Light.xaml | 9 +++++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Flow.Launcher/Resources/Dark.xaml b/Flow.Launcher/Resources/Dark.xaml
index 6661b406cd8..1ec01f8d143 100644
--- a/Flow.Launcher/Resources/Dark.xaml
+++ b/Flow.Launcher/Resources/Dark.xaml
@@ -13,7 +13,7 @@
     <SolidColorBrush x:Key="SubTitleSelectedForeground" Color="#33FFFFFF" />
     <SolidColorBrush x:Key="SearchIconForeground" Color="#33FFFFFF" />
     <SolidColorBrush x:Key="SeparatorForeground" Color="#24FFFFFF" />
-    <SolidColorBrush x:Key="ThumbColor" Color="#9a9a9a" />
+    <SolidColorBrush x:Key="ThumbColor" Color="#28F7F3FF" />
     <SolidColorBrush x:Key="InlineHighlight" Color="#0078d7" />
     <SolidColorBrush x:Key="HotkeyForeground" Color="#33FFFFFF" />
     <SolidColorBrush x:Key="HotkeySelectedForeground" Color="#33FFFFFF" />
diff --git a/Flow.Launcher/Resources/Light.xaml b/Flow.Launcher/Resources/Light.xaml
index 381e2267357..4d765d161fe 100644
--- a/Flow.Launcher/Resources/Light.xaml
+++ b/Flow.Launcher/Resources/Light.xaml
@@ -13,7 +13,7 @@
     <SolidColorBrush x:Key="SubTitleSelectedForeground" Color="#72767d" />
     <SolidColorBrush x:Key="SearchIconForeground" Color="#20000000" />
     <SolidColorBrush x:Key="SeparatorForeground" Color="#20000000" />
-    <SolidColorBrush x:Key="ThumbColor" Color="#868686" />
+    <SolidColorBrush x:Key="ThumbColor" Color="#1F000000" />
     <SolidColorBrush x:Key="InlineHighlight" Color="#0078d7" />
     <SolidColorBrush x:Key="HotkeyForeground" Color="#51000000" />
     <SolidColorBrush x:Key="HotkeySelectedForeground" Color="#51000000" />
diff --git a/Flow.Launcher/Themes/Win11Light.xaml b/Flow.Launcher/Themes/Win11Light.xaml
index 08ce7f0d215..0c3e15c6dd9 100644
--- a/Flow.Launcher/Themes/Win11Light.xaml
+++ b/Flow.Launcher/Themes/Win11Light.xaml
@@ -33,12 +33,17 @@
         <Setter Property="CornerRadius" Value="2" />
         <Setter Property="Background" Value="{DynamicResource BasicSystemAccentColor}" />
     </Style>
+    <Style x:Key="ImageIconStyle" TargetType="{x:Type Image}">
+        <Setter Property="Height" Value="32" />
+        <Setter Property="Width" Value="32" />
+        <Setter Property="Margin" Value="-2 0 0 0" />
+    </Style>
     <Style
         x:Key="ItemGlyph"
         BasedOn="{StaticResource BaseGlyphStyle}"
         TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
-        <Setter Property="Margin" Value="0 0 0 0" />
+        <Setter Property="Margin" Value="-2 0 0 0" />
     </Style>
     <Style
         x:Key="QueryBoxStyle"
@@ -182,7 +187,7 @@
         <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalAlignment" Value="Center" />
-        <Setter Property="Margin" Value="0 0 0 0" />
+        <Setter Property="Margin" Value="-2 0 0 0" />
         <Setter Property="Width" Value="25" />
         <Setter Property="Height" Value="25" />
         <Setter Property="FontSize" Value="25" />

From 1cd699887083e1cd0a3de7b72bb02996e93d090f Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 18 Apr 2025 07:39:02 +0800
Subject: [PATCH 18/18] Cleanup codes

---
 .../UserSettings/Settings.cs                  | 85 ++-----------------
 Flow.Launcher.Infrastructure/Win32Helper.cs   | 72 ++++++++++++++++
 .../ViewModels/SettingsPaneThemeViewModel.cs  |  5 +-
 3 files changed, 83 insertions(+), 79 deletions(-)

diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index 0bd1a809b7a..8500e7aa444 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -1,12 +1,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Drawing;
-using System.Globalization;
-using System.Linq;
 using System.Text.Json.Serialization;
 using System.Windows;
-using System.Windows.Media;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.Infrastructure.Hotkey;
 using Flow.Launcher.Infrastructure.Logger;
@@ -14,7 +9,6 @@
 using Flow.Launcher.Plugin;
 using Flow.Launcher.Plugin.SharedModels;
 using Flow.Launcher.ViewModel;
-using SystemFonts = System.Windows.SystemFonts;
 
 namespace Flow.Launcher.Infrastructure.UserSettings
 {
@@ -37,67 +31,6 @@ public void Save()
         {
             _storage.Save();
         }
-
-        private string language = Constant.SystemLanguageCode;
-        private static readonly Dictionary<string, string> LanguageToNotoSans = new()
-        {
-            { "ko", "Noto Sans KR" },
-            { "ja", "Noto Sans JP" },
-            { "zh-CN", "Noto Sans SC" },
-            { "zh-SG", "Noto Sans SC" },
-            { "zh-Hans", "Noto Sans SC" },
-            { "zh-TW", "Noto Sans TC" },
-            { "zh-HK", "Noto Sans TC" },
-            { "zh-MO", "Noto Sans TC" },
-            { "zh-Hant", "Noto Sans TC" },
-            { "th", "Noto Sans Thai" },
-            { "ar", "Noto Sans Arabic" },
-            { "he", "Noto Sans Hebrew" },
-            { "hi", "Noto Sans Devanagari" },
-            { "bn", "Noto Sans Bengali" },
-            { "ta", "Noto Sans Tamil" },
-            { "el", "Noto Sans Greek" },
-            { "ru", "Noto Sans" },
-            { "en", "Noto Sans" },
-            { "fr", "Noto Sans" },
-            { "de", "Noto Sans" },
-            { "es", "Noto Sans" },
-            { "pt", "Noto Sans" }
-        };
-
-        public static string GetSystemDefaultFont()
-        {
-            try
-            {
-                var culture = CultureInfo.CurrentCulture;
-                var language = culture.Name; // e.g., "zh-TW"
-                var langPrefix = language.Split('-')[0]; // e.g., "zh"
-
-                // First, try to find by full name, and if not found, fallback to prefix
-                if (TryGetNotoFont(language, out var notoFont) || TryGetNotoFont(langPrefix, out notoFont))
-                {
-                    if (Fonts.SystemFontFamilies.Any(f => f.Source.Equals(notoFont)))
-                        return notoFont;
-                }
-
-                var font = SystemFonts.MessageFontFamily;
-                if (font.FamilyNames.TryGetValue(System.Windows.Markup.XmlLanguage.GetLanguage("en-US"), out var englishName))
-                {
-                    return englishName;
-                }
-
-                return font.Source ?? "Segoe UI";
-            }
-            catch
-            {
-                return "Segoe UI";
-            }
-        }
-
-        private static bool TryGetNotoFont(string langKey, out string notoFont)
-        {
-            return LanguageToNotoSans.TryGetValue(langKey, out notoFont);
-        }
         
         private string _theme = Constant.DefaultTheme;
         public string Hotkey { get; set; } = $"{KeyConstant.Alt} + {KeyConstant.Space}";
@@ -119,12 +52,13 @@ private static bool TryGetNotoFont(string langKey, out string notoFont)
         public string CycleHistoryUpHotkey { get; set; } = $"{KeyConstant.Alt} + Up";
         public string CycleHistoryDownHotkey { get; set; } = $"{KeyConstant.Alt} + Down";
 
+        private string _language = Constant.SystemLanguageCode;
         public string Language
         {
-            get => language;
+            get => _language;
             set
             {
-                language = value;
+                _language = value;
                 OnPropertyChanged();
             }
         }
@@ -150,15 +84,15 @@ public string Theme
         public double QueryBoxFontSize { get; set; } = 16;
         public double ResultItemFontSize { get; set; } = 16;
         public double ResultSubItemFontSize { get; set; } = 13;
-        public string QueryBoxFont { get; set; } = GetSystemDefaultFont();
+        public string QueryBoxFont { get; set; } = Win32Helper.GetSystemDefaultFont();
         public string QueryBoxFontStyle { get; set; }
         public string QueryBoxFontWeight { get; set; }
         public string QueryBoxFontStretch { get; set; }
-        public string ResultFont { get; set; } = GetSystemDefaultFont();
+        public string ResultFont { get; set; } = Win32Helper.GetSystemDefaultFont();
         public string ResultFontStyle { get; set; }
         public string ResultFontWeight { get; set; }
         public string ResultFontStretch { get; set; }
-        public string ResultSubFont { get; set; } = GetSystemDefaultFont();
+        public string ResultSubFont { get; set; } = Win32Helper.GetSystemDefaultFont();
         public string ResultSubFontStyle { get; set; }
         public string ResultSubFontWeight { get; set; }
         public string ResultSubFontStretch { get; set; }
@@ -181,7 +115,7 @@ public string Theme
         public double? SettingWindowLeft { get; set; } = null;
         public WindowState SettingWindowState { get; set; } = WindowState.Normal;
 
-        bool _showPlaceholder { get; set; } = true;
+        private bool _showPlaceholder { get; set; } = true;
         public bool ShowPlaceholder
         {
             get => _showPlaceholder;
@@ -194,7 +128,7 @@ public bool ShowPlaceholder
                 }
             }
         }
-        string _placeholderText { get; set; } = string.Empty;
+        private string _placeholderText { get; set; } = string.Empty;
         public string PlaceholderText
         {
             get => _placeholderText;
@@ -373,7 +307,7 @@ public bool KeepMaxResults
         public bool StartFlowLauncherOnSystemStartup { get; set; } = false;
         public bool UseLogonTaskForStartup { get; set; } = false;
         public bool HideOnStartup { get; set; } = true;
-        bool _hideNotifyIcon { get; set; }
+        private bool _hideNotifyIcon;
         public bool HideNotifyIcon
         {
             get => _hideNotifyIcon;
@@ -551,5 +485,4 @@ public enum BackdropTypes
         Mica,
         MicaAlt
     }
-    
 }
diff --git a/Flow.Launcher.Infrastructure/Win32Helper.cs b/Flow.Launcher.Infrastructure/Win32Helper.cs
index 798501ae3fd..6a5af41df28 100644
--- a/Flow.Launcher.Infrastructure/Win32Helper.cs
+++ b/Flow.Launcher.Infrastructure/Win32Helper.cs
@@ -1,10 +1,13 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Globalization;
+using System.Linq;
 using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Interop;
+using System.Windows.Markup;
 using System.Windows.Media;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Microsoft.Win32;
@@ -14,6 +17,7 @@
 using Windows.Win32.UI.Input.KeyboardAndMouse;
 using Windows.Win32.UI.WindowsAndMessaging;
 using Point = System.Windows.Point;
+using SystemFonts = System.Windows.SystemFonts;
 
 namespace Flow.Launcher.Infrastructure
 {
@@ -595,5 +599,73 @@ public static void OpenImeSettings()
         }
 
         #endregion
+
+        #region System Font
+
+        private static readonly Dictionary<string, string> _languageToNotoSans = new()
+        {
+            { "ko", "Noto Sans KR" },
+            { "ja", "Noto Sans JP" },
+            { "zh-CN", "Noto Sans SC" },
+            { "zh-SG", "Noto Sans SC" },
+            { "zh-Hans", "Noto Sans SC" },
+            { "zh-TW", "Noto Sans TC" },
+            { "zh-HK", "Noto Sans TC" },
+            { "zh-MO", "Noto Sans TC" },
+            { "zh-Hant", "Noto Sans TC" },
+            { "th", "Noto Sans Thai" },
+            { "ar", "Noto Sans Arabic" },
+            { "he", "Noto Sans Hebrew" },
+            { "hi", "Noto Sans Devanagari" },
+            { "bn", "Noto Sans Bengali" },
+            { "ta", "Noto Sans Tamil" },
+            { "el", "Noto Sans Greek" },
+            { "ru", "Noto Sans" },
+            { "en", "Noto Sans" },
+            { "fr", "Noto Sans" },
+            { "de", "Noto Sans" },
+            { "es", "Noto Sans" },
+            { "pt", "Noto Sans" }
+        };
+
+        public static string GetSystemDefaultFont()
+        {
+            try
+            {
+                var culture = CultureInfo.CurrentCulture;
+                var language = culture.Name; // e.g., "zh-TW"
+                var langPrefix = language.Split('-')[0]; // e.g., "zh"
+
+                // First, try to find by full name, and if not found, fallback to prefix
+                if (TryGetNotoFont(language, out var notoFont) || TryGetNotoFont(langPrefix, out notoFont))
+                {
+                    // If the font is installed, return it
+                    if (Fonts.SystemFontFamilies.Any(f => f.Source.Equals(notoFont)))
+                    {
+                        return notoFont;
+                    }
+                }
+
+                // If Noto font is not found, fallback to the system default font
+                var font = SystemFonts.MessageFontFamily;
+                if (font.FamilyNames.TryGetValue(XmlLanguage.GetLanguage("en-US"), out var englishName))
+                {
+                    return englishName;
+                }
+
+                return font.Source ?? "Segoe UI";
+            }
+            catch
+            {
+                return "Segoe UI";
+            }
+        }
+
+        private static bool TryGetNotoFont(string langKey, out string notoFont)
+        {
+            return _languageToNotoSans.TryGetValue(langKey, out notoFont);
+        }
+
+        #endregion
     }
 }
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
index d62fd906b35..1138b286975 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Windows;
+using System.Windows.Controls;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -17,13 +17,12 @@
 using Flow.Launcher.ViewModel;
 using ModernWpf;
 using ThemeManagerForColorSchemeSwitch = ModernWpf.ThemeManager;
-using System.Windows.Controls;
 
 namespace Flow.Launcher.SettingPages.ViewModels;
 
 public partial class SettingsPaneThemeViewModel : BaseModel
 {
-    private string DefaultFont = Settings.GetSystemDefaultFont();
+    private readonly string DefaultFont = Win32Helper.GetSystemDefaultFont();
     public string BackdropSubText => !Win32Helper.IsBackdropSupported() ? App.API.GetTranslation("BackdropTypeDisabledToolTip") : ""; 
     public Settings Settings { get; }
     private readonly Theme _theme = Ioc.Default.GetRequiredService<Theme>();