diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index 79e9d916a..fc7f723e2 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -69,8 +69,7 @@
                 <Grid>
                     <TextBox x:Name="QueryTextSuggestionBox"
                          Style="{DynamicResource QuerySuggestionBoxStyle}"
-                         IsEnabled="False"
-                         Padding="16,0,60,0">
+                         IsEnabled="False">
                         <TextBox.Text>
                             <MultiBinding Converter="{StaticResource QuerySuggestionBoxConverter}">
                                 <Binding ElementName="QueryTextBox" Path="Text"/>
@@ -84,8 +83,7 @@
                      PreviewDragOver="OnPreviewDragOver"
                      AllowDrop="True"
                      Visibility="Visible"
-                    Background="Transparent"
-                    Padding="16,0,60,0">
+                    Background="Transparent">
                         <TextBox.ContextMenu>
                             <ContextMenu>
                                 <MenuItem Command="ApplicationCommands.Cut"/>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 52d3e9c64..071e72c39 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -268,21 +268,25 @@
                                     </Border.Clip>
                                     <Grid>
                                         <Grid.RowDefinitions>
-                                            <RowDefinition Height="58" />
+                                            <RowDefinition Height="54"/>
+                                            <RowDefinition />
                                             <RowDefinition />
                                         </Grid.RowDefinitions>
-                                        <TextBox Grid.Row="0"
+                                        <Border Grid.Row="0">
+                                            <TextBox
                                              Text="{DynamicResource hiThere}" IsReadOnly="True"
-                                             Style="{DynamicResource QueryBoxStyle}"
-                                             Margin="16 0 56 0" />
+                                             Style="{DynamicResource QueryBoxStyle}"/>
+                                            
+                                        </Border>
                                         <Canvas Style="{DynamicResource SearchIconPosition}">
                                             <Path Data="{DynamicResource SearchIconImg}" Style="{DynamicResource SearchIconStyle}" Margin="0"  Stretch="Fill"/>
                                         </Canvas>
-                                        <Border Height="58" Margin="0 28 0 0">
+
+                                        <Border Margin="0 0 0 0" Grid.Row="1">
                                             <Rectangle Width="Auto" HorizontalAlignment="Stretch" Style="{DynamicResource SeparatorStyle}" Visibility="visible"/>
                                         </Border>
 
-                                        <ContentControl Grid.Row="1">
+                                        <ContentControl Grid.Row="2">
                                             <flowlauncher:ResultListBox DataContext="{Binding PreviewResults, Mode=OneTime}" Visibility="Visible" />
                                         </ContentControl>
 
diff --git a/Flow.Launcher/Themes/Base.xaml b/Flow.Launcher/Themes/Base.xaml
index d011c32ec..48c293b32 100644
--- a/Flow.Launcher/Themes/Base.xaml
+++ b/Flow.Launcher/Themes/Base.xaml
@@ -7,10 +7,11 @@
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="FontSize" Value="28" />
         <Setter Property="FontWeight" Value="Regular" />
-        <Setter Property="Height" Value="56" />
+        <Setter Property="Height" Value="40" />
+        <Setter Property="Margin" Value="16 7 0 7" />
         <Setter Property="Padding" Value="0 4 0 0" />
         <Setter Property="Background" Value="#2F2F2F" />
-        <Setter Property="Width" Value="586" />
+        <Setter Property="Width" Value="470" />
         <Setter Property="Foreground" Value="#E3E0E3" />
         <Setter Property="CaretBrush" Value="#E3E0E3" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
@@ -39,10 +40,13 @@
     <!-- Further font customisations are dynamically loaded in Theme.cs -->
     <Style x:Key="BaseQuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
         <Setter Property="Foreground" Value="DarkGray" />
-        <Setter Property="Width" Value="56" />
+        <Setter Property="Height" Value="40" />
+        <Setter Property="Margin" Value="16 7 0 7" />
+        <Setter Property="Width" Value="470" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Padding" Value="0 4 0 0" />
         <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Center" />
     </Style>
 
     <Style x:Key="BaseWindowBorderStyle" TargetType="{x:Type Border}">
@@ -52,7 +56,7 @@
         <Setter Property="CornerRadius" Value="5" />
     </Style>
     <Style x:Key="BaseWindowStyle" TargetType="{x:Type Window}">
-        <Setter Property="Width" Value="586" />
+        <Setter Property="Width" Value="576" />
         <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled"/>
     </Style>
 
diff --git a/Flow.Launcher/Themes/BlackAndWhite.xaml b/Flow.Launcher/Themes/BlackAndWhite.xaml
index e3ffa39aa..38020f4cb 100644
--- a/Flow.Launcher/Themes/BlackAndWhite.xaml
+++ b/Flow.Launcher/Themes/BlackAndWhite.xaml
@@ -9,12 +9,12 @@
     </Style>
     <Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
         <Setter Property="Background" Value="#000000" />
-        <Setter Property="Foreground" Value="#ffffff" />
+        <Setter Property="Foreground" Value="#8f8f8f" />
     </Style>
     <Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
         <Setter Property="CornerRadius" Value="4" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="BorderBrush" Value="#1f1d1f" />
+        <Setter Property="BorderBrush" Value="#494949" />
         <Setter Property="Background" Value="#000000" />
     </Style>
     <Style x:Key="WindowStyle" TargetType="{x:Type Window}" BasedOn="{StaticResource BaseWindowStyle}" />
@@ -23,15 +23,22 @@
         <Setter Property="Foreground" Value="#FFFFF8" />
     </Style>
     <Style x:Key="ItemSubTitleStyle" BasedOn="{StaticResource BaseItemSubTitleStyle}" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#D9D9D4" />
+        <Setter Property="Foreground" Value="#8f8f8f" />
     </Style>
     <Style x:Key="ItemTitleSelectedStyle" BasedOn="{StaticResource BaseItemTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#FFFFF8" />
     </Style>
     <Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#D9D9D4" />
+        <Setter Property="Foreground" Value="#8f8f8f" />
     </Style>
-    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#4F6180</SolidColorBrush>
+    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#494949</SolidColorBrush>
     <Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}" />
     <Style x:Key="ScrollBarStyle" BasedOn="{StaticResource BaseScrollBarStyle}" TargetType="{x:Type ScrollBar}" />
+    <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="#b2b2b2" />
+    </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Flow.Launcher/Themes/BlurBlack Darker.xaml b/Flow.Launcher/Themes/BlurBlack Darker.xaml
index 2fb3f1faa..61cdd0bc3 100644
--- a/Flow.Launcher/Themes/BlurBlack Darker.xaml	
+++ b/Flow.Launcher/Themes/BlurBlack Darker.xaml	
@@ -14,6 +14,7 @@
 
     <Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
         <Setter Property="Foreground" Value="LightGray" />
+        <Setter Property="Opacity" Value="0.5" />
     </Style>
 
     <Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
@@ -27,7 +28,7 @@
     <Style x:Key="WindowStyle" BasedOn="{StaticResource BaseWindowStyle}" TargetType="{x:Type Window}">
         <Setter Property="Background">
             <Setter.Value>
-                <SolidColorBrush Color="Black" Opacity="0.6"/>
+                <SolidColorBrush Color="Black" Opacity="0.7"/>
             </Setter.Value>
         </Setter>
     </Style>
@@ -42,6 +43,7 @@
     </Style>
     <Style x:Key="ItemSubTitleStyle" BasedOn="{StaticResource BaseItemSubTitleStyle}" TargetType="{x:Type TextBlock}" >
         <Setter Property="Foreground" Value="#FFFFFFFF"/>
+        <Setter Property="Opacity" Value="0.5" />
     </Style>
     <Style x:Key="ItemTitleSelectedStyle" BasedOn="{StaticResource BaseItemTitleSelectedStyle}"  TargetType="{x:Type TextBlock}" >
         <Setter Property="Margin" Value="0, -10"/>
@@ -49,14 +51,33 @@
     </Style>
     <Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}" >
         <Setter Property="Foreground" Value="#FFFFFFFF"/>
+        <Setter Property="Opacity" Value="0.5" />
     </Style>
     <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#356ef3</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 CornerRadius="2" DockPanel.Dock="Right" Background="#FFFFFF" Opacity="0.5" BorderBrush="Transparent" BorderThickness="0" />
+                </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" TargetType="{x:Type Path}" BasedOn="{StaticResource BaseSearchIconStyle}">
+        <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="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="Foreground" Value="#ffffff" />
+        <Setter Property="Opacity" Value="0.2" />
+    </Style>
 </ResourceDictionary>
diff --git a/Flow.Launcher/Themes/BlurBlack.xaml b/Flow.Launcher/Themes/BlurBlack.xaml
index a07545c25..4dc372eaf 100644
--- a/Flow.Launcher/Themes/BlurBlack.xaml
+++ b/Flow.Launcher/Themes/BlurBlack.xaml
@@ -19,7 +19,7 @@
     <Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
         <Setter Property="Background">
             <Setter.Value>
-                <SolidColorBrush Color="Black" Opacity="0.3"/>
+                <SolidColorBrush Color="Black" Opacity="0.5"/>
             </Setter.Value>
         </Setter>
     </Style>
@@ -54,9 +54,27 @@
 
     <!-- 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 CornerRadius="2" DockPanel.Dock="Right" Background="#ffffff" Opacity="0.5" BorderBrush="Transparent" BorderThickness="0" />
+                </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" TargetType="{x:Type Path}" BasedOn="{StaticResource BaseSearchIconStyle}">
+        <Setter Property="Fill" Value="#ffffff" />
+        <Setter Property="Width" Value="32" />
+        <Setter Property="Height" Value="32" />
+        <Setter Property="Opacity" Value="0.5" />
+    </Style>
+    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="Foreground" Value="#ffffff" />
+        <Setter Property="Opacity" Value="0.5" />
+    </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Flow.Launcher/Themes/BlurWhite.xaml b/Flow.Launcher/Themes/BlurWhite.xaml
index d88c033c9..2064911f6 100644
--- a/Flow.Launcher/Themes/BlurWhite.xaml
+++ b/Flow.Launcher/Themes/BlurWhite.xaml
@@ -52,9 +52,26 @@
 
     <!-- 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 CornerRadius="2" DockPanel.Dock="Right" Background="#FFFFFF" BorderBrush="Transparent" BorderThickness="0" />
+                </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" TargetType="{x:Type Path}" BasedOn="{StaticResource BaseSearchIconStyle}">
+        <Setter Property="Fill" Value="#000000" />
+        <Setter Property="Width" Value="32" />
+        <Setter Property="Height" Value="32" />
+        <Setter Property="Opacity" Value="0.2" />
+    </Style>
+    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="Foreground" Value="#000000" />
+        <Setter Property="Opacity" Value="0.2" />
+    </Style>
 </ResourceDictionary>
diff --git a/Flow.Launcher/Themes/Darker.xaml b/Flow.Launcher/Themes/Darker.xaml
index 3eb90f124..60aa3a671 100644
--- a/Flow.Launcher/Themes/Darker.xaml
+++ b/Flow.Launcher/Themes/Darker.xaml
@@ -6,12 +6,13 @@
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="QueryBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
+        <Setter Property="SelectionBrush" Value="#6e6e6e"/>
         <Setter Property="SelectionBrush" Value="#4D4D4D"/>
     </Style>
 
-    <Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}"/>
-
-
+    <Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
+        <Setter Property="Foreground" Value="#8f8f8f" />
+    </Style>
     <Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
     </Style>
 
@@ -25,11 +26,13 @@
     <Style x:Key="ItemTitleStyle"  BasedOn="{StaticResource BaseItemTitleStyle}" TargetType="{x:Type TextBlock}">
     </Style>
     <Style x:Key="ItemSubTitleStyle" BasedOn="{StaticResource BaseItemSubTitleStyle}" TargetType="{x:Type TextBlock}" >
+        <Setter Property="Foreground" Value="#8f8f8f" />
     </Style>
     <Style x:Key="ItemTitleSelectedStyle" BasedOn="{StaticResource BaseItemTitleSelectedStyle}"  TargetType="{x:Type TextBlock}" >
         <Setter Property="Cursor" Value="Arrow" />
     </Style>
     <Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}" >
+        <Setter Property="Foreground" Value="#8f8f8f" />
         <Setter Property="Cursor" Value="Arrow" />
     </Style>
     <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#4d4d4d</SolidColorBrush>
diff --git a/Flow.Launcher/Themes/Gray.xaml b/Flow.Launcher/Themes/Gray.xaml
index 1fbaa959a..7d94b6237 100644
--- a/Flow.Launcher/Themes/Gray.xaml
+++ b/Flow.Launcher/Themes/Gray.xaml
@@ -10,12 +10,12 @@
 
     <Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
         <Setter Property="Background" Value="LightGray" />
-        <Setter Property="Foreground" Value="#6E6E6E" />
+        <Setter Property="Foreground" Value="#b8b8b8" />
     </Style>
 
     <Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
         <Setter Property="BorderBrush" Value="LightGray" />
-        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="BorderThickness" Value="2" />
         <Setter Property="Background" Value="LightGray"></Setter>
     </Style>
     <Style x:Key="WindowStyle" TargetType="{x:Type Window}" BasedOn="{StaticResource BaseWindowStyle}" >
@@ -29,20 +29,22 @@
         <Setter Property="Foreground" Value="#A6A6A6" />
     </Style>
     <Style x:Key="ItemSubTitleStyle" BasedOn="{StaticResource BaseItemSubTitleStyle}" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#6B6B6B" />
+        <Setter Property="Foreground" Value="#818181" />
+        <Setter Property="FontSize" Value="13" />
     </Style>
     <Style x:Key="ItemTitleSelectedStyle" BasedOn="{StaticResource BaseItemTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="White" />
     </Style>
     <Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#EDEDED" />
+        <Setter Property="Foreground" Value="Silver" />
+        <Setter Property="FontSize" Value="13" />
     </Style>
     <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#787878</SolidColorBrush>
     <Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}">
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Border CornerRadius="2" DockPanel.Dock="Right" Background="#DBDADB" BorderBrush="Transparent" BorderThickness="0" />
+                    <Border CornerRadius="2" DockPanel.Dock="Right" Background="#eeeeee" BorderBrush="Transparent" BorderThickness="0" />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -51,4 +53,13 @@
     <Style x:Key="ScrollBarStyle" BasedOn="{StaticResource BaseScrollBarStyle}" TargetType="{x:Type ScrollBar}" >
         <Setter Property="Width" Value="3"/>
     </Style>
+    <Style x:Key="SearchIconStyle" TargetType="{x:Type Path}" BasedOn="{StaticResource BaseSearchIconStyle}">
+        <Setter Property="Fill" Value="#a4a4a4" />
+        <Setter Property="Width" Value="32" />
+        <Setter Property="Height" Value="32" />
+    </Style>
+    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="15" />
+        <Setter Property="Foreground" Value="#a3a3a3" />
+    </Style>
 </ResourceDictionary>
diff --git a/Flow.Launcher/Themes/Light.xaml b/Flow.Launcher/Themes/Light.xaml
index 2380f424e..7e980ef0d 100644
--- a/Flow.Launcher/Themes/Light.xaml
+++ b/Flow.Launcher/Themes/Light.xaml
@@ -8,11 +8,13 @@
     <Style x:Key="QueryBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
         <Setter Property="Background" Value="White "/>
         <Setter Property="Foreground" Value="#000000" />
+        <Setter Property="FontSize" Value="22" />
     </Style>
 
     <Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
         <Setter Property="Background" Value="White"/>
-        <Setter Property="Foreground" Value="#000000" />
+        <Setter Property="Foreground" Value="#d9d9d9" />
+        <Setter Property="FontSize" Value="22" />
     </Style>
 
     <Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
@@ -30,22 +32,22 @@
         <Setter Property="Foreground" Value="#000000"></Setter>
     </Style>
     <Style x:Key="ItemSubTitleStyle" BasedOn="{StaticResource BaseItemSubTitleStyle}" TargetType="{x:Type TextBlock}" >
-        <Setter Property="Foreground"  Value="#000000"></Setter>
+        <Setter Property="Foreground"  Value="#A8A8A8"></Setter>
     </Style>
     <Style x:Key="ItemTitleSelectedStyle" BasedOn="{StaticResource BaseItemTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#F6F6FF" />
+        <Setter Property="Foreground" Value="#000000" />
     </Style>
     <Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#F6F6FF" />
+        <Setter Property="Foreground" Value="#818181" />
     </Style>
-    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#909090</SolidColorBrush>
+    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#d9d9d9</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 CornerRadius="2" DockPanel.Dock="Right" Background="#DEDEDE" BorderBrush="Transparent" BorderThickness="0" />
+                    <Border CornerRadius="2" DockPanel.Dock="Right" Background="#C3C3C3" BorderBrush="Transparent" BorderThickness="0" />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -53,4 +55,13 @@
 
     <Style x:Key="ScrollBarStyle" BasedOn="{StaticResource BaseScrollBarStyle}" TargetType="{x:Type ScrollBar}">
     </Style>
+    <Style x:Key="SearchIconStyle" TargetType="{x:Type Path}" BasedOn="{StaticResource BaseSearchIconStyle}">
+        <Setter Property="Fill" Value="#d9d9d9" />
+        <Setter Property="Width" Value="32" />
+        <Setter Property="Height" Value="32" />
+    </Style>
+    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="15" />
+        <Setter Property="Foreground" Value="#a3a3a3" />
+    </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Flow.Launcher/Themes/Metro Server.xaml b/Flow.Launcher/Themes/Metro Server.xaml
index e4acdb7a4..b02ab7555 100644
--- a/Flow.Launcher/Themes/Metro Server.xaml	
+++ b/Flow.Launcher/Themes/Metro Server.xaml	
@@ -4,13 +4,12 @@
     </ResourceDictionary.MergedDictionaries>
     <Style x:Key="QueryBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
         <Setter Property="Foreground" Value="#FFFFFF" />
-        <Setter Property="Background" Value="#001e4e"></Setter>
+        <Setter Property="Background" Value="#001e4e"/>
     </Style>
 
     <Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
-        <Setter Property="Foreground" Value="#FFFFFF" />
-        <Setter Property="Background" Value="#001e4e"></Setter>
-        <Setter Property="Opacity" Value="0.4"></Setter>
+        <Setter Property="Foreground" Value="#344c71" />
+        <Setter Property="Background" Value="#001e4e" />
     </Style>
 
     <Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
@@ -24,21 +23,28 @@
         <Setter Property="Foreground" Value="#f5f5f5"></Setter>
     </Style>
     <Style x:Key="ItemSubTitleStyle" BasedOn="{StaticResource BaseItemSubTitleStyle}" TargetType="{x:Type TextBlock}" >
-        <Setter Property="Foreground" Value="#c2c2c2"></Setter>
-        <Setter Property="FontSize" Value="12" />
+        <Setter Property="Foreground" Value="#A5A5A5"></Setter>
+        <Setter Property="FontSize" Value="13" />
     </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="#c2c2c2" />
-        <Setter Property="FontSize" Value="12" />
+        <Setter Property="Foreground" Value="#A5A5A5"></Setter>
+        <Setter Property="FontSize" Value="13" />
     </Style>
-    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#006ac1</SolidColorBrush>
+    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#04152E</SolidColorBrush>
     <Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}">
     </Style>
     <Style x:Key="ScrollBarStyle" BasedOn="{StaticResource BaseScrollBarStyle}" TargetType="{x:Type ScrollBar}">
     </Style>
-    <Style x:Key="SearchIconStyle" TargetType="{x:Type Path}">
+    <Style x:Key="SearchIconStyle" TargetType="{x:Type Path}" BasedOn="{StaticResource BaseSearchIconStyle}">
+        <Setter Property="Fill" Value="#1d427d" />
+        <Setter Property="Width" Value="32" />
+        <Setter Property="Height" Value="32" />
     </Style>
+    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="15" />
+        <Setter Property="Foreground" Value="#2C5595" />
+    </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 13f4bf230..d231addc4 100644
--- a/Flow.Launcher/Themes/Nord Darker.xaml	
+++ b/Flow.Launcher/Themes/Nord Darker.xaml	
@@ -11,7 +11,7 @@
 
     <Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
         <Setter Property="Background" Value="#2e3440" />
-        <Setter Property="Foreground" Value="#eceff4" />
+        <Setter Property="Foreground" Value="#50596b" />
         <Setter Property="FontSize" Value="30" />
     </Style>
 
@@ -28,23 +28,23 @@
         <Setter Property="FontWeight" Value="Bold" />
     </Style>
     <Style x:Key="ItemNumberStyle" BasedOn="{StaticResource BaseItemNumberStyle}" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#A6A6A6" />
+        <Setter Property="Foreground" Value="#6F7C95" />
     </Style>
     <Style x:Key="ItemSubTitleStyle" BasedOn="{StaticResource BaseItemSubTitleStyle}" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#d8dee9" />
+        <Setter Property="Foreground" Value="#606c83" />
     </Style>
     <Style x:Key="ItemTitleSelectedStyle" BasedOn="{StaticResource BaseItemTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#2e3440" />
+        <Setter Property="Foreground" Value="#e5e9f0" />
     </Style>
     <Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#4c566a" />
+        <Setter Property="Foreground" Value="#8391AB" />
     </Style>
-    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#5e81ac</SolidColorBrush>
+    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#4e586b</SolidColorBrush>
     <Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}">
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Border CornerRadius="2" DockPanel.Dock="Right" Background="#4c566a" BorderBrush="Transparent" BorderThickness="0" />
+                    <Border CornerRadius="2" DockPanel.Dock="Right" Background="#B2B6BE" BorderBrush="Transparent" BorderThickness="0" />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -53,4 +53,13 @@
     <Style x:Key="ScrollBarStyle" BasedOn="{StaticResource BaseScrollBarStyle}" TargetType="{x:Type ScrollBar}" >
         <Setter Property="Width" Value="3"/>
     </Style>
+    <Style x:Key="SearchIconStyle" TargetType="{x:Type Path}" BasedOn="{StaticResource BaseSearchIconStyle}">
+        <Setter Property="Fill" Value="#50596b" />
+        <Setter Property="Width" Value="32" />
+        <Setter Property="Height" Value="32" />
+    </Style>
+    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="15" />
+        <Setter Property="Foreground" Value="#8391AB" />
+    </Style>    
 </ResourceDictionary>
diff --git a/Flow.Launcher/Themes/Nord.xaml b/Flow.Launcher/Themes/Nord.xaml
index 2253b3410..31b8e08eb 100644
--- a/Flow.Launcher/Themes/Nord.xaml
+++ b/Flow.Launcher/Themes/Nord.xaml
@@ -6,13 +6,13 @@
     <Style x:Key="QueryBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
         <Setter Property="Background" Value="#4c566a" />
         <Setter Property="Foreground" Value="#eceff4" />
-        <Setter Property="FontSize" Value="30" />
+        <Setter Property="FontSize" Value="25" />
     </Style>
 
     <Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
         <Setter Property="Background" Value="#4c566a" />
         <Setter Property="Foreground" Value="#eceff4" />
-        <Setter Property="FontSize" Value="30" />
+        <Setter Property="FontSize" Value="25" />
     </Style>
 
     <Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
@@ -28,18 +28,18 @@
         <Setter Property="FontWeight" Value="Bold" />
     </Style>
     <Style x:Key="ItemNumberStyle" BasedOn="{StaticResource BaseItemNumberStyle}" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#A6A6A6" />
+        <Setter Property="Foreground" Value="#798090" />
     </Style>
     <Style x:Key="ItemSubTitleStyle" BasedOn="{StaticResource BaseItemSubTitleStyle}" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#d8dee9" />
+        <Setter Property="Foreground" Value="#798090" />
     </Style>
     <Style x:Key="ItemTitleSelectedStyle" BasedOn="{StaticResource BaseItemTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#2e3440" />
+        <Setter Property="Foreground" Value="#FFFFFF" />
     </Style>
     <Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#4c566a" />
+        <Setter Property="Foreground" Value="#9498A0" />
     </Style>
-    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#5e81ac</SolidColorBrush>
+    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#596479</SolidColorBrush>
     <Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}">
         <Setter Property="Template">
             <Setter.Value>
@@ -49,8 +49,16 @@
             </Setter.Value>
         </Setter>
     </Style>
-
     <Style x:Key="ScrollBarStyle" BasedOn="{StaticResource BaseScrollBarStyle}" TargetType="{x:Type ScrollBar}" >
         <Setter Property="Width" Value="3"/>
     </Style>
+    <Style x:Key="SearchIconStyle" TargetType="{x:Type Path}" BasedOn="{StaticResource BaseSearchIconStyle}">
+        <Setter Property="Fill" Value="#687693" />
+        <Setter Property="Width" Value="32" />
+        <Setter Property="Height" Value="32" />
+    </Style>
+    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="Foreground" Value="#687693" />
+    </Style>
 </ResourceDictionary>
diff --git a/Flow.Launcher/Themes/Pink.xaml b/Flow.Launcher/Themes/Pink.xaml
index 1aec9a58d..1f6a67d59 100644
--- a/Flow.Launcher/Themes/Pink.xaml
+++ b/Flow.Launcher/Themes/Pink.xaml
@@ -16,7 +16,7 @@
 
     <Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
         <Setter Property="Background" Value="#1f1d1f"></Setter>
-        <Setter Property="Width" Value="586"></Setter>
+        <Setter Property="Width" Value="576" />
          <Setter Property="BorderThickness" Value="2"></Setter>
         <Setter Property="BorderBrush" Value="#000000"></Setter>
     </Style>
diff --git a/Flow.Launcher/Themes/Win10Light.xaml b/Flow.Launcher/Themes/Win10Light.xaml
index 4ad385a0a..4f8900cca 100644
--- a/Flow.Launcher/Themes/Win10Light.xaml
+++ b/Flow.Launcher/Themes/Win10Light.xaml
@@ -8,9 +8,11 @@
     <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="#dddddd" />
         <Setter Property="Foreground" Value="#000000" />
+        <Setter Property="Background" Value="#dddddd" />
         <Setter Property="CaretBrush" Value="#000000" />
+        <Setter Property="BorderBrush" Value="Black"/>
+        <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="FontSize" Value="26" />
         <Setter Property="Padding" Value="0 4 0 0" />
     </Style>
@@ -27,7 +29,7 @@
         <Setter Property="Background" Value="#dddddd" />
     </Style>
     <Style x:Key="WindowStyle" BasedOn="{StaticResource BaseWindowStyle}" TargetType="{x:Type Window}">
-        <Setter Property="Width" Value="596" />
+        <Setter Property="Width" Value="576" />
         <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled"/>
     </Style>
 
diff --git a/Flow.Launcher/Themes/Win11Dark.xaml b/Flow.Launcher/Themes/Win11Dark.xaml
index 7d8b05b6f..387f4bdfd 100644
--- a/Flow.Launcher/Themes/Win11Dark.xaml
+++ b/Flow.Launcher/Themes/Win11Dark.xaml
@@ -27,7 +27,7 @@
         <Setter Property="Background" Value="#202020" />
     </Style>
     <Style x:Key="WindowStyle" BasedOn="{StaticResource BaseWindowStyle}" TargetType="{x:Type Window}">
-        <Setter Property="Width" Value="596" />
+        <Setter Property="Width" Value="576" />
         <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled"/>
     </Style>
 
diff --git a/Flow.Launcher/Themes/Win11Light.xaml b/Flow.Launcher/Themes/Win11Light.xaml
index b82d916a8..050201220 100644
--- a/Flow.Launcher/Themes/Win11Light.xaml
+++ b/Flow.Launcher/Themes/Win11Light.xaml
@@ -13,7 +13,7 @@
         <Setter Property="CaretBrush" Value="#000000" />
         <Setter Property="FontSize" Value="26" />
         <Setter Property="Padding" Value="0 4 0 0" />
-    </Style>
+            </Style>
     <Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
         <Setter Property="Background" Value="#f3f3f3" />
         <Setter Property="Foreground" Value="#b5b5b5" />
@@ -27,7 +27,7 @@
         <Setter Property="Background" Value="#f3f3f3" />
     </Style>
     <Style x:Key="WindowStyle" BasedOn="{StaticResource BaseWindowStyle}" TargetType="{x:Type Window}">
-        <Setter Property="Width" Value="596" />
+        <Setter Property="Width" Value="576" />
         <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled"/>
     </Style>