diff --git a/Flow.Launcher/Themes/Gray.xaml b/Flow.Launcher/Themes/Gray.xaml
index 16a1db274..1fbaa959a 100644
--- a/Flow.Launcher/Themes/Gray.xaml
+++ b/Flow.Launcher/Themes/Gray.xaml
@@ -4,21 +4,19 @@
         <ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
     </ResourceDictionary.MergedDictionaries>
     <Style x:Key="QueryBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="#EDEDED" />
+        <Setter Property="Background" Value="LightGray" />
         <Setter Property="Foreground" Value="#222222" />
-        <Setter Property="FontSize" Value="38" />
     </Style>
 
     <Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="#EDEDED" />
-        <Setter Property="Foreground" Value="#222222" />
-        <Setter Property="FontSize" Value="38" />
+        <Setter Property="Background" Value="LightGray" />
+        <Setter Property="Foreground" Value="#6E6E6E" />
     </Style>
 
     <Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
-        <Setter Property="BorderBrush" Value="#B0B0B0" />
+        <Setter Property="BorderBrush" Value="LightGray" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Background" Value="#EDEDED"></Setter>
+        <Setter Property="Background" Value="LightGray"></Setter>
     </Style>
     <Style x:Key="WindowStyle" TargetType="{x:Type Window}" BasedOn="{StaticResource BaseWindowStyle}" >
     </Style>
@@ -31,15 +29,15 @@
         <Setter Property="Foreground" Value="#A6A6A6" />
     </Style>
     <Style x:Key="ItemSubTitleStyle" BasedOn="{StaticResource BaseItemSubTitleStyle}" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#A6A6A6" />
+        <Setter Property="Foreground" Value="#6B6B6B" />
     </Style>
     <Style x:Key="ItemTitleSelectedStyle" BasedOn="{StaticResource BaseItemTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#FFFFF8" />
+        <Setter Property="Foreground" Value="White" />
     </Style>
     <Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#ffffff" />
+        <Setter Property="Foreground" Value="#EDEDED" />
     </Style>
-    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#00AAF6</SolidColorBrush>
+    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#787878</SolidColorBrush>
     <Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}">
         <Setter Property="Template">
             <Setter.Value>
diff --git a/Flow.Launcher/Themes/Light.xaml b/Flow.Launcher/Themes/Light.xaml
index f004bb019..2380f424e 100644
--- a/Flow.Launcher/Themes/Light.xaml
+++ b/Flow.Launcher/Themes/Light.xaml
@@ -6,19 +6,19 @@
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="QueryBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="#EBEBEB"/>
+        <Setter Property="Background" Value="White "/>
         <Setter Property="Foreground" Value="#000000" />
     </Style>
 
     <Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="#EBEBEB"/>
+        <Setter Property="Background" Value="White"/>
         <Setter Property="Foreground" Value="#000000" />
     </Style>
 
     <Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
-        <Setter Property="BorderBrush" Value="#AAAAAA" />
-        <Setter Property="BorderThickness" Value="5" />
-        <Setter Property="Background" Value="#ffffff"></Setter>
+        <Setter Property="BorderBrush" Value="LightGray" />
+        <Setter Property="BorderThickness" Value="1"></Setter>
+        <Setter Property="Background" Value="White"></Setter>
     </Style>
     <Style x:Key="WindowStyle" TargetType="{x:Type Window}" BasedOn="{StaticResource BaseWindowStyle}" >
     </Style>
@@ -38,7 +38,7 @@
     <Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#F6F6FF" />
     </Style>
-    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#3875D7</SolidColorBrush>
+    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#909090</SolidColorBrush>
 
     <!-- button style in the middle of the scrollbar -->
     <Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}">