diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj
index c1fe421fb..8eb70b8e5 100644
--- a/Flow.Launcher/Flow.Launcher.csproj
+++ b/Flow.Launcher/Flow.Launcher.csproj
@@ -47,7 +47,13 @@
   </ItemGroup>
   
   <ItemGroup>
+    <Page Remove="Themes\DarkCyan.xaml" />
+    <Page Remove="Themes\Gray.xaml" />
+    <Page Remove="Themes\Light Bullet.xaml" />
+    <Page Remove="Themes\Light Circle.xaml" />
+    <Page Remove="Themes\Midnight.xaml" />
     <Page Remove="Themes\ThemeBuilder\Template.xaml" />
+    <Page Remove="Themes\Ubuntu.xaml" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/Flow.Launcher/Themes/Base.xaml b/Flow.Launcher/Themes/Base.xaml
index 82285ab69..edb9ce04d 100644
--- a/Flow.Launcher/Themes/Base.xaml
+++ b/Flow.Launcher/Themes/Base.xaml
@@ -22,7 +22,7 @@
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="FontSize" Value="28" />
         <Setter Property="FontWeight" Value="Regular" />
-        <Setter Property="Margin" Value="16,7,16,7" />
+        <Setter Property="Margin" Value="16,7,0,7" />
         <Setter Property="Padding" Value="0,4,68,0" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Height" Value="48" />
@@ -75,7 +75,7 @@
         TargetType="{x:Type TextBox}">
         <Setter Property="Foreground" Value="DarkGray" />
         <Setter Property="Height" Value="48" />
-        <Setter Property="Margin" Value="16,7,16,7" />
+        <Setter Property="Margin" Value="16,7,0,7" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Padding" Value="0,4,68,0" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
diff --git a/Flow.Launcher/Themes/BlurBlack Darker.xaml b/Flow.Launcher/Themes/BlurBlack Darker.xaml
index 6dc0db45e..88c48afee 100644
--- a/Flow.Launcher/Themes/BlurBlack Darker.xaml	
+++ b/Flow.Launcher/Themes/BlurBlack Darker.xaml	
@@ -71,7 +71,6 @@
         x:Key="ItemTitleStyle"
         BasedOn="{StaticResource BaseItemTitleStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Margin" Value="0,-10" />
         <Setter Property="Foreground" Value="#FFFFFFFF" />
     </Style>
     <Style
@@ -85,7 +84,6 @@
         x:Key="ItemTitleSelectedStyle"
         BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Margin" Value="0,-10" />
         <Setter Property="Foreground" Value="#FFFFFFFF" />
     </Style>
     <Style
diff --git a/Flow.Launcher/Themes/BlurBlack.xaml b/Flow.Launcher/Themes/BlurBlack.xaml
index 79d3ac35b..f74578a74 100644
--- a/Flow.Launcher/Themes/BlurBlack.xaml
+++ b/Flow.Launcher/Themes/BlurBlack.xaml
@@ -68,7 +68,6 @@
         x:Key="ItemTitleStyle"
         BasedOn="{StaticResource BaseItemTitleStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Margin" Value="0,-2" />
         <Setter Property="Foreground" Value="#FFFFFFFF" />
     </Style>
     <Style
@@ -81,7 +80,6 @@
         x:Key="ItemTitleSelectedStyle"
         BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Margin" Value="0,-2" />
         <Setter Property="Foreground" Value="#FFFFFFFF" />
     </Style>
     <Style
diff --git a/Flow.Launcher/Themes/BlurWhite.xaml b/Flow.Launcher/Themes/BlurWhite.xaml
index 6308f9e47..2d42d49bc 100644
--- a/Flow.Launcher/Themes/BlurWhite.xaml
+++ b/Flow.Launcher/Themes/BlurWhite.xaml
@@ -65,7 +65,6 @@
         x:Key="ItemTitleStyle"
         BasedOn="{StaticResource BaseItemTitleStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Margin" Value="0,-10" />
         <Setter Property="Foreground" Value="#FF000000" />
     </Style>
     <Style
@@ -78,7 +77,6 @@
         x:Key="ItemTitleSelectedStyle"
         BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Margin" Value="0,-10" />
         <Setter Property="Foreground" Value="#ff000000" />
     </Style>
     <Style
diff --git a/Flow.Launcher/Themes/BlackAndWhite.xaml b/Flow.Launcher/Themes/DarkCyan.xaml
similarity index 97%
rename from Flow.Launcher/Themes/BlackAndWhite.xaml
rename to Flow.Launcher/Themes/DarkCyan.xaml
index b2d03373b..2ad17eb67 100644
--- a/Flow.Launcher/Themes/BlackAndWhite.xaml
+++ b/Flow.Launcher/Themes/DarkCyan.xaml
@@ -11,7 +11,7 @@
         BasedOn="{StaticResource BaseBulletStyle}"
         TargetType="{x:Type Border}">
         <Setter Property="Width" Value="4" />
-        <Setter Property="Height" Value="40" />
+        <Setter Property="Height" Value="50" />
         <Setter Property="Background" Value="Transparent" />
     </Style>
     <Style
@@ -19,7 +19,7 @@
         BasedOn="{StaticResource BaseBulletStyle}"
         TargetType="{x:Type Border}">
         <Setter Property="Width" Value="4" />
-        <Setter Property="Height" Value="40" />
+        <Setter Property="Height" Value="50" />
         <Setter Property="Background" Value="#58c2b4" />
     </Style>
 
@@ -162,7 +162,7 @@
     </Style>
     <CornerRadius x:Key="ItemRadius">0</CornerRadius>
     <Thickness x:Key="ItemMargin">0</Thickness>
-    <Thickness x:Key="ResultMargin">0 0 0 4</Thickness>
+    <Thickness x:Key="ResultMargin">0 0 0 0</Thickness>
     <Style
         x:Key="ClockPanel"
         BasedOn="{StaticResource ClockPanel}"
diff --git a/Flow.Launcher/Themes/Darker Glass.xaml b/Flow.Launcher/Themes/Darker Glass.xaml
index 13c9e2bc5..011a042e8 100644
--- a/Flow.Launcher/Themes/Darker Glass.xaml	
+++ b/Flow.Launcher/Themes/Darker Glass.xaml	
@@ -62,7 +62,6 @@
         x:Key="ItemTitleStyle"
         BasedOn="{StaticResource BaseItemTitleStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Margin" Value="0,-10" />
         <Setter Property="Foreground" Value="#ebebeb" />
     </Style>
     <Style
@@ -75,7 +74,6 @@
         x:Key="ItemTitleSelectedStyle"
         BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Margin" Value="0,-10" />
         <Setter Property="Foreground" Value="#ffffff" />
     </Style>
     <Style
@@ -131,12 +129,10 @@
     <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="14" />
         <Setter Property="Foreground" Value="#787878" />
-        <Setter Property="Opacity" Value="0.1" />
     </Style>
     <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="14" />
         <Setter Property="Foreground" Value="#787878" />
-        <Setter Property="Opacity" Value="0.1" />
     </Style>
     <Style
         x:Key="ClockBox"
diff --git a/Flow.Launcher/Themes/Gray.xaml b/Flow.Launcher/Themes/Gray.xaml
index 13dba618c..eb8b48f43 100644
--- a/Flow.Launcher/Themes/Gray.xaml
+++ b/Flow.Launcher/Themes/Gray.xaml
@@ -6,37 +6,20 @@
     <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="Foreground" Value="#c6c8cb" />
         <Setter Property="Margin" Value="-4,0,0,0" />
     </Style>
     <Style
         x:Key="QueryBoxStyle"
         BasedOn="{StaticResource BaseQueryBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="Foreground" Value="#999aa3" />
-        <Setter Property="FontSize" Value="18" />
-        <Setter Property="Height" Value="38" />
+        <Setter Property="Foreground" Value="#eeeff0" />
+        <Setter Property="FontSize" Value="22" />
+        <Setter Property="Height" Value="42" />
     </Style>
 
     <Style
@@ -44,9 +27,9 @@
         BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
         TargetType="{x:Type TextBox}">
         <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Height" Value="38" />
-        <Setter Property="FontSize" Value="18" />
-        <Setter Property="Foreground" Value="#d9d9d9" />
+        <Setter Property="Height" Value="42" />
+        <Setter Property="FontSize" Value="22" />
+        <Setter Property="Foreground" Value="#7e838d" />
     </Style>
 
     <Style
@@ -54,9 +37,9 @@
         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="BorderBrush" Value="#747881" />
+        <Setter Property="Background" Value="#686d77" />
+        <Setter Property="CornerRadius" Value="0" />
         <Setter Property="UseLayoutRounding" Value="True" />
     </Style>
     <Style
@@ -73,36 +56,38 @@
         x:Key="ItemTitleStyle"
         BasedOn="{StaticResource BaseItemTitleStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#2b2b2e" />
+        <Setter Property="Foreground" Value="#b7babe" />
     </Style>
     <Style
         x:Key="ItemSubTitleStyle"
         BasedOn="{StaticResource BaseItemSubTitleStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#949394" />
+        <Setter Property="Foreground" Value="#9ea1a7" />
     </Style>
     <Style
         x:Key="SeparatorStyle"
         BasedOn="{StaticResource BaseSeparatorStyle}"
         TargetType="{x:Type Rectangle}">
-        <Setter Property="Fill" Value="#f6f5f9" />
+        <Setter Property="Fill" Value="#747881" />
         <Setter Property="Height" Value="1" />
         <Setter Property="Margin" Value="0,0,0,8" />
     </Style>
-    <Style x:Key="HighlightStyle" />
+    <Style x:Key="HighlightStyle">
+        <Setter Property="Inline.FontWeight" Value="Bold" />
+    </Style>
     <Style
         x:Key="ItemTitleSelectedStyle"
         BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#2b2b2e" />
+        <Setter Property="Foreground" Value="#e9e9eb" />
     </Style>
     <Style
         x:Key="ItemSubTitleSelectedStyle"
         BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#949394" />
+        <Setter Property="Foreground" Value="#e9e9eb" />
     </Style>
-    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#f1f1f1</SolidColorBrush>
+    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#797d86</SolidColorBrush>
 
     <!--  button style in the middle of the scrollbar  -->
     <Style
@@ -113,7 +98,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Thumb}">
                     <Border
-                        Background="#d9d9d9"
+                        Background="#848890"
                         BorderBrush="Transparent"
                         BorderThickness="0"
                         CornerRadius="2"
@@ -130,12 +115,12 @@
         x:Key="SearchIconStyle"
         BasedOn="{StaticResource BaseSearchIconStyle}"
         TargetType="{x:Type Path}">
-        <Setter Property="Fill" Value="#d9d9d9" />
+        <Setter Property="Fill" Value="#c7c9cc" />
         <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="Background" Value="#686d77" />
         <Setter Property="Width" Value="32" />
         <Setter Property="Height" Value="32" />
         <Setter Property="Margin" Value="0,8,8,0" />
@@ -144,23 +129,23 @@
 
     <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="12" />
-        <Setter Property="Foreground" Value="#87888b" />
+        <Setter Property="Foreground" Value="#9ea1a7" />
     </Style>
     <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="12" />
-        <Setter Property="Foreground" Value="#87888b" />
+        <Setter Property="Foreground" Value="#e9e9eb" />
     </Style>
     <Style x:Key="ItemGlyphSelectedStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#808dd5" />
+        <Setter Property="Foreground" Value="#eeeff0" />
         <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">5</CornerRadius>
-    <Thickness x:Key="ItemMargin">10 0 10 0</Thickness>
-    <Thickness x:Key="ResultMargin">0 0 0 10</Thickness>
+    <CornerRadius x:Key="ItemRadius">0</CornerRadius>
+    <Thickness x:Key="ItemMargin">0</Thickness>
+    <Thickness x:Key="ResultMargin">0 0 0 0</Thickness>
     <Style
         x:Key="ClockPanel"
         BasedOn="{StaticResource ClockPanel}"
@@ -171,12 +156,12 @@
         x:Key="ClockBox"
         BasedOn="{StaticResource BaseClockBox}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#d9d9d9" />
+        <Setter Property="Foreground" Value="#b7babe" />
     </Style>
     <Style
         x:Key="DateBox"
         BasedOn="{StaticResource BaseDateBox}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#d9d9d9" />
+        <Setter Property="Foreground" Value="#b7babe" />
     </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Flow.Launcher/Themes/League.xaml b/Flow.Launcher/Themes/League.xaml
index 771d38c39..2665988f7 100644
--- a/Flow.Launcher/Themes/League.xaml
+++ b/Flow.Launcher/Themes/League.xaml
@@ -52,6 +52,14 @@
         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}"
diff --git a/Flow.Launcher/Themes/Light Bullet.xaml b/Flow.Launcher/Themes/Light Bullet.xaml
new file mode 100644
index 000000000..3a5acfaee
--- /dev/null
+++ b/Flow.Launcher/Themes/Light Bullet.xaml	
@@ -0,0 +1,182 @@
+<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="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="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="#f6f5f9" />
+        <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="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>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Flow.Launcher/Themes/Light.xaml b/Flow.Launcher/Themes/Light Circle.xaml
similarity index 100%
rename from Flow.Launcher/Themes/Light.xaml
rename to Flow.Launcher/Themes/Light Circle.xaml
diff --git a/Flow.Launcher/Themes/Metro Server.xaml b/Flow.Launcher/Themes/Metro Server.xaml
deleted file mode 100644
index 65659aec5..000000000
--- a/Flow.Launcher/Themes/Metro Server.xaml	
+++ /dev/null
@@ -1,126 +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="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="#FFFFFF" />
-        <Setter Property="Background" Value="#001e4e" />
-        <Setter Property="Padding" Value="0,0,18,0" />
-    </Style>
-    <Style
-        x:Key="QuerySuggestionBoxStyle"
-        BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
-        TargetType="{x:Type TextBox}">
-        <Setter Property="Foreground" Value="#344c71" />
-        <Setter Property="Background" Value="#001e4e" />
-        <Setter Property="Padding" Value="0,0,18,0" />
-    </Style>
-
-    <Style
-        x:Key="WindowBorderStyle"
-        BasedOn="{StaticResource BaseWindowBorderStyle}"
-        TargetType="{x:Type Border}">
-        <Setter Property="Background" Value="#001e4e" />
-    </Style>
-    <Style
-        x:Key="WindowStyle"
-        BasedOn="{StaticResource BaseWindowStyle}"
-        TargetType="{x:Type Window}" />
-    <Style
-        x:Key="PendingLineStyle"
-        BasedOn="{StaticResource BasePendingLineStyle}"
-        TargetType="{x:Type Line}" />
-    <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="#A5A5A5" />
-        <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="#A5A5A5" />
-        <Setter Property="FontSize" Value="13" />
-    </Style>
-    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#04152E</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="SearchIconStyle"
-        BasedOn="{StaticResource BaseSearchIconStyle}"
-        TargetType="{x:Type Path}">
-        <Setter Property="Fill" Value="#1d427d" />
-        <Setter Property="Width" Value="32" />
-        <Setter Property="Height" Value="32" />
-        <Setter Property="Opacity" Value="0" />
-    </Style>
-    <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="15" />
-        <Setter Property="Foreground" Value="#2C5595" />
-    </Style>
-    <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="15" />
-        <Setter Property="Foreground" Value="#2C5595" />
-    </Style>
-    <Style
-        x:Key="ClockBox"
-        BasedOn="{StaticResource BaseClockBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#2C5595" />
-        <Setter Property="FontSize" Value="18" />
-        <Style.Triggers>
-            <DataTrigger Binding="{Binding ElementName=DateBox, Path=Visibility}" Value="Visible">
-                <Setter Property="FontSize" Value="18" />
-            </DataTrigger>
-        </Style.Triggers>
-    </Style>
-    <Style
-        x:Key="DateBox"
-        BasedOn="{StaticResource BaseDateBox}"
-        TargetType="{x:Type TextBlock}">
-        <Setter Property="Margin" Value="10,0,0,0" />
-        <Setter Property="FontSize" Value="18" />
-        <Setter Property="Foreground" Value="#2C5595" />
-        <Style.Triggers>
-            <DataTrigger Binding="{Binding ElementName=ClockBox, Path=Visibility}" Value="Visible">
-                <Setter Property="FontSize" Value="18" />
-            </DataTrigger>
-        </Style.Triggers>
-    </Style>
-    <Style
-        x:Key="ClockPanel"
-        BasedOn="{StaticResource ClockPanel}"
-        TargetType="{x:Type StackPanel}">
-        <Setter Property="Margin" Value="0,0,22,0" />
-        <Setter Property="Orientation" Value="Horizontal" />
-    </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Flow.Launcher/Themes/Darker.xaml b/Flow.Launcher/Themes/Midnight.xaml
similarity index 100%
rename from Flow.Launcher/Themes/Darker.xaml
rename to Flow.Launcher/Themes/Midnight.xaml
diff --git a/Flow.Launcher/Themes/Nord.xaml b/Flow.Launcher/Themes/Ubuntu.xaml
similarity index 94%
rename from Flow.Launcher/Themes/Nord.xaml
rename to Flow.Launcher/Themes/Ubuntu.xaml
index a512ee352..c4353df15 100644
--- a/Flow.Launcher/Themes/Nord.xaml
+++ b/Flow.Launcher/Themes/Ubuntu.xaml
@@ -26,14 +26,14 @@
         x:Key="ItemGlyph"
         BasedOn="{StaticResource BaseGlyphStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#2b2b2e" />
-        <Setter Property="Margin" Value="-4,0,0,0" />
+        <Setter Property="Foreground" Value="#c2c2c2" />
     </Style>
     <Style
         x:Key="QueryBoxStyle"
         BasedOn="{StaticResource BaseQueryBoxStyle}"
         TargetType="{x:Type TextBox}">
-        <Setter Property="Foreground" Value="#999aa3" />
+        <Setter Property="CaretBrush" Value="#fa7941" />
+        <Setter Property="Foreground" Value="#ffffff" />
         <Setter Property="FontSize" Value="18" />
         <Setter Property="Height" Value="38" />
     </Style>
@@ -45,7 +45,7 @@
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Height" Value="38" />
         <Setter Property="FontSize" Value="18" />
-        <Setter Property="Foreground" Value="#d9d9d9" />
+        <Setter Property="Foreground" Value="#949394" />
     </Style>
 
     <Style
@@ -86,7 +86,7 @@
         x:Key="ItemSubTitleStyle"
         BasedOn="{StaticResource BaseItemSubTitleStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#949394" />
+        <Setter Property="Foreground" Value="#7e7e7e" />
     </Style>
     <Style
         x:Key="SeparatorStyle"
@@ -101,7 +101,7 @@
         x:Key="ItemTitleSelectedStyle"
         BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
         TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#c2c2c2" />
+        <Setter Property="Foreground" Value="#ffffff" />
     </Style>
     <Style
         x:Key="ItemSubTitleSelectedStyle"
@@ -120,7 +120,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Thumb}">
                     <Border
-                        Background="#d9d9d9"
+                        Background="#262626"
                         BorderBrush="Transparent"
                         BorderThickness="0"
                         CornerRadius="2"
@@ -151,14 +151,14 @@
 
     <Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="12" />
-        <Setter Property="Foreground" Value="#c2c2c2" />
+        <Setter Property="Foreground" Value="#7e7e7e" />
     </Style>
     <Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="12" />
-        <Setter Property="Foreground" Value="#87888b" />
+        <Setter Property="Foreground" Value="#c2c2c2" />
     </Style>
     <Style x:Key="ItemGlyphSelectedStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#808dd5" />
+        <Setter Property="Foreground" Value="#fa7941" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalAlignment" Value="Center" />
         <Setter Property="Width" Value="25" />
diff --git a/Flow.Launcher/Themes/Win10Light.xaml b/Flow.Launcher/Themes/Win10Light.xaml
index 6a4a07c56..4f51c49e9 100644
--- a/Flow.Launcher/Themes/Win10Light.xaml
+++ b/Flow.Launcher/Themes/Win10Light.xaml
@@ -22,7 +22,6 @@
         <Setter Property="CaretBrush" Value="#000000" />
         <Setter Property="BorderBrush" Value="Black" />
         <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="FontSize" Value="28" />
         <Setter Property="Height" Value="42" />
         <Setter Property="Padding" Value="0,4,66,0" />
     </Style>
@@ -32,7 +31,7 @@
         TargetType="{x:Type TextBox}">
         <Setter Property="Background" Value="#dddddd" />
         <Setter Property="Foreground" Value="#c6c6c6" />
-        <Setter Property="FontSize" Value="28" />
+        <Setter Property="FontSize" Value="24" />
         <Setter Property="Padding" Value="0,4,66,0" />
         <Setter Property="Height" Value="42" />
     </Style>