diff --git a/Flow.Launcher.Core/Resource/Theme.cs b/Flow.Launcher.Core/Resource/Theme.cs
index 4648aef637c..6561419a16b 100644
--- a/Flow.Launcher.Core/Resource/Theme.cs
+++ b/Flow.Launcher.Core/Resource/Theme.cs
@@ -189,22 +189,11 @@ public ResourceDictionary GetResourceDictionary()
                     new[] { resultItemStyle, resultSubItemStyle, resultItemSelectedStyle, resultSubItemSelectedStyle, resultHotkeyItemStyle, resultHotkeyItemSelectedStyle }, o 
                     => Array.ForEach(setters, p => o.Setters.Add(p)));
             }
-
+            /* Ignore Theme Window Width and use setting */
             var windowStyle = dict["WindowStyle"] as Style;
-
-            var width = windowStyle?.Setters.OfType<Setter>().Where(x => x.Property.Name == "Width")
-                .Select(x => x.Value).FirstOrDefault();
-
-            if (width == null)
-            {
-                windowStyle = dict["BaseWindowStyle"] as Style;
-
-                width = windowStyle?.Setters.OfType<Setter>().Where(x => x.Property.Name == "Width")
-                .Select(x => x.Value).FirstOrDefault();
-            }
-
+            var width = Settings.WindowSize;
+            windowStyle.Setters.Add(new Setter(Window.WidthProperty, width));
             mainWindowWidth = (double)width;
-
             return dict;
         }
 
@@ -375,8 +364,6 @@ private void SetWindowAccent(Window w, AccentState state)
         {
             var windowHelper = new WindowInteropHelper(w);
 
-            // this determines the width of the main query window
-            w.Width = mainWindowWidth;
             windowHelper.EnsureHandle();
 
             var accent = new AccentPolicy { AccentState = state };
diff --git a/Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj b/Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj
index ef76fd61724..e01bc1efd56 100644
--- a/Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj
+++ b/Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj
@@ -50,10 +50,15 @@
 
   <ItemGroup>
     <PackageReference Include="Ben.Demystifier" Version="0.4.1" />
+    <PackageReference Include="Fody" Version="6.5.5">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Threading" Version="16.10.56" />
     <PackageReference Include="NLog" Version="4.7.10" />
     <PackageReference Include="NLog.Schema" Version="4.7.10" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="4.13.0" />
+    <PackageReference Include="PropertyChanged.Fody" Version="3.4.0" />
     <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
     <!--ToolGood.Words.Pinyin v3.0.2.6 results in high memory usage when search with pinyin is enabled-->
     <!--Bumping to it or higher needs to test and ensure this is no longer a problem-->
diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index 10244615863..5f9082fe935 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -4,19 +4,22 @@
 using System.Text.Json.Serialization;
 using Flow.Launcher.Plugin;
 using Flow.Launcher.Plugin.SharedModels;
+using Flow.Launcher;
 
 namespace Flow.Launcher.Infrastructure.UserSettings
 {
     public class Settings : BaseModel
     {
         private string language = "en";
-
         public string Hotkey { get; set; } = $"{KeyConstant.Alt} + {KeyConstant.Space}";
         public string OpenResultModifiers { get; set; } = KeyConstant.Alt;
         public bool ShowOpenResultHotkey { get; set; } = true;
+        public double WindowSize { get; set; } = 580;
+
         public string Language
         {
-            get => language; set
+            get => language;
+            set
             {
                 language = value;
                 OnPropertyChanged();
@@ -52,7 +55,7 @@ public string QuerySearchPrecisionString
                 try
                 {
                     var precisionScore = (SearchPrecisionScore)Enum
-                                            .Parse(typeof(SearchPrecisionScore), value);
+                        .Parse(typeof(SearchPrecisionScore), value);
 
                     QuerySearchPrecision = precisionScore;
                     StringMatcher.Instance.UserSettingSearchPrecision = precisionScore;
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index d1dcf14d304..1cb203515a3 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -98,6 +98,7 @@
     <system:String x:Key="deleteCustomHotkeyWarning">Are you sure you want to delete {0} plugin hotkey?</system:String>
     <system:String x:Key="queryWindowShadowEffect">Query window shadow effect</system:String>
     <system:String x:Key="shadowEffectCPUUsage">Shadow effect has a substantial usage of GPU. Not recommended if your computer performance is limited.</system:String>
+    <system:String x:Key="windowWidthSize">Window Width Size</system:String>
     <system:String x:Key="useGlyphUI">Use Segoe Fluent Icons</system:String>
     <system:String x:Key="useGlyphUIEffect">Use Segoe Fluent Icons for query results where supported</system:String>
 
diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index b517faf191a..daea406db05 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -26,6 +26,8 @@
         LocationChanged="OnLocationChanged"
         Deactivated="OnDeactivated"
         PreviewKeyDown="OnKeyDown"
+        MinWidth="{Binding MainWindowWidth, Mode=OneWay}"
+        MaxWidth="{Binding MainWindowWidth, Mode=OneWay}"
         Visibility="{Binding MainWindowVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
         d:DataContext="{d:DesignInstance vm:MainViewModel}">
     <Window.Resources>
@@ -102,7 +104,25 @@
                 </Grid>
 
                 <Grid ClipToBounds="True">
-                    <Rectangle Width="Auto" HorizontalAlignment="Stretch" Style="{DynamicResource SeparatorStyle}" />
+                    <ContentControl>
+                        <ContentControl.Style>
+                            <Style TargetType="ContentControl">
+                                <Setter Property="Visibility" Value="Collapsed" />
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding ElementName=ResultListBox, Path=Visibility}" Value="Visible">
+                                        <Setter Property="Visibility" Value="Visible" />
+                                    </DataTrigger>
+                                    <DataTrigger Binding="{Binding ElementName=ContextMenu, Path=Visibility}" Value="Visible">
+                                        <Setter Property="Visibility" Value="Visible" />
+                                    </DataTrigger>
+                                    <DataTrigger Binding="{Binding ElementName=History, Path=Visibility}" Value="Visible">
+                                        <Setter Property="Visibility" Value="Visible" />
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </ContentControl.Style>
+                        <Rectangle Width="Auto" HorizontalAlignment="Stretch" Style="{DynamicResource SeparatorStyle}"/>
+                    </ContentControl>
                     <Line x:Name="ProgressBar" HorizontalAlignment="Right"
                   Style="{DynamicResource PendingLineStyle}" Visibility="{Binding ProgressBarVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" 
                   Y1="0" Y2="0" X1="-150" X2="-50" Height="2" Width="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Grid}},Path=ActualWidth}" StrokeThickness="1">
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 8cc6f6c4376..5fc3f2fc96e 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -20,6 +20,7 @@
 using KeyEventArgs = System.Windows.Input.KeyEventArgs;
 using MessageBox = System.Windows.MessageBox;
 using NotifyIcon = System.Windows.Forms.NotifyIcon;
+using System.Windows.Interop;
 
 namespace Flow.Launcher
 {
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 88a9172b0fb..433feeb9fb2 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -1,28 +1,29 @@
-<Window xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<Window x:Class="Flow.Launcher.SettingWindow"
+        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:converters="clr-namespace:Flow.Launcher.Converters"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:flowlauncher="clr-namespace:Flow.Launcher"
-        xmlns:vm="clr-namespace:Flow.Launcher.ViewModel"
-        xmlns:converters="clr-namespace:Flow.Launcher.Converters"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:scm="clr-namespace:System.ComponentModel;assembly=WindowsBase"
-        xmlns:userSettings="clr-namespace:Flow.Launcher.Infrastructure.UserSettings;assembly=Flow.Launcher.Infrastructure"
+        xmlns:svgc="http://sharpvectors.codeplex.com/svgc/"
         xmlns:sys="clr-namespace:System;assembly=mscorlib"
         xmlns:ui="http://schemas.modernwpf.com/2019"
-        xmlns:svgc="http://sharpvectors.codeplex.com/svgc/"
-        x:Class="Flow.Launcher.SettingWindow"
-        mc:Ignorable="d"
-        Icon="Images\app.ico"
+        xmlns:userSettings="clr-namespace:Flow.Launcher.Infrastructure.UserSettings;assembly=Flow.Launcher.Infrastructure"
+        xmlns:vm="clr-namespace:Flow.Launcher.ViewModel"
         Title="{DynamicResource flowlauncher_settings}"
-        ResizeMode="CanResizeWithGrip"
-        WindowStartupLocation="CenterScreen"
-        Height="700" Width="1000"
+        Width="1000"
+        Height="700"
         MinWidth="900"
         MinHeight="600"
-        MouseDown="window_MouseDown"
-        Loaded="OnLoaded"
+        d:DataContext="{d:DesignInstance vm:SettingWindowViewModel}"
         Closed="OnClosed"
-        d:DataContext="{d:DesignInstance vm:SettingWindowViewModel}">
+        Icon="Images\app.ico"
+        Loaded="OnLoaded"
+        MouseDown="window_MouseDown"
+        ResizeMode="CanResizeWithGrip"
+        WindowStartupLocation="CenterScreen"
+        mc:Ignorable="d">
     <Window.InputBindings>
         <KeyBinding Key="Escape" Command="Close" />
     </Window.InputBindings>
@@ -32,7 +33,7 @@
 
     <Window.Resources>
         <converters:BorderClipConverter x:Key="BorderClipConverter" />
-        <CollectionViewSource Source="{Binding Source={x:Static Fonts.SystemFontFamilies}}" x:Key="SortedFonts">
+        <CollectionViewSource x:Key="SortedFonts" Source="{Binding Source={x:Static Fonts.SystemFontFamilies}}">
             <CollectionViewSource.SortDescriptions>
                 <scm:SortDescription PropertyName="Source" />
             </CollectionViewSource.SortDescriptions>
@@ -46,9 +47,9 @@
                     <ItemsPanelTemplate>
                         <Grid>
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="auto" MaxWidth="60" MinWidth="20" />
+                                <ColumnDefinition Width="auto" MinWidth="20" MaxWidth="60" />
                                 <ColumnDefinition Width="8*" />
-                                <ColumnDefinition Width="Auto" MaxWidth="550" MinWidth="40" />
+                                <ColumnDefinition Width="Auto" MinWidth="40" MaxWidth="550" />
                             </Grid.ColumnDefinitions>
                         </Grid>
                     </ItemsPanelTemplate>
@@ -60,25 +61,25 @@
             <Setter Property="BorderBrush" Value="#e5e5e5" />
             <Setter Property="BorderThickness" Value="1" />
             <Setter Property="CornerRadius" Value="5" />
-            <Setter Property="Margin" Value="0 5 0 0" />
-            <Setter Property="Padding" Value="0 15 0 15" />
+            <Setter Property="Margin" Value="0,5,0,0" />
+            <Setter Property="Padding" Value="0,15,0,15" />
             <Setter Property="SnapsToDevicePixels" Value="True" />
 
         </Style>
         <Style x:Key="SettingTitleLabel" TargetType="{x:Type TextBlock}">
-            <Setter Property="Margin" Value="0 0 0 0" />
+            <Setter Property="Margin" Value="0,0,0,0" />
         </Style>
 
         <Style x:Key="SettingSubTitleLabel" TargetType="{x:Type TextBlock}">
             <Setter Property="Foreground" Value="#5F5F5F" />
             <Setter Property="FontSize" Value="12" />
-            <Setter Property="Margin" Value="0 0 0 0" />
-            <Setter Property="Padding" Value="0 0 24 0" />
+            <Setter Property="Margin" Value="0,0,0,0" />
+            <Setter Property="Padding" Value="0,0,24,0" />
             <Setter Property="TextWrapping" Value="WrapWithOverflow" />
         </Style>
         <Style x:Key="TextPanel" TargetType="{x:Type StackPanel}">
             <Setter Property="Grid.Column" Value="1" />
-            <Setter Property="Margin" Value="0 0 0 0" />
+            <Setter Property="Margin" Value="0,0,0,0" />
             <Setter Property="Width" Value="Auto" />
             <Setter Property="VerticalAlignment" Value="Center" />
             <Setter Property="HorizontalAlignment" Value="Left" />
@@ -87,7 +88,7 @@
             <Setter Property="HorizontalAlignment" Value="Right" />
             <Setter Property="VerticalAlignment" Value="Center" />
             <Setter Property="Grid.Column" Value="2" />
-            <Setter Property="Margin" Value="0 4 18 4" />
+            <Setter Property="Margin" Value="0,4,18,4" />
             <Setter Property="LayoutTransform">
                 <Setter.Value>
                     <ScaleTransform ScaleX="1.5" ScaleY="1.5" />
@@ -95,12 +96,12 @@
             </Setter>
         </Style>
         <Style x:Key="SideControlToggle" TargetType="{x:Type ui:ToggleSwitch}">
-            <Setter Property="Padding" Value="2 0 0 0" />
+            <Setter Property="Padding" Value="2,0,0,0" />
             <Setter Property="Grid.Column" Value="2" />
         </Style>
 
-        <Style TargetType="{x:Type TabItem}" x:Key="logo">
-            <!--#region Logo Style -->
+        <Style x:Key="logo" TargetType="{x:Type TabItem}">
+            <!--#region Logo Style-->
             <Setter Property="Margin" Value="0" />
             <Setter Property="HorizontalAlignment" Value="center" />
             <Setter Property="Background" Value="Transparent" />
@@ -114,39 +115,31 @@
                         <Border>
                             <Grid>
                                 <Grid>
-                                    <Border
-                                        x:Name="Spacer"
-                                        Width="Auto"
-                                        Height="Auto"
-                                        Padding="0 0 0 0"
-                                        Margin="0 10 5 0"
-                                        BorderBrush="Transparent"
-                                        BorderThickness="0">
-                                        <Border x:Name="border"
-                                                CornerRadius="5"
-                                                Background="WhiteSmoke">
+                                    <Border x:Name="Spacer"
+                                            Width="Auto"
+                                            Height="Auto"
+                                            Margin="0,10,5,0"
+                                            Padding="0,0,0,0"
+                                            BorderBrush="Transparent"
+                                            BorderThickness="0">
+                                        <Border x:Name="border" Background="WhiteSmoke" CornerRadius="5">
                                             <ContentPresenter x:Name="ContentSite"
-                                                              Margin="12 12 0 12"
+                                                              Margin="12,12,0,12"
                                                               HorizontalAlignment="LEFT"
                                                               VerticalAlignment="Center"
-                                                              ContentSource="Header" TextBlock.Foreground="#000" />
+                                                              ContentSource="Header"
+                                                              TextBlock.Foreground="#000" />
                                         </Border>
                                     </Border>
                                 </Grid>
                             </Grid>
                         </Border>
                         <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver"
-                                     Value="True">
-                                <Setter TargetName="border"
-                                        Property="Background"
-                                        Value="Transparent" />
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter TargetName="border" Property="Background" Value="Transparent" />
                             </Trigger>
-                            <Trigger Property="IsSelected"
-                                     Value="True">
-                                <Setter TargetName="border"
-                                        Property="Background"
-                                        Value="transparent" />
+                            <Trigger Property="IsSelected" Value="True">
+                                <Setter TargetName="border" Property="Background" Value="transparent" />
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -161,15 +154,20 @@
                         <Border>
                             <Grid>
                                 <Grid>
-                                    <Border
-                                        x:Name="Spacer" Width="Auto" Height="Auto" Padding="0 0 0 0" Margin="8 4 8 0"
-                                        BorderBrush="Transparent" BorderThickness="0">
-                                        <Border x:Name="border" CornerRadius="5" Background="#f3f3f3">
+                                    <Border x:Name="Spacer"
+                                            Width="Auto"
+                                            Height="Auto"
+                                            Margin="8,4,8,0"
+                                            Padding="0,0,0,0"
+                                            BorderBrush="Transparent"
+                                            BorderThickness="0">
+                                        <Border x:Name="border" Background="#f3f3f3" CornerRadius="5">
                                             <ContentPresenter x:Name="ContentSite"
-                                                              Margin="12 12 0 12"
+                                                              Margin="12,12,0,12"
                                                               HorizontalAlignment="LEFT"
                                                               VerticalAlignment="Center"
-                                                              ContentSource="Header" TextBlock.Foreground="#000" />
+                                                              ContentSource="Header"
+                                                              TextBlock.Foreground="#000" />
                                         </Border>
                                     </Border>
                                 </Grid>
@@ -188,18 +186,17 @@
             </Setter>
         </Style>
 
-        <!-- Plugin Store Item when Selected layout for nothing-->
+        <!--  Plugin Store Item when Selected layout for nothing  -->
         <Style x:Key="StoreItem" TargetType="{x:Type ToggleButton}">
             <Style.Triggers>
-                <Trigger Property="IsChecked" Value="True">
-                </Trigger>
+                <Trigger Property="IsChecked" Value="True" />
             </Style.Triggers>
         </Style>
 
         <Style x:Key="PluginList" TargetType="ListBoxItem">
             <Setter Property="Background" Value="#ffffff" />
-            <Setter Property="Padding" Value="0 12 0 12" />
-            <Setter Property="Margin" Value="0 0 18 5" />
+            <Setter Property="Padding" Value="0,12,0,12" />
+            <Setter Property="Margin" Value="0,0,18,5" />
             <Setter Property="HorizontalContentAlignment" Value="Stretch" />
             <Setter Property="BorderBrush" Value="#e5e5e5" />
             <!--#region Template for blue highlight win10-->
@@ -207,15 +204,15 @@
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type ListBoxItem}">
                         <Border x:Name="Bd"
+                                Padding="{TemplateBinding Padding}"
                                 Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                Padding="{TemplateBinding Padding}" CornerRadius="5"
+                                CornerRadius="5"
                                 SnapsToDevicePixels="True">
                             <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                               Content="{TemplateBinding Content}"
-
                                               ContentStringFormat="{TemplateBinding ContentStringFormat}"
                                               ContentTemplate="{TemplateBinding ContentTemplate}"
                                               SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
@@ -237,7 +234,7 @@
                                 </MultiTrigger.Conditions>
                                 <Setter TargetName="Bd" Property="Background" Value="#ffffff" />
                                 <Setter TargetName="Bd" Property="BorderBrush" Value="#e5e5e5" />
-                                <Setter TargetName="Bd" Property="Margin" Value="0 0 0 0" />
+                                <Setter TargetName="Bd" Property="Margin" Value="0,0,0,0" />
 
 
                             </MultiTrigger>
@@ -249,13 +246,12 @@
                                 <Setter TargetName="Bd" Property="Background" Value="#ffffff" />
                                 <Setter TargetName="Bd" Property="BorderBrush" Value="#e5e5e5" />
                                 <Setter TargetName="Bd" Property="CornerRadius" Value="5" />
-                                <Setter TargetName="Bd" Property="Margin" Value="0 0 0 0" />
+                                <Setter TargetName="Bd" Property="Margin" Value="0,0,0,0" />
 
 
                             </MultiTrigger>
                             <Trigger Property="IsEnabled" Value="False">
-                                <Setter TargetName="Bd" Property="TextElement.Foreground"
-                                        Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                                <Setter TargetName="Bd" Property="TextElement.Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -268,25 +264,25 @@
         <!--#region PluginStore Style-->
         <Style x:Key="StoreList" TargetType="ListBoxItem">
             <Setter Property="Background" Value="#ffffff" />
-            <Setter Property="Padding" Value="0 0 0 0" />
-            <Setter Property="Margin" Value="0 0 8 5" />
+            <Setter Property="Padding" Value="0,0,0,0" />
+            <Setter Property="Margin" Value="0,0,8,5" />
             <Setter Property="BorderBrush" Value="#e5e5e5" />
-            <Setter Property="MinWidth" Value="330"/>
-            <Setter Property="Height" Value="98"/>
+            <Setter Property="MinWidth" Value="330" />
+            <Setter Property="Height" Value="98" />
             <!--#region Template for blue highlight win10-->
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type ListBoxItem}">
                         <Border x:Name="Bd"
+                                Padding="{TemplateBinding Padding}"
                                 Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                Padding="{TemplateBinding Padding}" CornerRadius="5"
+                                CornerRadius="5"
                                 SnapsToDevicePixels="True">
                             <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                               Content="{TemplateBinding Content}"
-
                                               ContentStringFormat="{TemplateBinding ContentStringFormat}"
                                               ContentTemplate="{TemplateBinding ContentTemplate}"
                                               SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
@@ -308,7 +304,7 @@
                                 </MultiTrigger.Conditions>
                                 <Setter TargetName="Bd" Property="Background" Value="#ffffff" />
                                 <Setter TargetName="Bd" Property="BorderBrush" Value="#e5e5e5" />
-                                <Setter TargetName="Bd" Property="Margin" Value="0 0 0 0" />
+                                <Setter TargetName="Bd" Property="Margin" Value="0,0,0,0" />
 
 
                             </MultiTrigger>
@@ -320,13 +316,12 @@
                                 <Setter TargetName="Bd" Property="Background" Value="#ffffff" />
                                 <Setter TargetName="Bd" Property="BorderBrush" Value="#e5e5e5" />
                                 <Setter TargetName="Bd" Property="CornerRadius" Value="5" />
-                                <Setter TargetName="Bd" Property="Margin" Value="0 0 0 0" />
+                                <Setter TargetName="Bd" Property="Margin" Value="0,0,0,0" />
 
 
                             </MultiTrigger>
                             <Trigger Property="IsEnabled" Value="False">
-                                <Setter TargetName="Bd" Property="TextElement.Foreground"
-                                        Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                                <Setter TargetName="Bd" Property="TextElement.Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -335,30 +330,27 @@
             <!--#endregion-->
         </Style>
 
-        <!-- For Tab Header responsive Width -->
-        <Style  TargetType="{x:Type TabControl}">
+        <!--  For Tab Header responsive Width  -->
+        <Style TargetType="{x:Type TabControl}">
             <Setter Property="FontSize" Value="14" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type TabControl}">
                         <Grid>
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="2.2*"/>
-                                <ColumnDefinition Width="7.8*"/>
+                                <ColumnDefinition Width="2.2*" />
+                                <ColumnDefinition Width="7.8*" />
                             </Grid.ColumnDefinitions>
-                            <TabPanel
-             Grid.Column="0"
-             Panel.ZIndex="1" 
-             Margin="0,0,0,0"
-                               
-             IsItemsHost="True"
-             Background="#f3f3f3" />
-                            <Border 
-             Grid.Column="1"
-             BorderBrush="Black" 
-             BorderThickness="0" 
-             CornerRadius="0">
-                                <ContentPresenter ContentSource="SelectedContent" Grid.Column="1"/>
+                            <TabPanel Grid.Column="0"
+                                      Margin="0,0,0,0"
+                                      Panel.ZIndex="1"
+                                      Background="#f3f3f3"
+                                      IsItemsHost="True" />
+                            <Border Grid.Column="1"
+                                    BorderBrush="Black"
+                                    BorderThickness="0"
+                                    CornerRadius="0">
+                                <ContentPresenter Grid.Column="1" ContentSource="SelectedContent" />
                             </Border>
                         </Grid>
                     </ControlTemplate>
@@ -369,56 +361,75 @@
     </Window.Resources>
 
 
-    <TabControl Height="auto" SelectedIndex="1" TabStripPlacement="Left" Background="#f3f3f3">
+    <TabControl Height="auto"
+                Background="#f3f3f3"
+                SelectedIndex="1"
+                TabStripPlacement="Left">
         <TabItem Style="{DynamicResource logo}">
             <TabItem.Header>
-                <Grid Margin="0 18 0 0">
+                <Grid Margin="0,18,0,0">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="50" />
                         <RowDefinition Height="27" />
                         <RowDefinition Height="25" />
                     </Grid.RowDefinitions>
-                    <Image Source="images/app.png" Width="50" Height="50" Grid.Row="0" />
-                    <TextBlock Text="Flow Launcher" Grid.Row="1" TextAlignment="center" Margin="0 12 0 0" />
-                    <TextBlock Text="{Binding Version}" Grid.Row="2" TextAlignment="center" FontSize="12"
-                               Margin="0 5 0 0" />
+                    <Image Grid.Row="0"
+                           Width="50"
+                           Height="50"
+                           Source="images/app.png" />
+                    <TextBlock Grid.Row="1"
+                               Margin="0,12,0,0"
+                               Text="Flow Launcher"
+                               TextAlignment="center" />
+                    <TextBlock Grid.Row="2"
+                               Margin="0,5,0,0"
+                               FontSize="12"
+                               Text="{Binding Version}"
+                               TextAlignment="center" />
                 </Grid>
             </TabItem.Header>
         </TabItem>
         <TabItem>
-            <!-- LEFT TAB WIDTH -->
+            <!--  LEFT TAB WIDTH  -->
             <TabItem.Header>
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" />
                         <ColumnDefinition />
                     </Grid.ColumnDefinitions>
-                    <TextBlock Grid.Column="0" FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20"
-                               Margin="0 0 12 0">
+                    <TextBlock Grid.Column="0"
+                               Margin="0,0,12,0"
+                               FontFamily="/Resources/#Segoe Fluent Icons"
+                               FontSize="20">
                         &#xe713;
                     </TextBlock>
                     <TextBlock Grid.Column="1" Text="{DynamicResource general}" />
                 </Grid>
             </TabItem.Header>
 
-            <ScrollViewer ScrollViewer.CanContentScroll="False"
-                          Margin="0,0,0,0" Background="#f3f3f3">
-                <StackPanel Orientation="Vertical" Margin="5,18,25,30">
-                    <TextBlock Text="{DynamicResource general}" Grid.Row="2" TextAlignment="left" FontSize="30"
-                               Margin="0 5 0 5" />
+            <ScrollViewer Margin="0,0,0,0" Background="#f3f3f3" ScrollViewer.CanContentScroll="False">
+                <StackPanel Margin="5,18,25,30" Orientation="Vertical">
+                    <TextBlock Grid.Row="2"
+                               Margin="0,5,0,5"
+                               FontSize="30"
+                               Text="{DynamicResource general}"
+                               TextAlignment="left" />
 
                     <Border Style="{DynamicResource SettingGroupBox}">
                         <ItemsControl Style="{StaticResource SettingGrid}">
                             <StackPanel Style="{StaticResource TextPanel}">
-                                <TextBlock Text="{DynamicResource startFlowLauncherOnSystemStartup}"
-                                           Style="{DynamicResource SettingTitleLabel}" />
+                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource startFlowLauncherOnSystemStartup}" />
                             </StackPanel>
-                            <CheckBox IsChecked="{Binding Settings.StartFlowLauncherOnSystemStartup}"
-                                      HorizontalAlignment="Right"
-                                      Checked="OnAutoStartupChecked" Unchecked="OnAutoStartupUncheck"
-                                      Style="{DynamicResource SideControlCheckBox}" />
-                            <TextBlock FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20" Grid.Column="0"
-                                       VerticalAlignment="Center" Margin="24 0 16 0">
+                            <CheckBox HorizontalAlignment="Right"
+                                      Checked="OnAutoStartupChecked"
+                                      IsChecked="{Binding Settings.StartFlowLauncherOnSystemStartup}"
+                                      Style="{DynamicResource SideControlCheckBox}"
+                                      Unchecked="OnAutoStartupUncheck" />
+                            <TextBlock Grid.Column="0"
+                                       Margin="24,0,16,0"
+                                       VerticalAlignment="Center"
+                                       FontFamily="/Resources/#Segoe Fluent Icons"
+                                       FontSize="20">
                                 &#xe8fc;
                             </TextBlock>
                         </ItemsControl>
@@ -427,26 +438,25 @@
                     <Border Style="{DynamicResource SettingGroupBox}">
                         <ItemsControl Style="{StaticResource SettingGrid}">
                             <StackPanel Style="{StaticResource TextPanel}">
-                                <TextBlock Text="{DynamicResource hideOnStartup}"
-                                           Style="{DynamicResource SettingTitleLabel}" />
+                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource hideOnStartup}" />
                             </StackPanel>
-                            <CheckBox IsChecked="{Binding Settings.HideOnStartup}"
-                                      Style="{DynamicResource SideControlCheckBox}" />
-                            <TextBlock FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20" Grid.Column="0"
-                                       VerticalAlignment="Center" Margin="24 0 16 0">
+                            <CheckBox IsChecked="{Binding Settings.HideOnStartup}" Style="{DynamicResource SideControlCheckBox}" />
+                            <TextBlock Grid.Column="0"
+                                       Margin="24,0,16,0"
+                                       VerticalAlignment="Center"
+                                       FontFamily="/Resources/#Segoe Fluent Icons"
+                                       FontSize="20">
                                 &#xed1a;
                             </TextBlock>
                         </ItemsControl>
                     </Border>
 
-                    <Border Style="{DynamicResource SettingGroupBox}" Margin="0 30 0 0">
+                    <Border Margin="0,30,0,0" Style="{DynamicResource SettingGroupBox}">
                         <ItemsControl Style="{StaticResource SettingGrid}">
                             <StackPanel Style="{StaticResource TextPanel}">
-                                <TextBlock Text="{DynamicResource hideFlowLauncherWhenLoseFocus}"
-                                           Style="{DynamicResource SettingTitleLabel}" />
+                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource hideFlowLauncherWhenLoseFocus}" />
                             </StackPanel>
-                            <CheckBox IsChecked="{Binding Settings.HideWhenDeactive}"
-                                      Style="{DynamicResource SideControlCheckBox}" />
+                            <CheckBox IsChecked="{Binding Settings.HideWhenDeactive}" Style="{DynamicResource SideControlCheckBox}" />
                         </ItemsControl>
                     </Border>
 
@@ -454,70 +464,69 @@
                     <Border Style="{DynamicResource SettingGroupBox}">
                         <ItemsControl Style="{StaticResource SettingGrid}">
                             <StackPanel Style="{StaticResource TextPanel}">
-                                <TextBlock Text="{DynamicResource hideNotifyIcon}"
-                                           Style="{DynamicResource SettingTitleLabel}" />
+                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource hideNotifyIcon}" />
                             </StackPanel>
-                            <CheckBox IsChecked="{Binding Settings.HideNotifyIcon}"
-                                      Style="{DynamicResource SideControlCheckBox}" />
+                            <CheckBox IsChecked="{Binding Settings.HideNotifyIcon}" Style="{DynamicResource SideControlCheckBox}" />
                         </ItemsControl>
                     </Border>
 
                     <Border Style="{DynamicResource SettingGroupBox}">
                         <ItemsControl Style="{StaticResource SettingGrid}">
                             <StackPanel Style="{StaticResource TextPanel}">
-                                <TextBlock Text="{DynamicResource rememberLastLocation}"
-                                           Style="{DynamicResource SettingTitleLabel}" />
+                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource rememberLastLocation}" />
                             </StackPanel>
-                            <CheckBox IsChecked="{Binding Settings.RememberLastLaunchLocation}"
-                                      Style="{DynamicResource SideControlCheckBox}" />
+                            <CheckBox IsChecked="{Binding Settings.RememberLastLaunchLocation}" Style="{DynamicResource SideControlCheckBox}" />
                         </ItemsControl>
                     </Border>
 
                     <Border Style="{DynamicResource SettingGroupBox}">
                         <ItemsControl Style="{StaticResource SettingGrid}">
                             <StackPanel Style="{StaticResource TextPanel}">
-                                <TextBlock Text="{DynamicResource ignoreHotkeysOnFullscreen}"
-                                           Style="{DynamicResource SettingTitleLabel}" />
-                                <TextBlock Text="{DynamicResource ignoreHotkeysOnFullscreenToolTip}"
-                                           Style="{DynamicResource SettingSubTitleLabel}" />
+                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource ignoreHotkeysOnFullscreen}" />
+                                <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource ignoreHotkeysOnFullscreenToolTip}" />
                             </StackPanel>
-                            <CheckBox IsChecked="{Binding Settings.IgnoreHotkeysOnFullscreen}"
-                                      Style="{DynamicResource SideControlCheckBox}" />
-                            <TextBlock FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20" Grid.Column="0"
-                                       VerticalAlignment="Center" Margin="24 0 16 0">
+                            <CheckBox IsChecked="{Binding Settings.IgnoreHotkeysOnFullscreen}" Style="{DynamicResource SideControlCheckBox}" />
+                            <TextBlock Grid.Column="0"
+                                       Margin="24,0,16,0"
+                                       VerticalAlignment="Center"
+                                       FontFamily="/Resources/#Segoe Fluent Icons"
+                                       FontSize="20">
                                 &#xe7fc;
                             </TextBlock>
                         </ItemsControl>
                     </Border>
 
-                    <Border Style="{DynamicResource SettingGroupBox}" Margin="0 30 0 0">
+                    <Border Margin="0,30,0,0" Style="{DynamicResource SettingGroupBox}">
                         <ItemsControl Style="{StaticResource SettingGrid}">
                             <StackPanel Style="{StaticResource TextPanel}">
-                                <TextBlock Text="{DynamicResource ShouldUsePinyin}"
-                                           Style="{DynamicResource SettingTitleLabel}" />
-                                <TextBlock Text="{DynamicResource ShouldUsePinyinToolTip}"
-                                           Style="{DynamicResource SettingSubTitleLabel}" />
+                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource ShouldUsePinyin}" />
+                                <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource ShouldUsePinyinToolTip}" />
                             </StackPanel>
-                            <CheckBox IsChecked="{Binding Settings.ShouldUsePinyin}"
-                                      ToolTip="{DynamicResource ShouldUsePinyinToolTip}"
-                                      Style="{DynamicResource SideControlCheckBox}" />
-                            <TextBlock FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20" Grid.Column="0"
-                                       VerticalAlignment="Center" Margin="24 0 16 0">
+                            <CheckBox IsChecked="{Binding Settings.ShouldUsePinyin}" Style="{DynamicResource SideControlCheckBox}" ToolTip="{DynamicResource ShouldUsePinyinToolTip}" />
+                            <TextBlock Grid.Column="0"
+                                       Margin="24,0,16,0"
+                                       VerticalAlignment="Center"
+                                       FontFamily="/Resources/#Segoe Fluent Icons"
+                                       FontSize="20">
                                 &#xe98a;
                             </TextBlock>
                         </ItemsControl>
                     </Border>
 
-                    <Border Style="{DynamicResource SettingGroupBox}" Margin="0 30 0 0">
+                    <Border Margin="0,30,0,0" Style="{DynamicResource SettingGroupBox}">
                         <ItemsControl Style="{StaticResource SettingGrid}">
                             <StackPanel Style="{StaticResource TextPanel}">
-                                <TextBlock Text="{DynamicResource autoUpdates}"
-                                           Style="{DynamicResource SettingTitleLabel}" />
+                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource autoUpdates}" />
                             </StackPanel>
-                            <ui:ToggleSwitch IsOn="{Binding AutoUpdates}" FocusVisualMargin="5"
-                                             Style="{DynamicResource SideControlToggle}" Width="100" />
-                            <TextBlock FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20" Grid.Column="0"
-                                       VerticalAlignment="Center" Margin="24 0 16 0">
+                            <ui:ToggleSwitch Width="100"
+                                             FocusVisualMargin="5"
+                                             IsOn="{Binding AutoUpdates}"
+                                             Style="{DynamicResource SideControlToggle}" />
+                            <TextBlock Grid.Column="0"
+                                       Margin="24,0,16,0"
+                                       VerticalAlignment="Center"
+                                       FontFamily="/Resources/#Segoe Fluent Icons"
+                                       FontSize="20">
                                 &#xecc5;
                             </TextBlock>
                         </ItemsControl>
@@ -526,61 +535,72 @@
                     <Border Style="{DynamicResource SettingGroupBox}">
                         <ItemsControl Style="{StaticResource SettingGrid}">
                             <StackPanel Style="{StaticResource TextPanel}">
-                                <TextBlock Text="{DynamicResource portableMode}"
-                                           Style="{DynamicResource SettingTitleLabel}" />
-                                <TextBlock Text="{DynamicResource portableModeToolTIp}"
-                                           Style="{DynamicResource SettingSubTitleLabel}" />
+                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource portableMode}" />
+                                <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource portableModeToolTIp}" />
                             </StackPanel>
-                            <ui:ToggleSwitch IsOn="{Binding PortableMode}" FocusVisualMargin="5"
-                                             Style="{DynamicResource SideControlToggle}" Width="100" />
-                            <TextBlock FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20" Grid.Column="0"
-                                       VerticalAlignment="Center" Margin="24 0 16 0">
+                            <ui:ToggleSwitch Width="100"
+                                             FocusVisualMargin="5"
+                                             IsOn="{Binding PortableMode}"
+                                             Style="{DynamicResource SideControlToggle}" />
+                            <TextBlock Grid.Column="0"
+                                       Margin="24,0,16,0"
+                                       VerticalAlignment="Center"
+                                       FontFamily="/Resources/#Segoe Fluent Icons"
+                                       FontSize="20">
                                 &#xe88e;
                             </TextBlock>
                         </ItemsControl>
                     </Border>
 
-                    <Border Style="{DynamicResource SettingGroupBox}" Padding="0" CornerRadius="5" Margin="0 30 0 0">
+                    <Border Margin="0,30,0,0"
+                            Padding="0"
+                            CornerRadius="5"
+                            Style="{DynamicResource SettingGroupBox}">
                         <StackPanel Orientation="Vertical">
-                            <Border Style="{DynamicResource SettingGroupBox}" Margin="0" BorderThickness="0">
+                            <Border Margin="0" BorderThickness="0" Style="{DynamicResource SettingGroupBox}">
                                 <ItemsControl Style="{StaticResource SettingGrid}">
                                     <StackPanel Style="{StaticResource TextPanel}">
-                                        <TextBlock Grid.Column="1" Text="{DynamicResource querySearchPrecision}"
-                                               VerticalAlignment="Center" />
-                                        <TextBlock Text="{DynamicResource querySearchPrecisionToolTip}"
-                                           Style="{DynamicResource SettingSubTitleLabel}" />
+                                        <TextBlock Grid.Column="1" VerticalAlignment="Center" Text="{DynamicResource querySearchPrecision}" />
+                                        <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource querySearchPrecisionToolTip}" />
                                     </StackPanel>
-                                    <ComboBox Margin="10 0 18 0" MaxWidth="200"
+                                    <ComboBox Grid.Column="2"
+                                              MaxWidth="200"
+                                              Margin="10,0,18,0"
                                               ItemsSource="{Binding QuerySearchPrecisionStrings}"
-                                              SelectedItem="{Binding Settings.QuerySearchPrecisionString}"
-                                              Grid.Column="2" />
+                                              SelectedItem="{Binding Settings.QuerySearchPrecisionString}" />
                                 </ItemsControl>
                             </Border>
-                            <Separator BorderBrush="#e5e5e5" BorderThickness="1" Width="Auto" />
-                            <Border Style="{DynamicResource SettingGroupBox}" Margin="0" BorderThickness="0">
+                            <Separator Width="Auto" BorderBrush="#e5e5e5" BorderThickness="1" />
+                            <Border Margin="0" BorderThickness="0" Style="{DynamicResource SettingGroupBox}">
                                 <ItemsControl Style="{StaticResource SettingGrid}">
                                     <StackPanel Style="{StaticResource TextPanel}">
-                                        <TextBlock Grid.Column="1" Text="{DynamicResource lastQueryMode}"
-                                               VerticalAlignment="Center" />
-                                        <TextBlock Text="{DynamicResource lastQueryModeToolTip}"
-                                           Style="{DynamicResource SettingSubTitleLabel}" />
+                                        <TextBlock Grid.Column="1" VerticalAlignment="Center" Text="{DynamicResource lastQueryMode}" />
+                                        <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource lastQueryModeToolTip}" />
                                     </StackPanel>
-                                    <ComboBox Margin="10 0 18 0" MaxWidth="200"
+                                    <ComboBox Grid.Column="2"
+                                              MaxWidth="200"
+                                              Margin="10,0,18,0"
+                                              DisplayMemberPath="Display"
                                               ItemsSource="{Binding LastQueryModes}"
                                               SelectedValue="{Binding Settings.LastQueryMode}"
-                                              DisplayMemberPath="Display" SelectedValuePath="Value" Grid.Column="2" />
+                                              SelectedValuePath="Value" />
                                 </ItemsControl>
                             </Border>
-                            <Separator BorderBrush="#e5e5e5" BorderThickness="1" Width="Auto" />
-                            <Border Style="{DynamicResource SettingGroupBox}" Margin="0" BorderThickness="0">
+                            <Separator Width="Auto" BorderBrush="#e5e5e5" BorderThickness="1" />
+                            <Border Margin="0" BorderThickness="0" Style="{DynamicResource SettingGroupBox}">
                                 <ItemsControl Style="{StaticResource SettingGrid}">
-                                    <TextBlock Grid.Column="1" Text="{DynamicResource maxShowResults}"
-                                               VerticalAlignment="Center" />
-                                    <ComboBox Margin="10 0 18 0" Width="100" ItemsSource="{Binding MaxResultsRange}"
+                                    <TextBlock Grid.Column="1" VerticalAlignment="Center" Text="{DynamicResource maxShowResults}" />
+                                    <ComboBox Grid.Column="2"
+                                              Width="100"
+                                              Margin="10,0,18,0"
                                               HorizontalContentAlignment="Center"
-                                              SelectedItem="{Binding Settings.MaxResultsToShow}" Grid.Column="2" />
-                                    <TextBlock FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20"
-                                               Grid.Column="0" VerticalAlignment="Center" Margin="24 0 16 0">
+                                              ItemsSource="{Binding MaxResultsRange}"
+                                              SelectedItem="{Binding Settings.MaxResultsToShow}" />
+                                    <TextBlock Grid.Column="0"
+                                               Margin="24,0,16,0"
+                                               VerticalAlignment="Center"
+                                               FontFamily="/Resources/#Segoe Fluent Icons"
+                                               FontSize="20">
                                         &#xe8fd;
                                     </TextBlock>
                                 </ItemsControl>
@@ -588,18 +608,14 @@
                         </StackPanel>
                     </Border>
 
-                    <Border Style="{DynamicResource SettingGroupBox}" Margin="0 30 0 0">
+                    <Border Margin="0,30,0,0" Style="{DynamicResource SettingGroupBox}">
                         <ItemsControl Style="{StaticResource SettingGrid}">
                             <StackPanel Style="{StaticResource TextPanel}">
-                                <TextBlock Text="{DynamicResource pythonDirectory}"
-                                           Style="{DynamicResource SettingTitleLabel}" />
+                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource pythonDirectory}" />
                             </StackPanel>
-                            <StackPanel Orientation="Horizontal" Grid.Column="2">
-                                <TextBox
-                                    Text="{Binding Settings.PluginSettings.PythonDirectory, TargetNullValue='No Setting'}"
-                                    Width="300" Height="26" />
-                                <Button Click="OnSelectPythonDirectoryClick"
-                                        Content="{DynamicResource selectPythonDirectory}" Margin="10 10 18 10" />
+                            <StackPanel Grid.Column="2" Orientation="Horizontal">
+                                <TextBox Width="300" Height="26" Text="{Binding Settings.PluginSettings.PythonDirectory, TargetNullValue='No Setting'}" />
+                                <Button Margin="10,10,18,10" Click="OnSelectPythonDirectoryClick" Content="{DynamicResource selectPythonDirectory}" />
                             </StackPanel>
                         </ItemsControl>
                     </Border>
@@ -607,12 +623,15 @@
                     <Border Style="{DynamicResource SettingGroupBox}">
                         <ItemsControl Style="{StaticResource SettingGrid}">
                             <StackPanel Style="{StaticResource TextPanel}">
-                                <TextBlock Text="{DynamicResource language}"
-                                           Style="{DynamicResource SettingTitleLabel}" />
+                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource language}" />
                             </StackPanel>
-                            <ComboBox Margin="10 0 16 0" MaxWidth="200"
-                                      ItemsSource="{Binding Languages}" SelectedValue="{Binding Language}"
-                                      DisplayMemberPath="Display" SelectedValuePath="LanguageCode" Grid.Column="2" />
+                            <ComboBox Grid.Column="2"
+                                      MaxWidth="200"
+                                      Margin="10,0,16,0"
+                                      DisplayMemberPath="Display"
+                                      ItemsSource="{Binding Languages}"
+                                      SelectedValue="{Binding Language}"
+                                      SelectedValuePath="LanguageCode" />
                         </ItemsControl>
                     </Border>
                 </StackPanel>
@@ -625,8 +644,10 @@
                         <ColumnDefinition Width="Auto" />
                         <ColumnDefinition />
                     </Grid.ColumnDefinitions>
-                    <TextBlock Grid.Column="0" FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20"
-                               Margin="0 0 12 0">
+                    <TextBlock Grid.Column="0"
+                               Margin="0,0,12,0"
+                               FontFamily="/Resources/#Segoe Fluent Icons"
+                               FontSize="20">
                         &#xea86;
                     </TextBlock>
                     <TextBlock Grid.Column="1" Text="{DynamicResource plugin}" />
@@ -635,36 +656,48 @@
 
             <Grid>
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition></ColumnDefinition>
+                    <ColumnDefinition />
                 </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="73"></RowDefinition>
-                    <RowDefinition Height="*"></RowDefinition>
+                    <RowDefinition Height="73" />
+                    <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
-                <Border Grid.Row="0" Background="#f3f3f3" Padding="5 18 0 0">
-                    <TextBlock Text="{DynamicResource plugin}" TextAlignment="left" FontSize="30" Margin="0 5 0 0"/>
+                <Border Grid.Row="0" Padding="5,18,0,0" Background="#f3f3f3">
+                    <TextBlock Margin="0,5,0,0"
+                               FontSize="30"
+                               Text="{DynamicResource plugin}"
+                               TextAlignment="left" />
                 </Border>
-                <Border Grid.Column="0" Grid.Row="1" Background="#f3f3f3" Padding="0 0 0 0">
-                    <ListBox SelectedItem="{Binding SelectedPlugin}"
-                             ScrollViewer.CanContentScroll="False"
-                             ItemsSource="{Binding PluginViewModels}"
-                             Margin="5, 0, 0, 0" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                <Border Grid.Row="1"
+                        Grid.Column="0"
+                        Padding="0,0,0,0"
+                        Background="#f3f3f3">
+                    <ListBox Width="Auto"
+                             Margin="5,0,0,0"
+                             Padding="0,0,7,0"
+                             HorizontalAlignment="Stretch"
                              ItemContainerStyle="{StaticResource PluginList}"
-                             Padding="0 0 7 0" Width="Auto" HorizontalAlignment="Stretch" SnapsToDevicePixels="True">
+                             ItemsSource="{Binding PluginViewModels}"
+                             ScrollViewer.CanContentScroll="False"
+                             ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                             SelectedItem="{Binding SelectedPlugin}"
+                             SnapsToDevicePixels="True">
                         <ListBox.ItemsPanel>
                             <ItemsPanelTemplate>
-                                <StackPanel Margin="0,0,0,18"/>
+                                <StackPanel Margin="0,0,0,18" />
                             </ItemsPanelTemplate>
                         </ListBox.ItemsPanel>
                         <ListBox.ItemTemplate>
                             <DataTemplate>
-                                <Expander Grid.Column="4" x:Name="expanderHeader"
+                                <Expander x:Name="expanderHeader"
+                                          Grid.Column="4"
+                                          Padding="0"
+                                          Background="Transparent"
+                                          FlowDirection="RightToLeft"
                                           IsExpanded="{Binding Mode=TwoWay, Path=IsSelected, RelativeSource={RelativeSource AncestorType=ListBoxItem, Mode=FindAncestor}}"
-                                          FlowDirection="RightToLeft" Background="Transparent" Padding="0"
                                           Style="{StaticResource ExpanderStyle1}">
                                     <Expander.Header>
-                                        <Grid FlowDirection="LeftToRight" HorizontalAlignment="Left"
-                                              Width="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}, Path=ActualWidth}">
+                                        <Grid Width="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}, Path=ActualWidth}" HorizontalAlignment="Left" FlowDirection="LeftToRight">
                                             <Grid.ColumnDefinitions>
                                                 <ColumnDefinition Width="100" MinWidth="100" />
                                                 <ColumnDefinition Width="*" MinWidth="350" MaxWidth="700" />
@@ -672,37 +705,45 @@
                                                 <ColumnDefinition Width="100" />
                                                 <ColumnDefinition Width="80" />
                                             </Grid.ColumnDefinitions>
-                                            <StackPanel FlowDirection="LeftToRight" Grid.Column="0" Margin="24 0 0 0"
-                                                        VerticalAlignment="Center">
-                                                <Image Source="{Binding Image, IsAsync=True}"
-                                                       Width="32" Height="32" Margin="32 0 0 0"
-                                                       FlowDirection="LeftToRight" />
+                                            <StackPanel Grid.Column="0"
+                                                        Margin="24,0,0,0"
+                                                        VerticalAlignment="Center"
+                                                        FlowDirection="LeftToRight">
+                                                <Image Width="32"
+                                                       Height="32"
+                                                       Margin="32,0,0,0"
+                                                       FlowDirection="LeftToRight"
+                                                       Source="{Binding Image, IsAsync=True}" />
                                             </StackPanel>
-                                            <StackPanel Grid.Column="1" Margin="12 0 14 0">
-                                                <TextBlock Text="{Binding PluginPair.Metadata.Name}"
-                                                           TextWrapping="Wrap"
-                                                           ToolTip="{Binding PluginPair.Metadata.Version}" />
-                                                <TextBlock TextWrapping="Wrap" Margin="0 2 0 0" Foreground="#5f5f5f">
-                                                    <Run Text="{Binding PluginPair.Metadata.Description}" FontSize="12" />
+                                            <StackPanel Grid.Column="1" Margin="12,0,14,0">
+                                                <TextBlock Text="{Binding PluginPair.Metadata.Name}" TextWrapping="Wrap" ToolTip="{Binding PluginPair.Metadata.Version}" />
+                                                <TextBlock Margin="0,2,0,0" Foreground="#5f5f5f" TextWrapping="Wrap">
+                                                    <Run FontSize="12" Text="{Binding PluginPair.Metadata.Description}" />
                                                 </TextBlock>
                                             </StackPanel>
                                             <StackPanel Grid.Column="3" Orientation="Horizontal">
-                                                <TextBlock Text="{DynamicResource priority}" Margin="0,0,8,0"
-                                                           MaxWidth="100" VerticalAlignment="Center" FontSize="12"/>
+                                                <TextBlock MaxWidth="100"
+                                                           Margin="0,0,8,0"
+                                                           VerticalAlignment="Center"
+                                                           FontSize="12"
+                                                           Text="{DynamicResource priority}" />
                                                 <Border CornerRadius="5">
-                                                    <Button x:Name="PriorityButton" Content="{Binding Priority, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center"
-                                                           ToolTip="Change Plugin Results Priority"
-                                                           Margin="5 0 0 0" Cursor="Hand"
-                                                           Click="OnPluginPriorityClick">
+                                                    <Button x:Name="PriorityButton"
+                                                            Margin="5,0,0,0"
+                                                            VerticalAlignment="Center"
+                                                            Click="OnPluginPriorityClick"
+                                                            Content="{Binding Priority, UpdateSourceTrigger=PropertyChanged}"
+                                                            Cursor="Hand"
+                                                            ToolTip="Change Plugin Results Priority">
                                                         <!--#region Priority Button Style-->
                                                         <Button.Resources>
                                                             <Style TargetType="Border">
-                                                                <Setter Property="CornerRadius" Value="2"/>
+                                                                <Setter Property="CornerRadius" Value="2" />
                                                             </Style>
                                                         </Button.Resources>
                                                         <Button.Style>
                                                             <Style TargetType="Button">
-                                                                <Setter Property="Padding" Value="12 8 12 8" />
+                                                                <Setter Property="Padding" Value="12,8,12,8" />
                                                                 <Setter Property="BorderThickness" Value="0" />
                                                                 <Setter Property="FontWeight" Value="DemiBold" />
                                                                 <Setter Property="Foreground" Value="Black" />
@@ -718,43 +759,63 @@
                                                     </Button>
                                                 </Border>
                                             </StackPanel>
-                                            <ui:ToggleSwitch Grid.Column="4" OffContent="{DynamicResource disable}"
-                                                             OnContent="{DynamicResource enable}"
-                                                             MaxWidth="110" HorizontalAlignment="Right"
-                                                             IsOn="{Binding PluginState}" />
+                                            <ui:ToggleSwitch Grid.Column="4"
+                                                             MaxWidth="110"
+                                                             HorizontalAlignment="Right"
+                                                             IsOn="{Binding PluginState}"
+                                                             OffContent="{DynamicResource disable}"
+                                                             OnContent="{DynamicResource enable}" />
                                         </Grid>
 
                                     </Expander.Header>
 
                                     <Grid FlowDirection="LeftToRight">
-                                        <StackPanel Orientation="Vertical" Margin="0 12 0 0">
+                                        <StackPanel Margin="0,12,0,0" Orientation="Vertical">
                                             <StackPanel>
-                                                <Border Style="{DynamicResource SettingGroupBox}"
-                                                        Visibility="{Binding ActionKeywordsVisibility}" Height="52" Padding="0"
-                                                        Width="auto" BorderThickness="0 1 0 0" CornerRadius="0">
-                                                    <ItemsControl VerticalAlignment="Center" Padding="22 0 18 0">
+                                                <Border Width="auto"
+                                                        Height="52"
+                                                        Padding="0"
+                                                        BorderThickness="0,1,0,0"
+                                                        CornerRadius="0"
+                                                        Style="{DynamicResource SettingGroupBox}"
+                                                        Visibility="{Binding ActionKeywordsVisibility}">
+                                                    <ItemsControl Padding="22,0,18,0" VerticalAlignment="Center">
                                                         <DockPanel>
-                                                            <TextBlock FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20" DockPanel.Dock="Left"
-                                       VerticalAlignment="Center" Margin="48 0 10 0">&#xe819;</TextBlock>
-                                                            <TextBlock Grid.Column="0" Text="{DynamicResource actionKeywords}"
+                                                            <TextBlock Margin="48,0,10,0"
+                                                                       VerticalAlignment="Center"
+                                                                       DockPanel.Dock="Left"
+                                                                       FontFamily="/Resources/#Segoe Fluent Icons"
+                                                                       FontSize="20">
+                                                                &#xe819;
+                                                            </TextBlock>
+                                                            <TextBlock Grid.Column="0"
+                                                                       Margin="0,0,0,0"
+                                                                       HorizontalAlignment="Left"
+                                                                       VerticalAlignment="Center"
+                                                                       DockPanel.Dock="Left"
                                                                        Style="{DynamicResource SettingTitleLabel}"
-                                                                       Margin="0 0 0 0"  VerticalAlignment="Center" HorizontalAlignment="Left" DockPanel.Dock="Left"/>
-
-
-                                                            <Button Grid.Column="2" Content="{Binding ActionKeywordsText}"
-                                                                       DockPanel.Dock="Right"
-                                                                       Visibility="{Binding ActionKeywordsVisibility}"
-                                                                       ToolTip="Change Action Keywords"
-                                                                       Margin="5 0 0 0" Cursor="Hand" FontWeight="Bold"
-                                                                       Click="OnPluginActionKeywordsClick" HorizontalAlignment="Right"
-                                                                       Width="100" Height="40">
+                                                                       Text="{DynamicResource actionKeywords}" />
+
+
+                                                            <Button Grid.Column="2"
+                                                                    Width="100"
+                                                                    Height="40"
+                                                                    Margin="5,0,0,0"
+                                                                    HorizontalAlignment="Right"
+                                                                    Click="OnPluginActionKeywordsClick"
+                                                                    Content="{Binding ActionKeywordsText}"
+                                                                    Cursor="Hand"
+                                                                    DockPanel.Dock="Right"
+                                                                    FontWeight="Bold"
+                                                                    ToolTip="Change Action Keywords"
+                                                                    Visibility="{Binding ActionKeywordsVisibility}">
 
                                                                 <Button.Resources>
                                                                     <Style TargetType="Border">
-                                                                        <Setter Property="CornerRadius" Value="2"/>
-                                                                        <Setter Property="BorderThickness" Value="1 1 1 2"/>
-                                                                        <Setter Property="BorderBrush" Value="#ececec"/>
-                                                                        <Setter Property="Background" Value="#ffffff"/>
+                                                                        <Setter Property="CornerRadius" Value="2" />
+                                                                        <Setter Property="BorderThickness" Value="1,1,1,2" />
+                                                                        <Setter Property="BorderBrush" Value="#ececec" />
+                                                                        <Setter Property="Background" Value="#ffffff" />
 
                                                                     </Style>
                                                                 </Button.Resources>
@@ -768,10 +829,13 @@
                                             <StackPanel>
 
 
-                                                <Border Background="White" Padding="0"
-                                                        BorderThickness="0 1 0 0" BorderBrush="#e6e6e6"
-                                                        VerticalAlignment="Center" HorizontalAlignment="Stretch">
-                                                    <!--#region SubInfo Styling -->
+                                                <Border Padding="0"
+                                                        HorizontalAlignment="Stretch"
+                                                        VerticalAlignment="Center"
+                                                        Background="White"
+                                                        BorderBrush="#e6e6e6"
+                                                        BorderThickness="0,1,0,0">
+                                                    <!--#region SubInfo Styling-->
                                                     <Border.Style>
                                                         <Style TargetType="{x:Type Border}">
                                                             <Setter Property="Visibility" Value="Visible" />
@@ -786,60 +850,106 @@
                                                     </Border.Style>
                                                 </Border>
                                                 <!--#endregion-->
-                                                <ContentControl x:Name="PluginSettingControl" 
-                                                        Content="{Binding SettingControl}"
-                                                        Padding="1" Margin="0" VerticalAlignment="Stretch"
-                                                        MaxWidth="750" MaxHeight="550">
-                                                </ContentControl>
+                                                <ContentControl x:Name="PluginSettingControl"
+                                                                MaxWidth="750"
+                                                                MaxHeight="550"
+                                                                Margin="0"
+                                                                Padding="1"
+                                                                VerticalAlignment="Stretch"
+                                                                Content="{Binding SettingControl}" />
 
                                             </StackPanel>
 
                                             <StackPanel>
-                                                <Border Style="{DynamicResource SettingGroupBox}" CornerRadius="0"
-                                                        Visibility="{Binding ActionKeywordsVisibility}"
-                                                        VerticalAlignment="Center" Margin="0" BorderThickness="0 1 0 0"
-                                                        Padding="0 12 0 0" >
+                                                <Border Margin="0"
+                                                        Padding="0,12,0,0"
+                                                        VerticalAlignment="Center"
+                                                        BorderThickness="0,1,0,0"
+                                                        CornerRadius="0"
+                                                        Style="{DynamicResource SettingGroupBox}"
+                                                        Visibility="{Binding ActionKeywordsVisibility}">
                                                     <ItemsControl Style="{DynamicResource SettingGrid}">
-                                                        <StackPanel Style="{StaticResource TextPanel}"
-                                                               Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0 0 -14 0">
-                                                            <TextBlock Text="{DynamicResource author}" 
-                                                                       FontSize="11" Margin="10 0 0 0" MaxWidth="100" Foreground="#8F8F8F" />
-                                                            <TextBlock Text="{Binding PluginPair.Metadata.Author}" FontSize="11" Foreground="#8F8F8F"
-                                                                       Margin="5 0 0 0" MaxWidth="100" />
-                                                            <TextBlock Text="|"
-                                                                       FontSize="11" Margin="5 0 0 0" MaxWidth="100" Foreground="#8F8F8F"
-                                                                       VerticalAlignment="Center" />
-                                                            <TextBlock Text="{DynamicResource plugin_init_time}" 
-                                                                       FontSize="11" Margin="5 0 0 0" MaxWidth="100" Foreground="#8F8F8F" />
-                                                            <TextBlock Text="{Binding InitilizaTime}" FontSize="11" Foreground="#8F8F8F"
-                                                                       Margin="5 0 0 0" MaxWidth="100" />
-                                                            <TextBlock Text="|"
-                                                                       FontSize="11" Margin="5 0 0 0" MaxWidth="100" Foreground="#8F8F8F"
-                                                                       VerticalAlignment="Center" />
-                                                            <TextBlock Text="{DynamicResource plugin_query_time}"
-                                                                       FontSize="11" Margin="5 0 0 0" MaxWidth="100" Foreground="#8F8F8F" />
-                                                            <TextBlock Text="{Binding QueryTime}" FontSize="11" Foreground="#8F8F8F"
-                                                                       Margin="5 0 0 0" MaxWidth="100" />
-                                                            <TextBlock Text="| version"
-                                                                       FontSize="11" Margin="5 0 0 0" MaxWidth="100" Foreground="#8F8F8F"
-                                                                       VerticalAlignment="Center" />
-                                                            <TextBlock Text="{Binding PluginPair.Metadata.Version}" Foreground="#8F8F8F"
-                                                                       FontSize="11" Margin="5 0 0 0" MaxWidth="100"
-                                                                       VerticalAlignment="Center" />
-
-                                                            <TextBlock
-                                                                   MaxWidth="120" Cursor="Hand" Margin="10,0,0,0"
-                                                                   HorizontalAlignment="Right" FontSize="12" VerticalAlignment="Center">
-                                                                  <Hyperlink NavigateUri="{Binding PluginPair.Metadata.Website}"
-                                                                        RequestNavigate="OnRequestNavigate" Foreground="#8F8F8F">
-                                                                       <Run Text="Website" />
+                                                        <StackPanel Margin="0,0,-14,0"
+                                                                    HorizontalAlignment="Right"
+                                                                    VerticalAlignment="Center"
+                                                                    Orientation="Horizontal"
+                                                                    Style="{StaticResource TextPanel}">
+                                                            <TextBlock MaxWidth="100"
+                                                                       Margin="10,0,0,0"
+                                                                       FontSize="11"
+                                                                       Foreground="#8F8F8F"
+                                                                       Text="{DynamicResource author}" />
+                                                            <TextBlock MaxWidth="100"
+                                                                       Margin="5,0,0,0"
+                                                                       FontSize="11"
+                                                                       Foreground="#8F8F8F"
+                                                                       Text="{Binding PluginPair.Metadata.Author}" />
+                                                            <TextBlock MaxWidth="100"
+                                                                       Margin="5,0,0,0"
+                                                                       VerticalAlignment="Center"
+                                                                       FontSize="11"
+                                                                       Foreground="#8F8F8F"
+                                                                       Text="|" />
+                                                            <TextBlock MaxWidth="100"
+                                                                       Margin="5,0,0,0"
+                                                                       FontSize="11"
+                                                                       Foreground="#8F8F8F"
+                                                                       Text="{DynamicResource plugin_init_time}" />
+                                                            <TextBlock MaxWidth="100"
+                                                                       Margin="5,0,0,0"
+                                                                       FontSize="11"
+                                                                       Foreground="#8F8F8F"
+                                                                       Text="{Binding InitilizaTime}" />
+                                                            <TextBlock MaxWidth="100"
+                                                                       Margin="5,0,0,0"
+                                                                       VerticalAlignment="Center"
+                                                                       FontSize="11"
+                                                                       Foreground="#8F8F8F"
+                                                                       Text="|" />
+                                                            <TextBlock MaxWidth="100"
+                                                                       Margin="5,0,0,0"
+                                                                       FontSize="11"
+                                                                       Foreground="#8F8F8F"
+                                                                       Text="{DynamicResource plugin_query_time}" />
+                                                            <TextBlock MaxWidth="100"
+                                                                       Margin="5,0,0,0"
+                                                                       FontSize="11"
+                                                                       Foreground="#8F8F8F"
+                                                                       Text="{Binding QueryTime}" />
+                                                            <TextBlock MaxWidth="100"
+                                                                       Margin="5,0,0,0"
+                                                                       VerticalAlignment="Center"
+                                                                       FontSize="11"
+                                                                       Foreground="#8F8F8F"
+                                                                       Text="| version" />
+                                                            <TextBlock MaxWidth="100"
+                                                                       Margin="5,0,0,0"
+                                                                       VerticalAlignment="Center"
+                                                                       FontSize="11"
+                                                                       Foreground="#8F8F8F"
+                                                                       Text="{Binding PluginPair.Metadata.Version}" />
+
+                                                            <TextBlock MaxWidth="120"
+                                                                       Margin="10,0,0,0"
+                                                                       HorizontalAlignment="Right"
+                                                                       VerticalAlignment="Center"
+                                                                       Cursor="Hand"
+                                                                       FontSize="12">
+                                                                <Hyperlink Foreground="#8F8F8F" NavigateUri="{Binding PluginPair.Metadata.Website}" RequestNavigate="OnRequestNavigate">
+                                                                    <Run Text="Website" />
                                                                 </Hyperlink>
                                                             </TextBlock>
 
-                                                            <TextBlock Text="{DynamicResource pluginDirectory}"
-                                                                   MaxWidth="120" Cursor="Hand" Margin="10,0,0,0"
-                                                                   MouseUp="OnPluginDirecotyClick" Foreground="#8f8f8f"
-                                                                   HorizontalAlignment="Right" FontSize="12" VerticalAlignment="Center" TextDecorations="Underline"/>
+                                                            <TextBlock MaxWidth="120"
+                                                                       Margin="10,0,0,0"
+                                                                       HorizontalAlignment="Right"
+                                                                       VerticalAlignment="Center"
+                                                                       Cursor="Hand"
+                                                                       FontSize="12"
+                                                                       Foreground="#8f8f8f"
+                                                                       MouseUp="OnPluginDirecotyClick"
+                                                                       Text="{DynamicResource pluginDirectory}"
+                                                                       TextDecorations="Underline" />
                                                         </StackPanel>
 
                                                     </ItemsControl>
@@ -858,7 +968,7 @@
             </Grid>
         </TabItem>
 
-        <!--#region Plugin Store -->
+        <!--#region Plugin Store-->
         <TabItem>
             <TabItem.Header>
                 <Grid>
@@ -866,8 +976,10 @@
                         <ColumnDefinition Width="Auto" />
                         <ColumnDefinition />
                     </Grid.ColumnDefinitions>
-                    <TextBlock Grid.Column="0" FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20"
-                               Margin="0 0 12 0">
+                    <TextBlock Grid.Column="0"
+                               Margin="0,0,12,0"
+                               FontFamily="/Resources/#Segoe Fluent Icons"
+                               FontSize="20">
                         &#xe719;
                     </TextBlock>
                     <TextBlock Grid.Column="1" Text="{DynamicResource pluginStore}" />
@@ -876,60 +988,94 @@
 
             <Grid>
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition></ColumnDefinition>
-                    <ColumnDefinition></ColumnDefinition>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
                 </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="72"></RowDefinition>
-                    <RowDefinition Height="*"></RowDefinition>
+                    <RowDefinition Height="72" />
+                    <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
-                <Border Grid.Row="0" Grid.Column="0" Background="#f3f3f3" Padding="5 18 0 0">
-                    <TextBlock Text="{DynamicResource pluginStore}" TextAlignment="left" FontSize="30" Margin="0 5 0 5"/>
+                <Border Grid.Row="0"
+                        Grid.Column="0"
+                        Padding="5,18,0,0"
+                        Background="#f3f3f3">
+                    <TextBlock Margin="0,5,0,5"
+                               FontSize="30"
+                               Text="{DynamicResource pluginStore}"
+                               TextAlignment="left" />
                 </Border>
-                <Border Grid.Row="0" Grid.Column="1" Background="#f3f3f3" Padding="5 18 32 0">
-                    <Button Content="{DynamicResource refresh}" 
-                            FontSize="13" 
-                            Margin="0 5 0 5" 
-                            HorizontalAlignment="Right" 
-                            Background="#ffffff" 
-                            Padding="12 4 12 4" 
-                            Height="34" 
-                            BorderBrush="#cecece" 
+                <Border Grid.Row="0"
+                        Grid.Column="1"
+                        Padding="5,18,32,0"
+                        Background="#f3f3f3">
+                    <Button Height="34"
+                            Margin="0,5,0,5"
+                            Padding="12,4,12,4"
+                            HorizontalAlignment="Right"
+                            Background="#ffffff"
+                            BorderBrush="#cecece"
+                            BorderThickness="1,1,1,2"
                             Click="OnPluginStoreRefreshClick"
-                            BorderThickness="1 1 1 2"/>
+                            Content="{DynamicResource refresh}"
+                            FontSize="13" />
                 </Border>
-                <Border Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Background="#f3f3f3" Padding="0 0 0 0">
-                    <ListBox  x:Name="StoreListBox"
+                <Border Grid.Row="1"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="2"
+                        Padding="0,0,0,0"
+                        Background="#f3f3f3">
+                    <ListBox x:Name="StoreListBox"
+                             Width="Auto"
+                             Margin="6,0,0,0"
+                             Padding="0,0,0,0"
+                             HorizontalAlignment="Stretch"
+                             VerticalContentAlignment="Center"
+                             ItemContainerStyle="{StaticResource StoreList}"
                              ItemsSource="{Binding ExternalPlugins}"
-                             Margin="6, 0, 0, 0" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                             ItemContainerStyle="{StaticResource StoreList}" SelectionMode="Single"
-                             Padding="0 0 0 0" Width="Auto" VerticalContentAlignment="Center" HorizontalAlignment="Stretch">
+                             ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                             SelectionMode="Single">
                         <ListBox.ItemsPanel>
                             <ItemsPanelTemplate>
-                                <UniformGrid IsItemsHost="True" HorizontalAlignment="Left" Columns="2" Margin="0 0 6 18" VerticalAlignment="Top" SnapsToDevicePixels="True"/>
+                                <UniformGrid Margin="0,0,6,18"
+                                             HorizontalAlignment="Left"
+                                             VerticalAlignment="Top"
+                                             Columns="2"
+                                             IsItemsHost="True"
+                                             SnapsToDevicePixels="True" />
                             </ItemsPanelTemplate>
                         </ListBox.ItemsPanel>
                         <ListBox.ItemTemplate>
                             <DataTemplate>
-                                <!-- Hover Layout Style-->
-
-                                <ToggleButton IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}},Path=IsSelected}" Background="Transparent" 
-                                                  Width="{Binding ActualWidth,RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}}" 
-                                                  HorizontalAlignment="Left" HorizontalContentAlignment="left" Style="{StaticResource StoreItem}">
+                                <!--  Hover Layout Style  -->
+
+                                <ToggleButton Width="{Binding ActualWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}}"
+                                              HorizontalAlignment="Left"
+                                              HorizontalContentAlignment="left"
+                                              Background="Transparent"
+                                              IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}, Path=IsSelected}"
+                                              Style="{StaticResource StoreItem}">
                                     <ToggleButton.Template>
                                         <ControlTemplate TargetType="{x:Type ButtonBase}">
-                                            <ContentPresenter x:Name="contentPresenter" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                                            <ControlTemplate.Triggers/>
+                                            <ContentPresenter x:Name="contentPresenter"
+                                                              Margin="{TemplateBinding Padding}"
+                                                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                              Content="{TemplateBinding Content}"
+                                                              ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                              Focusable="False"
+                                                              RecognizesAccessKey="True"
+                                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                            <ControlTemplate.Triggers />
                                         </ControlTemplate>
                                     </ToggleButton.Template>
-                                    
+
                                     <Grid HorizontalAlignment="Left" VerticalAlignment="Stretch">
                                         <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="72"/>
+                                            <ColumnDefinition Width="72" />
                                             <ColumnDefinition Width="*" />
                                         </Grid.ColumnDefinitions>
-                                        <StackPanel Grid.Column="0" Margin="0 0 0 0"
-                                                        VerticalAlignment="Center" >
+                                        <StackPanel Grid.Column="0" Margin="0,0,0,0" VerticalAlignment="Center">
                                             <StackPanel.Style>
                                                 <Style>
                                                     <Setter Property="StackPanel.Visibility" Value="Visible" />
@@ -940,11 +1086,16 @@
                                                     </Style.Triggers>
                                                 </Style>
                                             </StackPanel.Style>
-                                            <Image Source="{Binding IcoPath, IsAsync=True}"
-                                                   Width="32" Height="32" Margin="8 0 6 0"
-                                                   VerticalAlignment="Center"/>
+                                            <Image Width="32"
+                                                   Height="32"
+                                                   Margin="8,0,6,0"
+                                                   VerticalAlignment="Center"
+                                                   Source="{Binding IcoPath, IsAsync=True}" />
                                         </StackPanel>
-                                        <StackPanel Grid.Column="1" Margin="0 0 8 0" VerticalAlignment="Center" Panel.ZIndex="0">
+                                        <StackPanel Grid.Column="1"
+                                                    Margin="0,0,8,0"
+                                                    VerticalAlignment="Center"
+                                                    Panel.ZIndex="0">
                                             <StackPanel.Style>
                                                 <Style>
                                                     <Setter Property="StackPanel.Visibility" Value="Visible" />
@@ -955,15 +1106,22 @@
                                                     </Style.Triggers>
                                                 </Style>
                                             </StackPanel.Style>
-                                            <TextBlock Text="{Binding Name}"
-                                                           TextWrapping="WrapWithOverflow" Padding="0 0 20 0"
-                                                           ToolTip="{Binding Version}" />
-                                            <TextBlock TextWrapping="WrapWithOverflow" Margin="0 2 0 0" Padding="0 0 20 0" Foreground="#5f5f5f">
-                                                    <Run Text="{Binding Description}" FontSize="12" Foreground="#5f5f5f"/>
+                                            <TextBlock Padding="0,0,20,0"
+                                                       Text="{Binding Name}"
+                                                       TextWrapping="WrapWithOverflow"
+                                                       ToolTip="{Binding Version}" />
+                                            <TextBlock Margin="0,2,0,0"
+                                                       Padding="0,0,20,0"
+                                                       Foreground="#5f5f5f"
+                                                       TextWrapping="WrapWithOverflow">
+                                                <Run FontSize="12" Foreground="#5f5f5f" Text="{Binding Description}" />
                                             </TextBlock>
 
-                                        </StackPanel >
-                                        <StackPanel Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                                        </StackPanel>
+                                        <StackPanel Grid.Column="0"
+                                                    Grid.ColumnSpan="2"
+                                                    HorizontalAlignment="Stretch"
+                                                    VerticalAlignment="Stretch">
                                             <StackPanel.Style>
                                                 <Style>
                                                     <Setter Property="StackPanel.Visibility" Value="Collapsed" />
@@ -976,38 +1134,50 @@
                                             </StackPanel.Style>
 
 
-                                            <Grid Height="94" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Panel.ZIndex="1">
+                                            <Grid Height="94"
+                                                  HorizontalAlignment="Stretch"
+                                                  VerticalAlignment="Stretch"
+                                                  Panel.ZIndex="1">
                                                 <Grid.Background>
-                                                    <SolidColorBrush Color="#f6f6f6" Opacity=".95"/>
+                                                    <SolidColorBrush Opacity=".95" Color="#f6f6f6" />
                                                 </Grid.Background>
                                                 <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="{Binding ActualWidth,RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}}" />
+                                                    <ColumnDefinition Width="{Binding ActualWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}}" />
                                                 </Grid.ColumnDefinitions>
 
-                                                <StackPanel Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Stretch">
+                                                <StackPanel Grid.Column="0" HorizontalAlignment="Stretch" VerticalAlignment="Center">
                                                     <StackPanel Orientation="Horizontal">
-                                                        <TextBlock Text="{Binding Name}" FontWeight="Bold"
-                                                           TextWrapping="WrapWithOverflow" Padding="0 0 0 0" Margin="20 0 0 0"
-                                                           ToolTip="{Binding Name}" />
-                                                        <TextBlock Text="{Binding Version}"
-                                                           TextWrapping="WrapWithOverflow" Padding="0 0 20 0" Margin="10 0 0 0"
-                                                           ToolTip="{Binding Version}" />
+                                                        <TextBlock Margin="20,0,0,0"
+                                                                   Padding="0,0,0,0"
+                                                                   FontWeight="Bold"
+                                                                   Text="{Binding Name}"
+                                                                   TextWrapping="WrapWithOverflow"
+                                                                   ToolTip="{Binding Name}" />
+                                                        <TextBlock Margin="10,0,0,0"
+                                                                   Padding="0,0,20,0"
+                                                                   Text="{Binding Version}"
+                                                                   TextWrapping="WrapWithOverflow"
+                                                                   ToolTip="{Binding Version}" />
                                                     </StackPanel>
-                                                    <StackPanel Orientation="Vertical" Margin="20 2 120 0">
-                                                        <TextBlock TextWrapping="Wrap"  Padding="0 0 0 0" >
-                                                            <Hyperlink NavigateUri="{Binding Website}"
-                                                                        RequestNavigate="OnRequestNavigate" Foreground="#5F5F5F">
-                                                                <Run Text="{Binding Author}" FontSize="12" />
+                                                    <StackPanel Margin="20,2,120,0" Orientation="Vertical">
+                                                        <TextBlock Padding="0,0,0,0" TextWrapping="Wrap">
+                                                            <Hyperlink Foreground="#5F5F5F" NavigateUri="{Binding Website}" RequestNavigate="OnRequestNavigate">
+                                                                <Run FontSize="12" Text="{Binding Author}" />
                                                             </Hyperlink>
                                                         </TextBlock>
                                                     </StackPanel>
                                                 </StackPanel>
-                                                <Border Padding="0 0 20 0">
-                                                    <Button Foreground="Black" Name="ShortCutButtonPrev" Content="{DynamicResource install}"
-                                                           Click="OnExternalPluginInstallClick"
-                                                            Width="90" MinHeight="40" HorizontalAlignment="Right"
-                                                            VerticalAlignment="Center" Grid.Column="1" Margin="0 0 0 0">
-                                                    </Button>
+                                                <Border Padding="0,0,20,0">
+                                                    <Button Name="ShortCutButtonPrev"
+                                                            Grid.Column="1"
+                                                            Width="90"
+                                                            MinHeight="40"
+                                                            Margin="0,0,0,0"
+                                                            HorizontalAlignment="Right"
+                                                            VerticalAlignment="Center"
+                                                            Click="OnExternalPluginInstallClick"
+                                                            Content="{DynamicResource install}"
+                                                            Foreground="Black" />
                                                 </Border>
                                             </Grid>
                                         </StackPanel>
@@ -1030,33 +1200,41 @@
                         <ColumnDefinition Width="Auto" />
                         <ColumnDefinition />
                     </Grid.ColumnDefinitions>
-                    <TextBlock Grid.Column="0" FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20"
-                               Margin="0 0 12 0">
+                    <TextBlock Grid.Column="0"
+                               Margin="0,0,12,0"
+                               FontFamily="/Resources/#Segoe Fluent Icons"
+                               FontSize="20">
                         &#xe790;
                     </TextBlock>
                     <TextBlock Grid.Column="1" Text="{DynamicResource theme}" />
                 </Grid>
             </TabItem.Header>
-            <Border Padding=" 0 0 0 0 ">
-                <ScrollViewer ScrollViewer.CanContentScroll="False"
-                              Margin="0,0,0,0" Background="#f3f3f3" Padding="6 0 24 0">
-                    <Grid Margin="0 0 0 0" Background="#f3f3f3">
+            <Border Padding="0,0,0,0">
+                <ScrollViewer Margin="0,0,0,0"
+                              Padding="6,0,24,0"
+                              Background="#f3f3f3"
+                              ScrollViewer.CanContentScroll="False">
+                    <Grid Margin="0,0,0,0" Background="#f3f3f3">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="0" />
                             <RowDefinition Height="350" />
-                            <RowDefinition  />
+                            <RowDefinition />
                             <RowDefinition />
                             <RowDefinition Height="*" />
                         </Grid.RowDefinitions>
-                        <Border Padding="5 18 0 0" Grid.Row="0">
-                            <TextBlock Text="{DynamicResource theme}" TextAlignment="left" FontSize="30"
-                                       Margin="0 5 0 5" />
+                        <Border Grid.Row="0" Padding="5,18,0,0">
+                            <TextBlock Margin="0,5,0,5"
+                                       FontSize="30"
+                                       Text="{DynamicResource theme}"
+                                       TextAlignment="left" />
                         </Border>
 
-                        <StackPanel Background="{Binding PreviewBackground}" Grid.Row="1" Margin="0">
-                            <StackPanel Orientation="Horizontal" Margin="0 30 0 0"
-                                        HorizontalAlignment="Center" VerticalAlignment="Center">
-                                <Border Width="500" Style="{DynamicResource WindowBorderStyle}">
+                        <StackPanel Grid.Row="1" Margin="0" Background="{Binding PreviewBackground}">
+                            <StackPanel Margin="0,30,0,0"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        Orientation="Horizontal">
+                                <Border Width="{Binding WindowWidthSize}" Style="{DynamicResource WindowBorderStyle}">
                                     <Border Style="{DynamicResource WindowRadius}">
                                         <Border.Clip>
                                             <MultiBinding Converter="{StaticResource BorderClipConverter}">
@@ -1072,27 +1250,25 @@
                                                 <RowDefinition />
                                             </Grid.RowDefinitions>
                                             <Border Grid.Row="0">
-                                                <TextBox
-                                                    Text="{DynamicResource hiThere}" IsReadOnly="True"
-                                                    Style="{DynamicResource QueryBoxStyle}" />
+                                                <TextBox IsReadOnly="True" Style="{DynamicResource QueryBoxStyle}" Text="{DynamicResource hiThere}" />
 
                                             </Border>
                                             <Canvas Style="{DynamicResource SearchIconPosition}">
-                                                <Path Data="{DynamicResource SearchIconImg}"
-                                                      Style="{DynamicResource SearchIconStyle}" Margin="0"
-                                                      Stretch="Fill" />
+                                                <Path Margin="0"
+                                                      Data="{DynamicResource SearchIconImg}"
+                                                      Stretch="Fill"
+                                                      Style="{DynamicResource SearchIconStyle}" />
                                             </Canvas>
 
-                                            <Border Margin="0 0 0 0" Grid.Row="1">
-                                                <Rectangle Width="Auto" HorizontalAlignment="Stretch"
+                                            <Border Grid.Row="1" Margin="0,0,0,0">
+                                                <Rectangle Width="Auto"
+                                                           HorizontalAlignment="Stretch"
                                                            Style="{DynamicResource SeparatorStyle}"
                                                            Visibility="Visible" />
                                             </Border>
 
                                             <ContentControl Grid.Row="2">
-                                                <flowlauncher:ResultListBox
-                                                    DataContext="{Binding PreviewResults, Mode=OneTime}"
-                                                    Visibility="Visible" />
+                                                <flowlauncher:ResultListBox DataContext="{Binding PreviewResults, Mode=OneTime}" Visibility="Visible" />
                                             </ContentControl>
 
                                         </Grid>
@@ -1101,34 +1277,73 @@
                             </StackPanel>
                         </StackPanel>
 
-                        <StackPanel Grid.Row="2" VerticalAlignment="Top">
-                            <Border Style="{DynamicResource SettingGroupBox}" Margin="0 12 0 0">
+                        <StackPanel Grid.Row="2" Orientation="Vertical">
+                            <Border Margin="0,12,0,0" Style="{DynamicResource SettingGroupBox}">
                                 <ItemsControl Style="{StaticResource SettingGrid}">
                                     <StackPanel Style="{StaticResource TextPanel}">
-                                        <TextBlock Text="{DynamicResource queryWindowShadowEffect}"
-                                                   Style="{DynamicResource SettingTitleLabel}" />
-                                        <TextBlock Text="{DynamicResource shadowEffectCPUUsage}"
-                                                   Style="{DynamicResource SettingSubTitleLabel}" />
+                                        <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource queryWindowShadowEffect}" />
+                                        <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource shadowEffectCPUUsage}" />
                                     </StackPanel>
-                                    <ui:ToggleSwitch IsOn="{Binding DropShadowEffect, Mode=TwoWay}" Width="80"
-                                                     Grid.Column="2" Grid.Row="0" Margin="0 0 18 0" />
-                                    <TextBlock FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20"
-                                               Grid.Column="0" VerticalAlignment="Center" Margin="24 0 16 0">
+                                    <ui:ToggleSwitch Grid.Row="0"
+                                                     Grid.Column="2"
+                                                     Width="80"
+                                                     Margin="0,0,18,0"
+                                                     IsOn="{Binding DropShadowEffect, Mode=TwoWay}" />
+                                    <TextBlock Grid.Column="0"
+                                               Margin="24,0,16,0"
+                                               VerticalAlignment="Center"
+                                               FontFamily="/Resources/#Segoe Fluent Icons"
+                                               FontSize="20">
                                         &#xeb91;
                                     </TextBlock>
                                 </ItemsControl>
                             </Border>
+                            <Border Margin="0,12,0,0" Style="{DynamicResource SettingGroupBox}">
+                                <ItemsControl Style="{StaticResource SettingGrid}">
+                                    <StackPanel Style="{StaticResource TextPanel}">
+                                        <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource windowWidthSize}" />
+                                    </StackPanel>
+                                    <StackPanel Grid.Column="2" Orientation="Horizontal">
+                                        <TextBlock Width="100"
+                                                   Margin="0,0,8,2"
+                                                   VerticalAlignment="Center"
+                                                   Text="{Binding ElementName=WindowWidthValue, Path=Value, UpdateSourceTrigger=PropertyChanged}"
+                                                   TextAlignment="Right" />
+                                        <Slider Name="WindowWidthValue"
+                                                Width="300"
+                                                Margin="0,0,18,0"
+                                                IsMoveToPointEnabled="True"
+                                                IsSnapToTickEnabled="True"
+                                                Maximum="900"
+                                                Minimum="400"
+                                                TickFrequency="10"
+                                                Value="{Binding WindowWidthSize, Mode=TwoWay}" />
+                                    </StackPanel>
+                                    <TextBlock Grid.Column="0"
+                                               Margin="24,0,16,0"
+                                               VerticalAlignment="Center"
+                                               FontFamily="/Resources/#Segoe Fluent Icons"
+                                               FontSize="20">
+                                        &#xe740;
+                                    </TextBlock>
+                                </ItemsControl>
+                            </Border>
                         </StackPanel>
 
                         <StackPanel Grid.Row="3">
-                            <Border Style="{DynamicResource SettingGroupBox}" Margin="0 8 0 0" Padding="0"
-                                    HorizontalAlignment="Stretch">
-                                <ListBox ItemsSource="{Binding Themes}" SelectedItem="{Binding SelectedTheme}"
+                            <Border Margin="0,12,0,0"
+                                    Padding="0"
+                                    HorizontalAlignment="Stretch"
+                                    Style="{DynamicResource SettingGroupBox}">
+                                <ListBox Padding="18"
+                                         HorizontalAlignment="Center"
+                                         HorizontalContentAlignment="Center"
                                          ui:ScrollViewerHelper.AutoHideScrollBars="True"
+                                         Background="#ffffff"
+                                         ItemsSource="{Binding Themes}"
                                          ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                                         ScrollViewer.VerticalScrollBarVisibility="Disabled" Background="#ffffff"
-                                         Padding="18" HorizontalAlignment="Center"
-                                         HorizontalContentAlignment="Center">
+                                         ScrollViewer.VerticalScrollBarVisibility="Disabled"
+                                         SelectedItem="{Binding SelectedTheme}">
                                     <ListBox.ItemContainerStyle>
                                         <Style TargetType="ListBoxItem">
                                             <Style.Triggers>
@@ -1136,33 +1351,38 @@
                                                     <Setter Property="FontWeight" Value="Bold" />
                                                     <Setter Property="Background" Value="#cccccc" />
                                                     <Setter Property="Foreground" Value="Black" />
-                                                    <Setter Property="Margin" Value="12 8 12 8" />
+                                                    <Setter Property="Margin" Value="12,8,12,8" />
                                                     <Setter Property="BorderBrush" Value="#cccccc" />
                                                 </Trigger>
                                                 <Trigger Property="IsMouseOver" Value="True">
-                                                    <Setter Property="Margin" Value="12 8 12 8" />
+                                                    <Setter Property="Margin" Value="12,8,12,8" />
                                                     <Setter Property="Foreground" Value="#3E99D1" />
                                                 </Trigger>
                                                 <Trigger Property="IsMouseOver" Value="False">
                                                     <Setter Property="Background" Value="#f3f3f3" />
                                                     <Setter Property="Foreground" Value="Black" />
-                                                    <Setter Property="Margin" Value="12 8 12 8" />
+                                                    <Setter Property="Margin" Value="12,8,12,8" />
                                                 </Trigger>
                                             </Style.Triggers>
                                         </Style>
                                     </ListBox.ItemContainerStyle>
                                     <ListBox.Template>
-                                        <!-- For Scroll Wheel inside listbox area -->
+                                        <!--  For Scroll Wheel inside listbox area  -->
                                         <ControlTemplate>
                                             <ItemsPresenter />
                                         </ControlTemplate>
                                     </ListBox.Template>
                                     <ListBox.ItemTemplate>
                                         <DataTemplate>
-                                            <Grid Height="40" Width="Auto" Margin="0 0 0 0">
-                                                <TextBlock Text="{Binding}" Margin="0" HorizontalAlignment="Center"
-                                                           VerticalAlignment="Center" Focusable="True" FontSize="13"
-                                                           TextWrapping="Wrap" Padding="10" />
+                                            <Grid Width="Auto" Height="40" Margin="0,0,0,0">
+                                                <TextBlock Margin="0"
+                                                           Padding="10"
+                                                           HorizontalAlignment="Center"
+                                                           VerticalAlignment="Center"
+                                                           Focusable="True"
+                                                           FontSize="13"
+                                                           Text="{Binding}"
+                                                           TextWrapping="Wrap" />
                                             </Grid>
                                         </DataTemplate>
                                     </ListBox.ItemTemplate>
@@ -1175,51 +1395,56 @@
 
                             </Border>
                             <Border>
-                                <TextBlock DockPanel.Dock="Top" Margin="10" HorizontalAlignment="Right">
-                                    <Hyperlink NavigateUri="{Binding Theme, Mode=OneWay}"
-                                               RequestNavigate="OnRequestNavigate">
+                                <TextBlock Margin="10" HorizontalAlignment="Right" DockPanel.Dock="Top">
+                                    <Hyperlink NavigateUri="{Binding Theme, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
                                         <Run Text="{DynamicResource howToCreateTheme}" />
                                     </Hyperlink>
                                 </TextBlock>
                             </Border>
                         </StackPanel>
-
-
-                        <StackPanel Grid.Row="4" Margin="0 0 0 10" Orientation="Vertical">
-
-                            <Border Style="{DynamicResource SettingGroupBox}" Padding="0" CornerRadius="5"
-                                    Margin="0 30 0 0">
+                        <StackPanel Grid.Row="4" Margin="0,0,0,10" Orientation="Vertical">
+                            <Border Margin="0,30,0,0"
+                                    Padding="0"
+                                    CornerRadius="5"
+                                    Style="{DynamicResource SettingGroupBox}">
                                 <StackPanel Orientation="Vertical">
-                                    <Border Style="{DynamicResource SettingGroupBox}" Margin="0" BorderThickness="0">
+                                    <Border Margin="0" BorderThickness="0" Style="{DynamicResource SettingGroupBox}">
                                         <ItemsControl Style="{StaticResource SettingGrid}">
                                             <StackPanel Style="{StaticResource TextPanel}">
-                                                <TextBlock Text="{DynamicResource useGlyphUI}"
-                                                           Style="{DynamicResource SettingTitleLabel}" />
-                                                <TextBlock Text="{DynamicResource useGlyphUIEffect}"
-                                                           Style="{DynamicResource SettingSubTitleLabel}" />
+                                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource useGlyphUI}" />
+                                                <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource useGlyphUIEffect}" />
                                             </StackPanel>
-                                            <ui:ToggleSwitch IsOn="{Binding UseGlyphIcons, Mode=TwoWay}" Width="80"
-                                                             Grid.Column="2" Grid.Row="0" Margin="0 0 18 0" />
-                                            <TextBlock FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20"
-                                                       Grid.Column="0" VerticalAlignment="Center" Margin="24 0 16 0">
+                                            <ui:ToggleSwitch Grid.Row="0"
+                                                             Grid.Column="2"
+                                                             Width="80"
+                                                             Margin="0,0,18,0"
+                                                             IsOn="{Binding UseGlyphIcons, Mode=TwoWay}" />
+                                            <TextBlock Grid.Column="0"
+                                                       Margin="24,0,16,0"
+                                                       VerticalAlignment="Center"
+                                                       FontFamily="/Resources/#Segoe Fluent Icons"
+                                                       FontSize="20">
                                                 &#xf6b8;
                                             </TextBlock>
                                         </ItemsControl>
                                     </Border>
-                                    <Separator BorderBrush="#e5e5e5" BorderThickness="1" Width="Auto" />
-                                    <Border Style="{DynamicResource SettingGroupBox}" Margin="0" BorderThickness="0">
+                                    <Separator Width="Auto" BorderBrush="#e5e5e5" BorderThickness="1" />
+                                    <Border Margin="0" BorderThickness="0" Style="{DynamicResource SettingGroupBox}">
                                         <ItemsControl Style="{StaticResource SettingGrid}">
-                                            <TextBlock Grid.Column="1" Text="{DynamicResource queryBoxFont}"
-                                                       VerticalAlignment="Center" />
-                                            <StackPanel Orientation="Horizontal" Grid.Column="2" Margin="0 0 20 0">
-                                                <ComboBox ItemsSource="{Binding Source={StaticResource SortedFonts}}"
-                                                          SelectedItem="{Binding SelectedQueryBoxFont}"
-                                                          HorizontalAlignment="Left" VerticalAlignment="Top"
-                                                          Width="180" Margin="20 0 0 0" />
-                                                <ComboBox ItemsSource="{Binding SelectedQueryBoxFont.FamilyTypefaces}"
-                                                          SelectedItem="{Binding SelectedQueryBoxFontFaces}"
-                                                          HorizontalAlignment="Left" VerticalAlignment="Top"
-                                                          Width="130" Margin="10 0 0 0">
+                                            <TextBlock Grid.Column="1" VerticalAlignment="Center" Text="{DynamicResource queryBoxFont}" />
+                                            <StackPanel Grid.Column="2" Margin="0,0,20,0" Orientation="Horizontal">
+                                                <ComboBox Width="180"
+                                                          Margin="20,0,0,0"
+                                                          HorizontalAlignment="Left"
+                                                          VerticalAlignment="Top"
+                                                          ItemsSource="{Binding Source={StaticResource SortedFonts}}"
+                                                          SelectedItem="{Binding SelectedQueryBoxFont}" />
+                                                <ComboBox Width="130"
+                                                          Margin="10,0,0,0"
+                                                          HorizontalAlignment="Left"
+                                                          VerticalAlignment="Top"
+                                                          ItemsSource="{Binding SelectedQueryBoxFont.FamilyTypefaces}"
+                                                          SelectedItem="{Binding SelectedQueryBoxFontFaces}">
                                                     <ComboBox.ItemTemplate>
                                                         <DataTemplate>
                                                             <ItemsControl ItemsSource="{Binding AdjustedFaceNames}">
@@ -1233,26 +1458,32 @@
                                                     </ComboBox.ItemTemplate>
                                                 </ComboBox>
                                             </StackPanel>
-                                            <TextBlock FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20"
-                                                       Grid.Column="0" VerticalAlignment="Center" Margin="24 0 16 0">
+                                            <TextBlock Grid.Column="0"
+                                                       Margin="24,0,16,0"
+                                                       VerticalAlignment="Center"
+                                                       FontFamily="/Resources/#Segoe Fluent Icons"
+                                                       FontSize="20">
                                                 &#xe990;
                                             </TextBlock>
                                         </ItemsControl>
                                     </Border>
-                                    <Separator BorderBrush="#e5e5e5" BorderThickness="1" Width="Auto" />
-                                    <Border Style="{DynamicResource SettingGroupBox}" Margin="0" BorderThickness="0">
+                                    <Separator Width="Auto" BorderBrush="#e5e5e5" BorderThickness="1" />
+                                    <Border Margin="0" BorderThickness="0" Style="{DynamicResource SettingGroupBox}">
                                         <ItemsControl Style="{StaticResource SettingGrid}">
-                                            <TextBlock Grid.Column="1" Text="{DynamicResource resultItemFont}"
-                                                       VerticalAlignment="Center" />
-                                            <StackPanel Orientation="Horizontal" Grid.Column="2" Margin="0 0 20 0">
-                                                <ComboBox ItemsSource="{Binding Source={StaticResource SortedFonts}}"
-                                                          SelectedItem="{Binding SelectedResultFont}"
-                                                          HorizontalAlignment="Left" VerticalAlignment="Top"
-                                                          Width="180" Margin="20 -2 0 0" />
-                                                <ComboBox ItemsSource="{Binding SelectedResultFont.FamilyTypefaces}"
-                                                          SelectedItem="{Binding SelectedResultFontFaces}"
-                                                          HorizontalAlignment="Left" VerticalAlignment="Top"
-                                                          Width="130" Margin="10 -2 0 0">
+                                            <TextBlock Grid.Column="1" VerticalAlignment="Center" Text="{DynamicResource resultItemFont}" />
+                                            <StackPanel Grid.Column="2" Margin="0,0,20,0" Orientation="Horizontal">
+                                                <ComboBox Width="180"
+                                                          Margin="20,-2,0,0"
+                                                          HorizontalAlignment="Left"
+                                                          VerticalAlignment="Top"
+                                                          ItemsSource="{Binding Source={StaticResource SortedFonts}}"
+                                                          SelectedItem="{Binding SelectedResultFont}" />
+                                                <ComboBox Width="130"
+                                                          Margin="10,-2,0,0"
+                                                          HorizontalAlignment="Left"
+                                                          VerticalAlignment="Top"
+                                                          ItemsSource="{Binding SelectedResultFont.FamilyTypefaces}"
+                                                          SelectedItem="{Binding SelectedResultFontFaces}">
                                                     <ComboBox.ItemTemplate>
                                                         <DataTemplate>
                                                             <ItemsControl ItemsSource="{Binding AdjustedFaceNames}">
@@ -1266,8 +1497,11 @@
                                                     </ComboBox.ItemTemplate>
                                                 </ComboBox>
                                             </StackPanel>
-                                            <TextBlock FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20"
-                                                       Grid.Column="0" VerticalAlignment="Center" Margin="24 0 16 0">
+                                            <TextBlock Grid.Column="0"
+                                                       Margin="24,0,16,0"
+                                                       VerticalAlignment="Center"
+                                                       FontFamily="/Resources/#Segoe Fluent Icons"
+                                                       FontSize="20">
                                                 &#xe8fd;
                                             </TextBlock>
                                         </ItemsControl>
@@ -1276,17 +1510,23 @@
                             </Border>
 
                             <StackPanel>
-                                <Border Style="{DynamicResource SettingGroupBox}" Margin="0 12 0 18">
+                                <Border Margin="0,12,0,18" Style="{DynamicResource SettingGroupBox}">
                                     <ItemsControl Style="{StaticResource SettingGrid}">
                                         <StackPanel Style="{StaticResource TextPanel}">
-                                            <TextBlock Text="{DynamicResource ThemeFolder}" Style="{DynamicResource SettingTitleLabel}" />
+                                            <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource ThemeFolder}" />
                                         </StackPanel>
-                                        <Button DockPanel.Dock="Top" Margin="0,0,18,0" Width="180"
+                                        <Button Grid.Column="2"
+                                                Width="180"
+                                                Margin="0,0,18,0"
                                                 HorizontalAlignment="Center"
-                                                Click="OpenPluginFolder" Grid.Column="2" Content="{DynamicResource OpenThemeFolder}">
-                                        </Button>
-                                        <TextBlock FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20"
-                                                   Grid.Column="0" VerticalAlignment="Center" Margin="24 0 16 0">
+                                                Click="OpenPluginFolder"
+                                                Content="{DynamicResource OpenThemeFolder}"
+                                                DockPanel.Dock="Top" />
+                                        <TextBlock Grid.Column="0"
+                                                   Margin="24,0,16,0"
+                                                   VerticalAlignment="Center"
+                                                   FontFamily="/Resources/#Segoe Fluent Icons"
+                                                   FontSize="20">
                                             &#xe838;
                                         </TextBlock>
                                     </ItemsControl>
@@ -1306,17 +1546,21 @@
                         <ColumnDefinition Width="Auto" />
                         <ColumnDefinition />
                     </Grid.ColumnDefinitions>
-                    <TextBlock Grid.Column="0" FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20"
-                               Margin="0 0 12 0">
+                    <TextBlock Grid.Column="0"
+                               Margin="0,0,12,0"
+                               FontFamily="/Resources/#Segoe Fluent Icons"
+                               FontSize="20">
                         &#xe92e;
                     </TextBlock>
                     <TextBlock Grid.Column="1" Text="{DynamicResource hotkey}" />
                 </Grid>
             </TabItem.Header>
-            <ScrollViewer ScrollViewer.CanContentScroll="False"
-                          Margin="0,0,0,0" Background="#f3f3f3" Padding="0 0 6 0">
+            <ScrollViewer Margin="0,0,0,0"
+                          Padding="0,0,6,0"
+                          Background="#f3f3f3"
+                          ScrollViewer.CanContentScroll="False">
                 <Border Background="#f3f3f3">
-                    <Grid Margin="5 18 18 10">
+                    <Grid Margin="5,18,18,10">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="43" />
                             <RowDefinition Height="80" />
@@ -1325,83 +1569,99 @@
                             <RowDefinition Height="250" />
                             <RowDefinition Height="70" />
                         </Grid.RowDefinitions>
-                        <TextBlock Text="{DynamicResource hotkey}" Grid.Row="0" TextAlignment="left" FontSize="30"
-                                   Margin="0 5 0 2" />
+                        <TextBlock Grid.Row="0"
+                                   Margin="0,5,0,2"
+                                   FontSize="30"
+                                   Text="{DynamicResource hotkey}"
+                                   TextAlignment="left" />
 
                         <StackPanel Grid.Row="1">
-                            <Border Style="{DynamicResource SettingGroupBox}" Margin="0 12 0 0">
+                            <Border Margin="0,12,0,0" Style="{DynamicResource SettingGroupBox}">
                                 <ItemsControl Style="{StaticResource SettingGrid}">
                                     <StackPanel Style="{StaticResource TextPanel}">
-                                        <TextBlock Text="{DynamicResource flowlauncherHotkey}"
-                                                   Style="{DynamicResource SettingTitleLabel}" />
-                                        <TextBlock Text="{DynamicResource flowlauncherHotkeyToolTip}"
-                                                   Style="{DynamicResource SettingSubTitleLabel}" />
+                                        <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource flowlauncherHotkey}" />
+                                        <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource flowlauncherHotkeyToolTip}" />
                                     </StackPanel>
-                                    <flowlauncher:HotkeyControl x:Name="HotkeyControl" HotkeyChanged="OnHotkeyChanged"
-                                                                Loaded="OnHotkeyControlLoaded" Height="35"
-                                                                Grid.Column="2" Grid.Row="0" Width="300"
-                                                                Margin="0 0 0 0" HorizontalAlignment="Right"
-                                                                HorizontalContentAlignment="Right" />
-
-                                    <TextBlock FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20"
-                                               Grid.Column="0" VerticalAlignment="Center" Margin="24 0 16 0">
+                                    <flowlauncher:HotkeyControl x:Name="HotkeyControl"
+                                                                Grid.Row="0"
+                                                                Grid.Column="2"
+                                                                Width="300"
+                                                                Height="35"
+                                                                Margin="0,0,0,0"
+                                                                HorizontalAlignment="Right"
+                                                                HorizontalContentAlignment="Right"
+                                                                HotkeyChanged="OnHotkeyChanged"
+                                                                Loaded="OnHotkeyControlLoaded" />
+
+                                    <TextBlock Grid.Column="0"
+                                               Margin="24,0,16,0"
+                                               VerticalAlignment="Center"
+                                               FontFamily="/Resources/#Segoe Fluent Icons"
+                                               FontSize="20">
                                         &#xeda7;
                                     </TextBlock>
                                 </ItemsControl>
                             </Border>
                         </StackPanel>
 
-                        <Border Style="{DynamicResource SettingGroupBox}" Padding="0" CornerRadius="5"
-                                Margin="0 12 0 0" Grid.Row="2">
+                        <Border Grid.Row="2"
+                                Margin="0,12,0,0"
+                                Padding="0"
+                                CornerRadius="5"
+                                Style="{DynamicResource SettingGroupBox}">
                             <StackPanel Orientation="Vertical">
-                                <Border Style="{DynamicResource SettingGroupBox}" Margin="0" BorderThickness="0">
+                                <Border Margin="0" BorderThickness="0" Style="{DynamicResource SettingGroupBox}">
                                     <ItemsControl Style="{StaticResource SettingGrid}">
                                         <StackPanel Style="{StaticResource TextPanel}">
-                                        <TextBlock Grid.Column="1" Text="{DynamicResource openResultModifiers}"
-                                                   VerticalAlignment="Center" />
-                                            <TextBlock Text="{DynamicResource openResultModifiersToolTip}"
-                                                   Style="{DynamicResource SettingSubTitleLabel}" />
+                                            <TextBlock Grid.Column="1" VerticalAlignment="Center" Text="{DynamicResource openResultModifiers}" />
+                                            <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource openResultModifiersToolTip}" />
                                         </StackPanel>
-                            <ComboBox Margin="0 0 18 0" Width="120"
+                                        <ComboBox Grid.Column="2"
+                                                  Width="120"
+                                                  Margin="0,0,18,0"
+                                                  FontSize="14"
                                                   ItemsSource="{Binding OpenResultModifiersList}"
-                                                  SelectedItem="{Binding Settings.OpenResultModifiers}" FontSize="14"
-                                                  Grid.Column="2" />
+                                                  SelectedItem="{Binding Settings.OpenResultModifiers}" />
                                     </ItemsControl>
                                 </Border>
 
-                                <Separator BorderBrush="#e5e5e5" BorderThickness="1" Width="Auto" />
-                                <Border Style="{DynamicResource SettingGroupBox}" Margin="0" BorderThickness="0">
+                                <Separator Width="Auto" BorderBrush="#e5e5e5" BorderThickness="1" />
+                                <Border Margin="0" BorderThickness="0" Style="{DynamicResource SettingGroupBox}">
                                     <ItemsControl Style="{StaticResource SettingGrid}">
-                                        <StackPanel Style="{StaticResource TextPanel}" Grid.Column="1">
-                                            <TextBlock Text="{DynamicResource showOpenResultHotkey}"
-                                                       VerticalAlignment="Center" />
-                                            <TextBlock Text="{DynamicResource showOpenResultHotkeyToolTip}"
-                                                       Style="{DynamicResource SettingSubTitleLabel}" />
+                                        <StackPanel Grid.Column="1" Style="{StaticResource TextPanel}">
+                                            <TextBlock VerticalAlignment="Center" Text="{DynamicResource showOpenResultHotkey}" />
+                                            <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource showOpenResultHotkeyToolTip}" />
                                         </StackPanel>
-                                        <CheckBox IsChecked="{Binding Settings.ShowOpenResultHotkey}"
-                                                  Style="{DynamicResource SideControlCheckBox}" />
+                                        <CheckBox IsChecked="{Binding Settings.ShowOpenResultHotkey}" Style="{DynamicResource SideControlCheckBox}" />
                                     </ItemsControl>
                                 </Border>
                             </StackPanel>
                         </Border>
 
-                        <TextBlock Grid.Row="3" VerticalAlignment="Center" Margin="0 0 12 2"
-                                   Text="{DynamicResource customQueryHotkey}" FontSize="14" Padding="0 12 0 0 " />
-                        <ListView Grid.Row="4" ItemsSource="{Binding Settings.CustomPluginHotkeys}"
+                        <TextBlock Grid.Row="3"
+                                   Margin="0,0,12,2"
+                                   Padding="0,12,0,0"
+                                   VerticalAlignment="Center"
+                                   FontSize="14"
+                                   Text="{DynamicResource customQueryHotkey}" />
+                        <ListView Grid.Row="4"
+                                  Margin="0,0,0,0"
+                                  Background="#ffffff"
+                                  BorderBrush="DarkGray"
+                                  BorderThickness="1"
+                                  ItemsSource="{Binding Settings.CustomPluginHotkeys}"
                                   SelectedItem="{Binding SelectedCustomPluginHotkey}"
-                                  Style="{StaticResource {x:Static GridView.GridViewStyleKey}}"
-                                  BorderBrush="DarkGray" BorderThickness="1" Background="#ffffff"
-                                  Margin="0 0 0 0">
+                                  Style="{StaticResource {x:Static GridView.GridViewStyleKey}}">
                             <ListView.View>
                                 <GridView>
-                                    <GridViewColumn Header="{DynamicResource hotkey}" Width="180">
+                                    <GridViewColumn Width="180" Header="{DynamicResource hotkey}">
                                         <GridViewColumn.CellTemplate>
                                             <DataTemplate DataType="userSettings:CustomPluginHotkey">
                                                 <TextBlock Text="{Binding Hotkey}" />
                                             </DataTemplate>
                                         </GridViewColumn.CellTemplate>
                                     </GridViewColumn>
-                                    <GridViewColumn Header="{DynamicResource customQuery}" Width="540">
+                                    <GridViewColumn Width="540" Header="{DynamicResource customQuery}">
                                         <GridViewColumn.CellTemplate>
                                             <DataTemplate DataType="userSettings:CustomPluginHotkey">
                                                 <TextBlock Text="{Binding ActionKeyword}" />
@@ -1411,13 +1671,23 @@
                                 </GridView>
                             </ListView.View>
                         </ListView>
-                        <StackPanel Grid.Row="5" HorizontalAlignment="Right" VerticalAlignment="Top"
-                                    Orientation="Horizontal" Width="350" Margin="0">
-                            <Button Click="OnDeleteCustomHotkeyClick" Width="100"
-                                    Margin="10" Content="{DynamicResource delete}" />
-                            <Button Click="OnnEditCustomHotkeyClick" Width="100" Margin="10"
+                        <StackPanel Grid.Row="5"
+                                    Width="350"
+                                    Margin="0"
+                                    HorizontalAlignment="Right"
+                                    VerticalAlignment="Top"
+                                    Orientation="Horizontal">
+                            <Button Width="100"
+                                    Margin="10"
+                                    Click="OnDeleteCustomHotkeyClick"
+                                    Content="{DynamicResource delete}" />
+                            <Button Width="100"
+                                    Margin="10"
+                                    Click="OnnEditCustomHotkeyClick"
                                     Content="{DynamicResource edit}" />
-                            <Button Click="OnAddCustomeHotkeyClick" Width="100" Margin="10 10 0 10"
+                            <Button Width="100"
+                                    Margin="10,10,0,10"
+                                    Click="OnAddCustomeHotkeyClick"
                                     Content="{DynamicResource add}" />
                         </StackPanel>
                     </Grid>
@@ -1433,85 +1703,113 @@
                         <ColumnDefinition Width="Auto" />
                         <ColumnDefinition />
                     </Grid.ColumnDefinitions>
-                    <TextBlock Grid.Column="0" FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20"
-                               Margin="0 0 12 0">
+                    <TextBlock Grid.Column="0"
+                               Margin="0,0,12,0"
+                               FontFamily="/Resources/#Segoe Fluent Icons"
+                               FontSize="20">
                         &#xec27;
                     </TextBlock>
                     <TextBlock Grid.Column="1" Text="{DynamicResource proxy}" />
                 </Grid>
             </TabItem.Header>
-            <ScrollViewer ScrollViewer.CanContentScroll="False"
-                          Margin="0,0,0,0" Background="#f3f3f3" Padding="5 0 24 0">
+            <ScrollViewer Margin="0,0,0,0"
+                          Padding="5,0,24,0"
+                          Background="#f3f3f3"
+                          ScrollViewer.CanContentScroll="False">
                 <Border Background="#f3f3f3">
 
                     <StackPanel>
-                        <Border Margin="0 18 0 0">
-                            <TextBlock Text="{DynamicResource proxy}" Grid.Row="0" TextAlignment="left" FontSize="30"
-                                       Margin="0 5 0 0" />
+                        <Border Margin="0,18,0,0">
+                            <TextBlock Grid.Row="0"
+                                       Margin="0,5,0,0"
+                                       FontSize="30"
+                                       Text="{DynamicResource proxy}"
+                                       TextAlignment="left" />
                         </Border>
 
 
-                        <Border Style="{DynamicResource SettingGroupBox}" Padding="0" CornerRadius="5"
-                                Margin="0 10 0 0">
+                        <Border Margin="0,10,0,0"
+                                Padding="0"
+                                CornerRadius="5"
+                                Style="{DynamicResource SettingGroupBox}">
                             <StackPanel Orientation="Vertical">
-                                <Border Style="{DynamicResource SettingGroupBox}" Margin="0" BorderThickness="0">
+                                <Border Margin="0" BorderThickness="0" Style="{DynamicResource SettingGroupBox}">
                                     <ItemsControl Style="{StaticResource SettingGrid}">
-                                        <TextBlock Grid.Column="1" Text="{DynamicResource enableProxy}"
-                                                   VerticalAlignment="Center" />
-                                        <CheckBox IsChecked="{Binding Settings.Proxy.Enabled}"
-                                                  Style="{DynamicResource SideControlCheckBox}" />
+                                        <TextBlock Grid.Column="1" VerticalAlignment="Center" Text="{DynamicResource enableProxy}" />
+                                        <CheckBox IsChecked="{Binding Settings.Proxy.Enabled}" Style="{DynamicResource SideControlCheckBox}" />
                                     </ItemsControl>
                                 </Border>
-                                <Separator BorderBrush="#e5e5e5" BorderThickness="1" Width="Auto" />
-                                <Border Style="{DynamicResource SettingGroupBox}" Margin="0" BorderThickness="0">
+                                <Separator Width="Auto" BorderBrush="#e5e5e5" BorderThickness="1" />
+                                <Border Margin="0" BorderThickness="0" Style="{DynamicResource SettingGroupBox}">
                                     <ItemsControl Style="{StaticResource SettingGrid}">
-                                        <TextBlock Grid.Column="1" Text="{DynamicResource server}"
-                                                   VerticalAlignment="Center" Margin="22 0 0 0" />
-                                        <TextBox Text="{Binding Settings.Proxy.Server}" Grid.Column="2" Padding="5"
-                                                 Margin="0 0 16 0" IsEnabled="{Binding Settings.Proxy.Enabled}"
-                                                 Width="300" />
+                                        <TextBlock Grid.Column="1"
+                                                   Margin="22,0,0,0"
+                                                   VerticalAlignment="Center"
+                                                   Text="{DynamicResource server}" />
+                                        <TextBox Grid.Column="2"
+                                                 Width="300"
+                                                 Margin="0,0,16,0"
+                                                 Padding="5"
+                                                 IsEnabled="{Binding Settings.Proxy.Enabled}"
+                                                 Text="{Binding Settings.Proxy.Server}" />
                                     </ItemsControl>
                                 </Border>
-                                <Separator BorderBrush="#e5e5e5" BorderThickness="1" Width="Auto" />
-                                <Border Style="{DynamicResource SettingGroupBox}" Margin="0" BorderThickness="0">
+                                <Separator Width="Auto" BorderBrush="#e5e5e5" BorderThickness="1" />
+                                <Border Margin="0" BorderThickness="0" Style="{DynamicResource SettingGroupBox}">
                                     <ItemsControl Style="{StaticResource SettingGrid}">
-                                        <TextBlock Grid.Column="1" Text="{DynamicResource port}"
-                                                   VerticalAlignment="Center" Margin="22 0 0 0" />
-                                        <TextBox
-                                            Text="{Binding Settings.Proxy.Port, TargetNullValue={x:Static sys:String.Empty} }"
-                                            Grid.Column="2" IsEnabled="{Binding Settings.Proxy.Enabled}" Width="100"
-                                            Margin="0 0 16 0" />
+                                        <TextBlock Grid.Column="1"
+                                                   Margin="22,0,0,0"
+                                                   VerticalAlignment="Center"
+                                                   Text="{DynamicResource port}" />
+                                        <TextBox Grid.Column="2"
+                                                 Width="100"
+                                                 Margin="0,0,16,0"
+                                                 IsEnabled="{Binding Settings.Proxy.Enabled}"
+                                                 Text="{Binding Settings.Proxy.Port, TargetNullValue={x:Static sys:String.Empty}}" />
                                     </ItemsControl>
                                 </Border>
-                                <Separator BorderBrush="#e5e5e5" BorderThickness="1" Width="Auto" />
-                                <Border Style="{DynamicResource SettingGroupBox}" Margin="0" BorderThickness="0">
+                                <Separator Width="Auto" BorderBrush="#e5e5e5" BorderThickness="1" />
+                                <Border Margin="0" BorderThickness="0" Style="{DynamicResource SettingGroupBox}">
                                     <ItemsControl Style="{StaticResource SettingGrid}">
-                                        <TextBlock Grid.Column="1" Text="{DynamicResource userName}"
-                                                   VerticalAlignment="Center" Margin="22 0 0 0" />
-                                        <TextBox Text="{Binding Settings.Proxy.UserName}" Grid.Column="2" Padding="5"
-                                                 IsEnabled="{Binding Settings.Proxy.Enabled}" Width="200"
-                                                 Margin="0 0 16 0" />
+                                        <TextBlock Grid.Column="1"
+                                                   Margin="22,0,0,0"
+                                                   VerticalAlignment="Center"
+                                                   Text="{DynamicResource userName}" />
+                                        <TextBox Grid.Column="2"
+                                                 Width="200"
+                                                 Margin="0,0,16,0"
+                                                 Padding="5"
+                                                 IsEnabled="{Binding Settings.Proxy.Enabled}"
+                                                 Text="{Binding Settings.Proxy.UserName}" />
                                     </ItemsControl>
                                 </Border>
-                                <Separator BorderBrush="#e5e5e5" BorderThickness="1" Width="Auto" />
-                                <Border Style="{DynamicResource SettingGroupBox}" Margin="0" BorderThickness="0">
+                                <Separator Width="Auto" BorderBrush="#e5e5e5" BorderThickness="1" />
+                                <Border Margin="0" BorderThickness="0" Style="{DynamicResource SettingGroupBox}">
                                     <ItemsControl Style="{StaticResource SettingGrid}">
-                                        <TextBlock Grid.Column="1" Text="{DynamicResource password}"
-                                                   VerticalAlignment="Center" Margin="22 0 0 0" />
-                                        <TextBox Text="{Binding Settings.Proxy.Password}" Grid.Column="2" Padding="5"
-                                                 IsEnabled="{Binding Settings.Proxy.Enabled}" Width="200"
-                                                 Margin="0 0 16 0" />
+                                        <TextBlock Grid.Column="1"
+                                                   Margin="22,0,0,0"
+                                                   VerticalAlignment="Center"
+                                                   Text="{DynamicResource password}" />
+                                        <TextBox Grid.Column="2"
+                                                 Width="200"
+                                                 Margin="0,0,16,0"
+                                                 Padding="5"
+                                                 IsEnabled="{Binding Settings.Proxy.Enabled}"
+                                                 Text="{Binding Settings.Proxy.Password}" />
                                     </ItemsControl>
                                 </Border>
                             </StackPanel>
                         </Border>
-                        <Border Style="{DynamicResource SettingGroupBox}" Margin="0 12 0 0" BorderThickness="0">
+                        <Border Margin="0,12,0,0" BorderThickness="0" Style="{DynamicResource SettingGroupBox}">
                             <ItemsControl Style="{StaticResource SettingGrid}">
-                                <TextBlock Grid.Column="1" Text="{DynamicResource testProxy}"
-                                           VerticalAlignment="Center" />
-                                <Button Content="{DynamicResource testProxy}"
-                                        IsEnabled="{Binding Settings.Proxy.Enabled}" HorizontalAlignment="Right"
-                                        Margin="0 0 16 0" Width="150" Click="OnTestProxyClick" Grid.Column="2" />
+                                <TextBlock Grid.Column="1" VerticalAlignment="Center" Text="{DynamicResource testProxy}" />
+                                <Button Grid.Column="2"
+                                        Width="150"
+                                        Margin="0,0,16,0"
+                                        HorizontalAlignment="Right"
+                                        Click="OnTestProxyClick"
+                                        Content="{DynamicResource testProxy}"
+                                        IsEnabled="{Binding Settings.Proxy.Enabled}" />
                             </ItemsControl>
                         </Border>
                     </StackPanel>
@@ -1525,8 +1823,10 @@
                         <ColumnDefinition Width="Auto" />
                         <ColumnDefinition />
                     </Grid.ColumnDefinitions>
-                    <TextBlock Grid.Column="0" FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20"
-                               Margin="0 0 12 0">
+                    <TextBlock Grid.Column="0"
+                               Margin="0,0,12,0"
+                               FontFamily="/Resources/#Segoe Fluent Icons"
+                               FontSize="20">
                         &#xe946;
                     </TextBlock>
                     <TextBlock Grid.Column="1" Text="{DynamicResource about}" />
@@ -1537,7 +1837,7 @@
                     <!--<TextBlock Text="{DynamicResource about}" Grid.Row="0" TextAlignment="left" FontSize="30" Margin="0 5 0 5"/>  -->
                     <Grid.Resources>
                         <Style TargetType="{x:Type TextBlock}">
-                            <Setter Property="Margin" Value="10, 25, 0, 0" />
+                            <Setter Property="Margin" Value="10,25,0,0" />
                             <Setter Property="FontSize" Value="14" />
                         </Style>
                     </Grid.Resources>
@@ -1553,8 +1853,10 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
-                    <TextBlock Grid.Row="0" Grid.ColumnSpan="2" Text="{Binding ActivatedTimes, Mode=OneWay}"
-                               FontSize="12" />
+                    <TextBlock Grid.Row="0"
+                               Grid.ColumnSpan="2"
+                               FontSize="12"
+                               Text="{Binding ActivatedTimes, Mode=OneWay}" />
                     <TextBlock Grid.Row="1" Grid.Column="0" Text="{DynamicResource website}" />
                     <TextBlock Grid.Row="1" Grid.Column="1" HorizontalAlignment="Left">
                         <Hyperlink NavigateUri="{Binding Website, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
@@ -1565,21 +1867,22 @@
                     <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding Version}" />
                     <TextBlock Grid.Row="3" Grid.Column="0" Text="{DynamicResource releaseNotes}" />
                     <TextBlock Grid.Row="3" Grid.Column="1">
-                        <Hyperlink NavigateUri="{Binding ReleaseNotes, Mode=OneWay}"
-                                   RequestNavigate="OnRequestNavigate">
+                        <Hyperlink NavigateUri="{Binding ReleaseNotes, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
                             <Run Text="{Binding ReleaseNotes, Mode=OneWay}" />
                         </Hyperlink>
                     </TextBlock>
                     <TextBlock Grid.Row="4" Grid.Column="0" Text="{DynamicResource documentation}" />
                     <TextBlock Grid.Row="4" Grid.Column="1">
-                        <Hyperlink NavigateUri="{Binding Documentation, Mode=OneWay}"
-                                   RequestNavigate="OnRequestNavigate">
+                        <Hyperlink NavigateUri="{Binding Documentation, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
                             <Run Text="{Binding Documentation, Mode=OneWay}" />
                         </Hyperlink>
                     </TextBlock>
-                    <Button Grid.Row="5" Grid.Column="0"
-                            Content="{DynamicResource checkUpdates}" Click="OnCheckUpdates"
-                            HorizontalAlignment="Left" Margin="10 30 10 10" />
+                    <Button Grid.Row="5"
+                            Grid.Column="0"
+                            Margin="10,30,10,10"
+                            HorizontalAlignment="Left"
+                            Click="OnCheckUpdates"
+                            Content="{DynamicResource checkUpdates}" />
                 </Grid>
             </Border>
         </TabItem>
diff --git a/Flow.Launcher/Themes/Base.xaml b/Flow.Launcher/Themes/Base.xaml
index 19612af7058..454904f3ab7 100644
--- a/Flow.Launcher/Themes/Base.xaml
+++ b/Flow.Launcher/Themes/Base.xaml
@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:system="clr-namespace:System;assembly=mscorlib">
+                    xmlns:system="clr-namespace:System;assembly=mscorlib"
+                    xmlns:userSettings="clr-namespace:Flow.Launcher.Infrastructure.UserSettings;assembly=Flow.Launcher.Infrastructure">
 
     <!-- Further font customisations are dynamically loaded in Theme.cs -->
     <Style x:Key="BaseQueryBoxStyle" TargetType="{x:Type TextBox}">
@@ -54,7 +55,7 @@
         <Setter Property="CornerRadius" Value="5" />
     </Style>
     <Style x:Key="BaseWindowStyle" TargetType="{x:Type Window}">
-        <Setter Property="Width" Value="750" />
+        <Setter Property="Width" Value="600" />
         <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled"/>
     </Style>
 
@@ -222,31 +223,16 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-
     </Style>
     <Style x:Key="BaseSeparatorStyle" TargetType="Rectangle">
-        <Setter Property="Visibility" Value="Collapsed" />
-        <Style.Triggers>
-            <DataTrigger Binding="{Binding ElementName=ResultListBox, Path=Visibility}" Value="Visible">
-                <Setter Property="Visibility" Value="Visible" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding ElementName=ContextMenu, Path=Visibility}" Value="Visible">
-                <Setter Property="Visibility" Value="Visible" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding ElementName=History, Path=Visibility}" Value="Visible">
-                <Setter Property="Visibility" Value="Visible" />
-            </DataTrigger>
-        </Style.Triggers>
     </Style>
     <Style x:Key="HighlightStyle">
         <Setter Property="Inline.FontWeight" Value="Bold" />
     </Style>
-    
     <Style x:Key="BaseItemHotkeyStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="15" />
         <Setter Property="Foreground" Value="#8f8f8f" />
     </Style>
-
     <Style x:Key="BaseItemHotkeySelecetedStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="15" />
         <Setter Property="Foreground" Value="#8f8f8f" />
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index 4588a677fe9..92e22f7531f 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -22,6 +22,7 @@
 using ISavable = Flow.Launcher.Plugin.ISavable;
 using System.Windows.Threading;
 using NHotkey;
+using Windows.Web.Syndication;
 
 
 namespace Flow.Launcher.ViewModel
@@ -63,6 +64,13 @@ public MainViewModel(Settings settings)
             _lastQuery = new Query();
 
             _settings = settings;
+            _settings.PropertyChanged += (_, args) =>
+            {
+                if (args.PropertyName == nameof(Settings.WindowSize))
+                {
+                    OnPropertyChanged(nameof(MainWindowWidth));
+                }
+            };
 
             _historyItemsStorage = new FlowLauncherJsonStorage<History>();
             _userSelectedRecordStorage = new FlowLauncherJsonStorage<UserSelectedRecord>();
@@ -373,6 +381,8 @@ private ResultsViewModel SelectedResults
         public Visibility ProgressBarVisibility { get; set; }
         public Visibility MainWindowVisibility { get; set; }
 
+        public double MainWindowWidth => _settings.WindowSize;
+
         public ICommand EscCommand { get; set; }
         public ICommand SelectNextItemCommand { get; set; }
         public ICommand SelectPrevItemCommand { get; set; }
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index bfaddb701d6..4947ca38039 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -37,9 +37,11 @@ public SettingWindowViewModel(Updater updater, IPortable portable)
             Settings = _storage.Load();
             Settings.PropertyChanged += (s, e) =>
             {
-                if (e.PropertyName == nameof(Settings.ActivateTimes))
+                switch (e.PropertyName)
                 {
-                    OnPropertyChanged(nameof(ActivatedTimes));
+                    case nameof(Settings.ActivateTimes):
+                        OnPropertyChanged(nameof(ActivatedTimes));
+                        break;
                 }
             };
         }
@@ -53,7 +55,7 @@ public async void UpdateApp()
 
         public bool AutoUpdates
         {
-            get { return Settings.AutoUpdates; }
+            get => Settings.AutoUpdates;
             set
             {
                 Settings.AutoUpdates = value;
@@ -67,7 +69,7 @@ public bool AutoUpdates
         private bool _portableMode = DataLocation.PortableDataLocationInUse();
         public bool PortableMode
         {
-            get { return _portableMode; }
+            get => _portableMode;
             set
             {
                 if (!_portable.CanUpdatePortability())
@@ -314,10 +316,16 @@ public bool DropShadowEffect
             }
         }
 
+        public double WindowWidthSize
+        {
+            get => Settings.WindowSize;
+            set => Settings.WindowSize = value;
+        }
+
         public bool UseGlyphIcons
         {
-            get { return Settings.UseGlyphIcons; }
-            set { Settings.UseGlyphIcons = value; }
+            get => Settings.UseGlyphIcons;
+            set => Settings.UseGlyphIcons = value;
         }
 
         public Brush PreviewBackground