diff --git a/Flow.Launcher.Core/Resource/Theme.cs b/Flow.Launcher.Core/Resource/Theme.cs
index 0dd1d5bbb..1ae755bd1 100644
--- a/Flow.Launcher.Core/Resource/Theme.cs
+++ b/Flow.Launcher.Core/Resource/Theme.cs
@@ -396,19 +396,26 @@ namespace Flow.Launcher.Core.Resource
                 // Final decision on whether to use dark mode
                 bool useDarkMode = false;
 
-                if (colorScheme == "Dark" || systemBG == "Dark")
+                // If systemBG is not "Auto", prioritize it over ColorScheme and set the mode based on systemBG value
+                if (systemBG == "Dark")
                 {
                     useDarkMode = true;  // Dark
                 }
-                else if (colorScheme == "Light" || systemBG == "Light")
+                else if (systemBG == "Light")
                 {
                     useDarkMode = false; // Light
                 }
-                else if (colorScheme == "System" || systemBG == "Auto")
+                else if (systemBG == "Auto")
                 {
-                    useDarkMode = isSystemDark; // Auto
+                    // If systemBG is "Auto", decide based on ColorScheme
+                    if (colorScheme == "Dark")
+                        useDarkMode = true;
+                    else if (colorScheme == "Light")
+                        useDarkMode = false;
+                    else
+                        useDarkMode = isSystemDark;  // Auto (based on system setting)
                 }
-                
+
                 // Apply DWM Dark Mode 
                 Methods.SetWindowAttribute(new WindowInteropHelper(mainWindow).Handle, DWMWINDOWATTRIBUTE.DWMWA_USE_IMMERSIVE_DARK_MODE, useDarkMode ? 1 : 0);
 
@@ -458,6 +465,8 @@ namespace Flow.Launcher.Core.Resource
             }, DispatcherPriority.Normal);
         }
 
+
+
         public bool IsBlurTheme()
         {
             if (Environment.OSVersion.Version >= new Version(6, 2))
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
index dc9beec1c..87f5ed922 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
@@ -134,10 +134,8 @@ public partial class SettingsPaneThemeViewModel : BaseModel
                 Constant.System => null,
                 _ => ThemeManagerForColorSchemeSwitch.Current.ApplicationTheme
             };
-
-            ThemeManager.Instance.RefreshFrame();
-
             Settings.ColorScheme = value;
+            ThemeManager.Instance.RefreshFrame();
         }
     }
 
diff --git a/Flow.Launcher/Themes/BlurBlack Darker.xaml b/Flow.Launcher/Themes/BlurBlack Darker.xaml
index 4cd8408fa..9f7e6f5b0 100644
--- a/Flow.Launcher/Themes/BlurBlack Darker.xaml	
+++ b/Flow.Launcher/Themes/BlurBlack Darker.xaml	
@@ -13,7 +13,6 @@
 
     <system:Boolean x:Key="ThemeBlurEnabled">True</system:Boolean>
     <system:String x:Key="SystemBG">Dark</system:String>
-    <system:String x:Key="CornerType">DoNotRound</system:String>
     <Color x:Key="LightBG">#C7000000</Color>
     <Color x:Key="DarkBG">#C7000000</Color>
 
diff --git a/Flow.Launcher/Themes/BlurBlack.xaml b/Flow.Launcher/Themes/BlurBlack.xaml
index 0e2f0e245..c45827074 100644
--- a/Flow.Launcher/Themes/BlurBlack.xaml
+++ b/Flow.Launcher/Themes/BlurBlack.xaml
@@ -12,7 +12,6 @@
     </ResourceDictionary.MergedDictionaries>
     <system:Boolean x:Key="ThemeBlurEnabled">True</system:Boolean>
     <system:String x:Key="SystemBG">Dark</system:String>
-    <system:String x:Key="CornerType">DoNotRound</system:String>
     <Color x:Key="LightBG">#B0000000</Color>
     <Color x:Key="DarkBG">#B6000000</Color>
 
diff --git a/Flow.Launcher/Themes/BlurWhite.xaml b/Flow.Launcher/Themes/BlurWhite.xaml
index e5f310c5a..8bf1f06e2 100644
--- a/Flow.Launcher/Themes/BlurWhite.xaml
+++ b/Flow.Launcher/Themes/BlurWhite.xaml
@@ -12,7 +12,6 @@
     </ResourceDictionary.MergedDictionaries>
     <system:Boolean x:Key="ThemeBlurEnabled">True</system:Boolean>
     <system:String x:Key="SystemBG">Light</system:String>
-    <system:String x:Key="CornerType">DoNotRound</system:String>
     <Color x:Key="LightBG">#BFFAFAFA</Color>
     <Color x:Key="DarkBG">#BFFAFAFA</Color>
     <Style
diff --git a/Flow.Launcher/Themes/Circle System.xaml b/Flow.Launcher/Themes/Circle System.xaml
index 8c1c02ff6..600b9e9dc 100644
--- a/Flow.Launcher/Themes/Circle System.xaml	
+++ b/Flow.Launcher/Themes/Circle System.xaml	
@@ -14,7 +14,6 @@
     </ResourceDictionary.MergedDictionaries>
     <system:Boolean x:Key="ThemeBlurEnabled">True</system:Boolean>
     <system:String x:Key="SystemBG">Auto</system:String>
-    <system:String x:Key="CornerType">Round</system:String>
     <Color x:Key="LightBG">#E5E6E6E6</Color>
     <Color x:Key="DarkBG">#DF1F1F1F</Color>
     <Style