diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index 34b6dfcdc..adecfa2ba 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -29,7 +29,6 @@
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     SizeToContent="Height"
-    Style="{DynamicResource WindowStyle}"
     Topmost="True"
     Visibility="{Binding MainWindowVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
     WindowStartupLocation="Manual"
@@ -308,11 +307,11 @@
                     <Line
                         x:Name="ProgressBar"
                         Width="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Grid}}, Path=ActualWidth}"
-                        Height="2"
+                        Height="1"
                         Margin="12,0,12,0"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Bottom"
-                        StrokeThickness="2"
+                        StrokeThickness="1"
                         Style="{DynamicResource PendingLineStyle}"
                         Visibility="{Binding ProgressBarVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                         X1="-100"
diff --git a/Flow.Launcher/Resources/Dark.xaml b/Flow.Launcher/Resources/Dark.xaml
index 5f6934f30..740024ede 100644
--- a/Flow.Launcher/Resources/Dark.xaml
+++ b/Flow.Launcher/Resources/Dark.xaml
@@ -7,7 +7,7 @@
     xmlns:sys="clr-namespace:System;assembly=mscorlib">
 
     <SolidColorBrush x:Key="SystemThemeBorder" Color="#3f3f3f" />
-    <SolidColorBrush x:Key="QuerySuggestionBoxForeground" Color="#7b7b7b" />
+    <SolidColorBrush x:Key="QuerySuggestionBoxForeground" Color="#4d4d4d" />
     <SolidColorBrush x:Key="QuerySelectionBrush" Color="#4a5459" />
     <SolidColorBrush x:Key="SubTitleForeground" Color="#7b7b7b" />
     <SolidColorBrush x:Key="SubTitleSelectedForeground" Color="#7b7b7b" />
@@ -17,6 +17,7 @@
     <SolidColorBrush x:Key="InlineHighlight" Color="#0078d7" />
     <SolidColorBrush x:Key="HotkeyForeground" Color="#7b7b7b" />
     <SolidColorBrush x:Key="HotkeySelectedForeground" Color="#7b7b7b" />
+    <SolidColorBrush x:Key="ClockDateForeground" Color="#4d4d4d" />
     <Color x:Key="ItemSelectedBackgroundColorBrush">#198F8F8F</Color>
 
 
diff --git a/Flow.Launcher/Resources/Light.xaml b/Flow.Launcher/Resources/Light.xaml
index 6e06b99af..fe0f2dbe1 100644
--- a/Flow.Launcher/Resources/Light.xaml
+++ b/Flow.Launcher/Resources/Light.xaml
@@ -7,7 +7,7 @@
     xmlns:sys="clr-namespace:System;assembly=mscorlib">
 
     <SolidColorBrush x:Key="SystemThemeBorder" Color="#aaaaaa" />
-    <SolidColorBrush x:Key="QuerySuggestionBoxForeground" Color="#b5b5b5" />
+    <SolidColorBrush x:Key="QuerySuggestionBoxForeground" Color="#d8d2d0" />
     <SolidColorBrush x:Key="QuerySelectionBrush" Color="#0a68d8" />
     <SolidColorBrush x:Key="SubTitleForeground" Color="#818181" />
     <SolidColorBrush x:Key="SubTitleSelectedForeground" Color="#72767d" />
@@ -17,6 +17,7 @@
     <SolidColorBrush x:Key="InlineHighlight" Color="#0078d7" />
     <SolidColorBrush x:Key="HotkeyForeground" Color="#acacac" />
     <SolidColorBrush x:Key="HotkeySelectedForeground" Color="#acacac" />
+    <SolidColorBrush x:Key="ClockDateForeground" Color="#bebebe" />
     <Color x:Key="ItemSelectedBackgroundColorBrush">#198F8F8F</Color>
 
     <SolidColorBrush x:Key="Color00B" Color="#fbfbfb" />
diff --git a/Flow.Launcher/Themes/Base.xaml b/Flow.Launcher/Themes/Base.xaml
index 2ba3a5929..af41ff4b3 100644
--- a/Flow.Launcher/Themes/Base.xaml
+++ b/Flow.Launcher/Themes/Base.xaml
@@ -29,7 +29,7 @@
         <Setter Property="FontSize" Value="28" />
         <Setter Property="FontWeight" Value="Regular" />
         <Setter Property="Margin" Value="16,7,0,7" />
-        <Setter Property="Padding" Value="0,4,68,0" />
+        <Setter Property="Padding" Value="0,0,68,0" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Height" Value="48" />
         <Setter Property="Foreground" Value="#E3E0E3" />
@@ -69,7 +69,7 @@
 
     <!--  Further font customisations are dynamically loaded in Theme.cs  -->
     <Style x:Key="BaseQueryBoxBgStyle" TargetType="{x:Type Border}">
-        <Setter Property="Margin" Value="0,2,0,0" />
+        <Setter Property="Margin" Value="0,0,0,0" />
     </Style>
     <Style
         x:Key="QueryBoxBgStyle"
@@ -83,9 +83,10 @@
         <Setter Property="Height" Value="48" />
         <Setter Property="Margin" Value="16,7,0,7" />
         <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Padding" Value="0,4,68,0" />
+        <Setter Property="Padding" Value="0,0,68,0" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
     <Style x:Key="BaseWindowBorderStyle" TargetType="{x:Type Border}">
@@ -97,6 +98,7 @@
         <Setter Property="SnapsToDevicePixels" Value="True" />
     </Style>
     <Style x:Key="BaseWindowStyle" TargetType="{x:Type Window}">
+        <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
         <Setter Property="Width" Value="600" />
     </Style>
 
@@ -120,13 +122,15 @@
     </Style>
     <Style x:Key="BaseClockBox" TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="20" />
+        <Setter Property="Padding" Value="0" />
         <Setter Property="Foreground" Value="#8f8f8f" />
         <Setter Property="HorizontalAlignment" Value="Right" />
         <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="Margin" Value="0,0,0,0" />
+        <Setter Property="Margin" Value="0,0,0,3" />
         <Style.Triggers>
             <DataTrigger Binding="{Binding ElementName=DateBox, Path=Visibility}" Value="Visible">
                 <Setter Property="FontSize" Value="14" />
+                <Setter Property="Margin" Value="0,0,0,0" />
             </DataTrigger>
         </Style.Triggers>
     </Style>
@@ -139,6 +143,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" />
             </DataTrigger>
         </Style.Triggers>
     </Style>
@@ -413,7 +418,7 @@
     <Style x:Key="BaseSearchIconPosition" TargetType="{x:Type Canvas}">
         <Setter Property="Width" Value="32" />
         <Setter Property="Height" Value="32" />
-        <Setter Property="Margin" Value="0,2,18,0" />
+        <Setter Property="Margin" Value="0,0,18,0" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="HorizontalAlignment" Value="Right" />
     </Style>
@@ -495,7 +500,7 @@
     <Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
         <Setter Property="Width" Value="32" />
         <Setter Property="Height" Value="32" />
-        <Setter Property="Margin" Value="0,2,18,0" />
+        <Setter Property="Margin" Value="0,0,18,0" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="HorizontalAlignment" Value="Right" />
     </Style>
@@ -503,7 +508,7 @@
         x:Key="ClockPanelPosition"
         BasedOn="{StaticResource BaseClockPanelPosition}"
         TargetType="{x:Type Canvas}">
-        <Setter Property="Margin" Value="0,2,66,0" />
+        <Setter Property="Margin" Value="0,0,66,0" />
     </Style>
     <Style
         x:Key="ItemHotkeyStyle"
diff --git a/Flow.Launcher/Themes/Bullet Light.xaml b/Flow.Launcher/Themes/Bullet Light.xaml
deleted file mode 100644
index 1f776a2ee..000000000
--- a/Flow.Launcher/Themes/Bullet Light.xaml	
+++ /dev/null
@@ -1,209 +0,0 @@
-<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">
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-    <Style
-        x:Key="BulletStyle"
-        BasedOn="{StaticResource BaseBulletStyle}"
-        TargetType="{x:Type Border}">
-        <Setter Property="Width" Value="4" />
-        <Setter Property="Height" Value="42" />
-        <Setter Property="Background" Value="Transparent" />
-    </Style>
-    <Style
-        x:Key="ItemBulletSelectedStyle"
-        BasedOn="{StaticResource BaseBulletStyle}"
-        TargetType="{x:Type Border}">
-        <Setter Property="Width" Value="4" />
-        <Setter Property="Height" Value="42" />
-        <Setter Property="CornerRadius" Value="2" />
-        <Setter Property="Background" Value="#8897ea" />
-    </Style>
-    <Style
-        x:Key="ItemGlyph"
-        BasedOn="{StaticResource BaseGlyphStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#2b2b2e" />
-        <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,4,50,0" />
-        <Setter Property="Foreground" Value="#999aa3" />
-        <Setter Property="FontSize" Value="18" />
-        <Setter Property="Height" Value="38" />
-    </Style>
-
-    <Style
-        x:Key="QuerySuggestionBoxStyle"
-        BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
-        TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Padding" Value="0,4,50,0" />
-        <Setter Property="Height" Value="38" />
-        <Setter Property="FontSize" Value="18" />
-        <Setter Property="Foreground" Value="#d9d9d9" />
-    </Style>
-
-    <Style
-        x:Key="WindowBorderStyle"
-        BasedOn="{StaticResource BaseWindowBorderStyle}"
-        TargetType="{x:Type Border}">
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="BorderBrush" Value="#e2e2e2" />
-        <Setter Property="Background" Value="#fffeff" />
-        <Setter Property="CornerRadius" Value="8" />
-        <Setter Property="UseLayoutRounding" Value="True" />
-    </Style>
-    <Style
-        x:Key="WindowStyle"
-        BasedOn="{StaticResource BaseWindowStyle}"
-        TargetType="{x:Type Window}" />
-    <Style
-        x:Key="PendingLineStyle"
-        BasedOn="{StaticResource BasePendingLineStyle}"
-        TargetType="{x:Type Line}" />
-
-    <!--  Item Style  -->
-    <Style
-        x:Key="ItemTitleStyle"
-        BasedOn="{StaticResource BaseItemTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#2b2b2e" />
-    </Style>
-    <Style
-        x:Key="ItemSubTitleStyle"
-        BasedOn="{StaticResource BaseItemSubTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#949394" />
-    </Style>
-    <Style
-        x:Key="SeparatorStyle"
-        BasedOn="{StaticResource BaseSeparatorStyle}"
-        TargetType="{x:Type Rectangle}">
-        <Setter Property="Fill" Value="#e2e2e2" />
-        <Setter Property="Height" Value="1" />
-        <Setter Property="Margin" Value="0,0,0,8" />
-    </Style>
-    <Style x:Key="HighlightStyle" />
-    <Style
-        x:Key="ItemTitleSelectedStyle"
-        BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#2b2b2e" />
-    </Style>
-    <Style
-        x:Key="ItemSubTitleSelectedStyle"
-        BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#949394" />
-    </Style>
-    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#f1f1f1</SolidColorBrush>
-
-    <!--  button style in the middle of the scrollbar  -->
-    <Style
-        x:Key="ThumbStyle"
-        BasedOn="{StaticResource BaseThumbStyle}"
-        TargetType="{x:Type Thumb}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Border
-                        Background="#d9d9d9"
-                        BorderBrush="Transparent"
-                        BorderThickness="0"
-                        CornerRadius="2"
-                        DockPanel.Dock="Right" />
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-    <Style
-        x:Key="ScrollBarStyle"
-        BasedOn="{StaticResource BaseScrollBarStyle}"
-        TargetType="{x:Type ScrollBar}" />
-    <Style
-        x:Key="SearchIconStyle"
-        BasedOn="{StaticResource BaseSearchIconStyle}"
-        TargetType="{x:Type Path}">
-        <Setter Property="Fill" Value="#d9d9d9" />
-        <Setter Property="Width" Value="24" />
-        <Setter Property="Height" Value="24" />
-    </Style>
-    <Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
-        <Setter Property="Background" Value="#fffeff" />
-        <Setter Property="Width" Value="32" />
-        <Setter Property="Height" Value="32" />
-        <Setter Property="Margin" Value="0,8,8,0" />
-        <Setter Property="HorizontalAlignment" Value="Right" />
-    </Style>
-
-    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="12" />
-        <Setter Property="Foreground" Value="#87888b" />
-    </Style>
-    <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="12" />
-        <Setter Property="Foreground" Value="#87888b" />
-    </Style>
-    <Style x:Key="ItemGlyphSelectedStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#808dd5" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalAlignment" Value="Center" />
-        <Setter Property="Margin" Value="-4,0,0,0" />
-        <Setter Property="Width" Value="25" />
-        <Setter Property="Height" Value="25" />
-        <Setter Property="FontSize" Value="25" />
-    </Style>
-    <CornerRadius x:Key="ItemRadius">5</CornerRadius>
-    <Thickness x:Key="ItemMargin">10 0 10 0</Thickness>
-    <Thickness x:Key="ResultMargin">0 0 0 10</Thickness>
-    <Style
-        x:Key="ClockPanel"
-        BasedOn="{StaticResource ClockPanel}"
-        TargetType="{x:Type StackPanel}">
-        <Setter Property="Margin" Value="0,0,54,0" />
-    </Style>
-    <Style
-        x:Key="ClockBox"
-        BasedOn="{StaticResource BaseClockBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#c1c1c1" />
-    </Style>
-    <Style
-        x:Key="DateBox"
-        BasedOn="{StaticResource BaseDateBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#c1c1c1" />
-    </Style>
-    <Style
-        x:Key="PreviewBorderStyle"
-        BasedOn="{StaticResource BasePreviewBorderStyle}"
-        TargetType="{x:Type Border}">
-        <Setter Property="BorderBrush" Value="#e2e2e2" />
-    </Style>
-    <Style
-        x:Key="PreviewItemTitleStyle"
-        BasedOn="{StaticResource BasePreviewItemTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#2b2b2e" />
-    </Style>
-    <Style
-        x:Key="PreviewItemSubTitleStyle"
-        BasedOn="{StaticResource BasePreviewItemSubTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#949394" />
-    </Style>
-    <Style
-        x:Key="PreviewGlyph"
-        BasedOn="{StaticResource BasePreviewGlyph}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#2b2b2e" />
-    </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Flow.Launcher/Themes/Circle Light.xaml b/Flow.Launcher/Themes/Circle Light.xaml
deleted file mode 100644
index e52e3a957..000000000
--- a/Flow.Launcher/Themes/Circle Light.xaml	
+++ /dev/null
@@ -1,190 +0,0 @@
-<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">
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-    <Style
-        x:Key="ItemGlyph"
-        BasedOn="{StaticResource BaseGlyphStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#9da1aa" />
-    </Style>
-    <Style
-        x:Key="QueryBoxStyle"
-        BasedOn="{StaticResource BaseQueryBoxStyle}"
-        TargetType="{x:Type TextBox}">
-        <Setter Property="Foreground" Value="#999aa3" />
-        <Setter Property="Padding" Value="0,4,50,0" />
-        <Setter Property="FontSize" Value="18" />
-        <Setter Property="Height" Value="38" />
-    </Style>
-
-    <Style
-        x:Key="QuerySuggestionBoxStyle"
-        BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
-        TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Padding" Value="0,4,50,0" />
-        <Setter Property="Height" Value="38" />
-        <Setter Property="FontSize" Value="18" />
-        <Setter Property="Foreground" Value="#d9d9d9" />
-    </Style>
-
-    <Style
-        x:Key="WindowBorderStyle"
-        BasedOn="{StaticResource BaseWindowBorderStyle}"
-        TargetType="{x:Type Border}">
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="BorderBrush" Value="#e2e2e2" />
-        <Setter Property="Background" Value="White" />
-        <Setter Property="CornerRadius" Value="8" />
-        <Setter Property="UseLayoutRounding" Value="True" />
-    </Style>
-    <Style
-        x:Key="WindowStyle"
-        BasedOn="{StaticResource BaseWindowStyle}"
-        TargetType="{x:Type Window}" />
-    <Style
-        x:Key="PendingLineStyle"
-        BasedOn="{StaticResource BasePendingLineStyle}"
-        TargetType="{x:Type Line}" />
-
-    <!--  Item Style  -->
-    <Style
-        x:Key="ItemTitleStyle"
-        BasedOn="{StaticResource BaseItemTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#3d434a" />
-    </Style>
-    <Style
-        x:Key="ItemSubTitleStyle"
-        BasedOn="{StaticResource BaseItemSubTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#9da1aa" />
-    </Style>
-    <Style
-        x:Key="SeparatorStyle"
-        BasedOn="{StaticResource BaseSeparatorStyle}"
-        TargetType="{x:Type Rectangle}">
-        <Setter Property="Fill" Value="#e2e2e2" />
-        <Setter Property="Height" Value="1" />
-        <Setter Property="Margin" Value="0,0,0,8" />
-    </Style>
-    <Style x:Key="HighlightStyle" />
-    <Style
-        x:Key="ItemTitleSelectedStyle"
-        BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#ffffff" />
-    </Style>
-    <Style
-        x:Key="ItemSubTitleSelectedStyle"
-        BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#ffffff" />
-    </Style>
-    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#5046e5</SolidColorBrush>
-
-    <!--  button style in the middle of the scrollbar  -->
-    <Style
-        x:Key="ThumbStyle"
-        BasedOn="{StaticResource BaseThumbStyle}"
-        TargetType="{x:Type Thumb}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Border
-                        Background="#a0a8b5"
-                        BorderBrush="Transparent"
-                        BorderThickness="0"
-                        CornerRadius="2"
-                        DockPanel.Dock="Right" />
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-    <Style
-        x:Key="ScrollBarStyle"
-        BasedOn="{StaticResource BaseScrollBarStyle}"
-        TargetType="{x:Type ScrollBar}" />
-    <Style
-        x:Key="SearchIconStyle"
-        BasedOn="{StaticResource BaseSearchIconStyle}"
-        TargetType="{x:Type Path}">
-        <Setter Property="Fill" Value="#9da1aa" />
-        <Setter Property="Width" Value="24" />
-        <Setter Property="Height" Value="24" />
-    </Style>
-    <Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
-        <Setter Property="Background" Value="White" />
-        <Setter Property="Width" Value="32" />
-        <Setter Property="Height" Value="32" />
-        <Setter Property="Margin" Value="0,8,8,0" />
-        <Setter Property="HorizontalAlignment" Value="Right" />
-    </Style>
-
-    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="12" />
-        <Setter Property="Foreground" Value="#9da1aa" />
-    </Style>
-    <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="12" />
-        <Setter Property="Foreground" Value="#ffffff" />
-    </Style>
-    <Style x:Key="ItemGlyphSelectedStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#ffffff" />
-        <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>
-    <CornerRadius x:Key="ItemRadius">8</CornerRadius>
-    <Thickness x:Key="ItemMargin">10 0 10 0</Thickness>
-    <Thickness x:Key="ResultMargin">0 0 0 10</Thickness>
-    <Style
-        x:Key="ClockPanel"
-        BasedOn="{StaticResource ClockPanel}"
-        TargetType="{x:Type StackPanel}">
-        <Setter Property="Margin" Value="0,0,54,0" />
-    </Style>
-    <Style
-        x:Key="ClockBox"
-        BasedOn="{StaticResource BaseClockBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#999aa3" />
-    </Style>
-    <Style
-        x:Key="DateBox"
-        BasedOn="{StaticResource BaseDateBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#999aa3" />
-    </Style>
-    <Style
-        x:Key="PreviewBorderStyle"
-        BasedOn="{StaticResource BasePreviewBorderStyle}"
-        TargetType="{x:Type Border}">
-        <Setter Property="BorderBrush" Value="#e2e2e2" />
-    </Style>
-    <Style
-        x:Key="PreviewItemTitleStyle"
-        BasedOn="{StaticResource BasePreviewItemTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#3d434a" />
-    </Style>
-    <Style
-        x:Key="PreviewItemSubTitleStyle"
-        BasedOn="{StaticResource BasePreviewItemSubTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#9da1aa" />
-    </Style>
-    <Style
-        x:Key="PreviewGlyph"
-        BasedOn="{StaticResource BasePreviewGlyph}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#9da1aa" />
-    </Style>
-</ResourceDictionary>
diff --git a/Flow.Launcher/Themes/Cyan Dark.xaml b/Flow.Launcher/Themes/Cyan Dark.xaml
index 60bc09002..106b1b6d9 100644
--- a/Flow.Launcher/Themes/Cyan Dark.xaml	
+++ b/Flow.Launcher/Themes/Cyan Dark.xaml	
@@ -27,7 +27,7 @@
         x:Key="ItemGlyph"
         BasedOn="{StaticResource BaseGlyphStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#bbc1c3" />
+        <Setter Property="Foreground" Value="#eff2f2" />
     </Style>
     <Style
         x:Key="QueryBoxStyle"
@@ -139,7 +139,7 @@
         <Setter Property="Height" Value="24" />
     </Style>
     <Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
-        <Setter Property="Background" Value="#0f1f26" />
+        <Setter Property="Background" Value="Transparent" />
         <Setter Property="Width" Value="32" />
         <Setter Property="Height" Value="32" />
         <Setter Property="Margin" Value="0,8,8,0" />
@@ -155,7 +155,7 @@
         <Setter Property="Foreground" Value="#ffffff" />
     </Style>
     <Style x:Key="ItemGlyphSelectedStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#58c2b4" />
+        <Setter Property="Foreground" Value="#eff2f2" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalAlignment" Value="Center" />
         <Setter Property="Width" Value="25" />
diff --git a/Flow.Launcher/Themes/Darker Glass.xaml b/Flow.Launcher/Themes/Darker Glass.xaml
deleted file mode 100644
index 89b6dfa01..000000000
--- a/Flow.Launcher/Themes/Darker Glass.xaml	
+++ /dev/null
@@ -1,174 +0,0 @@
-<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">
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-    <Thickness x:Key="ResultMargin">0 0 0 8</Thickness>
-    <Style
-        x:Key="ItemGlyph"
-        BasedOn="{StaticResource BaseGlyphStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#ebebeb" />
-    </Style>
-    <Style
-        x:Key="QueryBoxStyle"
-        BasedOn="{StaticResource BaseQueryBoxStyle}"
-        TargetType="{x:Type TextBox}">
-        <Setter Property="Foreground" Value="#ebebeb" />
-        <Setter Property="Background" Value="Transparent" />
-    </Style>
-
-    <Style
-        x:Key="QuerySuggestionBoxStyle"
-        BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
-        TargetType="{x:Type TextBox}">
-        <Setter Property="Foreground" Value="#ebebeb" />
-        <Setter Property="Opacity" Value="0.2" />
-    </Style>
-
-    <Style
-        x:Key="WindowBorderStyle"
-        BasedOn="{StaticResource BaseWindowBorderStyle}"
-        TargetType="{x:Type Border}">
-        <Setter Property="CornerRadius" Value="5" />
-        <Setter Property="BorderThickness" Value="1,1,0,0" />
-        <Setter Property="BorderBrush" Value="#666666" />
-        <Setter Property="Background">
-            <Setter.Value>
-                <SolidColorBrush Opacity="0.95" Color="#333333" />
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style
-        x:Key="WindowStyle"
-        BasedOn="{StaticResource BaseWindowStyle}"
-        TargetType="{x:Type Window}">
-        <Setter Property="Background">
-            <Setter.Value>
-                <SolidColorBrush Opacity="0.5" Color="White" />
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style
-        x:Key="PendingLineStyle"
-        BasedOn="{StaticResource BasePendingLineStyle}"
-        TargetType="{x:Type Line}" />
-
-    <!--  Item Style  -->
-    <Style
-        x:Key="ItemTitleStyle"
-        BasedOn="{StaticResource BaseItemTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#ebebeb" />
-    </Style>
-    <Style
-        x:Key="ItemSubTitleStyle"
-        BasedOn="{StaticResource BaseItemSubTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#787878" />
-    </Style>
-    <Style
-        x:Key="ItemTitleSelectedStyle"
-        BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#ffffff" />
-    </Style>
-    <Style
-        x:Key="ItemSubTitleSelectedStyle"
-        BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#949494" />
-    </Style>
-    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#545454</SolidColorBrush>
-
-    <!--  button style in the middle of the scrollbar  -->
-    <Style
-        x:Key="ThumbStyle"
-        BasedOn="{StaticResource BaseThumbStyle}"
-        TargetType="{x:Type Thumb}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Border
-                        Background="#525252"
-                        BorderBrush="Transparent"
-                        BorderThickness="0"
-                        CornerRadius="2"
-                        DockPanel.Dock="Right" />
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-    <Style
-        x:Key="ScrollBarStyle"
-        BasedOn="{StaticResource BaseScrollBarStyle}"
-        TargetType="{x:Type ScrollBar}">
-        <Setter Property="Background" Value="#a0a0a0" />
-    </Style>
-    <Style
-        x:Key="SearchIconStyle"
-        BasedOn="{StaticResource BaseSearchIconStyle}"
-        TargetType="{x:Type Path}">
-        <Setter Property="Fill" Value="#FFFFFF" />
-        <Setter Property="Width" Value="32" />
-        <Setter Property="Height" Value="32" />
-        <Setter Property="Opacity" Value="0.2" />
-    </Style>
-    <Style
-        x:Key="SeparatorStyle"
-        BasedOn="{StaticResource BaseSeparatorStyle}"
-        TargetType="{x:Type Rectangle}">
-        <Setter Property="Fill" Value="#474747" />
-        <Setter Property="Height" Value="1" />
-        <Setter Property="Margin" Value="0,0,0,8" />
-    </Style>
-    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="14" />
-        <Setter Property="Foreground" Value="#787878" />
-    </Style>
-    <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="14" />
-        <Setter Property="Foreground" Value="#787878" />
-    </Style>
-    <Style
-        x:Key="ClockBox"
-        BasedOn="{StaticResource BaseClockBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#787878" />
-    </Style>
-    <Style
-        x:Key="DateBox"
-        BasedOn="{StaticResource BaseDateBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#787878" />
-    </Style>
-    <Style
-        x:Key="PreviewBorderStyle"
-        BasedOn="{StaticResource BasePreviewBorderStyle}"
-        TargetType="{x:Type Border}">
-        <Setter Property="BorderBrush" Value="#474747" />
-    </Style>
-
-    <Style
-        x:Key="PreviewItemTitleStyle"
-        BasedOn="{StaticResource BasePreviewItemTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#ebebeb" />
-    </Style>
-    <Style
-        x:Key="PreviewItemSubTitleStyle"
-        BasedOn="{StaticResource BasePreviewItemSubTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#787878" />
-    </Style>
-    <Style
-        x:Key="PreviewGlyph"
-        BasedOn="{StaticResource BasePreviewGlyph}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#ebebeb" />
-    </Style>
-</ResourceDictionary>
diff --git a/Flow.Launcher/Themes/Discord Dark.xaml b/Flow.Launcher/Themes/Discord Dark.xaml
deleted file mode 100644
index 5315c7644..000000000
--- a/Flow.Launcher/Themes/Discord Dark.xaml	
+++ /dev/null
@@ -1,192 +0,0 @@
-<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">
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-    <Thickness x:Key="ResultMargin">0 0 0 6</Thickness>
-    <Style
-        x:Key="ItemGlyph"
-        BasedOn="{StaticResource BaseGlyphStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#ffffff" />
-    </Style>
-    <Style
-        x:Key="QueryBoxStyle"
-        BasedOn="{StaticResource BaseQueryBoxStyle}"
-        TargetType="{x:Type TextBox}">
-        <Setter Property="Foreground" Value="#dcddde" />
-        <Setter Property="CaretBrush" Value="#ffffff" />
-        <Setter Property="SelectionBrush" Value="#0a68d8" />
-        <Setter Property="Height" Value="42" />
-        <Setter Property="FontSize" Value="24" />
-        <Setter Property="Padding" Value="0,0,66,0" />
-    </Style>
-    <Style
-        x:Key="QuerySuggestionBoxStyle"
-        BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
-        TargetType="{x:Type TextBox}">
-        <Setter Property="Foreground" Value="#72767d" />
-        <Setter Property="Background" Value="#36393f" />
-        <Setter Property="Height" Value="42" />
-        <Setter Property="FontSize" Value="24" />
-        <Setter Property="Padding" Value="0,0,66,0" />
-    </Style>
-    <Style
-        x:Key="WindowBorderStyle"
-        BasedOn="{StaticResource BaseWindowBorderStyle}"
-        TargetType="{x:Type Border}">
-        <Setter Property="BorderThickness" Value="2" />
-        <Setter Property="BorderBrush" Value="#2f3136" />
-        <Setter Property="CornerRadius" Value="4" />
-        <Setter Property="Background" Value="#36393f" />
-    </Style>
-    <Style
-        x:Key="WindowStyle"
-        BasedOn="{StaticResource BaseWindowStyle}"
-        TargetType="{x:Type Window}">
-        <Setter Property="Width" Value="576" />
-        <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
-    </Style>
-    <Style
-        x:Key="PendingLineStyle"
-        BasedOn="{StaticResource BasePendingLineStyle}"
-        TargetType="{x:Type Line}">
-        <Setter Property="Stroke" Value="#ffffff" />
-        <Setter Property="Opacity" Value="0.6" />
-    </Style>
-
-    <!--  Item Style  -->
-    <Style
-        x:Key="ItemTitleStyle"
-        BasedOn="{StaticResource BaseItemTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#dcddde" />
-    </Style>
-    <Style
-        x:Key="ItemSubTitleStyle"
-        BasedOn="{StaticResource BaseItemSubTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#72767d" />
-        <Setter Property="FontSize" Value="13" />
-    </Style>
-    <Style
-        x:Key="ItemNumberStyle"
-        BasedOn="{StaticResource BaseItemNumberStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#A6A6A6" />
-    </Style>
-    <Style
-        x:Key="ItemTitleSelectedStyle"
-        BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Cursor" Value="Arrow" />
-        <Setter Property="Foreground" Value="#32bd6a" />
-    </Style>
-    <Style
-        x:Key="ItemSubTitleSelectedStyle"
-        BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Cursor" Value="Arrow" />
-        <Setter Property="Foreground" Value="#72767d" />
-    </Style>
-    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#49443c</SolidColorBrush>
-    <Style
-        x:Key="ItemImageSelectedStyle"
-        BasedOn="{StaticResource BaseItemImageSelectedStyle}"
-        TargetType="{x:Type Image}">
-        <Setter Property="Cursor" Value="Arrow" />
-    </Style>
-    <Style x:Key="HighlightStyle">
-        <Setter Property="Inline.FontWeight" Value="Bold" />
-    </Style>
-    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="15" />
-        <Setter Property="Foreground" Value="#72767d" />
-        <Setter Property="Opacity" Value="0.8" />
-    </Style>
-    <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="15" />
-        <Setter Property="Foreground" Value="#72767d" />
-        <Setter Property="Opacity" Value="0.8" />
-    </Style>
-    <!--  button style in the middle of the scrollbar  -->
-    <Style
-        x:Key="ThumbStyle"
-        BasedOn="{StaticResource BaseThumbStyle}"
-        TargetType="{x:Type Thumb}">
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="true" />
-        <Setter Property="IsTabStop" Value="false" />
-        <Setter Property="Focusable" Value="false" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Border
-                        Background="#202225"
-                        BorderBrush="Transparent"
-                        BorderThickness="0"
-                        CornerRadius="2"
-                        DockPanel.Dock="Right" />
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-    <Style
-        x:Key="ScrollBarStyle"
-        BasedOn="{StaticResource BaseScrollBarStyle}"
-        TargetType="{x:Type ScrollBar}" />
-    <Style
-        x:Key="SeparatorStyle"
-        BasedOn="{StaticResource BaseSeparatorStyle}"
-        TargetType="{x:Type Rectangle}">
-        <Setter Property="Fill" Value="#42454a" />
-        <Setter Property="Height" Value="1" />
-        <Setter Property="Margin" Value="12,0,12,6" />
-    </Style>
-    <Style
-        x:Key="SearchIconStyle"
-        BasedOn="{StaticResource BaseSearchIconStyle}"
-        TargetType="{x:Type Path}">
-        <Setter Property="Fill" Value="#42454a" />
-        <Setter Property="Width" Value="32" />
-        <Setter Property="Height" Value="32" />
-    </Style>
-    <Style
-        x:Key="ClockBox"
-        BasedOn="{StaticResource BaseClockBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#72767d" />
-    </Style>
-    <Style
-        x:Key="DateBox"
-        BasedOn="{StaticResource BaseDateBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#72767d" />
-    </Style>
-    <Style
-        x:Key="PreviewBorderStyle"
-        BasedOn="{StaticResource BasePreviewBorderStyle}"
-        TargetType="{x:Type Border}">
-        <Setter Property="BorderBrush" Value="#42454a" />
-    </Style>
-    <Style
-        x:Key="PreviewItemTitleStyle"
-        BasedOn="{StaticResource BasePreviewItemTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#dcddde" />
-    </Style>
-    <Style
-        x:Key="PreviewItemSubTitleStyle"
-        BasedOn="{StaticResource BasePreviewItemSubTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#72767d" />
-    </Style>
-    <Style
-        x:Key="PreviewGlyph"
-        BasedOn="{StaticResource BasePreviewGlyph}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#ffffff" />
-    </Style>
-</ResourceDictionary>
diff --git a/Flow.Launcher/Themes/Dracula.xaml b/Flow.Launcher/Themes/Dracula.xaml
index d150e7355..eb8cc9557 100644
--- a/Flow.Launcher/Themes/Dracula.xaml
+++ b/Flow.Launcher/Themes/Dracula.xaml
@@ -28,7 +28,6 @@
         x:Key="QuerySuggestionBoxStyle"
         BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="#282a36" />
         <Setter Property="Foreground" Value="#6272a4" />
         <Setter Property="FontSize" Value="26" />
         <Setter Property="Padding" Value="0,4,66,0" />
@@ -98,7 +97,7 @@
         <Setter Property="Cursor" Value="Arrow" />
     </Style>
     <Style x:Key="HighlightStyle">
-        <Setter Property="Inline.Foreground" Value="#bd93f9" />
+        <Setter Property="Inline.FontWeight" Value="SemiBold" />
     </Style>
     <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="13" />
diff --git a/Flow.Launcher/Themes/Gray.xaml b/Flow.Launcher/Themes/Gray.xaml
index d8d344e21..84570e9d6 100644
--- a/Flow.Launcher/Themes/Gray.xaml
+++ b/Flow.Launcher/Themes/Gray.xaml
@@ -11,7 +11,6 @@
         BasedOn="{StaticResource BaseGlyphStyle}"
         TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#c6c8cb" />
-        <Setter Property="Margin" Value="-4,0,0,0" />
     </Style>
     <Style
         x:Key="QueryBoxStyle"
diff --git a/Flow.Launcher/Themes/League.xaml b/Flow.Launcher/Themes/League.xaml
deleted file mode 100644
index 7fbe56187..000000000
--- a/Flow.Launcher/Themes/League.xaml
+++ /dev/null
@@ -1,165 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-    <Style x:Key="WindowRadius" TargetType="{x:Type Border}">
-        <Setter Property="CornerRadius" Value="0" />
-    </Style>
-    <Style
-        x:Key="QueryBoxStyle"
-        BasedOn="{StaticResource BaseQueryBoxStyle}"
-        TargetType="{x:Type TextBox}">
-        <Setter Property="Foreground" Value="#b88f3a" />
-        <Setter Property="CaretBrush" Value="#b88f3a" />
-        <Setter Property="Padding" Value="0,0,66,0" />
-        <Setter Property="Height" Value="42" />
-    </Style>
-    <Style
-        x:Key="ItemGlyph"
-        BasedOn="{StaticResource BaseGlyphStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#b88f3a" />
-    </Style>
-    <Style
-        x:Key="QuerySuggestionBoxStyle"
-        BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
-        TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="#161614" />
-        <Setter Property="Foreground" Value="#a09b8c" />
-        <Setter Property="Padding" Value="0,0,66,0" />
-        <Setter Property="Height" Value="42" />
-    </Style>
-
-    <Style
-        x:Key="WindowBorderStyle"
-        BasedOn="{StaticResource BaseWindowBorderStyle}"
-        TargetType="{x:Type Border}">
-        <Setter Property="CornerRadius" Value="0" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="BorderBrush" Value="#785a28" />
-        <Setter Property="Background" Value="#161614" />
-    </Style>
-    <Style
-        x:Key="WindowStyle"
-        BasedOn="{StaticResource BaseWindowStyle}"
-        TargetType="{x:Type Window}">
-        <Setter Property="Width" Value="576" />
-    </Style>
-    <Style
-        x:Key="PendingLineStyle"
-        BasedOn="{StaticResource BasePendingLineStyle}"
-        TargetType="{x:Type Line}">
-        <Setter Property="Stroke" Value="#32EC32" />
-    </Style>
-    <Style
-        x:Key="SeparatorStyle"
-        BasedOn="{StaticResource BaseSeparatorStyle}"
-        TargetType="{x:Type Rectangle}">
-        <Setter Property="Fill" Value="#785a28" />
-        <Setter Property="Height" Value="1" />
-        <Setter Property="Margin" Value="0,0,0,0" />
-    </Style>
-    <Style
-        x:Key="ItemTitleStyle"
-        BasedOn="{StaticResource BaseItemTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#a09b8c" />
-    </Style>
-    <Style
-        x:Key="ItemSubTitleStyle"
-        BasedOn="{StaticResource BaseItemSubTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#5b5a56" />
-    </Style>
-    <Style
-        x:Key="ItemTitleSelectedStyle"
-        BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#a09b8c" />
-    </Style>
-    <Style
-        x:Key="ItemSubTitleSelectedStyle"
-        BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#4bb44b" />
-        <Setter Property="FontSize" Value="13" />
-    </Style>
-    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#192026</SolidColorBrush>
-    <Style
-        x:Key="ThumbStyle"
-        BasedOn="{StaticResource BaseThumbStyle}"
-        TargetType="{x:Type Thumb}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Border
-                        Background="#b88f3a"
-                        BorderBrush="Transparent"
-                        BorderThickness="0"
-                        CornerRadius="2"
-                        DockPanel.Dock="Right" />
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-    <Style
-        x:Key="ScrollBarStyle"
-        BasedOn="{StaticResource BaseScrollBarStyle}"
-        TargetType="{x:Type ScrollBar}">
-        <Setter Property="Width" Value="4" />
-    </Style>
-    <Style x:Key="HighlightStyle">
-        <Setter Property="Inline.FontWeight" Value="Bold" />
-    </Style>
-    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="15" />
-        <Setter Property="Foreground" Value="#5b5a56" />
-    </Style>
-    <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="15" />
-        <Setter Property="Foreground" Value="#5b5a56" />
-    </Style>
-    <Geometry x:Key="SearchIconImg">F1 M12000,12000z M0,0z M10354,10962C10326,10951 10279,10927 10249,10907 10216,10886 9476,10153 8370,9046 7366,8042 6541,7220 6536,7220 6532,7220 6498,7242 6461,7268 6213,7447 5883,7619 5592,7721 5194,7860 4802,7919 4360,7906 3612,7886 2953,7647 2340,7174 2131,7013 1832,6699 1664,6465 1394,6088 1188,5618 1097,5170 1044,4909 1030,4764 1030,4470 1030,4130 1056,3914 1135,3609 1263,3110 1511,2633 1850,2235 1936,2134 2162,1911 2260,1829 2781,1395 3422,1120 4090,1045 4271,1025 4667,1025 4848,1045 5505,1120 6100,1368 6630,1789 6774,1903 7081,2215 7186,2355 7362,2588 7467,2759 7579,2990 7802,3455 7911,3937 7911,4460 7911,4854 7861,5165 7737,5542 7684,5702 7675,5724 7602,5885 7517,6071 7390,6292 7270,6460 7242,6499 7220,6533 7220,6538 7220,6542 8046,7371 9055,8380 10441,9766 10898,10229 10924,10274 10945,10308 10966,10364 10976,10408 10990,10472 10991,10493 10980,10554 10952,10717 10840,10865 10690,10937 10621,10971 10607,10974 10510,10977 10425,10980 10395,10977 10354,10962z M4685,7050C5214,7001 5694,6809 6100,6484 6209,6396 6396,6209 6484,6100 7151,5267 7246,4110 6721,3190 6369,2571 5798,2137 5100,1956 4706,1855 4222,1855 3830,1957 3448,2056 3140,2210 2838,2453 2337,2855 2010,3427 1908,4080 1877,4274 1877,4656 1908,4850 1948,5105 2028,5370 2133,5590 2459,6272 3077,6782 3810,6973 3967,7014 4085,7034 4290,7053 4371,7061 4583,7059 4685,7050z</Geometry>
-    <Style x:Key="SearchIconStyle" TargetType="{x:Type Path}">
-        <Setter Property="Fill" Value="#b88f3a" />
-        <Setter Property="Width" Value="32" />
-        <Setter Property="Height" Value="32" />
-    </Style>
-    <Style
-        x:Key="ClockBox"
-        BasedOn="{StaticResource BaseClockBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#4bb44b" />
-    </Style>
-    <Style
-        x:Key="DateBox"
-        BasedOn="{StaticResource BaseDateBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#4bb44b" />
-    </Style>
-    <Style
-        x:Key="PreviewBorderStyle"
-        BasedOn="{StaticResource BasePreviewBorderStyle}"
-        TargetType="{x:Type Border}">
-        <Setter Property="Margin" Value="0,0,10,0" />
-        <Setter Property="BorderBrush" Value="#785a28" />
-    </Style>
-    <Style
-        x:Key="PreviewItemTitleStyle"
-        BasedOn="{StaticResource BasePreviewItemTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#a09b8c" />
-    </Style>
-    <Style
-        x:Key="PreviewItemSubTitleStyle"
-        BasedOn="{StaticResource BasePreviewItemSubTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#5b5a56" />
-    </Style>
-    <Style
-        x:Key="PreviewGlyph"
-        BasedOn="{StaticResource BasePreviewGlyph}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#b88f3a" />
-    </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Flow.Launcher/Themes/Nord Darker.xaml b/Flow.Launcher/Themes/Nord Darker.xaml
index d9ddb3076..bb5dbf87f 100644
--- a/Flow.Launcher/Themes/Nord Darker.xaml	
+++ b/Flow.Launcher/Themes/Nord Darker.xaml	
@@ -22,7 +22,6 @@
         x:Key="QuerySuggestionBoxStyle"
         BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="#2e3440" />
         <Setter Property="Foreground" Value="#50596b" />
         <Setter Property="FontSize" Value="30" />
     </Style>
diff --git a/Flow.Launcher/Themes/Pink.xaml b/Flow.Launcher/Themes/Pink.xaml
deleted file mode 100644
index dc97e4320..000000000
--- a/Flow.Launcher/Themes/Pink.xaml
+++ /dev/null
@@ -1,161 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-    <Thickness x:Key="ResultMargin">0 0 0 4</Thickness>
-    <Style
-        x:Key="ItemGlyph"
-        BasedOn="{StaticResource BaseGlyphStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#ffffff" />
-    </Style>
-    <Style
-        x:Key="QueryBoxStyle"
-        BasedOn="{StaticResource BaseQueryBoxStyle}"
-        TargetType="{x:Type TextBox}">
-        <Setter Property="Foreground" Value="#cc1081" />
-        <Setter Property="CaretBrush" Value="#cc1081" />
-        <Setter Property="SelectionBrush" Value="#e564b1" />
-    </Style>
-
-    <Style
-        x:Key="QuerySuggestionBoxStyle"
-        BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
-        TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="#1f1d1f" />
-        <Setter Property="Foreground" Value="#71114b" />
-    </Style>
-
-    <Style
-        x:Key="WindowBorderStyle"
-        BasedOn="{StaticResource BaseWindowBorderStyle}"
-        TargetType="{x:Type Border}">
-        <Setter Property="Background" Value="#1f1d1f" />
-        <Setter Property="BorderThickness" Value="2" />
-        <Setter Property="BorderBrush" Value="#000000" />
-    </Style>
-    <Style
-        x:Key="SeparatorStyle"
-        BasedOn="{StaticResource BaseSeparatorStyle}"
-        TargetType="{x:Type Rectangle}">
-        <Setter Property="Fill" Value="#000000" />
-        <Setter Property="Height" Value="1" />
-        <Setter Property="Margin" Value="12,0,12,4" />
-    </Style>
-    <Style
-        x:Key="WindowStyle"
-        BasedOn="{StaticResource BaseWindowStyle}"
-        TargetType="{x:Type Window}" />
-    <Style
-        x:Key="PendingLineStyle"
-        BasedOn="{StaticResource BasePendingLineStyle}"
-        TargetType="{x:Type Line}">
-        <Setter Property="Stroke" Value="#cc1081" />
-    </Style>
-    <Style
-        x:Key="ItemTitleStyle"
-        BasedOn="{StaticResource BaseItemTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#f5f5f5" />
-    </Style>
-    <Style
-        x:Key="ItemSubTitleStyle"
-        BasedOn="{StaticResource BaseItemSubTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#c2c2c2" />
-        <Setter Property="Opacity" Value="0.5" />
-    </Style>
-    <Style
-        x:Key="ItemTitleSelectedStyle"
-        BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#f5f5f5" />
-    </Style>
-    <Style
-        x:Key="ItemSubTitleSelectedStyle"
-        BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#ed92c9" />
-    </Style>
-    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#cc1081</SolidColorBrush>
-    <Style
-        x:Key="ThumbStyle"
-        BasedOn="{StaticResource BaseThumbStyle}"
-        TargetType="{x:Type Thumb}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Border
-                        Background="#e564b1"
-                        BorderBrush="Transparent"
-                        BorderThickness="0"
-                        CornerRadius="2"
-                        DockPanel.Dock="Right" />
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-    <Style
-        x:Key="ScrollBarStyle"
-        BasedOn="{StaticResource BaseScrollBarStyle}"
-        TargetType="{x:Type ScrollBar}" />
-    <Geometry x:Key="SearchIconImg">F1 M20,20z M0,0z M14.75,1A5.24,5.24,0,0,0,10,4A5.24,5.24,0,0,0,0,6.25C0,11.75 10,19 10,19 10,19 20,11.75 20,6.25A5.25,5.25,0,0,0,14.75,1z</Geometry>
-
-    <Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
-        <Setter Property="Width" Value="34" />
-        <Setter Property="Height" Value="34" />
-        <Setter Property="Margin" Value="0,6,14,0" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="HorizontalAlignment" Value="Right" />
-    </Style>
-    <Style x:Key="SearchIconStyle" TargetType="{x:Type Path}">
-        <Setter Property="Fill" Value="#cc1081" />
-        <Setter Property="Width" Value="28" />
-        <Setter Property="Height" Value="28" />
-    </Style>
-    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="14" />
-        <Setter Property="Foreground" Value="#ed92c9" />
-    </Style>
-    <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="14" />
-        <Setter Property="Foreground" Value="#ed92c9" />
-    </Style>
-    <Style
-        x:Key="ClockBox"
-        BasedOn="{StaticResource BaseClockBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#71114b" />
-    </Style>
-    <Style
-        x:Key="DateBox"
-        BasedOn="{StaticResource BaseDateBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="FontWeight" Value="Bold" />
-        <Setter Property="Foreground" Value="#71114b" />
-    </Style>
-    <Style
-        x:Key="PreviewBorderStyle"
-        BasedOn="{StaticResource BasePreviewBorderStyle}"
-        TargetType="{x:Type Border}">
-        <Setter Property="BorderBrush" Value="#000000" />
-    </Style>
-    <Style
-        x:Key="PreviewItemTitleStyle"
-        BasedOn="{StaticResource BasePreviewItemTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#f5f5f5" />
-    </Style>
-    <Style
-        x:Key="PreviewItemSubTitleStyle"
-        BasedOn="{StaticResource BasePreviewItemSubTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#c2c2c2" />
-    </Style>
-    <Style
-        x:Key="PreviewGlyph"
-        BasedOn="{StaticResource BasePreviewGlyph}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#ffffff" />
-    </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Flow.Launcher/Themes/SlimLight.xaml b/Flow.Launcher/Themes/SlimLight.xaml
index dc08eec30..078b07048 100644
--- a/Flow.Launcher/Themes/SlimLight.xaml
+++ b/Flow.Launcher/Themes/SlimLight.xaml
@@ -179,15 +179,28 @@
         BasedOn="{StaticResource BaseClockBox}"
         TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="14" />
-        <Setter Property="Foreground" Value="#8f8d90" />
+        <Setter Property="Foreground" Value="#bebebe" />
         <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" />
+            </DataTrigger>
+        </Style.Triggers>
+
     </Style>
     <Style
         x:Key="DateBox"
         BasedOn="{StaticResource BaseDateBox}"
         TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="14" />
-        <Setter Property="Foreground" Value="#8f8d90" />
+        <Setter Property="Foreground" Value="#bebebe" />
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding ElementName=ClockBox, Path=Visibility}" Value="Visible">
+                <Setter Property="FontSize" Value="14" />
+                <Setter Property="Margin" Value="0,0,0,3" />
+            </DataTrigger>
+        </Style.Triggers>
     </Style>
     <Style
         x:Key="PreviewBorderStyle"
diff --git a/Flow.Launcher/Themes/Sublime.xaml b/Flow.Launcher/Themes/Sublime.xaml
index 6df69ad3e..6cf716d4e 100644
--- a/Flow.Launcher/Themes/Sublime.xaml
+++ b/Flow.Launcher/Themes/Sublime.xaml
@@ -27,7 +27,6 @@
         x:Key="QuerySuggestionBoxStyle"
         BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="#303840" />
         <Setter Property="Foreground" Value="#798189" />
         <Setter Property="FontSize" Value="26" />
         <Setter Property="Height" Value="42" />
diff --git a/Flow.Launcher/Themes/Ubuntu.xaml b/Flow.Launcher/Themes/Ubuntu.xaml
index 33f232699..3c9e0a125 100644
--- a/Flow.Launcher/Themes/Ubuntu.xaml
+++ b/Flow.Launcher/Themes/Ubuntu.xaml
@@ -160,7 +160,7 @@
         <Setter Property="Foreground" Value="#c2c2c2" />
     </Style>
     <Style x:Key="ItemGlyphSelectedStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#fa7941" />
+        <Setter Property="Foreground" Value="#c2c2c2" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalAlignment" Value="Center" />
         <Setter Property="Width" Value="25" />
@@ -174,7 +174,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,2" />
     </Style>
     <Style
         x:Key="ClockBox"
diff --git a/Flow.Launcher/Themes/Win10Light.xaml b/Flow.Launcher/Themes/Win10Light.xaml
deleted file mode 100644
index eaa66e7fd..000000000
--- a/Flow.Launcher/Themes/Win10Light.xaml
+++ /dev/null
@@ -1,199 +0,0 @@
-<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">
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-    <Thickness x:Key="ResultMargin">0 0 0 4</Thickness>
-    <Style
-        x:Key="ItemGlyph"
-        BasedOn="{StaticResource BaseGlyphStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#000000" />
-    </Style>
-    <Style
-        x:Key="ItemGlyphSelectedStyle"
-        BasedOn="{StaticResource BaseGlyphStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#000000" />
-    </Style>
-    <Style
-        x:Key="QueryBoxStyle"
-        BasedOn="{StaticResource BaseQueryBoxStyle}"
-        TargetType="{x:Type TextBox}">
-        <Setter Property="SelectionBrush" Value="#0a68d8" />
-        <Setter Property="FontSize" Value="24" />
-        <Setter Property="Foreground" Value="#000000" />
-        <Setter Property="CaretBrush" Value="#000000" />
-        <Setter Property="BorderBrush" Value="Black" />
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Height" Value="42" />
-        <Setter Property="Padding" Value="0,4,66,0" />
-    </Style>
-    <Style
-        x:Key="QuerySuggestionBoxStyle"
-        BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
-        TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="#dddddd" />
-        <Setter Property="Foreground" Value="#c6c6c6" />
-        <Setter Property="FontSize" Value="24" />
-        <Setter Property="Padding" Value="0,4,66,0" />
-        <Setter Property="Height" Value="42" />
-    </Style>
-    <Style
-        x:Key="WindowBorderStyle"
-        BasedOn="{StaticResource BaseWindowBorderStyle}"
-        TargetType="{x:Type Border}">
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="BorderBrush" Value="#aaaaaa" />
-        <Setter Property="CornerRadius" Value="0" />
-        <Setter Property="Background" Value="#dddddd" />
-    </Style>
-    <Style
-        x:Key="WindowStyle"
-        BasedOn="{StaticResource BaseWindowStyle}"
-        TargetType="{x:Type Window}">
-        <Setter Property="Width" Value="576" />
-        <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
-    </Style>
-
-    <Style
-        x:Key="PendingLineStyle"
-        BasedOn="{StaticResource BasePendingLineStyle}"
-        TargetType="{x:Type Line}">
-        <Setter Property="Stroke" Value="#0a68d8" />
-    </Style>
-
-    <!--  Item Style  -->
-    <Style
-        x:Key="ItemTitleStyle"
-        BasedOn="{StaticResource BaseItemTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#000000" />
-    </Style>
-    <Style
-        x:Key="ItemSubTitleStyle"
-        BasedOn="{StaticResource BaseItemSubTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#818181" />
-        <Setter Property="FontSize" Value="13" />
-    </Style>
-    <Style
-        x:Key="ItemNumberStyle"
-        BasedOn="{StaticResource BaseItemNumberStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#818181" />
-    </Style>
-    <Style
-        x:Key="ItemTitleSelectedStyle"
-        BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Cursor" Value="Arrow" />
-        <Setter Property="Foreground" Value="#000000" />
-    </Style>
-    <Style
-        x:Key="ItemSubTitleSelectedStyle"
-        BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Cursor" Value="Arrow" />
-        <Setter Property="Foreground" Value="#72767d" />
-    </Style>
-    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#ccd0d4</SolidColorBrush>
-    <Style
-        x:Key="ItemImageSelectedStyle"
-        BasedOn="{StaticResource BaseItemImageSelectedStyle}"
-        TargetType="{x:Type Image}">
-        <Setter Property="Cursor" Value="Arrow" />
-    </Style>
-    <Style x:Key="HighlightStyle">
-        <Setter Property="Inline.Foreground" Value="#0078d7" />
-    </Style>
-    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="15" />
-        <Setter Property="Foreground" Value="#b2b2b2" />
-    </Style>
-    <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="15" />
-        <Setter Property="Foreground" Value="#b2b2b2" />
-    </Style>
-    <!--  button style in the middle of the scrollbar  -->
-    <Style
-        x:Key="ThumbStyle"
-        BasedOn="{StaticResource BaseThumbStyle}"
-        TargetType="{x:Type Thumb}">
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="true" />
-        <Setter Property="IsTabStop" Value="false" />
-        <Setter Property="Focusable" Value="false" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Border
-                        Background="#bebebe"
-                        BorderBrush="Transparent"
-                        BorderThickness="0"
-                        CornerRadius="2"
-                        DockPanel.Dock="Right" />
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-    <Style
-        x:Key="ScrollBarStyle"
-        BasedOn="{StaticResource BaseScrollBarStyle}"
-        TargetType="{x:Type ScrollBar}" />
-    <Style
-        x:Key="SeparatorStyle"
-        BasedOn="{StaticResource BaseSeparatorStyle}"
-        TargetType="{x:Type Rectangle}">
-        <Setter Property="Fill" Value="#c6c6c6" />
-        <Setter Property="Height" Value="1" />
-        <Setter Property="Margin" Value="12,0,12,4" />
-    </Style>
-    <Style
-        x:Key="SearchIconStyle"
-        BasedOn="{StaticResource BaseSearchIconStyle}"
-        TargetType="{x:Type Path}">
-        <Setter Property="Fill" Value="#555555" />
-        <Setter Property="Width" Value="32" />
-        <Setter Property="Height" Value="32" />
-        <Setter Property="Opacity" Value="0.2" />
-    </Style>
-    <Style
-        x:Key="ClockBox"
-        BasedOn="{StaticResource BaseClockBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#818181" />
-    </Style>
-    <Style
-        x:Key="DateBox"
-        BasedOn="{StaticResource BaseDateBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#818181" />
-    </Style>
-    <Style
-        x:Key="PreviewBorderStyle"
-        BasedOn="{StaticResource BasePreviewBorderStyle}"
-        TargetType="{x:Type Border}">
-        <Setter Property="BorderBrush" Value="#c6c6c6" />
-    </Style>
-    <Style
-        x:Key="PreviewItemTitleStyle"
-        BasedOn="{StaticResource BasePreviewItemTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#000000" />
-    </Style>
-    <Style
-        x:Key="PreviewItemSubTitleStyle"
-        BasedOn="{StaticResource BasePreviewItemSubTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#818181" />
-    </Style>
-    <Style
-        x:Key="PreviewGlyph"
-        BasedOn="{StaticResource BasePreviewGlyph}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#000000" />
-    </Style>
-</ResourceDictionary>
diff --git a/Flow.Launcher/Themes/Win11Dark.xaml b/Flow.Launcher/Themes/Win11Dark.xaml
deleted file mode 100644
index 5abb96cce..000000000
--- a/Flow.Launcher/Themes/Win11Dark.xaml
+++ /dev/null
@@ -1,195 +0,0 @@
-<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">
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-    <Thickness x:Key="ResultMargin">0 0 0 8</Thickness>
-    <Style
-        x:Key="ItemGlyph"
-        BasedOn="{StaticResource BaseGlyphStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#ffffff" />
-    </Style>
-    <Style
-        x:Key="QueryBoxStyle"
-        BasedOn="{StaticResource BaseQueryBoxStyle}"
-        TargetType="{x:Type TextBox}">
-        <Setter Property="SelectionBrush" Value="#4a5459" />
-        <Setter Property="FontSize" Value="24" />
-        <Setter Property="Foreground" Value="#FFFFFF" />
-        <Setter Property="CaretBrush" Value="#FFFFFF" />
-        <Setter Property="FontSize" Value="26" />
-        <Setter Property="Padding" Value="0,4,66,0" />
-        <Setter Property="Height" Value="42" />
-    </Style>
-    <Style
-        x:Key="QuerySuggestionBoxStyle"
-        BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
-        TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="#202020" />
-        <Setter Property="Foreground" Value="#7b7b7b" />
-        <Setter Property="FontSize" Value="26" />
-        <Setter Property="Padding" Value="0,4,66,0" />
-        <Setter Property="Height" Value="42" />
-    </Style>
-    <Style
-        x:Key="WindowBorderStyle"
-        BasedOn="{StaticResource BaseWindowBorderStyle}"
-        TargetType="{x:Type Border}">
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="BorderBrush" Value="#3f3f3f" />
-        <Setter Property="CornerRadius" Value="5" />
-        <Setter Property="Background" Value="#202020" />
-    </Style>
-    <Style
-        x:Key="WindowStyle"
-        BasedOn="{StaticResource BaseWindowStyle}"
-        TargetType="{x:Type Window}">
-        <Setter Property="Width" Value="576" />
-        <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
-    </Style>
-
-    <Style
-        x:Key="PendingLineStyle"
-        BasedOn="{StaticResource BasePendingLineStyle}"
-        TargetType="{x:Type Line}">
-        <Setter Property="Stroke" Value="White" />
-    </Style>
-
-    <!--  Item Style  -->
-    <Style
-        x:Key="ItemTitleStyle"
-        BasedOn="{StaticResource BaseItemTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#ffffff" />
-    </Style>
-    <Style
-        x:Key="ItemSubTitleStyle"
-        BasedOn="{StaticResource BaseItemSubTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#7b7b7b" />
-        <Setter Property="FontSize" Value="13" />
-        <Setter Property="FontWeight" Value="Regular" />
-    </Style>
-    <Style
-        x:Key="ItemNumberStyle"
-        BasedOn="{StaticResource BaseItemNumberStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#ffffff" />
-    </Style>
-    <Style
-        x:Key="ItemTitleSelectedStyle"
-        BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Cursor" Value="Arrow" />
-        <Setter Property="Foreground" Value="#ffffff" />
-    </Style>
-    <Style
-        x:Key="ItemSubTitleSelectedStyle"
-        BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Cursor" Value="Arrow" />
-        <Setter Property="Foreground" Value="#7b7b7b" />
-        <Setter Property="FontSize" Value="13" />
-        <Setter Property="FontWeight" Value="Regular" />
-    </Style>
-    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#198F8F8F</SolidColorBrush>
-    <Style
-        x:Key="ItemImageSelectedStyle"
-        BasedOn="{StaticResource BaseItemImageSelectedStyle}"
-        TargetType="{x:Type Image}">
-        <Setter Property="Cursor" Value="Arrow" />
-    </Style>
-    <Style x:Key="HighlightStyle">
-        <Setter Property="Inline.Foreground" Value="#0078d7" />
-    </Style>
-    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="13" />
-        <Setter Property="Foreground" Value="#7b7b7b" />
-    </Style>
-    <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="13" />
-        <Setter Property="Foreground" Value="#7b7b7b" />
-    </Style>
-    <!--  button style in the middle of the scrollbar  -->
-    <Style
-        x:Key="ThumbStyle"
-        BasedOn="{StaticResource BaseThumbStyle}"
-        TargetType="{x:Type Thumb}">
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="true" />
-        <Setter Property="IsTabStop" Value="false" />
-        <Setter Property="Width" Value="2" />
-        <Setter Property="Focusable" Value="false" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Border
-                        Background="#9a9a9a"
-                        BorderBrush="Transparent"
-                        BorderThickness="0"
-                        CornerRadius="2"
-                        DockPanel.Dock="Right" />
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-    <Style
-        x:Key="ScrollBarStyle"
-        BasedOn="{StaticResource BaseScrollBarStyle}"
-        TargetType="{x:Type ScrollBar}" />
-    <Style
-        x:Key="SeparatorStyle"
-        BasedOn="{StaticResource BaseSeparatorStyle}"
-        TargetType="{x:Type Rectangle}">
-        <Setter Property="Fill" Value="#4d4d4d" />
-        <Setter Property="Height" Value="1" />
-        <Setter Property="Margin" Value="12,0,12,8" />
-    </Style>
-    <Style
-        x:Key="SearchIconStyle"
-        BasedOn="{StaticResource BaseSearchIconStyle}"
-        TargetType="{x:Type Path}">
-        <Setter Property="Fill" Value="#4d4d4d" />
-        <Setter Property="Width" Value="32" />
-        <Setter Property="Height" Value="32" />
-    </Style>
-    <Style
-        x:Key="ClockBox"
-        BasedOn="{StaticResource BaseClockBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#7b7b7b" />
-    </Style>
-    <Style
-        x:Key="DateBox"
-        BasedOn="{StaticResource BaseDateBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#7b7b7b" />
-    </Style>
-    <Style
-        x:Key="PreviewBorderStyle"
-        BasedOn="{StaticResource BasePreviewBorderStyle}"
-        TargetType="{x:Type Border}">
-        <Setter Property="BorderBrush" Value="#4d4d4d" />
-    </Style>
-    <Style
-        x:Key="PreviewItemTitleStyle"
-        BasedOn="{StaticResource BasePreviewItemTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#ffffff" />
-    </Style>
-    <Style
-        x:Key="PreviewItemSubTitleStyle"
-        BasedOn="{StaticResource BasePreviewItemSubTitleStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#7b7b7b" />
-    </Style>
-    <Style
-        x:Key="PreviewGlyph"
-        BasedOn="{StaticResource BasePreviewGlyph}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#ffffff" />
-    </Style>
-</ResourceDictionary>
diff --git a/Flow.Launcher/Themes/Win11System.xaml b/Flow.Launcher/Themes/Win11System.xaml
index 3025f9a07..2f677804c 100644
--- a/Flow.Launcher/Themes/Win11System.xaml
+++ b/Flow.Launcher/Themes/Win11System.xaml
@@ -3,61 +3,70 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:m="http://schemas.modernwpf.com/2019"
     xmlns:system="clr-namespace:System;assembly=mscorlib">
+
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
     </ResourceDictionary.MergedDictionaries>
-    <Thickness x:Key="ResultMargin">0 0 0 8</Thickness>
+    <Style
+        x:Key="BulletStyle"
+        BasedOn="{StaticResource BaseBulletStyle}"
+        TargetType="{x:Type Border}">
+        <Setter Property="Width" Value="4" />
+        <Setter Property="Height" Value="38" />
+        <Setter Property="Background" Value="Transparent" />
+    </Style>
+    <Style
+        x:Key="ItemBulletSelectedStyle"
+        BasedOn="{StaticResource BaseBulletStyle}"
+        TargetType="{x:Type Border}">
+        <Setter Property="Width" Value="4" />
+        <Setter Property="Height" Value="38" />
+        <Setter Property="CornerRadius" Value="2" />
+        <Setter Property="Background" Value="{StaticResource SystemAccentColorLight1Brush}" />
+    </Style>
     <Style
         x:Key="ItemGlyph"
         BasedOn="{StaticResource BaseGlyphStyle}"
         TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
-    </Style>
-    <Style
-        x:Key="ItemGlyphSelectedStyle"
-        BasedOn="{StaticResource BaseGlyphStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
+        <Setter Property="Margin" Value="-4,0,0,0" />
     </Style>
     <Style
         x:Key="QueryBoxStyle"
         BasedOn="{StaticResource BaseQueryBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="SelectionBrush" Value="{DynamicResource QuerySelectionBrush}" />
-        <Setter Property="FontSize" Value="24" />
+        <Setter Property="Padding" Value="0,0,50,0" />
         <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
         <Setter Property="CaretBrush" Value="{DynamicResource Color05B}" />
-        <Setter Property="FontSize" Value="26" />
-        <Setter Property="Padding" Value="0,4,66,0" />
-        <Setter Property="Height" Value="42" />
+        <Setter Property="SelectionBrush" Value="{StaticResource SystemAccentColorLight1Brush}" />
+        <Setter Property="FontSize" Value="18" />
+        <Setter Property="Height" Value="38" />
     </Style>
+
     <Style
         x:Key="QuerySuggestionBoxStyle"
         BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="{DynamicResource Color01B}" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Padding" Value="0,0,50,0" />
+        <Setter Property="Height" Value="38" />
+        <Setter Property="FontSize" Value="18" />
         <Setter Property="Foreground" Value="{DynamicResource QuerySuggestionBoxForeground}" />
-        <Setter Property="FontSize" Value="26" />
-        <Setter Property="Padding" Value="0,4,66,0" />
-        <Setter Property="Height" Value="42" />
     </Style>
+
     <Style
         x:Key="WindowBorderStyle"
         BasedOn="{StaticResource BaseWindowBorderStyle}"
         TargetType="{x:Type Border}">
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="BorderBrush" Value="{DynamicResource SystemThemeBorder}" />
-        <Setter Property="CornerRadius" Value="5" />
         <Setter Property="Background" Value="{DynamicResource Color01B}" />
+        <Setter Property="UseLayoutRounding" Value="True" />
     </Style>
     <Style
         x:Key="WindowStyle"
         BasedOn="{StaticResource BaseWindowStyle}"
-        TargetType="{x:Type Window}">
-        <Setter Property="Width" Value="576" />
-        <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
-    </Style>
-
+        TargetType="{x:Type Window}" />
     <Style
         x:Key="PendingLineStyle"
         BasedOn="{StaticResource BasePendingLineStyle}"
@@ -75,59 +84,35 @@
         BasedOn="{StaticResource BaseItemSubTitleStyle}"
         TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="{DynamicResource SubTitleForeground}" />
-        <Setter Property="FontSize" Value="13" />
     </Style>
     <Style
-        x:Key="ItemNumberStyle"
-        BasedOn="{StaticResource BaseItemNumberStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#A6A6A6" />
+        x:Key="SeparatorStyle"
+        BasedOn="{StaticResource BaseSeparatorStyle}"
+        TargetType="{x:Type Rectangle}">
+        <Setter Property="Fill" Value="{DynamicResource SeparatorForeground}" />
+        <Setter Property="Height" Value="1" />
+        <Setter Property="Margin" Value="0,0,0,8" />
     </Style>
+    <Style x:Key="HighlightStyle" />
     <Style
         x:Key="ItemTitleSelectedStyle"
         BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Cursor" Value="Arrow" />
         <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
     </Style>
     <Style
         x:Key="ItemSubTitleSelectedStyle"
         BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Cursor" Value="Arrow" />
         <Setter Property="Foreground" Value="{DynamicResource SubTitleSelectedForeground}" />
     </Style>
     <SolidColorBrush x:Key="ItemSelectedBackgroundColor" Color="{m:DynamicColor ItemSelectedBackgroundColorBrush}" />
-    <Style
-        x:Key="ItemImageSelectedStyle"
-        BasedOn="{StaticResource BaseItemImageSelectedStyle}"
-        TargetType="{x:Type Image}">
-        <Setter Property="Cursor" Value="Arrow" />
-    </Style>
-    <Style x:Key="HighlightStyle">
-        <Setter Property="Inline.Foreground" Value="{DynamicResource InlineHighlight}" />
-    </Style>
-    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="13" />
-        <Setter Property="Foreground" Value="{DynamicResource HotkeyForeground}" />
-    </Style>
-    <Style
-        x:Key="ItemHotkeySelectedStyle"
-        BasedOn="{StaticResource BaseItemHotkeySelectedStyle}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="13" />
-        <Setter Property="Foreground" Value="{DynamicResource HotkeySelectedForeground}" />
-    </Style>
+
     <!--  button style in the middle of the scrollbar  -->
     <Style
         x:Key="ThumbStyle"
         BasedOn="{StaticResource BaseThumbStyle}"
         TargetType="{x:Type Thumb}">
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="OverridesDefaultStyle" Value="true" />
-        <Setter Property="IsTabStop" Value="false" />
-        <Setter Property="Width" Value="2" />
-        <Setter Property="Focusable" Value="false" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Thumb}">
@@ -145,34 +130,60 @@
         x:Key="ScrollBarStyle"
         BasedOn="{StaticResource BaseScrollBarStyle}"
         TargetType="{x:Type ScrollBar}" />
-    <Style
-        x:Key="SeparatorStyle"
-        BasedOn="{StaticResource BaseSeparatorStyle}"
-        TargetType="{x:Type Rectangle}">
-        <Setter Property="Fill" Value="{DynamicResource SeparatorForeground}" />
-        <Setter Property="Height" Value="1" />
-        <Setter Property="Margin" Value="12,0,12,8" />
-    </Style>
     <Style
         x:Key="SearchIconStyle"
         BasedOn="{StaticResource BaseSearchIconStyle}"
         TargetType="{x:Type Path}">
         <Setter Property="Fill" Value="{DynamicResource SearchIconForeground}" />
+        <Setter Property="Width" Value="24" />
+        <Setter Property="Height" Value="24" />
+    </Style>
+    <Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
+        <Setter Property="Background" Value="Transparent" />
         <Setter Property="Width" Value="32" />
         <Setter Property="Height" Value="32" />
-        <Setter Property="Opacity" Value="1" />
+        <Setter Property="Margin" Value="0,8,8,0" />
+        <Setter Property="HorizontalAlignment" Value="Right" />
+    </Style>
+
+    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="Foreground" Value="{DynamicResource HotkeyForeground}" />
+    </Style>
+    <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="Foreground" Value="{DynamicResource HotkeySelectedForeground}" />
+    </Style>
+    <Style x:Key="ItemGlyphSelectedStyle" TargetType="{x:Type TextBlock}">
+        <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="Width" Value="25" />
+        <Setter Property="Height" Value="25" />
+        <Setter Property="FontSize" Value="25" />
+    </Style>
+    <CornerRadius x:Key="ItemRadius">5</CornerRadius>
+    <Thickness x:Key="ItemMargin">10 0 10 0</Thickness>
+    <Thickness x:Key="ResultMargin">0 0 0 10</Thickness>
+    <Style
+        x:Key="ClockPanel"
+        BasedOn="{StaticResource ClockPanel}"
+        TargetType="{x:Type StackPanel}">
+        <Setter Property="Margin" Value="0,0,54,0" />
+
     </Style>
     <Style
         x:Key="ClockBox"
         BasedOn="{StaticResource BaseClockBox}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="{DynamicResource HotkeyForeground}" />
+        <Setter Property="Foreground" Value="{DynamicResource ClockDateForeground}" />
     </Style>
     <Style
         x:Key="DateBox"
         BasedOn="{StaticResource BaseDateBox}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="{DynamicResource HotkeyForeground}" />
+        <Setter Property="Foreground" Value="{DynamicResource ClockDateForeground}" />
     </Style>
     <Style
         x:Key="PreviewBorderStyle"
@@ -190,9 +201,7 @@
         x:Key="PreviewItemSubTitleStyle"
         BasedOn="{StaticResource BasePreviewItemSubTitleStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#818181" />
         <Setter Property="Foreground" Value="{DynamicResource SubTitleForeground}" />
-        <Setter Property="FontSize" Value="13" />
     </Style>
     <Style
         x:Key="PreviewGlyph"
@@ -200,4 +209,4 @@
         TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
     </Style>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Flow.Launcher/Themes/Win11Light.xaml b/Flow.Launcher/Themes/Win11SystemFlat.xaml
similarity index 69%
rename from Flow.Launcher/Themes/Win11Light.xaml
rename to Flow.Launcher/Themes/Win11SystemFlat.xaml
index e6f376f8b..2f5e0d237 100644
--- a/Flow.Launcher/Themes/Win11Light.xaml
+++ b/Flow.Launcher/Themes/Win11SystemFlat.xaml
@@ -1,6 +1,7 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:m="http://schemas.modernwpf.com/2019"
     xmlns:system="clr-namespace:System;assembly=mscorlib">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
@@ -10,23 +11,22 @@
         x:Key="ItemGlyph"
         BasedOn="{StaticResource BaseGlyphStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#000000" />
+        <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
     </Style>
     <Style
         x:Key="ItemGlyphSelectedStyle"
         BasedOn="{StaticResource BaseGlyphStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#000000" />
+        <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
     </Style>
     <Style
         x:Key="QueryBoxStyle"
         BasedOn="{StaticResource BaseQueryBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="SelectionBrush" Value="#0a68d8" />
-        <Setter Property="FontSize" Value="24" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Foreground" Value="#000000" />
-        <Setter Property="CaretBrush" Value="#000000" />
+        <Setter Property="SelectionBrush" Value="{DynamicResource QuerySelectionBrush}" />
+        <Setter Property="FontSize" Value="22" />
+        <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
+        <Setter Property="CaretBrush" Value="{DynamicResource Color05B}" />
         <Setter Property="FontSize" Value="26" />
         <Setter Property="Padding" Value="0,4,66,0" />
         <Setter Property="Height" Value="42" />
@@ -35,9 +35,8 @@
         x:Key="QuerySuggestionBoxStyle"
         BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Foreground" Value="#b5b5b5" />
-        <Setter Property="FontSize" Value="26" />
+        <Setter Property="Foreground" Value="{DynamicResource QuerySuggestionBoxForeground}" />
+        <Setter Property="FontSize" Value="22" />
         <Setter Property="Padding" Value="0,4,66,0" />
         <Setter Property="Height" Value="42" />
     </Style>
@@ -46,25 +45,15 @@
         BasedOn="{StaticResource BaseWindowBorderStyle}"
         TargetType="{x:Type Border}">
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="BorderBrush" Value="#aaaaaa" />
+        <Setter Property="BorderBrush" Value="{DynamicResource SystemThemeBorder}" />
         <Setter Property="CornerRadius" Value="5" />
-        <Setter Property="Background">
-            <Setter.Value>
-                <LinearGradientBrush StartPoint="0,0.5" EndPoint="1,0.5">
-                    <GradientStop Offset="0" Color="#f4f1f8" />
-                    <GradientStop Offset="0.8" Color="#f9f2e8" />
-                    <GradientStop Offset="1" Color="#f9f0f3" />
-                </LinearGradientBrush>
-
-            </Setter.Value>
-        </Setter>
+        <Setter Property="Background" Value="{DynamicResource Color01B}" />
     </Style>
     <Style
         x:Key="WindowStyle"
         BasedOn="{StaticResource BaseWindowStyle}"
         TargetType="{x:Type Window}">
         <Setter Property="Width" Value="576" />
-        <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
     </Style>
 
     <Style
@@ -77,13 +66,13 @@
         x:Key="ItemTitleStyle"
         BasedOn="{StaticResource BaseItemTitleStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#000000" />
+        <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
     </Style>
     <Style
         x:Key="ItemSubTitleStyle"
         BasedOn="{StaticResource BaseItemSubTitleStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#818181" />
+        <Setter Property="Foreground" Value="{DynamicResource SubTitleForeground}" />
         <Setter Property="FontSize" Value="13" />
     </Style>
     <Style
@@ -96,15 +85,17 @@
         x:Key="ItemTitleSelectedStyle"
         BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#000000" />
+        <Setter Property="Cursor" Value="Arrow" />
+        <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
     </Style>
     <Style
         x:Key="ItemSubTitleSelectedStyle"
         BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#72767d" />
+        <Setter Property="Cursor" Value="Arrow" />
+        <Setter Property="Foreground" Value="{DynamicResource SubTitleSelectedForeground}" />
     </Style>
-    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#198F8F8F</SolidColorBrush>
+    <SolidColorBrush x:Key="ItemSelectedBackgroundColor" Color="{m:DynamicColor ItemSelectedBackgroundColorBrush}" />
     <Style
         x:Key="ItemImageSelectedStyle"
         BasedOn="{StaticResource BaseItemImageSelectedStyle}"
@@ -112,18 +103,18 @@
         <Setter Property="Cursor" Value="Arrow" />
     </Style>
     <Style x:Key="HighlightStyle">
-        <Setter Property="Inline.Foreground" Value="#0078d7" />
+        <Setter Property="Inline.FontWeight" Value="SemiBold" />
     </Style>
     <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="13" />
-        <Setter Property="Foreground" Value="#acacac" />
+        <Setter Property="Foreground" Value="{DynamicResource HotkeyForeground}" />
     </Style>
     <Style
         x:Key="ItemHotkeySelectedStyle"
         BasedOn="{StaticResource BaseItemHotkeySelectedStyle}"
         TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="13" />
-        <Setter Property="Foreground" Value="#acacac" />
+        <Setter Property="Foreground" Value="{DynamicResource HotkeySelectedForeground}" />
     </Style>
     <!--  button style in the middle of the scrollbar  -->
     <Style
@@ -139,7 +130,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Thumb}">
                     <Border
-                        Background="#868686"
+                        Background="{DynamicResource ThumbColor}"
                         BorderBrush="Transparent"
                         BorderThickness="0"
                         CornerRadius="2"
@@ -156,7 +147,7 @@
         x:Key="SeparatorStyle"
         BasedOn="{StaticResource BaseSeparatorStyle}"
         TargetType="{x:Type Rectangle}">
-        <Setter Property="Fill" Value="#eaeaea" />
+        <Setter Property="Fill" Value="{DynamicResource SeparatorForeground}" />
         <Setter Property="Height" Value="1" />
         <Setter Property="Margin" Value="12,0,12,8" />
     </Style>
@@ -164,46 +155,53 @@
         x:Key="SearchIconStyle"
         BasedOn="{StaticResource BaseSearchIconStyle}"
         TargetType="{x:Type Path}">
-        <Setter Property="Fill" Value="#555555" />
+        <Setter Property="Fill" Value="{DynamicResource SearchIconForeground}" />
+        <Setter Property="Width" Value="30" />
+        <Setter Property="Height" Value="30" />
+        <Setter Property="Opacity" Value="1" />
+    </Style>
+    <Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
         <Setter Property="Width" Value="32" />
         <Setter Property="Height" Value="32" />
-        <Setter Property="Opacity" Value="0.2" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Margin" Value="0,0,16,0" />
+        <Setter Property="HorizontalAlignment" Value="Right" />
     </Style>
     <Style
         x:Key="ClockBox"
         BasedOn="{StaticResource BaseClockBox}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#acacac" />
-        <Setter Property="FontSize" Value="22" />
+        <Setter Property="Foreground" Value="{DynamicResource HotkeyForeground}" />
     </Style>
     <Style
         x:Key="DateBox"
         BasedOn="{StaticResource BaseDateBox}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#acacac" />
+        <Setter Property="Foreground" Value="{DynamicResource HotkeyForeground}" />
     </Style>
     <Style
         x:Key="PreviewBorderStyle"
         BasedOn="{StaticResource BasePreviewBorderStyle}"
         TargetType="{x:Type Border}">
-        <Setter Property="BorderBrush" Value="#eaeaea" />
+        <Setter Property="BorderBrush" Value="{DynamicResource SeparatorForeground}" />
     </Style>
     <Style
         x:Key="PreviewItemTitleStyle"
         BasedOn="{StaticResource BasePreviewItemTitleStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#000000" />
+        <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
     </Style>
     <Style
         x:Key="PreviewItemSubTitleStyle"
         BasedOn="{StaticResource BasePreviewItemSubTitleStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#818181" />
+        <Setter Property="Foreground" Value="{DynamicResource SubTitleForeground}" />
+        <Setter Property="FontSize" Value="13" />
     </Style>
     <Style
         x:Key="PreviewGlyph"
         BasedOn="{StaticResource BasePreviewGlyph}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#000000" />
+        <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
     </Style>
 </ResourceDictionary>