diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index c1cfda136..363f6f5c3 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -109,7 +109,7 @@
                     </Line>
                 </Grid>
 
-                <Border CornerRadius="4">
+                <Border Style="{DynamicResource WindowRadius}">
                     <Border.Clip>
                         <MultiBinding Converter="{StaticResource BorderClipConverter}">
                             <Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}"/>
@@ -121,7 +121,7 @@
                         <flowlauncher:ResultListBox x:Name="ResultListBox" DataContext="{Binding Results}" PreviewMouseDown="OnPreviewMouseButtonDown" />
                     </ContentControl>
                 </Border>
-                <Border CornerRadius="4">
+                <Border Style="{DynamicResource WindowRadius}">
                     <Border.Clip>
                         <MultiBinding Converter="{StaticResource BorderClipConverter}">
                             <Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}"/>
@@ -133,7 +133,7 @@
                         <flowlauncher:ResultListBox DataContext="{Binding ContextMenu}" PreviewMouseDown="OnPreviewMouseButtonDown" />
                       </ContentControl>
                 </Border>
-                <Border CornerRadius="4">
+                <Border Style="{DynamicResource WindowRadius}">
                 <Border.Clip>
                         <MultiBinding Converter="{StaticResource BorderClipConverter}">
                             <Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}"/>
diff --git a/Flow.Launcher/Themes/Base.xaml b/Flow.Launcher/Themes/Base.xaml
index a5b161a44..1850933f7 100644
--- a/Flow.Launcher/Themes/Base.xaml
+++ b/Flow.Launcher/Themes/Base.xaml
@@ -14,6 +14,7 @@
         <Setter Property="Foreground" Value="#E3E0E3" />
         <Setter Property="CaretBrush" Value="#E3E0E3" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
         <Setter Property="Template">
             <Setter.Value>
@@ -41,6 +42,7 @@
         <Setter Property="Width" Value="536" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Padding" Value="0 4 0 0" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
     </Style>
 
     <Style x:Key="BaseWindowBorderStyle" TargetType="{x:Type Border}">
@@ -54,6 +56,10 @@
         <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled"/>
     </Style>
 
+    <Style x:Key="WindowRadius" TargetType="{x:Type Border}">
+        <Setter Property="CornerRadius" Value="5" />
+    </Style>
+    
     <Style x:Key="BasePendingLineStyle" TargetType="{x:Type Line}">
         <Setter Property="Stroke" Value="Blue" />
     </Style>
diff --git a/Flow.Launcher/Themes/Pink.xaml b/Flow.Launcher/Themes/Pink.xaml
index 99db9ac42..a2225665e 100644
--- a/Flow.Launcher/Themes/Pink.xaml
+++ b/Flow.Launcher/Themes/Pink.xaml
@@ -6,16 +6,19 @@
         <Setter Property="Background" Value="#1f1d1f"/>
         <Setter Property="Foreground" Value="#cc1081" />
         <Setter Property="CaretBrush" Value="#cc1081" />
+        <Setter Property="Width" Value="370"/>
     </Style>
 
     <Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
         <Setter Property="Background" Value="#1f1d1f"/>
         <Setter Property="Foreground" Value="#71114b" />
+        <Setter Property="Width" Value="370"/>
     </Style>
 
     <Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
         <Setter Property="Background" Value="#1f1d1f"></Setter>
-        <Setter Property="BorderThickness" Value="2"></Setter>
+        <Setter Property="Width" Value="456"></Setter>
+         <Setter Property="BorderThickness" Value="2"></Setter>
         <Setter Property="BorderBrush" Value="#000000"></Setter>
     </Style>
     <Style x:Key="WindowStyle" TargetType="{x:Type Window}" BasedOn="{StaticResource BaseWindowStyle}" >