From c41fbbb93e64e159cf17da2398ac52fb2f35de51 Mon Sep 17 00:00:00 2001
From: bao-qian <bao.github@outlook.com>
Date: Sat, 26 Mar 2016 04:46:39 +0000
Subject: [PATCH] Cleanup using Resharper

---
 Wox/ActionKeywords.xaml           |  41 +++--
 Wox/App.xaml                      |   3 +-
 Wox/CustomQueryHotkeySetting.xaml |  34 ++--
 Wox/HotkeyControl.xaml            |  19 +-
 Wox/MainWindow.xaml               |  12 +-
 Wox/Msg.xaml                      |  26 +--
 Wox/ResultListBox.xaml            | 189 ++++++++++----------
 Wox/SettingWindow.xaml            | 278 +++++++++++++++++-------------
 Wox/WoxUpdate.xaml                |  39 +++--
 Wox/packages.config               |   1 +
 10 files changed, 351 insertions(+), 291 deletions(-)

diff --git a/Wox/ActionKeywords.xaml b/Wox/ActionKeywords.xaml
index 6f505062ef..ffe1b5400b 100644
--- a/Wox/ActionKeywords.xaml
+++ b/Wox/ActionKeywords.xaml
@@ -9,30 +9,37 @@
         Height="200" Width="600">
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition></RowDefinition>
-            <RowDefinition></RowDefinition>
-            <RowDefinition></RowDefinition>
-            <RowDefinition></RowDefinition>
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="170"></ColumnDefinition>
-            <ColumnDefinition></ColumnDefinition>
+            <ColumnDefinition Width="170" />
+            <ColumnDefinition />
         </Grid.ColumnDefinitions>
-        <TextBlock Margin="10" FontSize="14" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Text="{DynamicResource oldActionKeyword}"></TextBlock>
-        <TextBlock x:Name="tbOldActionKeyword" Margin="10" FontSize="14" Grid.Row="0" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left">Old ActionKeywords:</TextBlock>
+        <TextBlock Margin="10" FontSize="14" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center"
+                   HorizontalAlignment="Right" Text="{DynamicResource oldActionKeyword}" />
+        <TextBlock x:Name="tbOldActionKeyword" Margin="10" FontSize="14" Grid.Row="0" Grid.Column="1"
+                   VerticalAlignment="Center" HorizontalAlignment="Left">
+            Old ActionKeywords:
+        </TextBlock>
 
-        <TextBlock Margin="10" FontSize="14" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Text="{DynamicResource newActionKeyword}"></TextBlock>
-        <StackPanel Grid.Row="1" Orientation="Horizontal"  Grid.Column="1" >
-            <TextBox x:Name="tbAction" Margin="10"  Width="400" VerticalAlignment="Center" HorizontalAlignment="Left"></TextBox>
+        <TextBlock Margin="10" FontSize="14" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center"
+                   HorizontalAlignment="Right" Text="{DynamicResource newActionKeyword}" />
+        <StackPanel Grid.Row="1" Orientation="Horizontal" Grid.Column="1">
+            <TextBox x:Name="tbAction" Margin="10" Width="400" VerticalAlignment="Center" HorizontalAlignment="Left" />
         </StackPanel>
-        
-        <TextBlock Grid.Row="2" Grid.ColumnSpan="1" Grid.Column="1" Padding="5" Foreground="Gray" Text="{DynamicResource actionkeyword_tips}"></TextBlock>
+
+        <TextBlock Grid.Row="2" Grid.ColumnSpan="1" Grid.Column="1" Padding="5" Foreground="Gray"
+                   Text="{DynamicResource actionkeyword_tips}" />
 
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="3" Grid.Column="1">
-            <Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="10 0 10 0" Width="80" Height="25" Content="{DynamicResource cancel}"></Button>
-            <Button x:Name="btnDone" Margin="10 0 10 0"  Width="80" Height="25" Click="btnDone_OnClick">
-                <TextBlock x:Name="lblAdd" Text="{DynamicResource done}"></TextBlock>
+            <Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="10 0 10 0" Width="80" Height="25"
+                    Content="{DynamicResource cancel}" />
+            <Button x:Name="btnDone" Margin="10 0 10 0" Width="80" Height="25" Click="btnDone_OnClick">
+                <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
             </Button>
         </StackPanel>
     </Grid>
-</Window>
+</Window>
\ No newline at end of file
diff --git a/Wox/App.xaml b/Wox/App.xaml
index 2f32256d20..39976c70f0 100644
--- a/Wox/App.xaml
+++ b/Wox/App.xaml
@@ -1,7 +1,6 @@
 <Application x:Class="Wox.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            >
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
diff --git a/Wox/CustomQueryHotkeySetting.xaml b/Wox/CustomQueryHotkeySetting.xaml
index fc714d1b0d..a4e3d77f69 100644
--- a/Wox/CustomQueryHotkeySetting.xaml
+++ b/Wox/CustomQueryHotkeySetting.xaml
@@ -8,28 +8,32 @@
         Title="Custom Plugin Hotkey" Height="200" Width="674.766">
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition></RowDefinition>
-            <RowDefinition></RowDefinition>
-            <RowDefinition></RowDefinition>
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="150"></ColumnDefinition>
-            <ColumnDefinition></ColumnDefinition>
+            <ColumnDefinition Width="150" />
+            <ColumnDefinition />
         </Grid.ColumnDefinitions>
-        <TextBlock Margin="10" FontSize="14" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Text="{DynamicResource hotkey}"></TextBlock>
-        <wox:HotkeyControl x:Name="ctlHotkey" Margin="10"  Grid.Column="1" />
+        <TextBlock Margin="10" FontSize="14" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center"
+                   HorizontalAlignment="Right" Text="{DynamicResource hotkey}" />
+        <wox:HotkeyControl x:Name="ctlHotkey" Margin="10" Grid.Column="1" />
 
-        <TextBlock Margin="10" FontSize="14" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Text="{DynamicResource actionKeyword}"></TextBlock>
-        <StackPanel Grid.Row="1" Orientation="Horizontal"  Grid.Column="1" >
-            <TextBox x:Name="tbAction" Margin="10"  Width="400" VerticalAlignment="Center" HorizontalAlignment="Left"></TextBox>
-            <Button x:Name="btnTestActionKeyword" Padding="10 5 10 5" Height="30" Click="BtnTestActionKeyword_OnClick" Content="{DynamicResource preview}"></Button>
+        <TextBlock Margin="10" FontSize="14" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center"
+                   HorizontalAlignment="Right" Text="{DynamicResource actionKeyword}" />
+        <StackPanel Grid.Row="1" Orientation="Horizontal" Grid.Column="1">
+            <TextBox x:Name="tbAction" Margin="10" Width="400" VerticalAlignment="Center" HorizontalAlignment="Left" />
+            <Button x:Name="btnTestActionKeyword" Padding="10 5 10 5" Height="30" Click="BtnTestActionKeyword_OnClick"
+                    Content="{DynamicResource preview}" />
         </StackPanel>
 
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="2" Grid.Column="1">
-            <Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="10 0 10 0" Width="80" Height="25" Content="{DynamicResource cancel}"></Button>
-            <Button x:Name="btnAdd" Margin="10 0 10 0"  Width="80" Height="25" Click="btnAdd_OnClick">
-                <TextBlock x:Name="lblAdd" Text="{DynamicResource done}"></TextBlock>
+            <Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="10 0 10 0" Width="80" Height="25"
+                    Content="{DynamicResource cancel}" />
+            <Button x:Name="btnAdd" Margin="10 0 10 0" Width="80" Height="25" Click="btnAdd_OnClick">
+                <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
             </Button>
         </StackPanel>
     </Grid>
-</Window>
+</Window>
\ No newline at end of file
diff --git a/Wox/HotkeyControl.xaml b/Wox/HotkeyControl.xaml
index b3052ff164..9a57c312cb 100644
--- a/Wox/HotkeyControl.xaml
+++ b/Wox/HotkeyControl.xaml
@@ -1,17 +1,18 @@
 <UserControl x:Class="Wox.HotkeyControl"
              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" 
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             mc:Ignorable="d"
              Height="24"
              d:DesignHeight="300" d:DesignWidth="300">
-    <Grid >
+    <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="150"></ColumnDefinition>
-            <ColumnDefinition Width="120"></ColumnDefinition>
+            <ColumnDefinition Width="150" />
+            <ColumnDefinition Width="120" />
         </Grid.ColumnDefinitions>
-        <TextBox x:Name="tbHotkey" TabIndex="100" VerticalContentAlignment="Center" Grid.Column="0" PreviewKeyDown="TbHotkey_OnPreviewKeyDown"></TextBox>
-        <TextBlock x:Name="tbMsg" Visibility="Hidden" Margin="5 0 0 0" VerticalAlignment="Center" Grid.Column="1" ></TextBlock>
+        <TextBox x:Name="tbHotkey" TabIndex="100" VerticalContentAlignment="Center" Grid.Column="0"
+                 PreviewKeyDown="TbHotkey_OnPreviewKeyDown" />
+        <TextBlock x:Name="tbMsg" Visibility="Hidden" Margin="5 0 0 0" VerticalAlignment="Center" Grid.Column="1" />
     </Grid>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/Wox/MainWindow.xaml b/Wox/MainWindow.xaml
index 70e734c194..dd83be5594 100644
--- a/Wox/MainWindow.xaml
+++ b/Wox/MainWindow.xaml
@@ -27,8 +27,7 @@
         d:DataContext="{d:DesignInstance vm:MainViewModel, IsDesignTimeCreatable=True}">
     <Window.Resources>
         <DataTemplate DataType="{x:Type vm:ResultsViewModel}">
-            <wox:ResultListBox PreviewMouseDown="OnPreviewMouseButtonDown">
-            </wox:ResultListBox>
+            <wox:ResultListBox PreviewMouseDown="OnPreviewMouseButtonDown" />
         </DataTemplate>
     </Window.Resources>
     <Border Style="{DynamicResource WindowBorderStyle}" MouseDown="OnMouseDown">
@@ -38,14 +37,15 @@
                      PreviewDragOver="OnPreviewDragOver"
                      AllowDrop="True"
                      x:Name="QueryTextBox" />
-            <Line Style="{DynamicResource PendingLineStyle}" x:Name="progressBar" Y1="0" Y2="0" X2="100" Height="2" StrokeThickness="1"
+            <Line Style="{DynamicResource PendingLineStyle}" x:Name="progressBar" Y1="0" Y2="0" X2="100" Height="2"
+                  StrokeThickness="1"
                   Visibility="{Binding ProgressBarVisibility}">
                 <Line.ToolTip>
-                    <ToolTip IsOpen="{Binding IsProgressBarTooltipVisible}"></ToolTip>
+                    <ToolTip IsOpen="{Binding IsProgressBarTooltipVisible}" />
                 </Line.ToolTip>
             </Line>
-            <ContentControl Content="{Binding Results}" Visibility="{Binding ResultListBoxVisibility}"/>
-            <ContentControl Content="{Binding ContextMenu}" Visibility="{Binding ContextMenuVisibility}"/>
+            <ContentControl Content="{Binding Results}" Visibility="{Binding ResultListBoxVisibility}" />
+            <ContentControl Content="{Binding ContextMenu}" Visibility="{Binding ContextMenuVisibility}" />
         </StackPanel>
     </Border>
 </Window>
\ No newline at end of file
diff --git a/Wox/Msg.xaml b/Wox/Msg.xaml
index aa24747048..e8ebc1f29d 100644
--- a/Wox/Msg.xaml
+++ b/Wox/Msg.xaml
@@ -11,28 +11,30 @@
     <Window.Triggers>
         <EventTrigger RoutedEvent="Window.Loaded">
             <BeginStoryboard>
-                <Storyboard >
-                    <DoubleAnimation x:Name="showAnimation" Duration="0:0:0.3" Storyboard.TargetProperty="Top" AccelerationRatio="0.2"/>
+                <Storyboard>
+                    <DoubleAnimation x:Name="showAnimation" Duration="0:0:0.3" Storyboard.TargetProperty="Top"
+                                     AccelerationRatio="0.2" />
                 </Storyboard>
             </BeginStoryboard>
         </EventTrigger>
-     
+
     </Window.Triggers>
-    <Grid  HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="5">
+    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="5">
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="32"></ColumnDefinition>
-            <ColumnDefinition/>
-            <ColumnDefinition Width="16"></ColumnDefinition>
+            <ColumnDefinition Width="32" />
+            <ColumnDefinition />
+            <ColumnDefinition Width="16" />
         </Grid.ColumnDefinitions>
-        <Image x:Name="imgIco" Width="32" Height="32" HorizontalAlignment="Left" ></Image>
+        <Image x:Name="imgIco" Width="32" Height="32" HorizontalAlignment="Left" />
         <Grid HorizontalAlignment="Stretch" Margin="5 0 0 0" Grid.Column="1" VerticalAlignment="Stretch">
             <Grid.RowDefinitions>
-                <RowDefinition></RowDefinition>
-                <RowDefinition></RowDefinition>
+                <RowDefinition />
+                <RowDefinition />
             </Grid.RowDefinitions>
             <TextBlock x:Name="tbTitle" FontSize="16" Foreground="#37392c" FontWeight="Medium">Title</TextBlock>
             <TextBlock Grid.Row="1" Foreground="#8e94a4" x:Name="tbSubTitle">sdfdsf</TextBlock>
         </Grid>
-        <Image x:Name="imgClose" Grid.Column="2" Cursor="Hand" Width="16" VerticalAlignment="Top" HorizontalAlignment="Right" />
+        <Image x:Name="imgClose" Grid.Column="2" Cursor="Hand" Width="16" VerticalAlignment="Top"
+               HorizontalAlignment="Right" />
     </Grid>
-</Window>
+</Window>
\ No newline at end of file
diff --git a/Wox/ResultListBox.xaml b/Wox/ResultListBox.xaml
index e1851dbd43..e4c57b84a8 100644
--- a/Wox/ResultListBox.xaml
+++ b/Wox/ResultListBox.xaml
@@ -1,97 +1,98 @@
 <ListBox x:Class="Wox.ResultListBox"
-             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:converters="clr-namespace:Wox.Converters"
-             xmlns:vm ="clr-namespace:Wox.ViewModel"
-             mc:Ignorable="d" d:DesignWidth="100" d:DesignHeight="100" d:DataContext="{d:DesignInstance vm:ResultsViewModel}"
-             MaxHeight="{Binding MaxHeight}" SelectedItem="{Binding SelectedResult}"
-             HorizontalContentAlignment="Stretch" ItemsSource="{Binding Results}" Margin="{Binding Margin}"
-             Style="{DynamicResource BaseListboxStyle}" SelectionChanged="lbResults_SelectionChanged" Focusable="False"
-             KeyboardNavigation.DirectionalNavigation="Cycle" SelectionMode="Single"
-             VirtualizingStackPanel.IsVirtualizing="True" VirtualizingStackPanel.VirtualizationMode="Standard">
-        <ListBox.ItemTemplate>
-            <DataTemplate>
-                <DataTemplate.DataType>
-                    <x:Type TypeName="vm:ResultViewModel" />
-                </DataTemplate.DataType>
-                <Button>
-                    <Button.Template>
-                        <ControlTemplate>
-                            <ContentPresenter Content="{TemplateBinding Button.Content}"></ContentPresenter>
-                        </ControlTemplate>
-                    </Button.Template>
-                    <Button.Content>
-                        <Grid HorizontalAlignment="Stretch" Height="40" VerticalAlignment="Stretch" Margin="5" Cursor="Hand">
-                            <Grid.Resources>
-                                <converters:ImagePathConverter x:Key="ImageConverter" />
-                            </Grid.Resources>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="32" />
-                                <ColumnDefinition />
-                                <ColumnDefinition Width="0" />
-                            </Grid.ColumnDefinitions>
-                            <Image x:Name="imgIco" Width="32" Height="32" HorizontalAlignment="Left"
-                           Source="{Binding FullIcoPath,Converter={StaticResource ImageConverter},IsAsync=True}" />
-                            <Grid Margin="5 0 5 0" Grid.Column="1" HorizontalAlignment="Stretch">
-                                <Grid.RowDefinitions>
-                                    <RowDefinition />
-                                    <RowDefinition Height="Auto" x:Name="SubTitleRowDefinition" />
-                                </Grid.RowDefinitions>
-                                <TextBlock Style="{DynamicResource ItemTitleStyle}" DockPanel.Dock="Left"
-                                   VerticalAlignment="Center" ToolTip="{Binding Title}" x:Name="tbTitle"
-                                   Text="{Binding Title}" >
-                                </TextBlock>
-                                <TextBlock Style="{DynamicResource ItemSubTitleStyle}" ToolTip="{Binding SubTitle}"
-                                   Visibility="{Binding SubTitle, Converter={converters:StringNullOrEmptyToVisibilityConverter}}"
-                                   Grid.Row="1" x:Name="tbSubTitle" Text="{Binding SubTitle}" >
-                                </TextBlock>
-                            </Grid>
+         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:converters="clr-namespace:Wox.Converters"
+         xmlns:vm="clr-namespace:Wox.ViewModel"
+         mc:Ignorable="d" d:DesignWidth="100" d:DesignHeight="100"
+         d:DataContext="{d:DesignInstance vm:ResultsViewModel}"
+         MaxHeight="{Binding MaxHeight}" SelectedItem="{Binding SelectedResult}"
+         HorizontalContentAlignment="Stretch" ItemsSource="{Binding Results}" Margin="{Binding Margin}"
+         Style="{DynamicResource BaseListboxStyle}" SelectionChanged="lbResults_SelectionChanged" Focusable="False"
+         KeyboardNavigation.DirectionalNavigation="Cycle" SelectionMode="Single"
+         VirtualizingStackPanel.IsVirtualizing="True" VirtualizingStackPanel.VirtualizationMode="Standard">
+    <ListBox.ItemTemplate>
+        <DataTemplate>
+            <DataTemplate.DataType>
+                <x:Type TypeName="vm:ResultViewModel" />
+            </DataTemplate.DataType>
+            <Button>
+                <Button.Template>
+                    <ControlTemplate>
+                        <ContentPresenter Content="{TemplateBinding Button.Content}" />
+                    </ControlTemplate>
+                </Button.Template>
+                <Button.Content>
+                    <Grid HorizontalAlignment="Stretch" Height="40" VerticalAlignment="Stretch" Margin="5"
+                          Cursor="Hand">
+                        <Grid.Resources>
+                            <converters:ImagePathConverter x:Key="ImageConverter" />
+                        </Grid.Resources>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="32" />
+                            <ColumnDefinition />
+                            <ColumnDefinition Width="0" />
+                        </Grid.ColumnDefinitions>
+                        <Image x:Name="imgIco" Width="32" Height="32" HorizontalAlignment="Left"
+                               Source="{Binding FullIcoPath,Converter={StaticResource ImageConverter},IsAsync=True}" />
+                        <Grid Margin="5 0 5 0" Grid.Column="1" HorizontalAlignment="Stretch">
+                            <Grid.RowDefinitions>
+                                <RowDefinition />
+                                <RowDefinition Height="Auto" x:Name="SubTitleRowDefinition" />
+                            </Grid.RowDefinitions>
+                            <TextBlock Style="{DynamicResource ItemTitleStyle}" DockPanel.Dock="Left"
+                                       VerticalAlignment="Center" ToolTip="{Binding Title}" x:Name="tbTitle"
+                                       Text="{Binding Title}" />
+                            <TextBlock Style="{DynamicResource ItemSubTitleStyle}" ToolTip="{Binding SubTitle}"
+                                       Visibility="{Binding SubTitle, Converter={converters:StringNullOrEmptyToVisibilityConverter}}"
+                                       Grid.Row="1" x:Name="tbSubTitle" Text="{Binding SubTitle}" />
                         </Grid>
-                    </Button.Content>
-                </Button>
-                <!-- a result item height is 50 including margin -->
-                <DataTemplate.Triggers>
-                    <DataTrigger Binding="{Binding Path=IsSelected}" Value="True">
-                        <Setter TargetName="tbTitle" Property="Style" Value="{DynamicResource ItemTitleSelectedStyle}" />
-                    </DataTrigger>
-                    <DataTrigger Binding="{Binding Path=IsSelected}" Value="True">
-                        <Setter TargetName="tbSubTitle" Property="Style" Value="{DynamicResource ItemSubTitleSelectedStyle}" />
-                    </DataTrigger>
-                </DataTemplate.Triggers>
-            </DataTemplate>
-        </ListBox.ItemTemplate>
-        <!--http://stackoverflow.com/questions/16819577/setting-background-color-or-wpf-4-0-listbox-windows-8/#16820062-->
-        <ListBox.ItemContainerStyle>
-            <Style TargetType="{x:Type ListBoxItem}">
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type ListBoxItem}">
-                            <Border x:Name="Bd"
-                                    Background="{TemplateBinding Background}"
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    BorderThickness="{TemplateBinding BorderThickness}"
-                                    Padding="{TemplateBinding Padding}"
-                                    SnapsToDevicePixels="True">
-                                <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                  Content="{TemplateBinding Content}"
-                                                  ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                                  ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                            </Border>
-                            <ControlTemplate.Triggers>
-                                <Trigger Property="IsSelected" Value="True">
-                                    <Setter TargetName="Bd" Property="Background"
-                                            Value="{DynamicResource ItemSelectedBackgroundColor}" />
-                                    <Setter TargetName="Bd" Property="BorderBrush"
-                                            Value="{DynamicResource ItemSelectedBackgroundColor}" />
-                                </Trigger>
-                            </ControlTemplate.Triggers>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
-        </ListBox.ItemContainerStyle>
+                    </Grid>
+                </Button.Content>
+            </Button>
+            <!-- a result item height is 50 including margin -->
+            <DataTemplate.Triggers>
+                <DataTrigger Binding="{Binding Path=IsSelected}" Value="True">
+                    <Setter TargetName="tbTitle" Property="Style" Value="{DynamicResource ItemTitleSelectedStyle}" />
+                </DataTrigger>
+                <DataTrigger Binding="{Binding Path=IsSelected}" Value="True">
+                    <Setter TargetName="tbSubTitle" Property="Style"
+                            Value="{DynamicResource ItemSubTitleSelectedStyle}" />
+                </DataTrigger>
+            </DataTemplate.Triggers>
+        </DataTemplate>
+    </ListBox.ItemTemplate>
+    <!--http://stackoverflow.com/questions/16819577/setting-background-color-or-wpf-4-0-listbox-windows-8/#16820062-->
+    <ListBox.ItemContainerStyle>
+        <Style TargetType="{x:Type ListBoxItem}">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type ListBoxItem}">
+                        <Border x:Name="Bd"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                Padding="{TemplateBinding Padding}"
+                                SnapsToDevicePixels="True">
+                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                              Content="{TemplateBinding Content}"
+                                              ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsSelected" Value="True">
+                                <Setter TargetName="Bd" Property="Background"
+                                        Value="{DynamicResource ItemSelectedBackgroundColor}" />
+                                <Setter TargetName="Bd" Property="BorderBrush"
+                                        Value="{DynamicResource ItemSelectedBackgroundColor}" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </ListBox.ItemContainerStyle>
 </ListBox>
\ No newline at end of file
diff --git a/Wox/SettingWindow.xaml b/Wox/SettingWindow.xaml
index b55fa458d3..cdbe1088dc 100644
--- a/Wox/SettingWindow.xaml
+++ b/Wox/SettingWindow.xaml
@@ -1,78 +1,87 @@
 <Window
-		xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-		xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-		xmlns:wox="clr-namespace:Wox"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:wox="clr-namespace:Wox"
     x:Class="Wox.SettingWindow"
-		xmlns:woxPlugin="clr-namespace:Wox.Plugin;assembly=Wox.Plugin"
-		xmlns:converters="clr-namespace:Wox.Converters"
-		xmlns:userSettings="clr-namespace:Wox.Core.UserSettings;assembly=Wox.Core"
-        xmlns:sys="clr-namespace:System;assembly=mscorlib"
-		Icon="Images\app.png"
-		Title="{DynamicResource woxsettings}"
-		ResizeMode="NoResize"
-		WindowStartupLocation="CenterScreen"
-		Height="600" Width="800" PreviewKeyDown="Window_PreviewKeyDown">
+    xmlns:woxPlugin="clr-namespace:Wox.Plugin;assembly=Wox.Plugin"
+    xmlns:converters="clr-namespace:Wox.Converters"
+    xmlns:userSettings="clr-namespace:Wox.Core.UserSettings;assembly=Wox.Core"
+    xmlns:sys="clr-namespace:System;assembly=mscorlib"
+    Icon="Images\app.png"
+    Title="{DynamicResource woxsettings}"
+    ResizeMode="NoResize"
+    WindowStartupLocation="CenterScreen"
+    Height="600" Width="800" PreviewKeyDown="Window_PreviewKeyDown">
     <Window.Resources>
         <ListBoxItem HorizontalContentAlignment="Stretch"
-					IsEnabled="False"
-					IsHitTestVisible="False" x:Key="FeatureBoxSeperator">
-            <Separator Width="{Binding ElementName=lbPlugins, Path=ActualWidth}"/>
+                     IsEnabled="False"
+                     IsHitTestVisible="False" x:Key="FeatureBoxSeperator">
+            <Separator Width="{Binding ElementName=lbPlugins, Path=ActualWidth}" />
         </ListBoxItem>
         <converters:ImagePathConverter x:Key="ImageConverter" />
     </Window.Resources>
     <TabControl Height="auto" x:Name="settingTab" SelectionChanged="settingTab_SelectionChanged">
         <TabItem Header="{DynamicResource general}">
             <StackPanel Orientation="Vertical">
-                <CheckBox x:Name="cbStartWithWindows"  Unchecked="CbStartWithWindows_OnUnchecked" Checked="CbStartWithWindows_OnChecked" Margin="10">
-                    <TextBlock Text="{DynamicResource startWoxOnSystemStartup}" ></TextBlock>
+                <CheckBox x:Name="cbStartWithWindows" Unchecked="CbStartWithWindows_OnUnchecked"
+                          Checked="CbStartWithWindows_OnChecked" Margin="10">
+                    <TextBlock Text="{DynamicResource startWoxOnSystemStartup}" />
                 </CheckBox>
                 <CheckBox x:Name="cbHideWhenDeactive" Margin="10">
-                    <TextBlock Text="{DynamicResource hideWoxWhenLoseFocus}" ></TextBlock>
+                    <TextBlock Text="{DynamicResource hideWoxWhenLoseFocus}" />
                 </CheckBox>
                 <CheckBox x:Name="cbDontPromptUpdateMsg" Margin="10">
-                    <TextBlock Text="{DynamicResource dontPromptUpdateMsg}" ></TextBlock>
+                    <TextBlock Text="{DynamicResource dontPromptUpdateMsg}" />
                 </CheckBox>
                 <CheckBox x:Name="cbRememberLastLocation" Margin="10">
-                    <TextBlock Text="{DynamicResource rememberLastLocation}" ></TextBlock>
+                    <TextBlock Text="{DynamicResource rememberLastLocation}" />
                 </CheckBox>
                 <CheckBox x:Name="cbIgnoreHotkeysOnFullscreen" Margin="10">
-                    <TextBlock Text="{DynamicResource ignoreHotkeysOnFullscreen}" ></TextBlock>
+                    <TextBlock Text="{DynamicResource ignoreHotkeysOnFullscreen}" />
                 </CheckBox>
                 <StackPanel Margin="10" Orientation="Horizontal">
-                    <TextBlock  Text="{DynamicResource language}"></TextBlock>
+                    <TextBlock Text="{DynamicResource language}" />
                     <ComboBox Margin="10 0 0 0" Width="120" x:Name="cbLanguages" />
                 </StackPanel>
                 <StackPanel Orientation="Horizontal" Margin="10">
-                    <TextBlock  Text="{DynamicResource maxShowResults}"></TextBlock>
-                    <ComboBox Margin="10 0 0 0" Width="45" Name="comboMaxResultsToShow"/>
+                    <TextBlock Text="{DynamicResource maxShowResults}" />
+                    <ComboBox Margin="10 0 0 0" Width="45" Name="comboMaxResultsToShow" />
                 </StackPanel>
             </StackPanel>
         </TabItem>
         <TabItem Header="{DynamicResource plugin}" x:Name="tabPlugin">
             <Grid>
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="200"/>
-                    <ColumnDefinition/>
+                    <ColumnDefinition Width="200" />
+                    <ColumnDefinition />
                 </Grid.ColumnDefinitions>
-                <DockPanel Grid.Column="0" >
-                    <TextBlock DockPanel.Dock="Top" Margin="10" HorizontalAlignment="Left" Cursor="Hand" MouseUp="tbMorePlugins_MouseUp" x:Name="tbMorePlugins" Foreground="Blue" Text="{DynamicResource browserMorePlugins}"></TextBlock>
-                    <ListBox x:Name="lbPlugins" Margin="10, 0, 10, 10" SelectionChanged="lbPlugins_OnSelectionChanged" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" ScrollViewer.HorizontalScrollBarVisibility="Disabled" Grid.IsSharedSizeScope="True" >
+                <DockPanel Grid.Column="0">
+                    <TextBlock DockPanel.Dock="Top" Margin="10" HorizontalAlignment="Left" Cursor="Hand"
+                               MouseUp="tbMorePlugins_MouseUp" x:Name="tbMorePlugins" Foreground="Blue"
+                               Text="{DynamicResource browserMorePlugins}" />
+                    <ListBox x:Name="lbPlugins" Margin="10, 0, 10, 10" SelectionChanged="lbPlugins_OnSelectionChanged"
+                             HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
+                             ScrollViewer.HorizontalScrollBarVisibility="Disabled" Grid.IsSharedSizeScope="True">
                         <ListBox.Resources>
                             <DataTemplate DataType="{x:Type woxPlugin:PluginPair}">
                                 <Grid Height="36" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="3">
                                     <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="32"></ColumnDefinition>
-                                        <ColumnDefinition/>
+                                        <ColumnDefinition Width="32" />
+                                        <ColumnDefinition />
                                     </Grid.ColumnDefinitions>
-                                    <Image Width="32" Height="32" HorizontalAlignment="Left" Source="{Binding Metadata.FullIcoPath,Converter={StaticResource ImageConverter},IsAsync=True}">
-                                    </Image>
+                                    <Image Width="32" Height="32" HorizontalAlignment="Left"
+                                           Source="{Binding Metadata.FullIcoPath,Converter={StaticResource ImageConverter},IsAsync=True}" />
                                     <Grid Margin="3 0 3 0" Grid.Column="1" HorizontalAlignment="Stretch">
                                         <Grid.RowDefinitions>
-                                            <RowDefinition></RowDefinition>
-                                            <RowDefinition Height="Auto"></RowDefinition>
+                                            <RowDefinition />
+                                            <RowDefinition Height="Auto" />
                                         </Grid.RowDefinitions>
-                                        <TextBlock VerticalAlignment="Center" ToolTip="{Binding Metadata.Name}" x:Name="tbTitle" Text="{Binding Metadata.Name}"></TextBlock>
-                                        <TextBlock ToolTip="{Binding Metadata.Description}" Visibility="{Binding Metadata.Description, Converter={converters:StringNullOrEmptyToVisibilityConverter}}" Grid.Row="1" x:Name="tbSubTitle" Text="{Binding Metadata.Description}" Opacity="0.5"></TextBlock>
+                                        <TextBlock VerticalAlignment="Center" ToolTip="{Binding Metadata.Name}"
+                                                   x:Name="tbTitle" Text="{Binding Metadata.Name}" />
+                                        <TextBlock ToolTip="{Binding Metadata.Description}"
+                                                   Visibility="{Binding Metadata.Description, Converter={converters:StringNullOrEmptyToVisibilityConverter}}"
+                                                   Grid.Row="1" x:Name="tbSubTitle"
+                                                   Text="{Binding Metadata.Description}" Opacity="0.5" />
                                     </Grid>
                                 </Grid>
                             </DataTemplate>
@@ -81,75 +90,91 @@
                 </DockPanel>
                 <Grid Margin="0" Grid.Column="1">
                     <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
                     </Grid.RowDefinitions>
                     <ContentControl x:Name="PluginInfoPanel" Grid.ColumnSpan="1" Grid.Row="0" Margin="10 10 10 0">
                         <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="48"></ColumnDefinition>
-                                <ColumnDefinition/>
+                                <ColumnDefinition Width="48" />
+                                <ColumnDefinition />
                             </Grid.ColumnDefinitions>
-                            <Image Width="48" Height="48" HorizontalAlignment="Left" VerticalAlignment="Top" x:Name="pluginIcon"/>
+                            <Image Width="48" Height="48" HorizontalAlignment="Left" VerticalAlignment="Top"
+                                   x:Name="pluginIcon" />
                             <Grid Margin="10,0,0,0" Grid.Column="1" HorizontalAlignment="Stretch">
                                 <Grid.RowDefinitions>
-                                    <RowDefinition></RowDefinition>
-                                    <RowDefinition></RowDefinition>
-                                    <RowDefinition></RowDefinition>
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
                                 </Grid.RowDefinitions>
                                 <DockPanel Grid.Row="0">
-                                    <TextBlock x:Name="pluginTitle" Text="Plugin Title" Cursor="Hand" MouseUp="PluginTitle_OnMouseUp" ToolTip="{Binding Source=pluginTitle, Path=Text}" FontSize="24"></TextBlock>
-                                    <TextBlock Opacity="0.5" VerticalAlignment="Bottom" HorizontalAlignment="Right" x:Name="pluginAuthor" Text="{DynamicResource author}"></TextBlock>
+                                    <TextBlock x:Name="pluginTitle" Text="Plugin Title" Cursor="Hand"
+                                               MouseUp="PluginTitle_OnMouseUp"
+                                               ToolTip="{Binding Source=pluginTitle, Path=Text}" FontSize="24" />
+                                    <TextBlock Opacity="0.5" VerticalAlignment="Bottom" HorizontalAlignment="Right"
+                                               x:Name="pluginAuthor" Text="{DynamicResource author}" />
                                 </DockPanel>
-                                <TextBlock Grid.Row="1" x:Name="pluginSubTitle" Opacity="0.5" ToolTip="{Binding Source=pluginSubTitle, Path=Text}" Visibility="{Binding Source=pluginSubTitle, Path=Text, Converter={converters:StringNullOrEmptyToVisibilityConverter}}" ></TextBlock>
+                                <TextBlock Grid.Row="1" x:Name="pluginSubTitle" Opacity="0.5"
+                                           ToolTip="{Binding Source=pluginSubTitle, Path=Text}"
+                                           Visibility="{Binding Source=pluginSubTitle, Path=Text, Converter={converters:StringNullOrEmptyToVisibilityConverter}}" />
                                 <DockPanel Grid.Row="2" Margin="0 10 0 8">
                                     <CheckBox x:Name="cbDisablePlugin" Click="CbDisablePlugin_OnClick">
-                                        <TextBlock Text="{DynamicResource disable}"></TextBlock>
+                                        <TextBlock Text="{DynamicResource disable}" />
                                     </CheckBox>
-                                    <TextBlock x:Name="pluginActionKeywordsTitle" Margin="20 0 0 0" Text="{DynamicResource actionKeywords}" />
-                                    <TextBlock Margin="5 0 0 0" ToolTip="Change Action Keywords" Cursor="Hand" MouseUp="PluginActionKeywords_OnMouseUp" Foreground="Blue" Text="keys" x:Name="pluginActionKeywords"></TextBlock>
-                                    <TextBlock Margin="10 0 0 0" Text="Init time: 0ms" x:Name="pluginInitTime"></TextBlock>
-                                    <TextBlock Margin="10 0 0 0" Text="Query time: 0ms" x:Name="pluginQueryTime"></TextBlock>
-                                    <TextBlock HorizontalAlignment="Right" Cursor="Hand" MouseUp="tbOpenPluginDirecoty_MouseUp" Foreground="Blue" Text="{DynamicResource pluginDirectory}" x:Name="tbOpenPluginDirecoty"></TextBlock>
+                                    <TextBlock x:Name="pluginActionKeywordsTitle" Margin="20 0 0 0"
+                                               Text="{DynamicResource actionKeywords}" />
+                                    <TextBlock Margin="5 0 0 0" ToolTip="Change Action Keywords" Cursor="Hand"
+                                               MouseUp="PluginActionKeywords_OnMouseUp" Foreground="Blue" Text="keys"
+                                               x:Name="pluginActionKeywords" />
+                                    <TextBlock Margin="10 0 0 0" Text="Init time: 0ms" x:Name="pluginInitTime" />
+                                    <TextBlock Margin="10 0 0 0" Text="Query time: 0ms" x:Name="pluginQueryTime" />
+                                    <TextBlock HorizontalAlignment="Right" Cursor="Hand"
+                                               MouseUp="tbOpenPluginDirecoty_MouseUp" Foreground="Blue"
+                                               Text="{DynamicResource pluginDirectory}" x:Name="tbOpenPluginDirecoty" />
                                 </DockPanel>
                             </Grid>
                         </Grid>
                     </ContentControl>
 
-                    <ContentControl x:Name="PluginContentPanel" Grid.ColumnSpan="1" Grid.Row="1" Margin="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-
-                    </ContentControl>
+                    <ContentControl x:Name="PluginContentPanel" Grid.ColumnSpan="1" Grid.Row="1" Margin="0"
+                                    HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
                 </Grid>
             </Grid>
         </TabItem>
         <TabItem Header="{DynamicResource theme}" x:Name="tabTheme">
             <Grid>
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="200"/>
-                    <ColumnDefinition/>
+                    <ColumnDefinition Width="200" />
+                    <ColumnDefinition />
                 </Grid.ColumnDefinitions>
-                <DockPanel Grid.Column="0" >
-                    <TextBlock DockPanel.Dock="Top" Margin="10" HorizontalAlignment="Left" Cursor="Hand" MouseUp="tbMoreThemes_MouseUp" x:Name="tbMoreThemes" Foreground="Blue" Text="{DynamicResource browserMoreThemes}"></TextBlock>
-                    <ListBox x:Name="themeComboBox" Margin="10, 0, 10, 10" SelectionChanged="ThemeComboBox_OnSelectionChanged" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Width="180"/>
+                <DockPanel Grid.Column="0">
+                    <TextBlock DockPanel.Dock="Top" Margin="10" HorizontalAlignment="Left" Cursor="Hand"
+                               MouseUp="tbMoreThemes_MouseUp" x:Name="tbMoreThemes" Foreground="Blue"
+                               Text="{DynamicResource browserMoreThemes}" />
+                    <ListBox x:Name="themeComboBox" Margin="10, 0, 10, 10"
+                             SelectionChanged="ThemeComboBox_OnSelectionChanged" HorizontalAlignment="Stretch"
+                             VerticalAlignment="Stretch" Width="180" />
                 </DockPanel>
                 <Grid Margin="0" Grid.Column="1">
                     <Grid.RowDefinitions>
                         <RowDefinition />
-                        <RowDefinition Height="100"/>
+                        <RowDefinition Height="100" />
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition/>
+                        <ColumnDefinition />
                     </Grid.ColumnDefinitions>
                     <StackPanel x:Name="PreviewPanel" Grid.Row="0" Margin="0">
-                        <StackPanel x:Name="PreviewMainPanel" Orientation="Horizontal" Margin="10" HorizontalAlignment="Center" VerticalAlignment="Center">
+                        <StackPanel x:Name="PreviewMainPanel" Orientation="Horizontal" Margin="10"
+                                    HorizontalAlignment="Center" VerticalAlignment="Center">
                             <Border Width="500" Style="{DynamicResource WindowBorderStyle}">
                                 <Grid>
                                     <Grid.RowDefinitions>
                                         <RowDefinition Height="50" />
-                                        <RowDefinition/>
+                                        <RowDefinition />
                                     </Grid.RowDefinitions>
-                                    <TextBox Text="{DynamicResource helloWox}" IsReadOnly="True" Style="{DynamicResource QueryBoxStyle}" Grid.Row="0"/>
-                                    <wox:ResultListBox Grid.Row="1" x:Name="ResultListBoxPreview"/>
+                                    <TextBox Text="{DynamicResource helloWox}" IsReadOnly="True"
+                                             Style="{DynamicResource QueryBoxStyle}" Grid.Row="0" />
+                                    <wox:ResultListBox Grid.Row="1" x:Name="ResultListBoxPreview" />
                                 </Grid>
                             </Border>
                         </StackPanel>
@@ -158,10 +183,15 @@
                     <StackPanel Grid.Row="1" Margin="0 10 0 10" Orientation="Vertical">
                         <StackPanel Orientation="Horizontal" Margin="2">
                             <TextBlock Text="{DynamicResource queryBoxFont}" />
-                            <ComboBox Margin="10 -2 5 0" x:Name="cbQueryBoxFont" ItemsSource="{x:Static Fonts.SystemFontFamilies}" SelectionChanged="CbQueryBoxFont_OnSelectionChanged" HorizontalAlignment="Left" VerticalAlignment="Top" Width="160"/>
+                            <ComboBox Margin="10 -2 5 0" x:Name="cbQueryBoxFont"
+                                      ItemsSource="{x:Static Fonts.SystemFontFamilies}"
+                                      SelectionChanged="CbQueryBoxFont_OnSelectionChanged" HorizontalAlignment="Left"
+                                      VerticalAlignment="Top" Width="160" />
                             <ComboBox Margin="0 -2 0 0"
-								x:Name="cbQueryBoxFontFaces"
-								ItemsSource="{Binding SelectedValue.FamilyTypefaces, ElementName=cbQueryBoxFont}" SelectionChanged="CbQueryBoxFontFaces_OnSelectionChanged" HorizontalAlignment="Left" VerticalAlignment="Top" Width="120">
+                                      x:Name="cbQueryBoxFontFaces"
+                                      ItemsSource="{Binding SelectedValue.FamilyTypefaces, ElementName=cbQueryBoxFont}"
+                                      SelectionChanged="CbQueryBoxFontFaces_OnSelectionChanged"
+                                      HorizontalAlignment="Left" VerticalAlignment="Top" Width="120">
                                 <ComboBox.ItemTemplate>
                                     <DataTemplate>
                                         <ItemsControl ItemsSource="{Binding AdjustedFaceNames}">
@@ -177,10 +207,15 @@
                         </StackPanel>
                         <StackPanel Orientation="Horizontal" Margin="2">
                             <TextBlock Text="{DynamicResource resultItemFont}" />
-                            <ComboBox Margin="5 -2 5 0" x:Name="ResultFontComboBox" ItemsSource="{x:Static Fonts.SystemFontFamilies}" SelectionChanged="OnResultFontSelectionChanged" HorizontalAlignment="Left" VerticalAlignment="Top" Width="160"/>
+                            <ComboBox Margin="5 -2 5 0" x:Name="ResultFontComboBox"
+                                      ItemsSource="{x:Static Fonts.SystemFontFamilies}"
+                                      SelectionChanged="OnResultFontSelectionChanged" HorizontalAlignment="Left"
+                                      VerticalAlignment="Top" Width="160" />
                             <ComboBox Margin="0 -2 0 0"
-								x:Name="ResultFontFacesComboBox"
-								ItemsSource="{Binding SelectedValue.FamilyTypefaces, ElementName=ResultFontComboBox}" SelectionChanged="OnResultFontFacesSelectionChanged" HorizontalAlignment="Left" VerticalAlignment="Top" Width="120">
+                                      x:Name="ResultFontFacesComboBox"
+                                      ItemsSource="{Binding SelectedValue.FamilyTypefaces, ElementName=ResultFontComboBox}"
+                                      SelectionChanged="OnResultFontFacesSelectionChanged" HorizontalAlignment="Left"
+                                      VerticalAlignment="Top" Width="120">
                                 <ComboBox.ItemTemplate>
                                     <DataTemplate>
                                         <ItemsControl ItemsSource="{Binding AdjustedFaceNames}">
@@ -202,34 +237,35 @@
         <TabItem Header="{DynamicResource hotkey}" x:Name="tabHotkey">
             <Grid Margin="10">
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="30"/>
-                    <RowDefinition/>
-                    <RowDefinition Height="50"/>
+                    <RowDefinition Height="30" />
+                    <RowDefinition />
+                    <RowDefinition Height="50" />
                 </Grid.RowDefinitions>
-                <StackPanel  Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center">
-                    <TextBlock VerticalAlignment="Center" Margin="0 0 10 0" Text="{DynamicResource woxHotkey}"></TextBlock>
-                    <wox:HotkeyControl x:Name="ctlHotkey"/>
+                <StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center">
+                    <TextBlock VerticalAlignment="Center" Margin="0 0 10 0" Text="{DynamicResource woxHotkey}" />
+                    <wox:HotkeyControl x:Name="ctlHotkey" />
                 </StackPanel>
-                <Grid  Grid.Row="1">
+                <Grid Grid.Row="1">
                     <Grid.RowDefinitions>
-                        <RowDefinition Height="20"/>
-                        <RowDefinition/>
+                        <RowDefinition Height="20" />
+                        <RowDefinition />
                     </Grid.RowDefinitions>
-                    <TextBlock VerticalAlignment="Center" Grid.Row="0" Margin="0 0 10 0" Text="{DynamicResource customQueryHotkey}"></TextBlock>
+                    <TextBlock VerticalAlignment="Center" Grid.Row="0" Margin="0 0 10 0"
+                               Text="{DynamicResource customQueryHotkey}" />
                     <ListView x:Name="lvCustomHotkey" Margin="0 5 0 0" Grid.Row="1">
                         <ListView.View>
                             <GridView>
-                                <GridViewColumn Header="{DynamicResource hotkey}"  Width="180">
+                                <GridViewColumn Header="{DynamicResource hotkey}" Width="180">
                                     <GridViewColumn.CellTemplate>
                                         <DataTemplate>
-                                            <TextBlock Text="{Binding Hotkey}"/>
+                                            <TextBlock Text="{Binding Hotkey}" />
                                         </DataTemplate>
                                     </GridViewColumn.CellTemplate>
                                 </GridViewColumn>
                                 <GridViewColumn Header="{DynamicResource actionKeywords}" Width="500">
                                     <GridViewColumn.CellTemplate>
                                         <DataTemplate>
-                                            <TextBlock Text="{Binding ActionKeywords}"/>
+                                            <TextBlock Text="{Binding ActionKeywords}" />
                                         </DataTemplate>
                                     </GridViewColumn.CellTemplate>
                                 </GridViewColumn>
@@ -239,56 +275,61 @@
 
                 </Grid>
                 <StackPanel Grid.Row="2" HorizontalAlignment="Right" Orientation="Horizontal">
-                    <Button x:Name="btnDeleteCustomHotkey" Click="BtnDeleteCustomHotkey_OnClick" Width="100" Margin="10" Content="{DynamicResource delete}"/>
-                    <Button x:Name="btnEditCustomHotkey" Click="BtnEditCustomHotkey_OnClick" Width="100" Margin="10" Content="{DynamicResource edit}"/>
-                    <Button x:Name="btnAddCustomeHotkey" Click="BtnAddCustomeHotkey_OnClick" Width="100" Margin="10" Content="{DynamicResource add}"/>
+                    <Button x:Name="btnDeleteCustomHotkey" Click="BtnDeleteCustomHotkey_OnClick" Width="100"
+                            Margin="10" Content="{DynamicResource delete}" />
+                    <Button x:Name="btnEditCustomHotkey" Click="BtnEditCustomHotkey_OnClick" Width="100" Margin="10"
+                            Content="{DynamicResource edit}" />
+                    <Button x:Name="btnAddCustomeHotkey" Click="BtnAddCustomeHotkey_OnClick" Width="100" Margin="10"
+                            Content="{DynamicResource add}" />
                 </StackPanel>
             </Grid>
         </TabItem>
         <TabItem Header="{DynamicResource proxy}">
             <StackPanel>
                 <CheckBox x:Name="cbEnableProxy" Margin="10">
-                    <TextBlock Text="{DynamicResource enableProxy}"></TextBlock>
+                    <TextBlock Text="{DynamicResource enableProxy}" />
                 </CheckBox>
                 <Grid Margin="10">
                     <Grid.RowDefinitions>
-                        <RowDefinition ></RowDefinition>
-                        <RowDefinition ></RowDefinition>
+                        <RowDefinition />
+                        <RowDefinition />
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="80"></ColumnDefinition>
-                        <ColumnDefinition Width="220"></ColumnDefinition>
-                        <ColumnDefinition Width="80"></ColumnDefinition>
-                        <ColumnDefinition></ColumnDefinition>
+                        <ColumnDefinition Width="80" />
+                        <ColumnDefinition Width="220" />
+                        <ColumnDefinition Width="80" />
+                        <ColumnDefinition />
                     </Grid.ColumnDefinitions>
                     <Border Grid.Row="0" Grid.Column="0" Padding="5">
-                        <TextBlock Text="{DynamicResource server}"></TextBlock>
+                        <TextBlock Text="{DynamicResource server}" />
                     </Border>
                     <Border Grid.Row="0" Grid.Column="1" Padding="5">
-                        <TextBox  Width="200" HorizontalAlignment="Left" x:Name="tbProxyServer"></TextBox>
+                        <TextBox Width="200" HorizontalAlignment="Left" x:Name="tbProxyServer" />
                     </Border>
                     <Border Grid.Row="0" Grid.Column="2" Padding="5">
-                        <TextBlock Text="{DynamicResource port}"></TextBlock>
+                        <TextBlock Text="{DynamicResource port}" />
                     </Border>
                     <Border Grid.Row="0" Grid.Column="3" Padding="5">
-                        <TextBox Width="50" HorizontalAlignment="Left" x:Name="tbProxyPort"></TextBox>
+                        <TextBox Width="50" HorizontalAlignment="Left" x:Name="tbProxyPort" />
                     </Border>
                     <Border Grid.Row="1" Grid.Column="0" Padding="5">
-                        <TextBlock Text="{DynamicResource userName}"></TextBlock>
+                        <TextBlock Text="{DynamicResource userName}" />
                     </Border>
                     <Border Grid.Row="1" Grid.Column="1" Padding="5">
-                        <TextBox Width="200" HorizontalAlignment="Left" x:Name="tbProxyUserName"></TextBox>
+                        <TextBox Width="200" HorizontalAlignment="Left" x:Name="tbProxyUserName" />
                     </Border>
                     <Border Grid.Row="1" Grid.Column="2" Padding="5">
-                        <TextBlock Text="{DynamicResource password}"></TextBlock>
+                        <TextBlock Text="{DynamicResource password}" />
                     </Border>
                     <Border Grid.Row="1" Grid.Column="3" Padding="5">
                         <PasswordBox Width="200" HorizontalAlignment="Left" x:Name="tbProxyPassword" />
                     </Border>
                 </Grid>
                 <StackPanel Orientation="Horizontal">
-                    <Button x:Name="btnTestProxy" Width="80" HorizontalAlignment="Left" Margin="10" Click="btnTestProxy_Click" Content="{DynamicResource testProxy}"></Button>
-                    <Button x:Name="btnSaveProxy" Width="80" HorizontalAlignment="Left" Margin="10" Click="btnSaveProxy_Click" Content="{DynamicResource save}"></Button>
+                    <Button x:Name="btnTestProxy" Width="80" HorizontalAlignment="Left" Margin="10"
+                            Click="btnTestProxy_Click" Content="{DynamicResource testProxy}" />
+                    <Button x:Name="btnSaveProxy" Width="80" HorizontalAlignment="Left" Margin="10"
+                            Click="btnSaveProxy_Click" Content="{DynamicResource save}" />
                 </StackPanel>
             </StackPanel>
         </TabItem>
@@ -300,25 +341,28 @@
                     </Style>
                 </Grid.Resources>
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="80"></ColumnDefinition>
-                    <ColumnDefinition></ColumnDefinition>
+                    <ColumnDefinition Width="80" />
+                    <ColumnDefinition />
                 </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto"></RowDefinition>
-                    <RowDefinition Height="Auto"></RowDefinition>
-                    <RowDefinition Height="Auto"></RowDefinition>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
 
-                <TextBlock Grid.Column="0" Grid.Row="0" Text="{DynamicResource website}"></TextBlock>
-                <TextBlock Grid.Column="1" Grid.Row="0" HorizontalAlignment="Left" Cursor="Hand" MouseUp="tbWebsite_MouseUp" x:Name="tbWebsite" Foreground="Blue" Text="http://www.getwox.com"></TextBlock>
+                <TextBlock Grid.Column="0" Grid.Row="0" Text="{DynamicResource website}" />
+                <TextBlock Grid.Column="1" Grid.Row="0" HorizontalAlignment="Left" Cursor="Hand"
+                           MouseUp="tbWebsite_MouseUp" x:Name="tbWebsite" Foreground="Blue"
+                           Text="http://www.getwox.com" />
 
-                <TextBlock Grid.Column="0" Grid.Row="1" Text="{DynamicResource version}"></TextBlock>
+                <TextBlock Grid.Column="0" Grid.Row="1" Text="{DynamicResource version}" />
                 <StackPanel Grid.Column="1" Grid.Row="1" Orientation="Horizontal">
-                    <TextBlock HorizontalAlignment="Left" x:Name="tbVersion" Text="1.0.0"></TextBlock>
+                    <TextBlock HorizontalAlignment="Left" x:Name="tbVersion" Text="1.0.0" />
                 </StackPanel>
 
-                <TextBlock x:Name="tbActivatedTimes" Grid.Row="2" Grid.ColumnSpan="2" Text="{DynamicResource about_activate_times}"></TextBlock>
+                <TextBlock x:Name="tbActivatedTimes" Grid.Row="2" Grid.ColumnSpan="2"
+                           Text="{DynamicResource about_activate_times}" />
             </Grid>
         </TabItem>
     </TabControl>
-</Window>
+</Window>
\ No newline at end of file
diff --git a/Wox/WoxUpdate.xaml b/Wox/WoxUpdate.xaml
index 648d196125..23687ff5a9 100644
--- a/Wox/WoxUpdate.xaml
+++ b/Wox/WoxUpdate.xaml
@@ -8,38 +8,39 @@
         Title="{DynamicResource update_wox_update}" Height="400" Width="600">
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="100"></ColumnDefinition>
-            <ColumnDefinition></ColumnDefinition>
+            <ColumnDefinition Width="100" />
+            <ColumnDefinition />
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
-            <RowDefinition Height="80"></RowDefinition>
-            <RowDefinition ></RowDefinition>
-            <RowDefinition Height="50"></RowDefinition>
+            <RowDefinition Height="80" />
+            <RowDefinition />
+            <RowDefinition Height="50" />
         </Grid.RowDefinitions>
-        <Image Source="Images/update.png" Width="64"></Image>
-        <TextBlock x:Name="tbNewVersionAvailable" Grid.Column="1" Grid.Row="0" VerticalAlignment="Center" FontSize="20" Text="{DynamicResource update_wox_update_new_version_available}"></TextBlock>
+        <Image Source="Images/update.png" Width="64" />
+        <TextBlock x:Name="tbNewVersionAvailable" Grid.Column="1" Grid.Row="0" VerticalAlignment="Center" FontSize="20"
+                   Text="{DynamicResource update_wox_update_new_version_available}" />
         <TabControl Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2">
             <TabItem Header="{DynamicResource update_wox_update_upadte_description}">
-                <WebBrowser x:Name="wbDetails" Grid.Row="1"></WebBrowser>
+                <WebBrowser x:Name="wbDetails" Grid.Row="1" />
             </TabItem>
             <TabItem Header="{DynamicResource update_wox_update_files}">
                 <Grid>
                     <Grid.RowDefinitions>
-                        <RowDefinition Height="30"></RowDefinition>
-                        <RowDefinition></RowDefinition>
+                        <RowDefinition Height="30" />
+                        <RowDefinition />
                     </Grid.RowDefinitions>
-                    <TextBlock Grid.Row="0" Padding="8" Text="{DynamicResource update_wox_update_upadte_files}"></TextBlock>
-                    <ListBox x:Name="lbUpdatedFiles" Grid.Row="1">
-                    </ListBox>
+                    <TextBlock Grid.Row="0" Padding="8" Text="{DynamicResource update_wox_update_upadte_files}" />
+                    <ListBox x:Name="lbUpdatedFiles" Grid.Row="1" />
                 </Grid>
             </TabItem>
         </TabControl>
         <StackPanel Grid.Column="1" Grid.Row="4" HorizontalAlignment="Right" Orientation="Horizontal">
-            <TextBlock Foreground="Gray" TextAlignment="Center" Margin="0 0 10 0" VerticalAlignment="Center" Text="{DynamicResource update_wox_update_restart_wox_tip}"></TextBlock>
-            <Button x:Name="btnUpdate" Padding="8 3" Margin="8" Click="btnUpdate_Click" Content="{DynamicResource update_wox_update}">
-            </Button>
-            <Button x:Name="btnCancel" Padding="8 3" Margin="8" Click="btnCancel_Click" Content="{DynamicResource update_wox_update_cancel}">
-            </Button>
+            <TextBlock Foreground="Gray" TextAlignment="Center" Margin="0 0 10 0" VerticalAlignment="Center"
+                       Text="{DynamicResource update_wox_update_restart_wox_tip}" />
+            <Button x:Name="btnUpdate" Padding="8 3" Margin="8" Click="btnUpdate_Click"
+                    Content="{DynamicResource update_wox_update}" />
+            <Button x:Name="btnCancel" Padding="8 3" Margin="8" Click="btnCancel_Click"
+                    Content="{DynamicResource update_wox_update_cancel}" />
         </StackPanel>
     </Grid>
-</Window>
+</Window>
\ No newline at end of file
diff --git a/Wox/packages.config b/Wox/packages.config
index cd2f4b05cd..4dbbb0cdad 100644
--- a/Wox/packages.config
+++ b/Wox/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <packages>
   <package id="Exceptionless" version="1.5.2121" targetFramework="net452" />
   <package id="InputSimulator" version="1.0.4.0" targetFramework="net452" />