diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
index 919078b66..829f8e4e5 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
@@ -466,7 +466,6 @@
                             <Grid
                                 Width="Auto"
                                 Height="34"
-                                MinWidth="140"
                                 Margin="0">
                                 <StackPanel Margin="12 0" Orientation="Horizontal">
                                     <TextBlock
@@ -487,7 +486,7 @@
                                     <ui:FontIcon
                                         Margin="8 0 0 0"
                                         VerticalAlignment="Center"
-                                        FontSize="8"
+                                        FontSize="12"
                                         Glyph="&#xEB42;"
                                         Visibility="{Binding IsBlur, Converter={StaticResource BoolToVisibilityConverter}}" />
                                 </StackPanel>
diff --git a/Flow.Launcher/Themes/BlurBlack Darker.xaml b/Flow.Launcher/Themes/BlurBlack Darker.xaml
index 67a47f4cf..714dd73c9 100644
--- a/Flow.Launcher/Themes/BlurBlack Darker.xaml	
+++ b/Flow.Launcher/Themes/BlurBlack Darker.xaml	
@@ -1,4 +1,9 @@
-<ResourceDictionary
+<!--
+    Name: Blur Black Darker
+    IsDark: False
+    IsBlur: True
+-->
+<ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:system="clr-namespace:System;assembly=mscorlib">
@@ -53,7 +58,7 @@
         TargetType="{x:Type Rectangle}">
         <Setter Property="Fill" Value="#444444" />
         <Setter Property="Height" Value="1" />
-        <Setter Property="Margin" Value="12,0,12,8" />
+        <Setter Property="Margin" Value="12 0 12 8" />
     </Style>
 
     <Style
diff --git a/Flow.Launcher/Themes/BlurBlack.xaml b/Flow.Launcher/Themes/BlurBlack.xaml
index 0f1264292..d5034717f 100644
--- a/Flow.Launcher/Themes/BlurBlack.xaml
+++ b/Flow.Launcher/Themes/BlurBlack.xaml
@@ -1,4 +1,9 @@
-<ResourceDictionary
+<!--
+    Name: Blur Black
+    IsDark: False
+    IsBlur: True
+-->
+<ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:system="clr-namespace:System;assembly=mscorlib">
@@ -51,7 +56,7 @@
         TargetType="{x:Type Rectangle}">
         <Setter Property="Fill" Value="#444444" />
         <Setter Property="Height" Value="1" />
-        <Setter Property="Margin" Value="12,0,12,8" />
+        <Setter Property="Margin" Value="12 0 12 8" />
     </Style>
 
     <Style
diff --git a/Flow.Launcher/Themes/BlurWhite.xaml b/Flow.Launcher/Themes/BlurWhite.xaml
index 4406724b8..75f61ee47 100644
--- a/Flow.Launcher/Themes/BlurWhite.xaml
+++ b/Flow.Launcher/Themes/BlurWhite.xaml
@@ -1,4 +1,9 @@
-<ResourceDictionary
+<!--
+    Name: Blur White
+    IsDark: False
+    IsBlur: True
+-->
+<ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:system="clr-namespace:System;assembly=mscorlib">
@@ -96,7 +101,7 @@
         TargetType="{x:Type Rectangle}">
         <Setter Property="Fill" Value="#c6c6c6" />
         <Setter Property="Height" Value="1" />
-        <Setter Property="Margin" Value="12,0,12,8" />
+        <Setter Property="Margin" Value="12 0 12 8" />
     </Style>
     <!--  button style in the middle of the scrollbar  -->
     <Style
diff --git a/Flow.Launcher/Themes/Circle System.xaml b/Flow.Launcher/Themes/Circle System.xaml
index 2b2ce7ca3..872ed7bf0 100644
--- a/Flow.Launcher/Themes/Circle System.xaml	
+++ b/Flow.Launcher/Themes/Circle System.xaml	
@@ -1,3 +1,8 @@
+<!--
+    Name: Circle
+    IsDark: True
+    IsBlur: False
+-->
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -17,7 +22,7 @@
         x:Key="QueryBoxStyle"
         BasedOn="{StaticResource BaseQueryBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="Padding" Value="0,4,50,0" />
+        <Setter Property="Padding" Value="0 4 50 0" />
         <Setter Property="Foreground" Value="{m:DynamicColor SystemControlPageTextBaseHighBrush}" />
         <Setter Property="FontSize" Value="18" />
         <Setter Property="Height" Value="38" />
@@ -27,7 +32,7 @@
         x:Key="QuerySuggestionBoxStyle"
         BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="Padding" Value="0,4,50,0" />
+        <Setter Property="Padding" Value="0 4 50 0" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Height" Value="38" />
         <Setter Property="FontSize" Value="18" />
@@ -72,7 +77,7 @@
         TargetType="{x:Type Rectangle}">
         <Setter Property="Fill" Value="{m:DynamicColor SystemControlBackgroundChromeMediumBrush}" />
         <Setter Property="Height" Value="1" />
-        <Setter Property="Margin" Value="0,0,0,8" />
+        <Setter Property="Margin" Value="0 0 0 8" />
     </Style>
     <Style x:Key="HighlightStyle" />
     <Style
@@ -123,7 +128,7 @@
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Width" Value="32" />
         <Setter Property="Height" Value="32" />
-        <Setter Property="Margin" Value="0,8,8,0" />
+        <Setter Property="Margin" Value="0 8 8 0" />
         <Setter Property="HorizontalAlignment" Value="Right" />
     </Style>
 
@@ -150,7 +155,7 @@
         x:Key="ClockPanel"
         BasedOn="{StaticResource ClockPanel}"
         TargetType="{x:Type StackPanel}">
-        <Setter Property="Margin" Value="0,0,54,0" />
+        <Setter Property="Margin" Value="0 0 54 0" />
     </Style>
     <Style
         x:Key="ClockBox"
diff --git a/Flow.Launcher/Themes/Win10System.xaml b/Flow.Launcher/Themes/Win10System.xaml
index b4f1cfd8c..1b785329f 100644
--- a/Flow.Launcher/Themes/Win10System.xaml
+++ b/Flow.Launcher/Themes/Win10System.xaml
@@ -1,3 +1,8 @@
+<!--
+    Name: Windows 10
+    IsDark: True
+    IsBlur: False
+-->
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -27,7 +32,7 @@
         <Setter Property="FontSize" Value="22" />
         <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
         <Setter Property="CaretBrush" Value="{DynamicResource Color05B}" />
-        <Setter Property="Padding" Value="0,4,66,0" />
+        <Setter Property="Padding" Value="0 4 66 0" />
         <Setter Property="Height" Value="42" />
     </Style>
     <Style
@@ -36,7 +41,7 @@
         TargetType="{x:Type TextBox}">
         <Setter Property="Foreground" Value="{DynamicResource QuerySuggestionBoxForeground}" />
         <Setter Property="FontSize" Value="22" />
-        <Setter Property="Padding" Value="0,4,66,0" />
+        <Setter Property="Padding" Value="0 4 66 0" />
         <Setter Property="Height" Value="42" />
     </Style>
     <Style
@@ -148,7 +153,7 @@
         TargetType="{x:Type Rectangle}">
         <Setter Property="Fill" Value="{DynamicResource SeparatorForeground}" />
         <Setter Property="Height" Value="1" />
-        <Setter Property="Margin" Value="12,0,12,8" />
+        <Setter Property="Margin" Value="12 0 12 8" />
     </Style>
     <Style
         x:Key="SearchIconStyle"
@@ -163,7 +168,7 @@
         <Setter Property="Width" Value="32" />
         <Setter Property="Height" Value="32" />
         <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Margin" Value="0,0,16,0" />
+        <Setter Property="Margin" Value="0 0 16 0" />
         <Setter Property="HorizontalAlignment" Value="Right" />
     </Style>
     <Style
diff --git a/Flow.Launcher/Themes/Win11Light.xaml b/Flow.Launcher/Themes/Win11Light.xaml
index 3edc9a192..10933268c 100644
--- a/Flow.Launcher/Themes/Win11Light.xaml
+++ b/Flow.Launcher/Themes/Win11Light.xaml
@@ -1,7 +1,7 @@
 <!--
     Name: Windows 11
     IsDark: True
-    BlurAmount: 0
+    IsBlur: False
 -->
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -34,13 +34,13 @@
         BasedOn="{StaticResource BaseGlyphStyle}"
         TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
-        <Setter Property="Margin" Value="-4,0,0,0" />
+        <Setter Property="Margin" Value="-4 0 0 0" />
     </Style>
     <Style
         x:Key="QueryBoxStyle"
         BasedOn="{StaticResource BaseQueryBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="Padding" Value="0,0,50,0" />
+        <Setter Property="Padding" Value="0 0 50 0" />
         <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
         <Setter Property="CaretBrush" Value="{DynamicResource Color05B}" />
         <Setter Property="SelectionBrush" Value="{StaticResource SystemAccentColorLight1Brush}" />
@@ -53,7 +53,7 @@
         BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
         TargetType="{x:Type TextBox}">
         <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Padding" Value="0,0,50,0" />
+        <Setter Property="Padding" Value="0 0 50 0" />
         <Setter Property="Height" Value="42" />
         <Setter Property="FontSize" Value="18" />
         <Setter Property="Foreground" Value="{DynamicResource QuerySuggestionBoxForeground}" />
@@ -96,7 +96,7 @@
         TargetType="{x:Type Rectangle}">
         <Setter Property="Fill" Value="{DynamicResource SeparatorForeground}" />
         <Setter Property="Height" Value="1" />
-        <Setter Property="Margin" Value="0,0,0,8" />
+        <Setter Property="Margin" Value="0 0 0 8" />
     </Style>
     <Style x:Key="HighlightStyle" />
     <Style
@@ -147,7 +147,7 @@
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Width" Value="32" />
         <Setter Property="Height" Value="32" />
-        <Setter Property="Margin" Value="0,8,8,0" />
+        <Setter Property="Margin" Value="0 8 8 0" />
         <Setter Property="HorizontalAlignment" Value="Right" />
     </Style>
 
@@ -163,7 +163,7 @@
         <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalAlignment" Value="Center" />
-        <Setter Property="Margin" Value="-4,0,0,0" />
+        <Setter Property="Margin" Value="-4 0 0 0" />
         <Setter Property="Width" Value="25" />
         <Setter Property="Height" Value="25" />
         <Setter Property="FontSize" Value="25" />
@@ -175,7 +175,7 @@
         x:Key="ClockPanel"
         BasedOn="{StaticResource ClockPanel}"
         TargetType="{x:Type StackPanel}">
-        <Setter Property="Margin" Value="0,0,54,0" />
+        <Setter Property="Margin" Value="0 0 54 0" />
 
     </Style>
     <Style