diff --git a/Flow.Launcher/Resources/Dark.xaml b/Flow.Launcher/Resources/Dark.xaml
index ed031c939..25cc8e878 100644
--- a/Flow.Launcher/Resources/Dark.xaml
+++ b/Flow.Launcher/Resources/Dark.xaml
@@ -7,17 +7,17 @@
     xmlns:sys="clr-namespace:System;assembly=mscorlib">
 
     <SolidColorBrush x:Key="SystemThemeBorder" Color="#3f3f3f" />
-    <SolidColorBrush x:Key="QuerySuggestionBoxForeground" Color="#4d4d4d" />
+    <SolidColorBrush x:Key="QuerySuggestionBoxForeground" Color="#33FFFFFF" />
     <SolidColorBrush x:Key="QuerySelectionBrush" Color="#4a5459" />
-    <SolidColorBrush x:Key="SubTitleForeground" Color="#7b7b7b" />
-    <SolidColorBrush x:Key="SubTitleSelectedForeground" Color="#7b7b7b" />
-    <SolidColorBrush x:Key="SearchIconForeground" Color="#4d4d4d" />
-    <SolidColorBrush x:Key="SeparatorForeground" Color="#14ffffff" />
+    <SolidColorBrush x:Key="SubTitleForeground" Color="#33FFFFFF" />
+    <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="InlineHighlight" Color="#0078d7" />
-    <SolidColorBrush x:Key="HotkeyForeground" Color="#7b7b7b" />
-    <SolidColorBrush x:Key="HotkeySelectedForeground" Color="#7b7b7b" />
-    <SolidColorBrush x:Key="ClockDateForeground" Color="#4d4d4d" />
+    <SolidColorBrush x:Key="HotkeyForeground" Color="#33FFFFFF" />
+    <SolidColorBrush x:Key="HotkeySelectedForeground" Color="#33FFFFFF" />
+    <SolidColorBrush x:Key="ClockDateForeground" Color="#26FFFFFF" />
     <Color x:Key="ItemSelectedBackgroundColorBrush">#198F8F8F</Color>
 
 
diff --git a/Flow.Launcher/Resources/Light.xaml b/Flow.Launcher/Resources/Light.xaml
index 8fe84588f..b9f65ce96 100644
--- a/Flow.Launcher/Resources/Light.xaml
+++ b/Flow.Launcher/Resources/Light.xaml
@@ -7,18 +7,18 @@
     xmlns:sys="clr-namespace:System;assembly=mscorlib">
 
     <SolidColorBrush x:Key="SystemThemeBorder" Color="#aaaaaa" />
-    <SolidColorBrush x:Key="QuerySuggestionBoxForeground" Color="#d8d2d0" />
+    <SolidColorBrush x:Key="QuerySuggestionBoxForeground" Color="#51000000" />
     <SolidColorBrush x:Key="QuerySelectionBrush" Color="#0a68d8" />
     <SolidColorBrush x:Key="SubTitleForeground" Color="#818181" />
     <SolidColorBrush x:Key="SubTitleSelectedForeground" Color="#72767d" />
-    <SolidColorBrush x:Key="SearchIconForeground" Color="#d3d3d3" />
-    <SolidColorBrush x:Key="SeparatorForeground" Color="#14000000" />
+    <SolidColorBrush x:Key="SearchIconForeground" Color="#20000000" />
+    <SolidColorBrush x:Key="SeparatorForeground" Color="#20000000" />
     <SolidColorBrush x:Key="ThumbColor" Color="#868686" />
     <SolidColorBrush x:Key="InlineHighlight" Color="#0078d7" />
-    <SolidColorBrush x:Key="HotkeyForeground" Color="#acacac" />
-    <SolidColorBrush x:Key="HotkeySelectedForeground" Color="#acacac" />
-    <SolidColorBrush x:Key="ClockDateForeground" Color="#d3d3d3" />
-    <Color x:Key="ItemSelectedBackgroundColorBrush">#198F8F8F</Color>
+    <SolidColorBrush x:Key="HotkeyForeground" Color="#51000000" />
+    <SolidColorBrush x:Key="HotkeySelectedForeground" Color="#51000000" />
+    <SolidColorBrush x:Key="ClockDateForeground" Color="#44000000" />
+    <Color x:Key="ItemSelectedBackgroundColorBrush">#0C000000</Color>
 
     <SolidColorBrush x:Key="Color00B" Color="#fbfbfb" />
     <SolidColorBrush x:Key="Color01B" Color="#f3f3f3" />
diff --git a/Flow.Launcher/Themes/BlurBlack Darker.xaml b/Flow.Launcher/Themes/BlurBlack Darker.xaml
index 99cd9af0e..4cd8408fa 100644
--- a/Flow.Launcher/Themes/BlurBlack Darker.xaml	
+++ b/Flow.Launcher/Themes/BlurBlack Darker.xaml	
@@ -143,8 +143,8 @@
         BasedOn="{StaticResource BaseSearchIconStyle}"
         TargetType="{x:Type Path}">
         <Setter Property="Fill" Value="#ffffff" />
-        <Setter Property="Width" Value="32" />
-        <Setter Property="Height" Value="32" />
+        <Setter Property="Width" Value="30" />
+        <Setter Property="Height" Value="30" />
         <Setter Property="Opacity" Value="0.2" />
     </Style>
     <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
diff --git a/Flow.Launcher/Themes/BlurBlack.xaml b/Flow.Launcher/Themes/BlurBlack.xaml
index bb4b5cae0..0e2f0e245 100644
--- a/Flow.Launcher/Themes/BlurBlack.xaml
+++ b/Flow.Launcher/Themes/BlurBlack.xaml
@@ -139,8 +139,8 @@
         BasedOn="{StaticResource BaseSearchIconStyle}"
         TargetType="{x:Type Path}">
         <Setter Property="Fill" Value="#ffffff" />
-        <Setter Property="Width" Value="32" />
-        <Setter Property="Height" Value="32" />
+        <Setter Property="Width" Value="30" />
+        <Setter Property="Height" Value="30" />
         <Setter Property="Opacity" Value="0.5" />
     </Style>
     <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
diff --git a/Flow.Launcher/Themes/BlurWhite.xaml b/Flow.Launcher/Themes/BlurWhite.xaml
index af7ae4974..636bfb0ce 100644
--- a/Flow.Launcher/Themes/BlurWhite.xaml
+++ b/Flow.Launcher/Themes/BlurWhite.xaml
@@ -21,6 +21,14 @@
         TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#FF000000" />
     </Style>
+    <Style x:Key="ItemGlyphSelectedStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="Foreground" Value="#FF000000" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="Width" Value="25" />
+        <Setter Property="Height" Value="25" />
+        <Setter Property="FontSize" Value="25" />
+    </Style>
     <Style x:Key="WindowRadius" TargetType="{x:Type Border}">
         <Setter Property="CornerRadius" Value="0" />
     </Style>
@@ -79,7 +87,7 @@
         x:Key="ItemSubTitleStyle"
         BasedOn="{StaticResource BaseItemSubTitleStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#818181" />
+        <Setter Property="Foreground" Value="#85000000" />
     </Style>
     <Style
         x:Key="ItemTitleSelectedStyle"
@@ -91,12 +99,12 @@
         x:Key="ItemSubTitleSelectedStyle"
         BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#72767d" />
+        <Setter Property="Foreground" Value="#85000000" />
     </Style>
     <SolidColorBrush
         x:Key="ItemSelectedBackgroundColor"
-        Opacity="0.5"
-        Color="#ccd0d4" />
+        Opacity="0.6"
+        Color="#33000000" />
 
     <Style
         x:Key="SeparatorStyle"
@@ -135,8 +143,8 @@
         BasedOn="{StaticResource BaseSearchIconStyle}"
         TargetType="{x:Type Path}">
         <Setter Property="Fill" Value="#000000" />
-        <Setter Property="Width" Value="32" />
-        <Setter Property="Height" Value="32" />
+        <Setter Property="Width" Value="30" />
+        <Setter Property="Height" Value="30" />
         <Setter Property="Opacity" Value="0.2" />
     </Style>
     <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
diff --git a/Flow.Launcher/Themes/Circle System.xaml b/Flow.Launcher/Themes/Circle System.xaml
index c08ad5910..8c1c02ff6 100644
--- a/Flow.Launcher/Themes/Circle System.xaml	
+++ b/Flow.Launcher/Themes/Circle System.xaml	
@@ -14,8 +14,9 @@
     </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">#BC202020</Color>
+    <system:String x:Key="CornerType">Round</system:String>
+    <Color x:Key="LightBG">#E5E6E6E6</Color>
+    <Color x:Key="DarkBG">#DF1F1F1F</Color>
     <Style
         x:Key="ItemGlyph"
         BasedOn="{StaticResource BaseGlyphStyle}"
@@ -27,7 +28,7 @@
         BasedOn="{StaticResource BaseQueryBoxStyle}"
         TargetType="{x:Type TextBox}">
         <Setter Property="Padding" Value="0 4 50 0" />
-        <Setter Property="Foreground" Value="{m:DynamicColor SystemControlPageTextBaseHighBrush}" />
+        <Setter Property="Foreground" Value="{m:DynamicColor SystemControlHighlightBaseHighBrush}" />
         <Setter Property="FontSize" Value="18" />
         <Setter Property="Height" Value="38" />
     </Style>
@@ -79,7 +80,7 @@
         x:Key="SeparatorStyle"
         BasedOn="{StaticResource BaseSeparatorStyle}"
         TargetType="{x:Type Rectangle}">
-        <Setter Property="Fill" Value="{m:DynamicColor SystemControlBackgroundChromeMediumBrush}" />
+        <Setter Property="Fill" Value="{DynamicResource SeparatorForeground}" />
         <Setter Property="Height" Value="1" />
         <Setter Property="Margin" Value="0 0 0 8" />
     </Style>
diff --git a/Flow.Launcher/Themes/Darker.xaml b/Flow.Launcher/Themes/Darker.xaml
index d1abbe978..7d2614be8 100644
--- a/Flow.Launcher/Themes/Darker.xaml
+++ b/Flow.Launcher/Themes/Darker.xaml
@@ -29,7 +29,9 @@
     <Style
         x:Key="WindowBorderStyle"
         BasedOn="{StaticResource BaseWindowBorderStyle}"
-        TargetType="{x:Type Border}" />
+        TargetType="{x:Type Border}">
+        <Setter Property="Background" Value="#2F2F2F" />
+    </Style>
 
     <Style
         x:Key="WindowStyle"
@@ -89,7 +91,7 @@
         TargetType="{x:Type Rectangle}">
         <Setter Property="Fill" Value="#3b3b3b" />
         <Setter Property="Height" Value="1" />
-        <Setter Property="Margin" Value="8,0,8,8" />
+        <Setter Property="Margin" Value="8 0 8 8" />
     </Style>
     <Style
         x:Key="PreviewBorderStyle"
diff --git a/Flow.Launcher/Themes/Win10System.xaml b/Flow.Launcher/Themes/Win10System.xaml
index b8bb02eb8..2c68edc79 100644
--- a/Flow.Launcher/Themes/Win10System.xaml
+++ b/Flow.Launcher/Themes/Win10System.xaml
@@ -179,13 +179,13 @@
         x:Key="ClockBox"
         BasedOn="{StaticResource BaseClockBox}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="{DynamicResource ClockDateForeground}" />
+        <Setter Property="Foreground" Value="{DynamicResource SystemControlBackgroundBaseLowBrush}" />
     </Style>
     <Style
         x:Key="DateBox"
         BasedOn="{StaticResource BaseDateBox}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="{DynamicResource ClockDateForeground}" />
+        <Setter Property="Foreground" Value="{DynamicResource SystemControlBackgroundBaseLowBrush}" />
     </Style>
     <Style
         x:Key="PreviewBorderStyle"