diff --git a/Flow.Launcher/Resources/Dark.xaml b/Flow.Launcher/Resources/Dark.xaml
index 4933dc021..581b1f10e 100644
--- a/Flow.Launcher/Resources/Dark.xaml
+++ b/Flow.Launcher/Resources/Dark.xaml
@@ -37,6 +37,7 @@
     <SolidColorBrush x:Key="NumberBoxColor25B" Color="#5d5d5d" />
     <SolidColorBrush x:Key="NumberBoxColor26B" Color="#ffffff" />
     <SolidColorBrush x:Key="CustomNumberBoxBG" Color="#292929" />
+    <SolidColorBrush x:Key="PluginInfoColor" Color="#878787" />
 
     <SolidColorBrush x:Key="ThemeHoverButton" Color="#3c3c3c" />
     <SolidColorBrush x:Key="PopuBGColor" Color="#202020" />
@@ -72,6 +73,7 @@
     <Color x:Key="NumberBoxColor24">#f5f5f5</Color>
     <Color x:Key="NumberBoxColor25">#464646</Color>
     <Color x:Key="NumberBoxColor26">#ffffff</Color>
+    <Color x:Key="HoverStoreGrid">#272727</Color>
 
 
     <SolidColorBrush x:Key="ButtonOutBorder" Color="Transparent" />
diff --git a/Flow.Launcher/Resources/Light.xaml b/Flow.Launcher/Resources/Light.xaml
index 9dd240f4d..4e8abc1bc 100644
--- a/Flow.Launcher/Resources/Light.xaml
+++ b/Flow.Launcher/Resources/Light.xaml
@@ -34,6 +34,7 @@
     <SolidColorBrush x:Key="NumberBoxColor25B" Color="#878787" />
     <SolidColorBrush x:Key="NumberBoxColor26B" Color="#1b1b1b" />
     <SolidColorBrush x:Key="CustomNumberBoxBG" Color="#fdfdfd" />
+    <SolidColorBrush x:Key="PluginInfoColor" Color="#8f8f8f" />
 
     <SolidColorBrush x:Key="ThemeHoverButton" Color="#f6f6f6" />
     <SolidColorBrush x:Key="PopuBGColor" Color="#ffffff" />
@@ -66,6 +67,7 @@
     <Color x:Key="NumberBoxColor24">#f5f5f5</Color>
     <Color x:Key="NumberBoxColor25">#878787</Color>
     <Color x:Key="NumberBoxColor26">#1b1b1b</Color>
+    <Color x:Key="HoverStoreGrid">#f6f6f6</Color>
 
 
     <SolidColorBrush x:Key="ButtonOutBorder" Color="#e5e5e5" />
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index f846dd057..17b18acb2 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -1118,65 +1118,65 @@
                                                                         MaxWidth="100"
                                                                         Margin="10,0,0,0"
                                                                         FontSize="11"
-                                                                        Foreground="#8F8F8F"
+                                                                        Foreground="{DynamicResource PluginInfoColor}"
                                                                         Text="{DynamicResource author}" />
                                                                     <TextBlock
                                                                         MaxWidth="100"
                                                                         Margin="5,0,0,0"
                                                                         FontSize="11"
-                                                                        Foreground="#8F8F8F"
+                                                                        Foreground="{DynamicResource PluginInfoColor}"
                                                                         Text="{Binding PluginPair.Metadata.Author}" />
                                                                     <TextBlock
                                                                         MaxWidth="100"
                                                                         Margin="5,0,0,0"
                                                                         VerticalAlignment="Center"
                                                                         FontSize="11"
-                                                                        Foreground="#8F8F8F"
+                                                                        Foreground="{DynamicResource PluginInfoColor}"
                                                                         Text="|" />
                                                                     <TextBlock
                                                                         MaxWidth="100"
                                                                         Margin="5,0,0,0"
                                                                         FontSize="11"
-                                                                        Foreground="#8F8F8F"
+                                                                        Foreground="{DynamicResource PluginInfoColor}"
                                                                         Text="{DynamicResource plugin_init_time}" />
                                                                     <TextBlock
                                                                         MaxWidth="100"
                                                                         Margin="5,0,0,0"
                                                                         FontSize="11"
-                                                                        Foreground="#8F8F8F"
+                                                                        Foreground="{DynamicResource PluginInfoColor}"
                                                                         Text="{Binding InitilizaTime}" />
                                                                     <TextBlock
                                                                         MaxWidth="100"
                                                                         Margin="5,0,0,0"
                                                                         VerticalAlignment="Center"
                                                                         FontSize="11"
-                                                                        Foreground="#8F8F8F"
+                                                                        Foreground="{DynamicResource PluginInfoColor}"
                                                                         Text="|" />
                                                                     <TextBlock
                                                                         MaxWidth="100"
                                                                         Margin="5,0,0,0"
                                                                         FontSize="11"
-                                                                        Foreground="#8F8F8F"
+                                                                        Foreground="{DynamicResource PluginInfoColor}"
                                                                         Text="{DynamicResource plugin_query_time}" />
                                                                     <TextBlock
                                                                         MaxWidth="100"
                                                                         Margin="5,0,0,0"
                                                                         FontSize="11"
-                                                                        Foreground="#8F8F8F"
+                                                                        Foreground="{DynamicResource PluginInfoColor}"
                                                                         Text="{Binding QueryTime}" />
                                                                     <TextBlock
                                                                         MaxWidth="100"
                                                                         Margin="5,0,0,0"
                                                                         VerticalAlignment="Center"
                                                                         FontSize="11"
-                                                                        Foreground="#8F8F8F"
+                                                                        Foreground="{DynamicResource PluginInfoColor}"
                                                                         Text="| version" />
                                                                     <TextBlock
                                                                         MaxWidth="100"
                                                                         Margin="5,0,0,0"
                                                                         VerticalAlignment="Center"
                                                                         FontSize="11"
-                                                                        Foreground="#8F8F8F"
+                                                                        Foreground="{DynamicResource PluginInfoColor}"
                                                                         Text="{Binding PluginPair.Metadata.Version}" />
 
                                                                     <TextBlock
@@ -1187,7 +1187,7 @@
                                                                         Cursor="Hand"
                                                                         FontSize="12">
                                                                         <Hyperlink
-                                                                            Foreground="#8F8F8F"
+                                                                            Foreground="{DynamicResource PluginInfoColor}"
                                                                             NavigateUri="{Binding PluginPair.Metadata.Website}"
                                                                             RequestNavigate="OnRequestNavigate">
                                                                             <Run Text="Website" />
@@ -1201,7 +1201,7 @@
                                                                         VerticalAlignment="Center"
                                                                         Cursor="Hand"
                                                                         FontSize="12"
-                                                                        Foreground="#8f8f8f"
+                                                                        Foreground="{DynamicResource PluginInfoColor}"
                                                                         MouseUp="OnPluginDirecotyClick"
                                                                         Text="{DynamicResource pluginDirectory}"
                                                                         TextDecorations="Underline" />
@@ -1412,7 +1412,7 @@
                                                         VerticalAlignment="Stretch"
                                                         Panel.ZIndex="1">
                                                         <Grid.Background>
-                                                            <SolidColorBrush Opacity=".95" Color="{StaticResource Color07}" />
+                                                            <SolidColorBrush Opacity=".95" Color="{StaticResource HoverStoreGrid}" />
                                                         </Grid.Background>
                                                         <Grid.ColumnDefinitions>
                                                             <ColumnDefinition Width="{Binding ActualWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}}" />
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
index abe1f0ad5..59bdf222b 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
@@ -1,72 +1,106 @@
-<UserControl x:Class="Flow.Launcher.Plugin.BrowserBookmark.Views.SettingsControl"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             mc:Ignorable="d"
-             Background="White"
-             d:DesignHeight="300" d:DesignWidth="500"
-             DataContext="{Binding RelativeSource={RelativeSource Self}}">
+<UserControl
+    x:Class="Flow.Launcher.Plugin.BrowserBookmark.Views.SettingsControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="300"
+    d:DesignWidth="500"
+    DataContext="{Binding RelativeSource={RelativeSource Self}}"
+    mc:Ignorable="d">
     <Grid Margin="10">
         <Grid.RowDefinitions>
             <RowDefinition Height="50" />
-            <RowDefinition Height="80"/>
-            <RowDefinition Height="auto"/>
+            <RowDefinition Height="80" />
+            <RowDefinition Height="auto" />
         </Grid.RowDefinitions>
         <StackPanel>
-            <Grid Grid.Row="0" Margin="30 20 0 0">
+            <Grid Grid.Row="0" Margin="30,20,0,0">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="160" />
-                    <ColumnDefinition Width="140"/>
-                    <ColumnDefinition Width="100"/>
+                    <ColumnDefinition Width="140" />
+                    <ColumnDefinition Width="100" />
                 </Grid.ColumnDefinitions>
-                <Label Grid.Column="0" Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_openBookmarks}"
-                       FontSize="15" Margin="10 5 0 0"/>
-                <RadioButton Grid.Column="1" Name="NewWindowBrowser"
-                             IsChecked="{Binding OpenInNewBrowserWindow}"
-                             Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_newWindow}"/>
-                <RadioButton Grid.Column="2" Name="NewTabInBrowser"
-                             IsChecked="{Binding OpenInNewTab, Mode=OneTime}"
-                             Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_newTab}"/>
+                <Label
+                    Grid.Column="0"
+                    Margin="10,5,0,0"
+                    Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_openBookmarks}"
+                    FontSize="15" />
+                <RadioButton
+                    Name="NewWindowBrowser"
+                    Grid.Column="1"
+                    Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_newWindow}"
+                    IsChecked="{Binding OpenInNewBrowserWindow}" />
+                <RadioButton
+                    Name="NewTabInBrowser"
+                    Grid.Column="2"
+                    Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_newTab}"
+                    IsChecked="{Binding OpenInNewTab, Mode=OneTime}" />
             </Grid>
         </StackPanel>
-        <StackPanel Orientation="Horizontal" VerticalAlignment="Top" Grid.Row="1" Height="60" Margin="30,20,0,0">
-            <Label Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_setBrowserFromPath}"
-                   Height="28" Margin="10"/>
-            <TextBox x:Name="BrowserPathBox" 
-                     HorizontalAlignment="Left" 
-                     Height="30" 
-                     TextWrapping="NoWrap" 
-                     VerticalAlignment="Center"
-                     Text="{Binding Settings.BrowserPath}"
-                     Width="240"
-                     Margin="10"/>
-            <Button x:Name="ViewButton" Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_choose}"
-                    HorizontalAlignment="Left" Margin="10" Width="100" Height="30" Click="OnChooseClick" FontSize="14" />
+        <StackPanel
+            Grid.Row="1"
+            Height="60"
+            Margin="30,20,0,0"
+            VerticalAlignment="Top"
+            Orientation="Horizontal">
+            <Label
+                Height="28"
+                Margin="10"
+                Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_setBrowserFromPath}" />
+            <TextBox
+                x:Name="BrowserPathBox"
+                Width="240"
+                Height="30"
+                Margin="10"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center"
+                Text="{Binding Settings.BrowserPath}"
+                TextWrapping="NoWrap" />
+            <Button
+                x:Name="ViewButton"
+                Width="100"
+                Height="30"
+                Margin="10"
+                HorizontalAlignment="Left"
+                Click="OnChooseClick"
+                Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_choose}"
+                FontSize="14" />
         </StackPanel>
-        <StackPanel Grid.Row="2" Orientation="Vertical" Margin="30,20,0,0">
-            <TextBlock Text="{DynamicResource flowlauncher_plugin_browserbookmark_loadBrowserFrom}" Margin="10"/>
-            <ListView Grid.Row="2" ItemsSource="{Binding Settings.CustomChromiumBrowsers}"
-                      SelectedItem="{Binding SelectedCustomBrowser}"
-                      Margin="10"
-                      BorderBrush="DarkGray"
-                      BorderThickness="1"
-                      Style="{StaticResource {x:Static GridView.GridViewStyleKey}}"
-                      Height="auto"
-                      Name="CustomBrowsers"
-                      MouseDoubleClick="MouseDoubleClickOnSelectedCustomBrowser">
+        <StackPanel
+            Grid.Row="2"
+            Margin="30,20,0,0"
+            Orientation="Vertical">
+            <TextBlock Margin="10" Text="{DynamicResource flowlauncher_plugin_browserbookmark_loadBrowserFrom}" />
+            <ListView
+                Name="CustomBrowsers"
+                Grid.Row="2"
+                Height="auto"
+                Margin="10"
+                BorderBrush="DarkGray"
+                BorderThickness="1"
+                ItemsSource="{Binding Settings.CustomChromiumBrowsers}"
+                MouseDoubleClick="MouseDoubleClickOnSelectedCustomBrowser"
+                SelectedItem="{Binding SelectedCustomBrowser}"
+                Style="{StaticResource {x:Static GridView.GridViewStyleKey}}">
                 <ListView.View>
                     <GridView>
-                        <GridViewColumn DisplayMemberBinding="{Binding Name, Mode=OneWay}" Header="{DynamicResource flowlauncher_plugin_browserbookmark_browserName}"/>
-                        <GridViewColumn DisplayMemberBinding="{Binding DataDirectoryPath, Mode=OneWay}" Header="{DynamicResource flowlauncher_plugin_browserbookmark_browserBookmarkDataDirectory}"/>
+                        <GridViewColumn DisplayMemberBinding="{Binding Name, Mode=OneWay}" Header="{DynamicResource flowlauncher_plugin_browserbookmark_browserName}" />
+                        <GridViewColumn DisplayMemberBinding="{Binding DataDirectoryPath, Mode=OneWay}" Header="{DynamicResource flowlauncher_plugin_browserbookmark_browserBookmarkDataDirectory}" />
                     </GridView>
                 </ListView.View>
             </ListView>
             <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
-                <Button Content="{DynamicResource flowlauncher_plugin_browserbookmark_addBrowserBookmark}" 
-                        Margin="10" Click="NewCustomBrowser" Width="80" />
-                <Button Content="{DynamicResource flowlauncher_plugin_browserbookmark_removeBrowserBookmark}" 
-                        Margin="10" Click="DeleteCustomBrowser" Width="80"/>
+                <Button
+                    Width="80"
+                    Margin="10"
+                    Click="NewCustomBrowser"
+                    Content="{DynamicResource flowlauncher_plugin_browserbookmark_addBrowserBookmark}" />
+                <Button
+                    Width="80"
+                    Margin="10"
+                    Click="DeleteCustomBrowser"
+                    Content="{DynamicResource flowlauncher_plugin_browserbookmark_removeBrowserBookmark}" />
             </StackPanel>
         </StackPanel>
     </Grid>
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
index 68f5adc3b..2d4da962b 100644
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
@@ -1,128 +1,203 @@
-<UserControl x:Class="Flow.Launcher.Plugin.WebSearch.SettingsControl"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:vm="clr-namespace:Flow.Launcher.Plugin.WebSearch"
-             mc:Ignorable="d"
-             Background="White"
-             d:DataContext="{d:DesignInstance vm:SettingsViewModel}"
-             d:DesignHeight="300" d:DesignWidth="500">
+<UserControl
+    x:Class="Flow.Launcher.Plugin.WebSearch.SettingsControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:Flow.Launcher.Plugin.WebSearch"
+    d:DataContext="{d:DesignInstance vm:SettingsViewModel}"
+    d:DesignHeight="300"
+    d:DesignWidth="500"
+    mc:Ignorable="d">
     <UserControl.Resources>
-        <Style TargetType="TextBox" x:Key="BrowserPathBoxStyle">
-            <Setter Property="Height" Value="28"/>
-            <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Style x:Key="BrowserPathBoxStyle" TargetType="TextBox">
+            <Setter Property="Height" Value="28" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
         </Style>
         <DataTemplate x:Key="HeaderTemplateArrowUp">
             <DockPanel>
-                <TextBlock HorizontalAlignment="Center" Text="{Binding}"/>
-                <Path x:Name="arrow"
-           StrokeThickness = "1"            
-           Fill            = "gray"
-           Data            = "M 5,10 L 15,10 L 10,5 L 5,10"/>
+                <TextBlock HorizontalAlignment="Center" Text="{Binding}" />
+                <Path
+                    x:Name="arrow"
+                    Data="M 5,10 L 15,10 L 10,5 L 5,10"
+                    Fill="gray"
+                    StrokeThickness="1" />
             </DockPanel>
         </DataTemplate>
         <DataTemplate x:Key="HeaderTemplateArrowDown">
             <DockPanel>
-                <TextBlock HorizontalAlignment="Center" Text="{Binding }"/>
-                <Path x:Name="arrow"
-              StrokeThickness = "1"            
-              Fill            = "gray"
-              Data            = "M 5,5 L 10,10 L 15,5 L 5,5"/>
+                <TextBlock HorizontalAlignment="Center" Text="{Binding}" />
+                <Path
+                    x:Name="arrow"
+                    Data="M 5,5 L 10,10 L 15,5 L 5,5"
+                    Fill="gray"
+                    StrokeThickness="1" />
             </DockPanel>
         </DataTemplate>
     </UserControl.Resources>
-    <Grid Margin="14 14 14 0">
+    <Grid Margin="14,14,14,0">
         <Grid.RowDefinitions>
             <RowDefinition Height="48" />
             <RowDefinition Height="40" />
             <RowDefinition />
-            <RowDefinition Height="56"/>
+            <RowDefinition Height="56" />
             <RowDefinition Height="50" />
         </Grid.RowDefinitions>
-        <StackPanel Grid.Row="0" HorizontalAlignment="Left" Orientation="Horizontal" Margin="14 0 0 0">
-            <Label Content="{DynamicResource flowlauncher_plugin_websearch_open_search_in}" Margin="0 15 20 0"/>
-            <RadioButton Name="NewWindowBrowser" GroupName="OpenSearchBehaviour" Content="{DynamicResource flowlauncher_plugin_websearch_new_window}" Click="OnNewBrowserWindowClick" 
-                         Margin="0 0 20 0"/>
-            <RadioButton Name="NewTabInBrowser" GroupName="OpenSearchBehaviour" Content="{DynamicResource flowlauncher_plugin_websearch_new_tab}" Click="OnNewTabClick" />
+        <StackPanel
+            Grid.Row="0"
+            Margin="14,0,0,0"
+            HorizontalAlignment="Left"
+            Orientation="Horizontal">
+            <Label Margin="0,15,20,0" Content="{DynamicResource flowlauncher_plugin_websearch_open_search_in}" />
+            <RadioButton
+                Name="NewWindowBrowser"
+                Margin="0,0,20,0"
+                Click="OnNewBrowserWindowClick"
+                Content="{DynamicResource flowlauncher_plugin_websearch_new_window}"
+                GroupName="OpenSearchBehaviour" />
+            <RadioButton
+                Name="NewTabInBrowser"
+                Click="OnNewTabClick"
+                Content="{DynamicResource flowlauncher_plugin_websearch_new_tab}"
+                GroupName="OpenSearchBehaviour" />
         </StackPanel>
-        <StackPanel Grid.Row="1" HorizontalAlignment="Left" Margin="14 3 0 0" Orientation="Horizontal">
-            <Label Content="{DynamicResource flowlaucnher_plugin_websearch_set_browser_path}" Margin="0 0 10 0" HorizontalAlignment="Left" VerticalAlignment="Center"/>
-            <TextBox x:Name="browserPathBox" HorizontalAlignment="Left" Margin="0,0,0,0" TextChanged="OnBrowserPathTextChanged"
-                     Width="250" Style="{StaticResource BrowserPathBoxStyle}"/>
-            <Button x:Name="viewButton" HorizontalAlignment="Left" Margin="10,0,0,0"  
-                    Click="OnChooseClick" FontSize="13" Content="{DynamicResource flowlauncher_plugin_websearch_choose}" Width="80"/>
+        <StackPanel
+            Grid.Row="1"
+            Margin="14,3,0,0"
+            HorizontalAlignment="Left"
+            Orientation="Horizontal">
+            <Label
+                Margin="0,0,10,0"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center"
+                Content="{DynamicResource flowlaucnher_plugin_websearch_set_browser_path}" />
+            <TextBox
+                x:Name="browserPathBox"
+                Width="250"
+                Margin="0,0,0,0"
+                HorizontalAlignment="Left"
+                Style="{StaticResource BrowserPathBoxStyle}"
+                TextChanged="OnBrowserPathTextChanged" />
+            <Button
+                x:Name="viewButton"
+                Width="80"
+                Margin="10,0,0,0"
+                HorizontalAlignment="Left"
+                Click="OnChooseClick"
+                Content="{DynamicResource flowlauncher_plugin_websearch_choose}"
+                FontSize="13" />
         </StackPanel>
-        <ListView Margin="0 18 0 0" ItemsSource="{Binding Settings.SearchSources}"
-                  SelectedItem="{Binding Settings.SelectedSearchSource}"
-                  x:Name="SearchSourcesListView"
-                  Grid.Row="2"
-                  Style="{StaticResource {x:Static GridView.GridViewStyleKey}}"
-                  BorderBrush="DarkGray"
-                  BorderThickness="1"
-                  GridViewColumnHeader.Click="SortByColumn"
-                  MouseDoubleClick="MouseDoubleClickItem">
+        <ListView
+            x:Name="SearchSourcesListView"
+            Grid.Row="2"
+            Margin="0,18,0,0"
+            BorderBrush="DarkGray"
+            BorderThickness="1"
+            GridViewColumnHeader.Click="SortByColumn"
+            ItemsSource="{Binding Settings.SearchSources}"
+            MouseDoubleClick="MouseDoubleClickItem"
+            SelectedItem="{Binding Settings.SelectedSearchSource}"
+            Style="{StaticResource {x:Static GridView.GridViewStyleKey}}">
             <ListView.View>
                 <GridView>
                     <GridViewColumn Width="50">
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
-                                <Image Source="{Binding Path=IconPath}" Width="20" Height="20" Margin="6 0 0 0"/>
+                                <Image
+                                    Width="20"
+                                    Height="20"
+                                    Margin="6,0,0,0"
+                                    Source="{Binding Path=IconPath}" />
                             </DataTemplate>
                         </GridViewColumn.CellTemplate>
                     </GridViewColumn>
 
-                    <GridViewColumn Header="{DynamicResource flowlauncher_plugin_websearch_action_keyword}"
-                                    DisplayMemberBinding="{Binding ActionKeyword}"
-                                    Width="130">
+                    <GridViewColumn
+                        Width="130"
+                        DisplayMemberBinding="{Binding ActionKeyword}"
+                        Header="{DynamicResource flowlauncher_plugin_websearch_action_keyword}">
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
-                                <TextBlock Text="{Binding ActionKeyword}"/>
+                                <TextBlock Text="{Binding ActionKeyword}" />
                             </DataTemplate>
                         </GridViewColumn.CellTemplate>
                     </GridViewColumn>
-                    <GridViewColumn Header="{DynamicResource flowlauncher_plugin_websearch_title}"
-                                    DisplayMemberBinding="{Binding Title}" Width="350">
+                    <GridViewColumn
+                        Width="350"
+                        DisplayMemberBinding="{Binding Title}"
+                        Header="{DynamicResource flowlauncher_plugin_websearch_title}">
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
-                                <TextBlock Text="{Binding Title}"/>
+                                <TextBlock Text="{Binding Title}" />
                             </DataTemplate>
                         </GridViewColumn.CellTemplate>
                     </GridViewColumn>
-                    <GridViewColumn Header="{DynamicResource flowlauncher_plugin_websearch_enable}"
-                                    DisplayMemberBinding="{Binding Enabled}"
-                                    Width="80">
+                    <GridViewColumn
+                        Width="80"
+                        DisplayMemberBinding="{Binding Enabled}"
+                        Header="{DynamicResource flowlauncher_plugin_websearch_enable}">
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
-                                <TextBlock Text="{Binding Enabled}"/>
+                                <TextBlock Text="{Binding Enabled}" />
                             </DataTemplate>
                         </GridViewColumn.CellTemplate>
                     </GridViewColumn>
                 </GridView>
             </ListView.View>
         </ListView>
-        <StackPanel Grid.Row="3" HorizontalAlignment="Right" Orientation="Horizontal">
-            <Button Click="OnDeleteSearchSearchClick" Width="100" Margin="10"
-                    Content="{DynamicResource flowlauncher_plugin_websearch_delete}" />
-            <Button Click="OnEditSearchSourceClick" Width="100" Margin="10"
-                    Content="{DynamicResource flowlauncher_plugin_websearch_edit}" />
-            <Button Click="OnAddSearchSearchClick" Width="100" Margin="10 10 0 10"
-                    Content="{DynamicResource flowlauncher_plugin_websearch_add}" />
+        <StackPanel
+            Grid.Row="3"
+            HorizontalAlignment="Right"
+            Orientation="Horizontal">
+            <Button
+                Width="100"
+                Margin="10"
+                Click="OnDeleteSearchSearchClick"
+                Content="{DynamicResource flowlauncher_plugin_websearch_delete}" />
+            <Button
+                Width="100"
+                Margin="10"
+                Click="OnEditSearchSourceClick"
+                Content="{DynamicResource flowlauncher_plugin_websearch_edit}" />
+            <Button
+                Width="100"
+                Margin="10,10,0,10"
+                Click="OnAddSearchSearchClick"
+                Content="{DynamicResource flowlauncher_plugin_websearch_add}" />
         </StackPanel>
-        <Border BorderThickness="0 1 0 0" Grid.Row="4" Margin="0 0 0 0" BorderBrush="#cecece" HorizontalAlignment="Stretch">
-            <DockPanel HorizontalAlignment="Right" Margin="0 14 0 0">
-                <StackPanel Orientation="Horizontal" DockPanel.Dock="Right">
-                    <Label Content="{DynamicResource flowlauncher_plugin_websearch_enable_suggestion_provider}" Margin="14 0 10 0" HorizontalAlignment="Right" VerticalAlignment="Center"/>
-                    <ComboBox ItemsSource="{Binding Settings.Suggestions}" VerticalAlignment="Center"
-                      SelectedItem="{Binding Settings.SelectedSuggestion}"
-                      IsEnabled="{Binding ElementName=EnableSuggestion, Path=IsChecked}" Margin="0 0 20 0" FontSize="11" Height="30"/>
-                    <Label Content="{DynamicResource flowlauncher_plugin_websearch_enable_suggestion}" Margin="0 0 10 0" HorizontalAlignment="Right" VerticalAlignment="Center"/>
-                    <CheckBox IsChecked="{Binding Settings.EnableSuggestion}"
-                      Margin="0 0 0 0"
-                      Name="EnableSuggestion"/>
+        <Border
+            Grid.Row="4"
+            Margin="0,0,0,0"
+            HorizontalAlignment="Stretch"
+            BorderBrush="#cecece"
+            BorderThickness="0,1,0,0">
+            <DockPanel Margin="0,14,0,0" HorizontalAlignment="Right">
+                <StackPanel DockPanel.Dock="Right" Orientation="Horizontal">
+                    <Label
+                        Margin="14,0,10,0"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Center"
+                        Content="{DynamicResource flowlauncher_plugin_websearch_enable_suggestion_provider}" />
+                    <ComboBox
+                        Height="30"
+                        Margin="0,0,20,0"
+                        VerticalAlignment="Center"
+                        FontSize="11"
+                        IsEnabled="{Binding ElementName=EnableSuggestion, Path=IsChecked}"
+                        ItemsSource="{Binding Settings.Suggestions}"
+                        SelectedItem="{Binding Settings.SelectedSuggestion}" />
+                    <Label
+                        Margin="0,0,10,0"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Center"
+                        Content="{DynamicResource flowlauncher_plugin_websearch_enable_suggestion}" />
+                    <CheckBox
+                        Name="EnableSuggestion"
+                        Margin="0,0,0,0"
+                        IsChecked="{Binding Settings.EnableSuggestion}" />
                 </StackPanel>
-                <!-- Not sure why binding IsEnabled directly to Settings.EnableWebSaerchSuggestion is not working -->
-        </DockPanel>
+                <!--  Not sure why binding IsEnabled directly to Settings.EnableWebSaerchSuggestion is not working  -->
+            </DockPanel>
         </Border>
     </Grid>
 </UserControl>
\ No newline at end of file