diff --git a/Flow.Launcher.Core/ExternalPlugins/PluginsManifest.cs b/Flow.Launcher.Core/ExternalPlugins/PluginsManifest.cs
new file mode 100644
index 00000000000..c0cd022eaa7
--- /dev/null
+++ b/Flow.Launcher.Core/ExternalPlugins/PluginsManifest.cs
@@ -0,0 +1,57 @@
+using Flow.Launcher.Infrastructure.Http;
+using Flow.Launcher.Infrastructure.Logger;
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Flow.Launcher.Core.ExternalPlugins
+{
+    public static class PluginsManifest
+    {
+        static PluginsManifest()
+        {
+            UpdateTask = UpdateManifestAsync();
+        }
+
+        public static List<UserPlugin> UserPlugins { get; private set; } = new List<UserPlugin>();
+
+        public static Task UpdateTask { get; private set; }
+
+        private static readonly SemaphoreSlim manifestUpdateLock = new(1);
+
+        public static Task UpdateManifestAsync()
+        {
+            if (manifestUpdateLock.CurrentCount == 0)
+            {
+                return UpdateTask;
+            }
+
+            return UpdateTask = DownloadManifestAsync();
+        }
+
+        private async static Task DownloadManifestAsync()
+        {
+            try
+            {
+                await manifestUpdateLock.WaitAsync().ConfigureAwait(false);
+
+                await using var jsonStream = await Http.GetStreamAsync("https://raw.githubusercontent.com/Flow-Launcher/Flow.Launcher.PluginsManifest/plugin_api_v2/plugins.json")
+                                 .ConfigureAwait(false);
+
+                UserPlugins = await JsonSerializer.DeserializeAsync<List<UserPlugin>>(jsonStream).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                Log.Exception("|PluginManagement.GetManifest|Encountered error trying to download plugins manifest", e);
+
+                UserPlugins = new List<UserPlugin>();
+            }
+            finally
+            {
+                manifestUpdateLock.Release();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/Models/UserPlugin.cs b/Flow.Launcher.Core/ExternalPlugins/UserPlugin.cs
similarity index 77%
rename from Plugins/Flow.Launcher.Plugin.PluginsManager/Models/UserPlugin.cs
rename to Flow.Launcher.Core/ExternalPlugins/UserPlugin.cs
index c1af3014bf9..f98815c1a9f 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/Models/UserPlugin.cs
+++ b/Flow.Launcher.Core/ExternalPlugins/UserPlugin.cs
@@ -1,7 +1,6 @@
-
-namespace Flow.Launcher.Plugin.PluginsManager.Models
+namespace Flow.Launcher.Core.ExternalPlugins
 {
-    public class UserPlugin
+    public record UserPlugin
     {
         public string ID { get; set; }
         public string Name { get; set; }
@@ -12,5 +11,6 @@ public class UserPlugin
         public string Website { get; set; }
         public string UrlDownload { get; set; }
         public string UrlSourceCode { get; set; }
+        public string IcoPath { get; set; }
     }
 }
diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index 907314ba88e..10244615863 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -99,8 +99,6 @@ public bool HideNotifyIcon
         public bool RememberLastLaunchLocation { get; set; }
         public bool IgnoreHotkeysOnFullscreen { get; set; }
 
-        public bool AutoHideScrollBar { get; set; }
-
         public HttpProxy Proxy { get; set; } = new HttpProxy();
 
         [JsonConverter(typeof(JsonStringEnumConverter))]
diff --git a/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj b/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
index 67c76d0064d..c808052b073 100644
--- a/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
+++ b/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
@@ -60,8 +60,13 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Fody" Version="6.5.4">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
     <PackageReference Include="JetBrains.Annotations" Version="2021.2.0" />
+    <PackageReference Include="PropertyChanged.Fody" Version="3.4.0" />
   </ItemGroup>
 
 </Project>
diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index d9cdf5581d0..974eafa9646 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -59,6 +59,11 @@ public interface IPublicAPI
         /// <param name="subTitle">Optional message subtitle</param>
         void ShowMsgError(string title, string subTitle = "");
 
+        /// <summary>
+        /// Show the MainWindow when hiding
+        /// </summary>
+        void ShowMainWindow();
+
         /// <summary>
         /// Show message box
         /// </summary>
diff --git a/Flow.Launcher/ActionKeywords.xaml.cs b/Flow.Launcher/ActionKeywords.xaml.cs
index 281be6e5285..e116e6f4d9f 100644
--- a/Flow.Launcher/ActionKeywords.xaml.cs
+++ b/Flow.Launcher/ActionKeywords.xaml.cs
@@ -44,7 +44,7 @@ private void btnDone_OnClick(object sender, RoutedEventArgs _)
             var oldActionKeyword = plugin.Metadata.ActionKeywords[0];
             var newActionKeyword = tbAction.Text.Trim();
             newActionKeyword = newActionKeyword.Length > 0 ? newActionKeyword : "*";
-            if (!pluginViewModel.IsActionKeywordRegistered(newActionKeyword))
+            if (!PluginViewModel.IsActionKeywordRegistered(newActionKeyword))
             {
                 pluginViewModel.ChangeActionKeyword(newActionKeyword, oldActionKeyword);
                 Close();
diff --git a/Flow.Launcher/App.xaml b/Flow.Launcher/App.xaml
index 18addac7398..13d88e1c6f9 100644
--- a/Flow.Launcher/App.xaml
+++ b/Flow.Launcher/App.xaml
@@ -6,6 +6,227 @@
              Startup="OnStartupAsync">
     <Application.Resources>
         <ResourceDictionary>
+            <!--#region Expander for Setting Window-->
+            <Style x:Key="ExpanderRightHeaderStyle" TargetType="{x:Type ToggleButton}">
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type ToggleButton}">
+                            <Border Padding="{TemplateBinding Padding}">
+                                <Grid Background="Transparent" SnapsToDevicePixels="False">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="19"/>
+                                        <RowDefinition Height="*"/>
+                                    </Grid.RowDefinitions>
+                                    <Grid>
+                                        <Grid.LayoutTransform>
+                                            <TransformGroup>
+                                                <TransformGroup.Children>
+                                                    <TransformCollection>
+                                                        <RotateTransform Angle="-90"/>
+                                                    </TransformCollection>
+                                                </TransformGroup.Children>
+                                            </TransformGroup>
+                                        </Grid.LayoutTransform>
+                                        <Ellipse x:Name="circle" HorizontalAlignment="Center" Height="19" Stroke="DarkGray" VerticalAlignment="Center" Width="19"/>
+                                        <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" SnapsToDevicePixels="false" Stroke="#666" StrokeThickness="2" VerticalAlignment="Center"/>
+                                    </Grid>
+                                    <ContentPresenter HorizontalAlignment="Center" Margin="0,4,0,0" Grid.Row="1" RecognizesAccessKey="True" SnapsToDevicePixels="True" VerticalAlignment="Top"/>
+                                </Grid>
+                            </Border>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="IsChecked" Value="true">
+                                    <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
+                                </Trigger>
+                                <Trigger Property="IsMouseOver" Value="true">
+                                    <Setter Property="Stroke" TargetName="circle" Value="#FF3C7FB1"/>
+                                    <Setter Property="Stroke" TargetName="arrow" Value="#222"/>
+                                </Trigger>
+                                <Trigger Property="IsPressed" Value="true">
+                                    <Setter Property="Stroke" TargetName="circle" Value="#FF526C7B"/>
+                                    <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
+                                    <Setter Property="Stroke" TargetName="arrow" Value="#FF003366"/>
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+            <Style x:Key="ExpanderUpHeaderStyle" TargetType="{x:Type ToggleButton}">
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type ToggleButton}">
+                            <Border Padding="{TemplateBinding Padding}">
+                                <Grid Background="Transparent" SnapsToDevicePixels="False">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="19"/>
+                                        <ColumnDefinition Width="*"/>
+                                    </Grid.ColumnDefinitions>
+                                    <Grid>
+                                        <Grid.LayoutTransform>
+                                            <TransformGroup>
+                                                <TransformGroup.Children>
+                                                    <TransformCollection>
+                                                        <RotateTransform Angle="180"/>
+                                                    </TransformCollection>
+                                                </TransformGroup.Children>
+                                            </TransformGroup>
+                                        </Grid.LayoutTransform>
+                                        <Ellipse x:Name="circle" HorizontalAlignment="Center" Height="19" Stroke="Transparent" VerticalAlignment="Center" Width="19"/>
+                                        <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" SnapsToDevicePixels="false" Stroke="#666" StrokeThickness="1" VerticalAlignment="Center"/>
+                                    </Grid>
+                                    <ContentPresenter Grid.Column="1" HorizontalAlignment="Left" Margin="4,0,0,0" RecognizesAccessKey="True" SnapsToDevicePixels="True" VerticalAlignment="Center"/>
+                                </Grid>
+                            </Border>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="IsChecked" Value="true">
+                                    <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
+                                </Trigger>
+                                <Trigger Property="IsMouseOver" Value="true">
+                                    <Setter Property="Stroke" TargetName="circle" Value="Transparent"/>
+                                    <Setter Property="Stroke" TargetName="arrow" Value="#222"/>
+                                </Trigger>
+                                <Trigger Property="IsPressed" Value="true">
+                                    <Setter Property="Stroke" TargetName="circle" Value="Transparent"/>
+                                    <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
+                                    <Setter Property="Stroke" TargetName="arrow" Value="#FF003366"/>
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+            <Style x:Key="ExpanderLeftHeaderStyle" TargetType="{x:Type ToggleButton}">
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type ToggleButton}">
+                            <Border Padding="{TemplateBinding Padding}">
+                                <Grid Background="Transparent" SnapsToDevicePixels="False">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="19"/>
+                                        <RowDefinition Height="*"/>
+                                    </Grid.RowDefinitions>
+                                    <Grid>
+                                        <Grid.LayoutTransform>
+                                            <TransformGroup>
+                                                <TransformGroup.Children>
+                                                    <TransformCollection>
+                                                        <RotateTransform Angle="90"/>
+                                                    </TransformCollection>
+                                                </TransformGroup.Children>
+                                            </TransformGroup>
+                                        </Grid.LayoutTransform>
+                                        <Ellipse x:Name="circle" HorizontalAlignment="Center" Height="19" Stroke="DarkGray" VerticalAlignment="Center" Width="19"/>
+                                        <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" SnapsToDevicePixels="false" Stroke="#666" StrokeThickness="2" VerticalAlignment="Center"/>
+                                    </Grid>
+                                    <ContentPresenter HorizontalAlignment="Center" Margin="0,4,0,0" Grid.Row="1" RecognizesAccessKey="True" SnapsToDevicePixels="True" VerticalAlignment="Top"/>
+                                </Grid>
+                            </Border>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="IsChecked" Value="true">
+                                    <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
+                                </Trigger>
+                                <Trigger Property="IsMouseOver" Value="true">
+                                    <Setter Property="Stroke" TargetName="circle" Value="#FF3C7FB1"/>
+                                    <Setter Property="Stroke" TargetName="arrow" Value="#222"/>
+                                </Trigger>
+                                <Trigger Property="IsPressed" Value="true">
+                                    <Setter Property="Stroke" TargetName="circle" Value="#FF526C7B"/>
+                                    <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
+                                    <Setter Property="Stroke" TargetName="arrow" Value="#FF003366"/>
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+            <Style x:Key="ExpanderHeaderFocusVisual">
+                <Setter Property="Control.Template">
+                    <Setter.Value>
+                        <ControlTemplate>
+                            <Border>
+                                <Rectangle Margin="0" SnapsToDevicePixels="true" Stroke="Black" StrokeThickness="1" StrokeDashArray="1 2"/>
+                            </Border>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+            <Style x:Key="ExpanderDownHeaderStyle" TargetType="{x:Type ToggleButton}">
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type ToggleButton}">
+                            <Border Padding="{TemplateBinding Padding}">
+                                <Grid Background="Transparent" SnapsToDevicePixels="False">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="19"/>
+                                        <ColumnDefinition Width="*"/>
+                                    </Grid.ColumnDefinitions>
+                                    <Ellipse x:Name="circle" HorizontalAlignment="Center" Height="19" Stroke="Transparent" VerticalAlignment="Center" Width="19"/>
+                                    <Path x:Name="arrow" Data="M 1,1.5 L 4.5,5 L 8,1.5" HorizontalAlignment="Center" SnapsToDevicePixels="false" Stroke="#666" StrokeThickness="1" VerticalAlignment="Center"/>
+                                    <ContentPresenter Grid.Column="1" HorizontalAlignment="Left" Margin="4,0,0,0" RecognizesAccessKey="True" SnapsToDevicePixels="True" VerticalAlignment="Center"/>
+                                </Grid>
+                            </Border>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="IsChecked" Value="true">
+                                    <Setter Property="Data" TargetName="arrow" Value="M 1,4.5  L 4.5,1  L 8,4.5"/>
+                                </Trigger>
+                                <Trigger Property="IsMouseOver" Value="true">
+                                    <Setter Property="Stroke" TargetName="circle" Value="Transparent"/>
+                                    <Setter Property="Stroke" TargetName="arrow" Value="#222"/>
+                                </Trigger>
+                                <Trigger Property="IsPressed" Value="true">
+                                    <Setter Property="Stroke" TargetName="circle" Value="Transparent"/>
+                                    <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
+                                    <Setter Property="Stroke" TargetName="arrow" Value="#FF003366"/>
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+            <Style x:Key="ExpanderStyle1" TargetType="{x:Type Expander}">
+                <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+                <Setter Property="Background" Value="Transparent"/>
+                <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+                <Setter Property="VerticalContentAlignment" Value="Stretch"/>
+                <Setter Property="BorderBrush" Value="Transparent"/>
+                <Setter Property="BorderThickness" Value="1"/>
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type Expander}">
+                            <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="3" SnapsToDevicePixels="true">
+                                <DockPanel>
+                                    <ToggleButton x:Name="HeaderSite" ContentTemplate="{TemplateBinding HeaderTemplate}" ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}" Content="{TemplateBinding Header}" DockPanel.Dock="Top" Foreground="{TemplateBinding Foreground}" FontWeight="{TemplateBinding FontWeight}" FocusVisualStyle="{StaticResource ExpanderHeaderFocusVisual}" FontStyle="{TemplateBinding FontStyle}" FontStretch="{TemplateBinding FontStretch}" FontSize="{TemplateBinding FontSize}" FontFamily="{TemplateBinding FontFamily}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="18 0 0 0" MinWidth="0" MinHeight="0" Padding="{TemplateBinding Padding}" Style="{StaticResource ExpanderDownHeaderStyle}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                                    <ContentPresenter x:Name="ExpandSite" DockPanel.Dock="Bottom" Focusable="false" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" Visibility="Collapsed" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                                </DockPanel>
+                            </Border>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="IsExpanded" Value="true">
+                                    <Setter Property="Visibility" TargetName="ExpandSite" Value="Visible"/>
+                                </Trigger>
+                                <Trigger Property="ExpandDirection" Value="Right">
+                                    <Setter Property="DockPanel.Dock" TargetName="ExpandSite" Value="Right"/>
+                                    <Setter Property="DockPanel.Dock" TargetName="HeaderSite" Value="Left"/>
+                                    <Setter Property="Style" TargetName="HeaderSite" Value="{StaticResource ExpanderRightHeaderStyle}"/>
+                                </Trigger>
+                                <Trigger Property="ExpandDirection" Value="Up">
+                                    <Setter Property="DockPanel.Dock" TargetName="ExpandSite" Value="Top"/>
+                                    <Setter Property="DockPanel.Dock" TargetName="HeaderSite" Value="Bottom"/>
+                                    <Setter Property="Style" TargetName="HeaderSite" Value="{StaticResource ExpanderUpHeaderStyle}"/>
+                                </Trigger>
+                                <Trigger Property="ExpandDirection" Value="Left">
+                                    <Setter Property="DockPanel.Dock" TargetName="ExpandSite" Value="Left"/>
+                                    <Setter Property="DockPanel.Dock" TargetName="HeaderSite" Value="Right"/>
+                                    <Setter Property="Style" TargetName="HeaderSite" Value="{StaticResource ExpanderLeftHeaderStyle}"/>
+                                </Trigger>
+                                <Trigger Property="IsEnabled" Value="false">
+                                    <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+            <!--#endregion-->
             <ResourceDictionary.MergedDictionaries>
                 <ui:ThemeResources RequestedTheme="Light" />
                 <ui:XamlControlsResources />
diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj
index edf41e1938b..fd2f5f1d942 100644
--- a/Flow.Launcher/Flow.Launcher.csproj
+++ b/Flow.Launcher/Flow.Launcher.csproj
@@ -83,6 +83,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Fody" Version="6.5.4">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="InputSimulator" Version="1.0.4" />
     <PackageReference Include="ModernWpfUI" Version="0.9.4" />
     <PackageReference Include="NHotkey.Wpf" Version="2.1.0" />
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 4a9b9270071..051891a2b9f 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -13,50 +13,59 @@
     <system:String x:Key="iconTraySettings">Settings</system:String>
     <system:String x:Key="iconTrayAbout">About</system:String>
     <system:String x:Key="iconTrayExit">Exit</system:String>
+    <system:String x:Key="closeWindow">Close</system:String>
 
     <!--Setting General-->
     <system:String x:Key="flowlauncher_settings">Flow Launcher Settings</system:String>
     <system:String x:Key="general">General</system:String>
     <system:String x:Key="portableMode">Portable Mode</system:String>
+    <system:String x:Key="portableModeToolTIp">Store all settings and user data in one folder (Useful when used with removable drives or cloud services).</system:String>
     <system:String x:Key="startFlowLauncherOnSystemStartup">Start Flow Launcher on system startup</system:String>
     <system:String x:Key="hideFlowLauncherWhenLoseFocus">Hide Flow Launcher when focus is lost</system:String>
     <system:String x:Key="dontPromptUpdateMsg">Do not show new version notifications</system:String>
     <system:String x:Key="rememberLastLocation">Remember last launch location</system:String>
     <system:String x:Key="language">Language</system:String>
     <system:String x:Key="lastQueryMode">Last Query Style</system:String>
+    <system:String x:Key="lastQueryModeToolTip">Show/Hide previous results when Flow Launcher is reactivated.</system:String>
     <system:String x:Key="LastQueryPreserved">Preserve Last Query</system:String>
     <system:String x:Key="LastQuerySelected">Select last Query</system:String>
     <system:String x:Key="LastQueryEmpty">Empty last Query</system:String>
     <system:String x:Key="maxShowResults">Maximum results shown</system:String>
     <system:String x:Key="ignoreHotkeysOnFullscreen">Ignore hotkeys in fullscreen mode</system:String>
+    <system:String x:Key="ignoreHotkeysOnFullscreenToolTip">Disable Flow Launcher activation when a full screen application is active (Recommended for games).</system:String>
     <system:String x:Key="pythonDirectory">Python Directory</system:String>
     <system:String x:Key="autoUpdates">Auto Update</system:String>
-    <system:String x:Key="autoHideScrollBar">Auto Hide Scroll Bar</system:String>
-    <system:String x:Key="autoHideScrollBarToolTip">Automatically hides the Settings window scroll bar and show when hover the mouse over it</system:String>
     <system:String x:Key="selectPythonDirectory">Select</system:String>
     <system:String x:Key="hideOnStartup">Hide Flow Launcher on startup</system:String>
     <system:String x:Key="hideNotifyIcon">Hide tray icon</system:String>
     <system:String x:Key="querySearchPrecision">Query Search Precision</system:String>
+    <system:String x:Key="querySearchPrecisionToolTip">Changes minimum match score required for results.</system:String>
     <system:String x:Key="ShouldUsePinyin">Should Use Pinyin</system:String>
     <system:String x:Key="ShouldUsePinyinToolTip">Allows using Pinyin to search. Pinyin is the standard system of romanized spelling for translating Chinese</system:String>
     <system:String x:Key="shadowEffectNotAllowed">Shadow effect is not allowed while current theme has blur effect enabled</system:String>
 
     <!--Setting Plugin-->
-    <system:String x:Key="plugin">Plugin</system:String>
+    <system:String x:Key="plugin">Plugins</system:String>
     <system:String x:Key="browserMorePlugins">Find more plugins</system:String>
-    <system:String x:Key="enable">Enable</system:String>
-    <system:String x:Key="disable">Disable</system:String>
-    <system:String x:Key="actionKeywords">Action keyword:</system:String>
+    <system:String x:Key="enable">On</system:String>
+    <system:String x:Key="disable">Off</system:String>
+    <system:String x:Key="actionKeywords">Action keyword</system:String>
     <system:String x:Key="currentActionKeywords">Current action keyword:</system:String>
     <system:String x:Key="newActionKeyword">New action keyword:</system:String>
     <system:String x:Key="currentPriority">Current Priority:</system:String>
     <system:String x:Key="newPriority">New Priority:</system:String>
-    <system:String x:Key="priority">Priority:</system:String>
+    <system:String x:Key="priority">Priority</system:String>
     <system:String x:Key="pluginDirectory">Plugin Directory</system:String>
-    <system:String x:Key="author">Author</system:String>
+    <system:String x:Key="author">Author:</system:String>
     <system:String x:Key="plugin_init_time">Init time:</system:String>
     <system:String x:Key="plugin_query_time">Query time:</system:String>
 
+
+    <!--Setting Plugin Store-->
+    <system:String x:Key="pluginStore">Plugin Store</system:String>
+    <system:String x:Key="refresh">Refresh</system:String>
+    <system:String x:Key="install">Install</system:String>
+
     <!--Setting Theme-->
     <system:String x:Key="theme">Theme</system:String>
     <system:String x:Key="browserMoreThemes">Browse for more themes</system:String>
@@ -67,12 +76,17 @@
     <system:String x:Key="opacity">Opacity</system:String>
     <system:String x:Key="theme_load_failure_path_not_exists">Theme {0} not exists, fallback to default theme</system:String>
     <system:String x:Key="theme_load_failure_parse_error">Fail to load theme {0}, fallback to default theme</system:String>
+    <system:String x:Key="ThemeFolder">Theme Folder</system:String>
+    <system:String x:Key="OpenThemeFolder">Open Theme Folder</system:String>
 
     <!--Setting Hotkey-->
     <system:String x:Key="hotkey">Hotkey</system:String>
     <system:String x:Key="flowlauncherHotkey">Flow Launcher Hotkey</system:String>
-    <system:String x:Key="openResultModifiers">Open Result Modifiers</system:String>
+    <system:String x:Key="flowlauncherHotkeyToolTip">Enter shortcut to show/hide Flow Launcher.</system:String>
+    <system:String x:Key="openResultModifiers">Open Result Modifier Key</system:String>
+    <system:String x:Key="openResultModifiersToolTip">Select a modifier key to open selected result via keyboard.</system:String>
     <system:String x:Key="showOpenResultHotkey">Show Hotkey</system:String>
+    <system:String x:Key="showOpenResultHotkeyToolTip">Show result selection hotkey with results.</system:String>
     <system:String x:Key="customQueryHotkey">Custom Query Hotkey</system:String>
     <system:String x:Key="customQuery">Query</system:String>
     <system:String x:Key="delete">Delete</system:String>
@@ -117,6 +131,7 @@
     <system:String x:Key="documentation">Usage Tips:</system:String>
 
     <!--Priority Setting Dialog-->
+    <system:String x:Key="changePriorityWindow">Change Priority</system:String>
     <system:String x:Key="priority_tips">Greater the number, the higher the result will be ranked. Try setting it as 5. If you want the results to be lower than any other plugin's, provide a negative number</system:String>
     <system:String x:Key="invalidPriority">Please provide an valid integer for Priority!</system:String>
 
@@ -180,4 +195,4 @@
     <system:String x:Key="update_flowlauncher_update_files">Update files</system:String>
     <system:String x:Key="update_flowlauncher_update_upadte_description">Update description</system:String>
 
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>
diff --git a/Flow.Launcher/Languages/ko.xaml b/Flow.Launcher/Languages/ko.xaml
index 6c755dbae24..649895cea92 100644
--- a/Flow.Launcher/Languages/ko.xaml
+++ b/Flow.Launcher/Languages/ko.xaml
@@ -13,55 +13,90 @@
     <system:String x:Key="iconTraySettings">설정</system:String>
     <system:String x:Key="iconTrayAbout">정보</system:String>
     <system:String x:Key="iconTrayExit">종료</system:String>
+    <system:String x:Key="closeWindow">닫기</system:String>
 
     <!--Setting General-->
     <system:String x:Key="flowlauncher_settings">Flow Launcher 설정</system:String>
     <system:String x:Key="general">일반</system:String>
+    <system:String x:Key="portableMode">포터블 모드</system:String>
+    <system:String x:Key="portableModeToolTIp">모든 설정이 폴더안에 들어갑니다. USB 드라이브나 클라우드로 사용 가능합니다.</system:String>
     <system:String x:Key="startFlowLauncherOnSystemStartup">시스템 시작 시 Flow Launcher 실행</system:String>
     <system:String x:Key="hideFlowLauncherWhenLoseFocus">포커스 잃으면 Flow Launcher 숨김</system:String>
     <system:String x:Key="dontPromptUpdateMsg">새 버전 알림 끄기</system:String>
     <system:String x:Key="rememberLastLocation">마지막 실행 위치 기억</system:String>
     <system:String x:Key="language">언어</system:String>
     <system:String x:Key="lastQueryMode">마지막 쿼리 스타일</system:String>
+    <system:String x:Key="lastQueryModeToolTip">쿼리박스를 열었을 때 쿼리 처리 방식</system:String>
     <system:String x:Key="LastQueryPreserved">직전 쿼리에 계속 입력</system:String>
     <system:String x:Key="LastQuerySelected">직전 쿼리 내용 선택</system:String>
     <system:String x:Key="LastQueryEmpty">직전 쿼리 지우기</system:String>
     <system:String x:Key="maxShowResults">표시할 결과 수</system:String>
     <system:String x:Key="ignoreHotkeysOnFullscreen">전체화면 모드에서는 핫키 무시</system:String>
+    <system:String x:Key="ignoreHotkeysOnFullscreenToolTip">게이머라면 켜는 것을 추천합니다.</system:String>
     <system:String x:Key="pythonDirectory">Python 디렉토리</system:String>
     <system:String x:Key="autoUpdates">자동 업데이트</system:String>
     <system:String x:Key="selectPythonDirectory">선택</system:String>
     <system:String x:Key="hideOnStartup">시작 시 Flow Launcher 숨김</system:String>
+    <system:String x:Key="hideNotifyIcon">트레이 아이콘 숨기기</system:String>
+    <system:String x:Key="querySearchPrecision">쿼리 검색 정확도</system:String>
+    <system:String x:Key="querySearchPrecisionToolTip">검색 결과가 좀 더 정확해집니다.</system:String>
+    <system:String x:Key="ShouldUsePinyin">항상 Pinyin 사용</system:String>
+    <system:String x:Key="ShouldUsePinyinToolTip">Pinyin을 사용하여 검색할 수 있습니다. Pinyin(병음)은 로마자 중국어 입력 방식입니다.</system:String>
+    <system:String x:Key="shadowEffectNotAllowed">반투명 흐림 효과를 사용하는 경우, 그림자 효과를 쓸 수 없습니다.</system:String>
 
     <!--Setting Plugin-->
     <system:String x:Key="plugin">플러그인</system:String>
     <system:String x:Key="browserMorePlugins">플러그인 더 찾아보기</system:String>
-    <system:String x:Key="disable">비활성화</system:String>
+    <system:String x:Key="enable">On</system:String>
+    <system:String x:Key="disable">Off</system:String>
     <system:String x:Key="actionKeywords">액션 키워드</system:String>
+    <system:String x:Key="currentPriority">현재 중요도:</system:String>
+    <system:String x:Key="newPriority">새 중요도:</system:String>
+    <system:String x:Key="priority">중요도</system:String>
     <system:String x:Key="pluginDirectory">플러그인 디렉토리</system:String>
     <system:String x:Key="author">저자</system:String>
     <system:String x:Key="plugin_init_time">초기화 시간:</system:String>
     <system:String x:Key="plugin_query_time">쿼리 시간:</system:String>
+    
+    
+    <!--Setting Plugin Store-->
+    <system:String x:Key="pluginStore">플러그인 스토어</system:String>
+    <system:String x:Key="refresh">새로고침</system:String>
+    <system:String x:Key="install">설치</system:String>
+
 
     <!--Setting Theme-->
     <system:String x:Key="theme">테마</system:String>
     <system:String x:Key="browserMoreThemes">테마 더 찾아보기</system:String>
+    <system:String x:Key="hiThere">Hi There</system:String>
     <system:String x:Key="queryBoxFont">쿼리 상자 글꼴</system:String>
     <system:String x:Key="resultItemFont">결과 항목 글꼴</system:String>
     <system:String x:Key="windowMode">윈도우 모드</system:String>
     <system:String x:Key="opacity">투명도</system:String>
+    <system:String x:Key="theme_load_failure_path_not_exists">{0} 테마가 존재하지 않습니다. 기본 테마로 변경합니다.</system:String>
+    <system:String x:Key="theme_load_failure_parse_error">{0} 테마 로드에 실패했습니다. 기본 테마로 변경합니다.</system:String>
+    <system:String x:Key="ThemeFolder">테마 폴더</system:String>
+    <system:String x:Key="OpenThemeFolder">테마 폴더 열기</system:String>
 
     <!--Setting Hotkey-->
     <system:String x:Key="hotkey">핫키</system:String>
     <system:String x:Key="flowlauncherHotkey">Flow Launcher 핫키</system:String>
-    <system:String x:Key="openResultModifiers">결과 수정 자 열기</system:String>
-    <system:String x:Key="customQueryHotkey">사용자지정 쿼리 핫키</system:String>
+    <system:String x:Key="flowlauncherHotkeyToolTip">Flow Launcher를 열 때 사용할 단축키를 입력합니다.</system:String>
+    <system:String x:Key="openResultModifiers">결과 선택 단축키</system:String>
+    <system:String x:Key="openResultModifiersToolTip">결과 목록을 선택하는 단축키입니다.</system:String>
     <system:String x:Key="showOpenResultHotkey">단축키 표시</system:String>
+    <system:String x:Key="showOpenResultHotkeyToolTip">결과창에서 결과 선택 단축키를 표시합니다.</system:String>
+    <system:String x:Key="customQueryHotkey">사용자지정 쿼리 핫키</system:String>
+    <system:String x:Key="customQuery">Query</system:String>
     <system:String x:Key="delete">삭제</system:String>
     <system:String x:Key="edit">편집</system:String>
     <system:String x:Key="add">추가</system:String>
     <system:String x:Key="pleaseSelectAnItem">항목을 선택하세요.</system:String>
     <system:String x:Key="deleteCustomHotkeyWarning">{0} 플러그인 핫키를 삭제하시겠습니까?</system:String>
+    <system:String x:Key="queryWindowShadowEffect">그림자 효과</system:String>
+    <system:String x:Key="shadowEffectCPUUsage">그림자 효과는 GPU를 사용합니다. 컴퓨터 퍼포먼스가 제한적인 경우 사용을 추천하지 않습니다.</system:String>
+    <system:String x:Key="useGlyphUI">플루언트 아이콘 사용</system:String>
+    <system:String x:Key="useGlyphUIEffect">결과 및 일부 메뉴에서 플루언트 아이콘을 사용합니다.</system:String>
 
     <!--Setting Proxy-->
     <system:String x:Key="proxy">HTTP 프록시</system:String>
@@ -86,8 +121,18 @@
     <system:String x:Key="about_activate_times">Flow Launcher를 {0}번 실행했습니다.</system:String>
     <system:String x:Key="checkUpdates">업데이트 확인</system:String>
     <system:String x:Key="newVersionTips">새 버전({0})이 있습니다. Flow Launcher를 재시작하세요.</system:String>
+    <system:String x:Key="checkUpdatesFailed">업데이트 확인을 실패했습니다. api.github.com로의 연결 또는 프록시 설정을 확인해주세요.</system:String>
+    <system:String x:Key="downloadUpdatesFailed">
+        업데이트 다운로드에 실패했습니다. github-cloud.s3.amazonaws.com의 연결 또는 프록시 설정을 확인해주세요. 
+        수동 다운로드를 하려면 https://github.com/Flow-Launcher/Flow.Launcher/releases 으로 방문하세요.
+    </system:String>
     <system:String x:Key="releaseNotes">릴리즈 노트:</system:String>
+    <system:String x:Key="documentation">사용 팁:</system:String>
 
+    <!--Priority Setting Dialog-->
+    <system:String x:Key="changePriorityWindow">중요도 변경</system:String>
+    <system:String x:Key="priority_tips">높은 수를 넣을수록 상위 결과에 표시됩니다. 5를 시도해보세요. 다른 플러그인 보다 결과를 낮추고 싶다면, 그보다 낮은 수를 입력하세요.</system:String>
+    <system:String x:Key="invalidPriority">중요도에 올바른 정수를 입력하세요.</system:String>
     <!--Action Keyword Setting Dialog-->
     <system:String x:Key="oldActionKeywords">예전 액션 키워드</system:String>
     <system:String x:Key="newActionKeywords">새 액션 키워드</system:String>
@@ -97,9 +142,11 @@
     <system:String x:Key="newActionKeywordsCannotBeEmpty">새 액션 키워드를 입력하세요.</system:String>
     <system:String x:Key="newActionKeywordsHasBeenAssigned">새 액션 키워드가 할당된 플러그인이 이미 있습니다. 다른 액션 키워드를 입력하세요.</system:String>
     <system:String x:Key="success">성공</system:String>
+    <system:String x:Key="completedSuccessfully">성공적으로 완료했습니다.</system:String>
     <system:String x:Key="actionkeyword_tips">액션 키워드를 지정하지 않으려면 *를 사용하세요.</system:String>
 
     <!--Custom Query Hotkey Dialog-->
+    <system:String x:Key="customeQueryHotkeyTitle">커스텀 플러그인 핫키</system:String>
     <system:String x:Key="preview">미리보기</system:String>
     <system:String x:Key="hotkeyIsNotUnavailable">핫키를 사용할 수 없습니다. 다른 핫키를 입력하세요.</system:String>
     <system:String x:Key="invalidPluginHotkey">플러그인 핫키가 유효하지 않습니다.</system:String>
@@ -123,12 +170,23 @@
     <system:String x:Key="reportWindow_report_succeed">보고서를 정상적으로 보냈습니다.</system:String>
     <system:String x:Key="reportWindow_report_failed">보고서를 보내지 못했습니다.</system:String>
     <system:String x:Key="reportWindow_flowlauncher_got_an_error">Flow Launcher에 문제가 발생했습니다.</system:String>
-
+    
+    <!--General Notice-->
+    <system:String x:Key="pleaseWait">잠시 기다려주세요...</system:String>
     <!--update-->
+    <system:String x:Key="update_flowlauncher_update_check">새 업데이트 확인 중</system:String>
     <system:String x:Key="update_flowlauncher_update_new_version_available">새 Flow Launcher 버전({0})을 사용할 수 있습니다.</system:String>
+    <system:String x:Key="update_flowlauncher_already_on_latest">이미 가장 최신 버전의 Flow Launcher를 사용중입니다.</system:String>
+    <system:String x:Key="update_flowlauncher_update_found">업데이트 발견</system:String>
+    <system:String x:Key="update_flowlauncher_updating">업데이트 중...</system:String>
+    <system:String x:Key="update_flowlauncher_fail_moving_portable_user_profile_data">Flow Launcher가 유저 정보 데이터를 새버전으로 옮길 수 없습니다.
+        프로필 데이터 폴더를 수동으로 {0} 에서 {1}로 옮겨주세요. </system:String>
+    <system:String x:Key="update_flowlauncher_new_update">새 업데이트</system:String>
     <system:String x:Key="update_flowlauncher_update_error">소프트웨어 업데이트를 설치하는 중에 오류가 발생했습니다.</system:String>
     <system:String x:Key="update_flowlauncher_update">업데이트</system:String>
     <system:String x:Key="update_flowlauncher_update_cancel">취소</system:String>
+    <system:String x:Key="update_flowlauncher_fail">업데이트 실패</system:String>
+    <system:String x:Key="update_flowlauncher_check_connection">Check your connection and try updating proxy settings to github-cloud.s3.amazonaws.com.</system:String>
     <system:String x:Key="update_flowlauncher_update_restart_flowlauncher_tip">업데이트를 위해 Flow Launcher를 재시작합니다.</system:String>
     <system:String x:Key="update_flowlauncher_update_upadte_files">아래 파일들이 업데이트됩니다.</system:String>
     <system:String x:Key="update_flowlauncher_update_files">업데이트 파일</system:String>
diff --git a/Flow.Launcher/Languages/sk.xaml b/Flow.Launcher/Languages/sk.xaml
index b766ccfa21a..70a5d3b7c13 100644
--- a/Flow.Launcher/Languages/sk.xaml
+++ b/Flow.Launcher/Languages/sk.xaml
@@ -31,8 +31,6 @@
     <system:String x:Key="ignoreHotkeysOnFullscreen">Ignorovať klávesové skratky v režime na celú obrazovku</system:String>
     <system:String x:Key="pythonDirectory">Priečinok s Pythonom</system:String>
     <system:String x:Key="autoUpdates">Automatická aktualizácia</system:String>
-    <system:String x:Key="autoHideScrollBar">Automaticky skryť posuvník</system:String>
-    <system:String x:Key="autoHideScrollBarToolTip">Automaticky skrývať posuvník v okne nastavení a zobraziť ho, keď naň prejdete myšou</system:String>
     <system:String x:Key="selectPythonDirectory">Vybrať</system:String>
     <system:String x:Key="hideOnStartup">Schovať Flow Launcher po spustení</system:String>
     <system:String x:Key="hideNotifyIcon">Schovať ikonu z oblasti oznámení</system:String>
diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index 73b13be8c95..b517faf191a 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -92,7 +92,7 @@
                                 <MenuItem Command="ApplicationCommands.Paste"/>
                                 <Separator />
                                 <MenuItem Header="{DynamicResource flowlauncher_settings}"  Click="OnContextMenusForSettingsClick" />
-                                <MenuItem Command="{Binding EscCommand}" Header="Close"/>
+                                <MenuItem Command="{Binding EscCommand}" Header="{DynamicResource closeWindow}"/>
                             </ContextMenu>
                         </TextBox.ContextMenu>
                     </TextBox>
diff --git a/Flow.Launcher/PriorityChangeWindow.xaml b/Flow.Launcher/PriorityChangeWindow.xaml
index 68b5a49b7d1..60a289e61ea 100644
--- a/Flow.Launcher/PriorityChangeWindow.xaml
+++ b/Flow.Launcher/PriorityChangeWindow.xaml
@@ -7,37 +7,51 @@
         Loaded="PriorityChangeWindow_Loaded"
         mc:Ignorable="d"
         WindowStartupLocation="CenterScreen"
-        Title="PriorityChangeWindow" Height="250" Width="300">
+        Title="{DynamicResource changePriorityWindow}" Height="400" Width="350" ResizeMode="NoResize" Background="#f3f3f3">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition />
-            <RowDefinition Height="60"/>
-            <RowDefinition Height="75"/>
             <RowDefinition />
+            <RowDefinition />
+            <RowDefinition Height="80"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="20" />
             <ColumnDefinition />
         </Grid.ColumnDefinitions>
-        <TextBlock FontSize="14" Grid.Row="0" Grid.Column="1" VerticalAlignment="Center"
-                   HorizontalAlignment="Left" Text="{DynamicResource currentPriority}" />
-        <TextBlock x:Name="OldPriority" Grid.Row="0" Grid.Column="1" Margin="170 10 10 10" FontSize="14"
-                   VerticalAlignment="Center" HorizontalAlignment="Left" />
-
-        <TextBlock FontSize="14" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"
-                   HorizontalAlignment="Left" Text="{DynamicResource newPriority}" />
-        <StackPanel Grid.Row="1" Orientation="Horizontal" Grid.Column="1">
-            <TextBox x:Name="tbAction" Margin="140 10 15 10" Width="105" VerticalAlignment="Center" HorizontalAlignment="Left" />
+        <StackPanel Grid.Row="0" VerticalAlignment="Center">
+        <TextBlock Grid.Column="0" FontFamily="/Resources/#Segoe Fluent Icons" FontSize="40"  TextAlignment="Center"
+                               Margin="0 0 0 0">
+                        &#xe8d0;
+        </TextBlock>
         </StackPanel>
 
-        <TextBlock Grid.Row="2" Grid.ColumnSpan="1" Grid.Column="1" Foreground="Gray"
-                   Text="{DynamicResource priority_tips}" TextWrapping="Wrap"
-                   Margin="0,0,20,0"/>
+        <Border Background="#ffffff" Grid.Row="1" BorderBrush="#cecece" BorderThickness="1" Margin="14 0 14 0" Padding="0 14 0 0" CornerRadius="5">
+        <StackPanel Orientation="Vertical" >
+            
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Grid.Row="1">
+            <TextBlock FontSize="14" Grid.Column="1" VerticalAlignment="Center"
+                       HorizontalAlignment="Left" Text="{DynamicResource currentPriority}" />
+            <TextBlock x:Name="OldPriority" Grid.Row="0" Grid.Column="1" Margin="14 0 10 0" FontSize="14"
+                       VerticalAlignment="Center" HorizontalAlignment="Left" FontWeight="Bold" />
+            </StackPanel>
 
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="3" Grid.Column="1">
-            <Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="10 0 10 0" Width="80" Height="30"
+            <StackPanel Orientation="Horizontal" Grid.Column="1" HorizontalAlignment="Center">
+                <TextBlock FontSize="14" VerticalAlignment="Center"
+                       HorizontalAlignment="Right" Text="{DynamicResource newPriority}" />
+                <TextBox x:Name="tbAction" Margin="14 10 15 10" Width="105" VerticalAlignment="Center" HorizontalAlignment="Left" />
+            </StackPanel>
+            
+        </StackPanel>
+        </Border>
+        <StackPanel Grid.Row="2" VerticalAlignment="Center">
+        <TextBlock  Foreground="Gray"
+                   Text="{DynamicResource priority_tips}" TextWrapping="WrapWithOverflow" TextAlignment="Center"
+                   Margin="20,0,20,0"/>
+        </StackPanel>
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Grid.Row="3" Grid.Column="1">
+            <Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="0 0 10 0" Width="80" Height="30"
                     Content="{DynamicResource cancel}" />
-            <Button x:Name="btnDone" Margin="10 0 10 0" Width="80" Height="30" Click="btnDone_OnClick">
+            <Button x:Name="btnDone" Margin="10 0 0 0" Width="80" Height="30" Click="btnDone_OnClick">
                 <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
             </Button>
         </StackPanel>
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index 6f995671dd2..70d54619d9d 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -68,6 +68,8 @@ public void RestartApp()
 
         public void RestarApp() => RestartApp();
 
+        public void ShowMainWindow() => _mainVM.MainWindowVisibility = Visibility.Visible;
+
         public void CheckForNewUpdate() => _settingsVM.UpdateApp();
 
         public void SaveAppAllSettings()
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 7dc8829bec7..ac613864444 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -17,43 +17,40 @@
         ResizeMode="CanResizeWithGrip"
         WindowStartupLocation="CenterScreen"
         Height="700" Width="1000"
-        MinWidth="850"
+        MinWidth="900"
         MinHeight="600"
-        Loaded="OnLoaded" 
+        Loaded="OnLoaded"
         Closed="OnClosed"
         d:DataContext="{d:DesignInstance vm:SettingWindowViewModel}">
     <Window.InputBindings>
-        <KeyBinding Key="Escape" Command="Close"/>
+        <KeyBinding Key="Escape" Command="Close" />
     </Window.InputBindings>
     <Window.CommandBindings>
-        <CommandBinding Command="Close" Executed="OnCloseExecuted"/>
+        <CommandBinding Command="Close" Executed="OnCloseExecuted" />
     </Window.CommandBindings>
 
     <Window.Resources>
-        <converters:BorderClipConverter x:Key="BorderClipConverter"/>
+        <converters:BorderClipConverter x:Key="BorderClipConverter" />
         <CollectionViewSource Source="{Binding Source={x:Static Fonts.SystemFontFamilies}}" x:Key="SortedFonts">
             <CollectionViewSource.SortDescriptions>
-                <scm:SortDescription PropertyName="Source"/>
+                <scm:SortDescription PropertyName="Source" />
             </CollectionViewSource.SortDescriptions>
         </CollectionViewSource>
+
         <Style x:Key="SettingGrid" TargetType="ItemsControl">
-            <Setter Property="Focusable" Value="False"/>
+            <Setter Property="Focusable" Value="False" />
             <Setter Property="Margin" Value="0" />
             <Setter Property="ItemsPanel">
                 <Setter.Value>
                     <ItemsPanelTemplate>
                         <Grid>
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="auto" MaxWidth="60" MinWidth="20"/>
+                                <ColumnDefinition Width="auto" MaxWidth="60" MinWidth="20" />
                                 <ColumnDefinition Width="8*" />
-                                <ColumnDefinition Width="Auto" MaxWidth="550" MinWidth="40"/>
-
+                                <ColumnDefinition Width="Auto" MaxWidth="550" MinWidth="40" />
                             </Grid.ColumnDefinitions>
-
                         </Grid>
-
                     </ItemsPanelTemplate>
-
                 </Setter.Value>
             </Setter>
         </Style>
@@ -64,13 +61,15 @@
             <Setter Property="CornerRadius" Value="5" />
             <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" />
         </Style>
-   
+
         <Style x:Key="SettingSubTitleLabel" TargetType="{x:Type TextBlock}">
-            <Setter Property="Foreground" Value="#5f5f5f" />
+            <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" />
@@ -100,6 +99,7 @@
         </Style>
 
         <Style TargetType="{x:Type TabItem}" x:Key="logo">
+            <!--#region Logo Style -->
             <Setter Property="Margin" Value="0" />
             <Setter Property="HorizontalAlignment" Value="center" />
             <Setter Property="Background" Value="Transparent" />
@@ -121,14 +121,14 @@
                                         Margin="0 10 5 0"
                                         BorderBrush="Transparent"
                                         BorderThickness="0">
-                                        <Border x:Name="border" 
-                                            CornerRadius="5"
-                                            Background="WhiteSmoke">
+                                        <Border x:Name="border"
+                                                CornerRadius="5"
+                                                Background="WhiteSmoke">
                                             <ContentPresenter x:Name="ContentSite"
-                                                  Margin="12 12 0 12"
-                                                  HorizontalAlignment="LEFT"
-                                                  VerticalAlignment="Center"
-                                                  ContentSource="Header" TextBlock.Foreground="#000" />
+                                                              Margin="12 12 0 12"
+                                                              HorizontalAlignment="LEFT"
+                                                              VerticalAlignment="Center"
+                                                              ContentSource="Header" TextBlock.Foreground="#000" />
                                         </Border>
                                     </Border>
                                 </Grid>
@@ -151,6 +151,7 @@
                     </ControlTemplate>
                 </Setter.Value>
             </Setter>
+            <!--#endregion-->
         </Style>
         <Style TargetType="{x:Type TabItem}">
             <Setter Property="Template">
@@ -160,13 +161,14 @@
                             <Grid>
                                 <Grid>
                                     <Border
-                                        x:Name="Spacer" Width="Auto" Height="Auto" Padding="0 0 0 0" Margin="0 5 8 0" BorderBrush="Transparent" BorderThickness="0">
-                                        <Border x:Name="border"  CornerRadius="5" Background="#f3f3f3">
+                                        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">
                                             <ContentPresenter x:Name="ContentSite"
-                                                  Margin="12 12 0 12"
-                                                  HorizontalAlignment="LEFT"
-                                                  VerticalAlignment="Center"
-                                                  ContentSource="Header" TextBlock.Foreground="#000" />
+                                                              Margin="12 12 0 12"
+                                                              HorizontalAlignment="LEFT"
+                                                              VerticalAlignment="Center"
+                                                              ContentSource="Header" TextBlock.Foreground="#000" />
                                         </Border>
                                     </Border>
                                 </Grid>
@@ -185,58 +187,237 @@
             </Setter>
         </Style>
 
+        <!-- Plugin Store Item when Selected layout for nothing-->
+        <Style x:Key="StoreItem" TargetType="{x:Type ToggleButton}">
+            <Style.Triggers>
+                <Trigger Property="IsChecked" Value="True">
+                </Trigger>
+            </Style.Triggers>
+        </Style>
 
         <Style x:Key="PluginList" TargetType="ListBoxItem">
-            <Setter Property="Background" Value="#ffffff"></Setter>
-            <Setter Property="VerticalContentAlignment" Value="Center" />
-            <Setter Property="Padding" Value="0 12 18 12" />
-            <Setter Property="Margin" Value="12 0 0 0" />
-            <Setter Property="Height" Value="Auto"></Setter>
-            
+            <Setter Property="Background" Value="#ffffff" />
+            <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-->
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type ListBoxItem}">
+                        <Border x:Name="Bd"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                Padding="{TemplateBinding Padding}" CornerRadius="5"
+                                SnapsToDevicePixels="True">
+                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                              Content="{TemplateBinding Content}"
+
+                                              ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <MultiTrigger>
+                                <MultiTrigger.Conditions>
+                                    <Condition Property="IsMouseOver" Value="True" />
+                                </MultiTrigger.Conditions>
+                                <Setter TargetName="Bd" Property="Background" Value="#f6f6f6" />
+                                <Setter TargetName="Bd" Property="BorderBrush" Value="#e5e5e5" />
+                                <Setter TargetName="Bd" Property="CornerRadius" Value="5" />
+
+                            </MultiTrigger>
+                            <MultiTrigger>
+                                <MultiTrigger.Conditions>
+                                    <Condition Property="Selector.IsSelectionActive" Value="False" />
+                                    <Condition Property="IsSelected" Value="True" />
+                                </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" />
+
+
+                            </MultiTrigger>
+                            <MultiTrigger>
+                                <MultiTrigger.Conditions>
+                                    <Condition Property="Selector.IsSelectionActive" Value="True" />
+                                    <Condition Property="IsSelected" Value="True" />
+                                </MultiTrigger.Conditions>
+                                <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" />
+
+
+                            </MultiTrigger>
+                            <Trigger Property="IsEnabled" Value="False">
+                                <Setter TargetName="Bd" Property="TextElement.Foreground"
+                                        Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+            <!--#endregion-->
+            <Setter Property="Height" Value="Auto" />
+        </Style>
+
+        <!--#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="BorderBrush" Value="#e5e5e5" />
+            <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"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                Padding="{TemplateBinding Padding}" CornerRadius="5"
+                                SnapsToDevicePixels="True">
+                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                              Content="{TemplateBinding Content}"
+
+                                              ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <MultiTrigger>
+                                <MultiTrigger.Conditions>
+                                    <Condition Property="IsMouseOver" Value="True" />
+                                </MultiTrigger.Conditions>
+                                <Setter TargetName="Bd" Property="Background" Value="#f6f6f6" />
+                                <Setter TargetName="Bd" Property="BorderBrush" Value="#e5e5e5" />
+                                <Setter TargetName="Bd" Property="CornerRadius" Value="5" />
+
+                            </MultiTrigger>
+                            <MultiTrigger>
+                                <MultiTrigger.Conditions>
+                                    <Condition Property="Selector.IsSelectionActive" Value="False" />
+                                    <Condition Property="IsSelected" Value="True" />
+                                </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" />
+
+
+                            </MultiTrigger>
+                            <MultiTrigger>
+                                <MultiTrigger.Conditions>
+                                    <Condition Property="Selector.IsSelectionActive" Value="True" />
+                                    <Condition Property="IsSelected" Value="True" />
+                                </MultiTrigger.Conditions>
+                                <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" />
+
+
+                            </MultiTrigger>
+                            <Trigger Property="IsEnabled" Value="False">
+                                <Setter TargetName="Bd" Property="TextElement.Foreground"
+                                        Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+            <!--#endregion-->
+        </Style>
+
+        <!-- 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*"/>
+                            </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"/>
+                            </Border>
+                        </Grid>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
         </Style>
 
     </Window.Resources>
 
+
     <TabControl Height="auto" SelectedIndex="1" TabStripPlacement="Left" Background="#f3f3f3">
         <TabItem Style="{DynamicResource logo}">
             <TabItem.Header>
                 <Grid Margin="0 18 0 0">
                     <Grid.RowDefinitions>
-                        <RowDefinition Height="50"/>
-                        <RowDefinition Height="27"/>
-                        <RowDefinition Height="25"/>
+                        <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 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" />
                 </Grid>
             </TabItem.Header>
         </TabItem>
-        <TabItem Width="180">
+        <TabItem>
+            <!-- LEFT TAB WIDTH -->
             <TabItem.Header>
                 <Grid>
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition/>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition />
                     </Grid.ColumnDefinitions>
-                    <TextBlock Grid.Column="0" FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20" Margin="0 0 12 0">&#xe713;</TextBlock>
-                    <TextBlock Grid.Column="1" Text="{DynamicResource general}"></TextBlock>
+                    <TextBlock Grid.Column="0" FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20"
+                               Margin="0 0 12 0">
+                        &#xe713;
+                    </TextBlock>
+                    <TextBlock Grid.Column="1" Text="{DynamicResource general}" />
                 </Grid>
             </TabItem.Header>
-            
-            <ScrollViewer ScrollViewer.CanContentScroll="False" ui:ScrollViewerHelper.AutoHideScrollBars="{Binding AutoHideScrollBar, Mode=OneWay}" Margin="0,0,0,0" Background="#f3f3f3">
+
+            <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"/>
+                    <TextBlock Text="{DynamicResource general}" Grid.Row="2" TextAlignment="left" FontSize="30"
+                               Margin="0 5 0 5" />
 
                     <Border Style="{DynamicResource SettingGroupBox}">
                         <ItemsControl Style="{StaticResource SettingGrid}">
                             <StackPanel Style="{StaticResource TextPanel}">
-                                <TextBlock Text="{DynamicResource startFlowLauncherOnSystemStartup}" Style="{DynamicResource SettingTitleLabel}" />
+                                <TextBlock Text="{DynamicResource startFlowLauncherOnSystemStartup}"
+                                           Style="{DynamicResource SettingTitleLabel}" />
                             </StackPanel>
-                            <CheckBox IsChecked="{Binding Settings.StartFlowLauncherOnSystemStartup}" HorizontalAlignment="Right"
-                                    Checked="OnAutoStartupChecked" Unchecked="OnAutoStartupUncheck" Style="{DynamicResource SideControlCheckBox}">
-                            </CheckBox>
-                            <TextBlock FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20" Grid.Column="0" VerticalAlignment="Center" Margin="24 0 16 0">
+                            <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">
                                 &#xe8fc;
                             </TextBlock>
                         </ItemsControl>
@@ -245,11 +426,13 @@
                     <Border Style="{DynamicResource SettingGroupBox}">
                         <ItemsControl Style="{StaticResource SettingGrid}">
                             <StackPanel Style="{StaticResource TextPanel}">
-                                <TextBlock Text="{DynamicResource hideOnStartup}" Style="{DynamicResource SettingTitleLabel}" />
+                                <TextBlock Text="{DynamicResource hideOnStartup}"
+                                           Style="{DynamicResource SettingTitleLabel}" />
                             </StackPanel>
-                            <CheckBox IsChecked="{Binding Settings.HideOnStartup}" Style="{DynamicResource SideControlCheckBox}" >
-                            </CheckBox>
-                            <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 FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20" Grid.Column="0"
+                                       VerticalAlignment="Center" Margin="24 0 16 0">
                                 &#xed1a;
                             </TextBlock>
                         </ItemsControl>
@@ -258,10 +441,11 @@
                     <Border Style="{DynamicResource SettingGroupBox}" Margin="0 30 0 0">
                         <ItemsControl Style="{StaticResource SettingGrid}">
                             <StackPanel Style="{StaticResource TextPanel}">
-                                <TextBlock Text="{DynamicResource hideFlowLauncherWhenLoseFocus}" Style="{DynamicResource SettingTitleLabel}" />
+                                <TextBlock Text="{DynamicResource hideFlowLauncherWhenLoseFocus}"
+                                           Style="{DynamicResource SettingTitleLabel}" />
                             </StackPanel>
-                            <CheckBox IsChecked="{Binding Settings.HideWhenDeactive}" Style="{DynamicResource SideControlCheckBox}" >
-                            </CheckBox>
+                            <CheckBox IsChecked="{Binding Settings.HideWhenDeactive}"
+                                      Style="{DynamicResource SideControlCheckBox}" />
                         </ItemsControl>
                     </Border>
 
@@ -269,31 +453,37 @@
                     <Border Style="{DynamicResource SettingGroupBox}">
                         <ItemsControl Style="{StaticResource SettingGrid}">
                             <StackPanel Style="{StaticResource TextPanel}">
-                                <TextBlock Text="{DynamicResource hideNotifyIcon}" Style="{DynamicResource SettingTitleLabel}" />
+                                <TextBlock Text="{DynamicResource hideNotifyIcon}"
+                                           Style="{DynamicResource SettingTitleLabel}" />
                             </StackPanel>
-                            <CheckBox IsChecked="{Binding Settings.HideNotifyIcon}" Style="{DynamicResource SideControlCheckBox}" >
-                            </CheckBox>
+                            <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 Text="{DynamicResource rememberLastLocation}"
+                                           Style="{DynamicResource SettingTitleLabel}" />
                             </StackPanel>
-                            <CheckBox IsChecked="{Binding Settings.RememberLastLaunchLocation}" Style="{DynamicResource SideControlCheckBox}" >
-                            </CheckBox>
+                            <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 ignoreHotkeysOnFullscreen}"
+                                           Style="{DynamicResource SettingTitleLabel}" />
+                                <TextBlock Text="{DynamicResource ignoreHotkeysOnFullscreenToolTip}"
+                                           Style="{DynamicResource SettingSubTitleLabel}" />
                             </StackPanel>
-                            <CheckBox IsChecked="{Binding Settings.IgnoreHotkeysOnFullscreen}" Style="{DynamicResource SideControlCheckBox}" >
-                            </CheckBox>
-                            <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 FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20" Grid.Column="0"
+                                       VerticalAlignment="Center" Margin="24 0 16 0">
                                 &#xe7fc;
                             </TextBlock>
                         </ItemsControl>
@@ -302,12 +492,16 @@
                     <Border Style="{DynamicResource SettingGroupBox}" Margin="0 30 0 0">
                         <ItemsControl Style="{StaticResource SettingGrid}">
                             <StackPanel Style="{StaticResource TextPanel}">
-                                <TextBlock Text="{DynamicResource ShouldUsePinyin}" Style="{DynamicResource SettingTitleLabel}" />
-                                <TextBlock Text="{DynamicResource ShouldUsePinyinToolTip}" Style="{DynamicResource SettingSubTitleLabel}" />
+                                <TextBlock Text="{DynamicResource ShouldUsePinyin}"
+                                           Style="{DynamicResource SettingTitleLabel}" />
+                                <TextBlock Text="{DynamicResource ShouldUsePinyinToolTip}"
+                                           Style="{DynamicResource SettingSubTitleLabel}" />
                             </StackPanel>
-                            <CheckBox IsChecked="{Binding Settings.ShouldUsePinyin}" ToolTip="{DynamicResource ShouldUsePinyinToolTip}" Style="{DynamicResource SideControlCheckBox}" >
-                            </CheckBox>
-                            <TextBlock FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20" Grid.Column="0" VerticalAlignment="Center" Margin="24 0 16 0">
+                            <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">
                                 &#xe98a;
                             </TextBlock>
                         </ItemsControl>
@@ -316,10 +510,13 @@
                     <Border Style="{DynamicResource SettingGroupBox}" Margin="0 30 0 0">
                         <ItemsControl Style="{StaticResource SettingGrid}">
                             <StackPanel Style="{StaticResource TextPanel}">
-                                <TextBlock Text="{DynamicResource autoUpdates}" Style="{DynamicResource SettingTitleLabel}" />
+                                <TextBlock Text="{DynamicResource autoUpdates}"
+                                           Style="{DynamicResource SettingTitleLabel}" />
                             </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 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">
                                 &#xecc5;
                             </TextBlock>
                         </ItemsControl>
@@ -328,10 +525,15 @@
                     <Border Style="{DynamicResource SettingGroupBox}">
                         <ItemsControl Style="{StaticResource SettingGrid}">
                             <StackPanel Style="{StaticResource TextPanel}">
-                                <TextBlock Text="{DynamicResource portableMode}" Style="{DynamicResource SettingTitleLabel}" />
+                                <TextBlock Text="{DynamicResource portableMode}"
+                                           Style="{DynamicResource SettingTitleLabel}" />
+                                <TextBlock Text="{DynamicResource portableModeToolTIp}"
+                                           Style="{DynamicResource SettingSubTitleLabel}" />
                             </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 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">
                                 &#xe88e;
                             </TextBlock>
                         </ItemsControl>
@@ -341,29 +543,44 @@
                         <StackPanel Orientation="Vertical">
                             <Border Style="{DynamicResource SettingGroupBox}" Margin="0" BorderThickness="0">
                                 <ItemsControl Style="{StaticResource SettingGrid}">
-                                    <TextBlock Grid.Column="1" Text="{DynamicResource querySearchPrecision}" VerticalAlignment="Center" />
+                                    <StackPanel Style="{StaticResource TextPanel}">
+                                        <TextBlock Grid.Column="1" Text="{DynamicResource querySearchPrecision}"
+                                               VerticalAlignment="Center" />
+                                        <TextBlock Text="{DynamicResource querySearchPrecisionToolTip}"
+                                           Style="{DynamicResource SettingSubTitleLabel}" />
+                                    </StackPanel>
                                     <ComboBox Margin="10 0 18 0" MaxWidth="200"
-                              ItemsSource="{Binding QuerySearchPrecisionStrings}" 
-                              SelectedItem="{Binding Settings.QuerySearchPrecisionString}" Grid.Column="2"/>
+                                              ItemsSource="{Binding QuerySearchPrecisionStrings}"
+                                              SelectedItem="{Binding Settings.QuerySearchPrecisionString}"
+                                              Grid.Column="2" />
                                 </ItemsControl>
                             </Border>
-                            <Separator BorderBrush="#e5e5e5" BorderThickness="1" Width="Auto"/>
+                            <Separator BorderBrush="#e5e5e5" BorderThickness="1" Width="Auto" />
                             <Border Style="{DynamicResource SettingGroupBox}" Margin="0" BorderThickness="0">
                                 <ItemsControl Style="{StaticResource SettingGrid}">
-                                    <TextBlock Grid.Column="1" Text="{DynamicResource lastQueryMode}" VerticalAlignment="Center" />
+                                    <StackPanel Style="{StaticResource TextPanel}">
+                                        <TextBlock Grid.Column="1" Text="{DynamicResource lastQueryMode}"
+                                               VerticalAlignment="Center" />
+                                        <TextBlock Text="{DynamicResource lastQueryModeToolTip}"
+                                           Style="{DynamicResource SettingSubTitleLabel}" />
+                                    </StackPanel>
                                     <ComboBox Margin="10 0 18 0" MaxWidth="200"
-                              ItemsSource="{Binding LastQueryModes}" SelectedValue="{Binding Settings.LastQueryMode}"
-                              DisplayMemberPath="Display" SelectedValuePath="Value" Grid.Column="2"/>
+                                              ItemsSource="{Binding LastQueryModes}"
+                                              SelectedValue="{Binding Settings.LastQueryMode}"
+                                              DisplayMemberPath="Display" SelectedValuePath="Value" Grid.Column="2" />
                                 </ItemsControl>
                             </Border>
-                            <Separator BorderBrush="#e5e5e5" BorderThickness="1" Width="Auto"/>
+                            <Separator BorderBrush="#e5e5e5" BorderThickness="1" Width="Auto" />
                             <Border Style="{DynamicResource SettingGroupBox}" Margin="0" BorderThickness="0">
                                 <ItemsControl Style="{StaticResource SettingGrid}">
-                                    <TextBlock Grid.Column="1" Text="{DynamicResource maxShowResults}" VerticalAlignment="Center"/>
-                                    <ComboBox Margin="10 0 18 0" Width="100" ItemsSource="{Binding MaxResultsRange}" 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">
-                                &#xe8fd;
+                                    <TextBlock Grid.Column="1" Text="{DynamicResource maxShowResults}"
+                                               VerticalAlignment="Center" />
+                                    <ComboBox Margin="10 0 18 0" Width="100" ItemsSource="{Binding MaxResultsRange}"
+                                              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">
+                                        &#xe8fd;
                                     </TextBlock>
                                 </ItemsControl>
                             </Border>
@@ -373,12 +590,15 @@
                     <Border Style="{DynamicResource SettingGroupBox}" Margin="0 30 0 0">
                         <ItemsControl Style="{StaticResource SettingGrid}">
                             <StackPanel Style="{StaticResource TextPanel}">
-                                <TextBlock Text="{DynamicResource pythonDirectory}" Style="{DynamicResource SettingTitleLabel}" />
+                                <TextBlock Text="{DynamicResource pythonDirectory}"
+                                           Style="{DynamicResource SettingTitleLabel}" />
                             </StackPanel>
                             <StackPanel Orientation="Horizontal" Grid.Column="2">
-                                <TextBox Text="{Binding Settings.PluginSettings.PythonDirectory, TargetNullValue='No Setting'}" Width="300" Height="26"/>
+                                <TextBox
+                                    Text="{Binding Settings.PluginSettings.PythonDirectory, TargetNullValue='No Setting'}"
+                                    Width="300" Height="26" />
                                 <Button Click="OnSelectPythonDirectoryClick"
-                            Content="{DynamicResource selectPythonDirectory}" Margin="10 10 18 10"/>
+                                        Content="{DynamicResource selectPythonDirectory}" Margin="10 10 18 10" />
                             </StackPanel>
                         </ItemsControl>
                     </Border>
@@ -386,20 +606,12 @@
                     <Border Style="{DynamicResource SettingGroupBox}">
                         <ItemsControl Style="{StaticResource SettingGrid}">
                             <StackPanel Style="{StaticResource TextPanel}">
-                                <TextBlock Text="{DynamicResource language}" Style="{DynamicResource SettingTitleLabel}" />
+                                <TextBlock Text="{DynamicResource language}"
+                                           Style="{DynamicResource SettingTitleLabel}" />
                             </StackPanel>
                             <ComboBox Margin="10 0 16 0" MaxWidth="200"
-                              ItemsSource="{Binding Languages}" SelectedValue="{Binding Language}"
-                              DisplayMemberPath="Display" SelectedValuePath="LanguageCode" Grid.Column="2"/>
-                        </ItemsControl>
-                    </Border>
-                    <Border Style="{DynamicResource SettingGroupBox}">
-                        <ItemsControl Style="{StaticResource SettingGrid}">
-                            <StackPanel Style="{StaticResource TextPanel}">
-                                <TextBlock Text="{DynamicResource autoHideScrollBar}" Style="{DynamicResource SettingTitleLabel}" />
-                                <TextBlock Text="{DynamicResource autoHideScrollBarToolTip}" Style="{DynamicResource SettingSubTitleLabel}" />
-                            </StackPanel>
-                            <ui:ToggleSwitch IsOn="{Binding AutoHideScrollBar}" FocusVisualMargin="5" Style="{DynamicResource SideControlToggle}" Width="100" ToolTip="{DynamicResource autoHideScrollBarToolTip}"/>
+                                      ItemsSource="{Binding Languages}" SelectedValue="{Binding Language}"
+                                      DisplayMemberPath="Display" SelectedValuePath="LanguageCode" Grid.Column="2" />
                         </ItemsControl>
                     </Border>
                 </StackPanel>
@@ -409,189 +621,476 @@
             <TabItem.Header>
                 <Grid>
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition/>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition />
                     </Grid.ColumnDefinitions>
-                    <TextBlock Grid.Column="0" FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20" Margin="0 0 12 0">&#xea86;</TextBlock>
-                    <TextBlock Grid.Column="1" Text="{DynamicResource plugin}"></TextBlock>
+                    <TextBlock Grid.Column="0" FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20"
+                               Margin="0 0 12 0">
+                        &#xea86;
+                    </TextBlock>
+                    <TextBlock Grid.Column="1" Text="{DynamicResource plugin}" />
                 </Grid>
             </TabItem.Header>
+
             <Grid>
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="180"></ColumnDefinition>
-                    <ColumnDefinition Width="*"></ColumnDefinition>
+                    <ColumnDefinition></ColumnDefinition>
                 </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="74"></RowDefinition>
+                    <RowDefinition Height="73"></RowDefinition>
                     <RowDefinition Height="*"></RowDefinition>
                 </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 5"/>
+                    <TextBlock Text="{DynamicResource plugin}" TextAlignment="left" FontSize="30" Margin="0 5 0 0"/>
                 </Border>
-                <Border Grid.Column="0" Grid.Row="1" Background="#f3f3f3">
-                    <ListBox SelectedIndex="0" SelectedItem="{Binding SelectedPlugin}"
+                <Border Grid.Column="0" Grid.Row="1" Background="#f3f3f3" Padding="0 0 0 0">
+                    <ListBox SelectedItem="{Binding SelectedPlugin}"
                              ItemsSource="{Binding PluginViewModels}"
-                             Margin="0, 0, 0, 0" ScrollViewer.HorizontalScrollBarVisibility="Disabled" ui:ScrollViewerHelper.AutoHideScrollBars="{Binding AutoHideScrollBar, Mode=OneWay}" ItemContainerStyle="{StaticResource PluginList}" ScrollViewer.IsDeferredScrollingEnabled="True">
-                        
+                             Margin="5, 0, 0, 0" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                             ItemContainerStyle="{StaticResource PluginList}"
+                             Padding="0 0 7 0" Width="Auto" HorizontalAlignment="Stretch" SnapsToDevicePixels="True">
+                        <ListBox.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <StackPanel Margin="0,0,0,18"/>
+                            </ItemsPanelTemplate>
+                        </ListBox.ItemsPanel>
                         <ListBox.ItemTemplate>
                             <DataTemplate>
-                                <DockPanel Margin="0">
-                                    <Grid>
+                                <Expander Grid.Column="4" x:Name="expanderHeader"
+                                          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.ColumnDefinitions>
+                                                <ColumnDefinition Width="100" MinWidth="100" />
+                                                <ColumnDefinition Width="*" MinWidth="350" MaxWidth="700" />
+                                                <ColumnDefinition MaxWidth="1400" />
+                                                <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>
+                                            <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" />
+                                                </TextBlock>
+                                            </StackPanel>
+                                            <StackPanel Grid.Column="3" Orientation="Horizontal">
+                                                <TextBlock Text="{DynamicResource priority}" Margin="0,0,8,0"
+                                                           MaxWidth="100" VerticalAlignment="Center" FontSize="12"/>
+                                                <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">
+                                                        <!--#region Priority Button Style-->
+                                                        <Button.Resources>
+                                                            <Style TargetType="Border">
+                                                                <Setter Property="CornerRadius" Value="2"/>
+                                                            </Style>
+                                                        </Button.Resources>
+                                                        <Button.Style>
+                                                            <Style TargetType="Button">
+                                                                <Setter Property="Padding" Value="12 8 12 8" />
+                                                                <Setter Property="BorderThickness" Value="0" />
+                                                                <Setter Property="FontWeight" Value="DemiBold" />
+                                                                <Setter Property="Foreground" Value="Black" />
+                                                                <Style.Triggers>
+                                                                    <DataTrigger Binding="{Binding ElementName=PriorityButton, UpdateSourceTrigger=PropertyChanged, Path=Content}" Value="0">
+                                                                        <Setter Property="Foreground" Value="#878787" />
+                                                                        <Setter Property="FontWeight" Value="Normal" />
+                                                                    </DataTrigger>
+                                                                </Style.Triggers>
+                                                            </Style>
+                                                        </Button.Style>
+                                                        <!--#endregion-->
+                                                    </Button>
+                                                </Border>
+                                            </StackPanel>
+                                            <ui:ToggleSwitch Grid.Column="4" OffContent="{DynamicResource disable}"
+                                                             OnContent="{DynamicResource enable}"
+                                                             MaxWidth="110" HorizontalAlignment="Right"
+                                                             IsOn="{Binding PluginState}" />
+                                        </Grid>
+
+                                    </Expander.Header>
+
+                                    <Grid FlowDirection="LeftToRight">
+                                        <StackPanel Orientation="Vertical" Margin="0 12 0 0">
+                                            <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">
+                                                        <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}"
+                                                                       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">
+
+                                                                <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"/>
+
+                                                                    </Style>
+                                                                </Button.Resources>
+                                                            </Button>
+                                                        </DockPanel>
+
+                                                    </ItemsControl>
+                                                </Border>
+                                            </StackPanel>
+
+                                            <StackPanel>
+
+
+                                                <Border Background="White" Padding="0"
+                                                        BorderThickness="0 1 0 0" BorderBrush="#e6e6e6"
+                                                        VerticalAlignment="Center" HorizontalAlignment="Stretch">
+                                                    <!--#region SubInfo Styling -->
+                                                    <Border.Style>
+                                                        <Style TargetType="{x:Type Border}">
+                                                            <Setter Property="Visibility" Value="Visible" />
+                                                            <Style.Triggers>
+                                                                <DataTrigger Binding="{Binding ElementName=PluginSettingControl, Path=ActualHeight}" Value="0">
+                                                                    <Setter Property="Visibility" Value="Collapsed" />
+                                                                    <Setter Property="BorderThickness" Value="0" />
+                                                                    <Setter Property="Padding" Value="0" />
+                                                                </DataTrigger>
+                                                            </Style.Triggers>
+                                                        </Style>
+                                                    </Border.Style>
+                                                </Border>
+                                                <!--#endregion-->
+                                                <ContentControl x:Name="PluginSettingControl" 
+                                                        Content="{Binding SettingControl}"
+                                                        Padding="1" Margin="0" VerticalAlignment="Stretch"
+                                                        MaxWidth="750" MaxHeight="550">
+                                                </ContentControl>
+
+                                            </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" >
+                                                    <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" />
+                                                                </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"/>
+                                                        </StackPanel>
+
+                                                    </ItemsControl>
+                                                </Border>
+
+                                            </StackPanel>
+                                        </StackPanel>
+                                    </Grid>
+                                </Expander>
+
+                            </DataTemplate>
+                        </ListBox.ItemTemplate>
+                    </ListBox>
+                </Border>
+
+            </Grid>
+        </TabItem>
+
+        <!--#region Plugin Store -->
+        <TabItem>
+            <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">
+                        &#xe719;
+                    </TextBlock>
+                    <TextBlock Grid.Column="1" Text="{DynamicResource pluginStore}" />
+                </Grid>
+            </TabItem.Header>
+
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition></ColumnDefinition>
+                    <ColumnDefinition></ColumnDefinition>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="72"></RowDefinition>
+                    <RowDefinition Height="*"></RowDefinition>
+                </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>
+                <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" 
+                            Click="OnPluginStoreRefreshClick"
+                            BorderThickness="1 1 1 2"/>
+                </Border>
+                <Border Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Background="#f3f3f3" Padding="0 0 0 0">
+                    <ListBox  x:Name="StoreListBox"
+                             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">
+                        <ListBox.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <UniformGrid IsItemsHost="True" HorizontalAlignment="Left" Columns="2" Margin="0 0 6 18" VerticalAlignment="Top" 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}">
+                                    <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/>
+                                        </ControlTemplate>
+                                    </ToggleButton.Template>
+                                    
+                                    <Grid HorizontalAlignment="Left" VerticalAlignment="Stretch">
                                         <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="50"/>
-                                            <ColumnDefinition />
+                                            <ColumnDefinition Width="72"/>
+                                            <ColumnDefinition Width="*" />
                                         </Grid.ColumnDefinitions>
-                                        <Image Source="{Binding Image, IsAsync=True}"
-                                           Width="32" Height="32" Margin="12 0 0 0" Grid.Column="0"/>
-                                        <StackPanel Grid.Column="1" Margin="12 0 0 0">
-                                            <TextBlock Text="{Binding PluginPair.Metadata.Name}" TextWrapping="Wrap" ToolTip="{Binding PluginPair.Metadata.Version}" />
-                                            <TextBlock Opacity="0.5" TextWrapping="Wrap" Margin="0 2 0 0">
-                                            <Run Text="{Binding PluginPair.Metadata.Version}"/>
+                                        <StackPanel Grid.Column="0" Margin="0 0 0 0"
+                                                        VerticalAlignment="Center" >
+                                            <StackPanel.Style>
+                                                <Style>
+                                                    <Setter Property="StackPanel.Visibility" Value="Visible" />
+                                                    <Style.Triggers>
+                                                        <DataTrigger Binding="{Binding Mode=TwoWay, Path=IsSelected, RelativeSource={RelativeSource AncestorType=ListBoxItem, Mode=FindAncestor}}" Value="true">
+                                                            <Setter Property="StackPanel.Opacity" Value="1" />
+                                                        </DataTrigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </StackPanel.Style>
+                                            <Image Source="{Binding IcoPath, IsAsync=True}"
+                                                   Width="32" Height="32" Margin="8 0 6 0"
+                                                   VerticalAlignment="Center"/>
+                                        </StackPanel>
+                                        <StackPanel Grid.Column="1" Margin="0 0 8 0" VerticalAlignment="Center" Panel.ZIndex="0">
+                                            <StackPanel.Style>
+                                                <Style>
+                                                    <Setter Property="StackPanel.Visibility" Value="Visible" />
+                                                    <Style.Triggers>
+                                                        <DataTrigger Binding="{Binding Mode=TwoWay, Path=IsSelected, RelativeSource={RelativeSource AncestorType=ListBoxItem, Mode=FindAncestor}}" Value="true">
+                                                            <Setter Property="StackPanel.Opacity" Value="1" />
+                                                        </DataTrigger>
+                                                    </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>
+
+                                        </StackPanel >
+                                        <StackPanel Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                                            <StackPanel.Style>
+                                                <Style>
+                                                    <Setter Property="StackPanel.Visibility" Value="Collapsed" />
+                                                    <Style.Triggers>
+                                                        <DataTrigger Binding="{Binding Mode=TwoWay, Path=IsSelected, RelativeSource={RelativeSource AncestorType=ListBoxItem, Mode=FindAncestor}}" Value="true">
+                                                            <Setter Property="StackPanel.Visibility" Value="Visible" />
+                                                        </DataTrigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </StackPanel.Style>
+
+
+                                            <Grid Height="94" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Panel.ZIndex="1">
+                                                <Grid.Background>
+                                                    <SolidColorBrush Color="#f6f6f6" Opacity=".95"/>
+                                                </Grid.Background>
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="{Binding ActualWidth,RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}}" />
+                                                </Grid.ColumnDefinitions>
+
+                                                <StackPanel Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Stretch">
+                                                    <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}" />
+                                                    </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" />
+                                                            </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>
+                                            </Grid>
                                         </StackPanel>
                                     </Grid>
-                                </DockPanel>
+
+                                </ToggleButton>
                             </DataTemplate>
                         </ListBox.ItemTemplate>
                     </ListBox>
                 </Border>
 
-                <Border BorderThickness="1 2 0 0" BorderBrush="#f3f3f3" Grid.Column="2" Grid.RowSpan="2" Padding="12 12 12 12">
-                <Grid Grid.Column="1" Grid.RowSpan="2">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="*" />
-                    </Grid.RowDefinitions>
-                    
-                    <ContentControl DataContext="{Binding Path=SelectedPlugin}"
-                                    Grid.ColumnSpan="1" Grid.Row="0" Margin="10 10 10 0">
-                        <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="48" />
-                                <ColumnDefinition />
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition/>
-                                <RowDefinition/>
-                                <RowDefinition/>
-                            </Grid.RowDefinitions>
-                            
-                            <Image Source="{Binding Image, IsAsync=True}"
-                                   Width="48" Height="48" 
-                                   HorizontalAlignment="Left" VerticalAlignment="Top"
-                                   Grid.RowSpan="2"/>
-                            <Grid Grid.Row="0" Grid.Column="1"
-                                  Margin="20,0,0,0">
-                                <TextBlock Text="{Binding PluginPair.Metadata.Name}"
-                                            Grid.Column="0"
-                                            Cursor="Hand" MouseUp="OnPluginNameClick" FontSize="24"
-                                            HorizontalAlignment="Left">
-                                        <ToolTipService.ToolTip>
-                                            <TextBlock>
-                                                <Run Text="{DynamicResource author}" />
-                                                <Run Text=": " />
-                                                <Run Text="{Binding PluginPair.Metadata.Author}" />
-                                            </TextBlock>
-                                        </ToolTipService.ToolTip>
-                                    </TextBlock>
-                                <ui:ToggleSwitch Grid.Column="1" OffContent="{DynamicResource disable}" OnContent="{DynamicResource enable}" 
-                                                    MaxWidth="110" HorizontalAlignment="Right"
-                                                    IsOn="{Binding PluginState}"/>
-                            </Grid>
-                            <TextBlock Margin="20,0,0,0"
-                                       Text="{Binding PluginPair.Metadata.Description}"
-                                       Grid.Row="1" Opacity="0.5" Grid.Column="2" />
-                            <DockPanel Grid.ColumnSpan="2" Grid.Row="2" Margin="0 10 0 8" HorizontalAlignment="Right">
-                                <TextBlock Text="{DynamicResource priority}" Margin="15,0,0,0" MaxWidth="100"/>
-                                <TextBlock Text="{Binding Priority}"
-                                            ToolTip="Change Plugin Results Priority"
-                                            Margin="5 0 0 0" Cursor="Hand" Foreground="Blue"
-                                            MouseUp="OnPluginPriorityClick"/>
-                                <TextBlock Text="{DynamicResource actionKeywords}"
-                                            Visibility="{Binding ActionKeywordsVisibility}"
-                                            Margin="5 0 0 0"/>
-                                <TextBlock Text="{Binding ActionKeywordsText}"
-                                            Visibility="{Binding ActionKeywordsVisibility}"
-                                            ToolTip="Change Action Keywords"
-                                            Margin="5 0 0 0" Cursor="Hand" Foreground="Blue"
-                                            MouseUp="OnPluginActionKeywordsClick" MaxWidth="100" />
-                                <TextBlock Text="{DynamicResource plugin_init_time}" Margin="10 0 0 0" MaxWidth="100"/>
-                                <TextBlock Text="{Binding InitilizaTime}" Margin="5 0 0 0" MaxWidth="100"/>
-                                <TextBlock Text="{DynamicResource plugin_query_time}" Margin="10 0 0 0" MaxWidth="100"/>
-                                <TextBlock Text="{Binding QueryTime}" Margin="5 0 0 0" MaxWidth="100"/>
-                                <TextBlock Text="{DynamicResource pluginDirectory}"
-                                            MaxWidth="120" Cursor="Hand" Margin="10,0,0,0"
-                                            MouseUp="OnPluginDirecotyClick" Foreground="Blue" />
-                            </DockPanel>
-                        </Grid>
-                    </ContentControl>
-                    
-                    <ContentControl Content="{Binding SettingProvider}"
-                                    Grid.ColumnSpan="1" Grid.Row="1"
-                                    HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
-                </Grid>
-                </Border>
             </Grid>
         </TabItem>
+        <!--#endregion-->
+
         <TabItem>
             <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">&#xe790;</TextBlock>
-                        <TextBlock Grid.Column="1" Text="{DynamicResource theme}"></TextBlock>
-                    </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">
+                        &#xe790;
+                    </TextBlock>
+                    <TextBlock Grid.Column="1" Text="{DynamicResource theme}" />
+                </Grid>
             </TabItem.Header>
             <Border Padding=" 0 0 0 0 ">
-                <ScrollViewer ScrollViewer.CanContentScroll="False" ui:ScrollViewerHelper.AutoHideScrollBars="{Binding AutoHideScrollBar, Mode=OneWay}" Margin="0,0,0,0" Background="#f3f3f3" Padding="0 0 18 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">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="0" />
-                            <RowDefinition  Height="350"/>
-                            <RowDefinition Height="80"/>
+                            <RowDefinition Height="350" />
+                            <RowDefinition  />
                             <RowDefinition />
-                            <RowDefinition Height="*"/>
+                            <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"/>
+                            <TextBlock Text="{DynamicResource theme}" TextAlignment="left" FontSize="30"
+                                       Margin="0 5 0 5" />
                         </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}" >
+                                        HorizontalAlignment="Center" VerticalAlignment="Center">
+                                <Border Width="500" Style="{DynamicResource WindowBorderStyle}">
                                     <Border Style="{DynamicResource WindowRadius}">
                                         <Border.Clip>
                                             <MultiBinding Converter="{StaticResource BorderClipConverter}">
-                                                <Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}"/>
-                                                <Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}"/>
-                                                <Binding Path="CornerRadius" RelativeSource="{RelativeSource Self}"/>
+                                                <Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}" />
+                                                <Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}" />
+                                                <Binding Path="CornerRadius" RelativeSource="{RelativeSource Self}" />
                                             </MultiBinding>
                                         </Border.Clip>
                                         <Grid>
                                             <Grid.RowDefinitions>
-                                                <RowDefinition Height="54"/>
+                                                <RowDefinition Height="54" />
                                                 <RowDefinition />
                                                 <RowDefinition />
                                             </Grid.RowDefinitions>
                                             <Border Grid.Row="0">
                                                 <TextBox
-                                             Text="{DynamicResource hiThere}" IsReadOnly="True"
-                                             Style="{DynamicResource QueryBoxStyle}"/>
+                                                    Text="{DynamicResource hiThere}" IsReadOnly="True"
+                                                    Style="{DynamicResource QueryBoxStyle}" />
 
                                             </Border>
                                             <Canvas Style="{DynamicResource SearchIconPosition}">
-                                                <Path Data="{DynamicResource SearchIconImg}" Style="{DynamicResource SearchIconStyle}" Margin="0"  Stretch="Fill"/>
+                                                <Path Data="{DynamicResource SearchIconImg}"
+                                                      Style="{DynamicResource SearchIconStyle}" Margin="0"
+                                                      Stretch="Fill" />
                                             </Canvas>
 
                                             <Border Margin="0 0 0 0" Grid.Row="1">
-                                                <Rectangle Width="Auto" HorizontalAlignment="Stretch" Style="{DynamicResource SeparatorStyle}" Visibility="visible"/>
+                                                <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>
@@ -600,26 +1099,49 @@
                             </StackPanel>
                         </StackPanel>
 
+                        <StackPanel Grid.Row="2" VerticalAlignment="Top">
+                            <Border Style="{DynamicResource SettingGroupBox}" Margin="0 12 0 0">
+                                <ItemsControl Style="{StaticResource SettingGrid}">
+                                    <StackPanel Style="{StaticResource TextPanel}">
+                                        <TextBlock Text="{DynamicResource queryWindowShadowEffect}"
+                                                   Style="{DynamicResource SettingTitleLabel}" />
+                                        <TextBlock Text="{DynamicResource shadowEffectCPUUsage}"
+                                                   Style="{DynamicResource SettingSubTitleLabel}" />
+                                    </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">
+                                        &#xeb91;
+                                    </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}" ui:ScrollViewerHelper.AutoHideScrollBars="True" 
-                                         ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Disabled" Background="#ffffff" Padding="18" HorizontalAlignment="Center" 
+                            <Border Style="{DynamicResource SettingGroupBox}" Margin="0 8 0 0" Padding="0"
+                                    HorizontalAlignment="Stretch">
+                                <ListBox ItemsSource="{Binding Themes}" SelectedItem="{Binding SelectedTheme}"
+                                         ui:ScrollViewerHelper.AutoHideScrollBars="True"
+                                         ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                                         ScrollViewer.VerticalScrollBarVisibility="Disabled" Background="#ffffff"
+                                         Padding="18" HorizontalAlignment="Center"
                                          HorizontalContentAlignment="Center">
                                     <ListBox.ItemContainerStyle>
                                         <Style TargetType="ListBoxItem">
                                             <Style.Triggers>
-                                                <Trigger Property="IsSelected" Value="True" >
+                                                <Trigger Property="IsSelected" Value="True">
                                                     <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="BorderBrush" Value="#cccccc" />
                                                 </Trigger>
-                                                <Trigger Property="IsMouseOver" Value="True" >
+                                                <Trigger Property="IsMouseOver" Value="True">
                                                     <Setter Property="Margin" Value="12 8 12 8" />
                                                     <Setter Property="Foreground" Value="#3E99D1" />
                                                 </Trigger>
-                                                <Trigger Property="IsMouseOver" Value="False" >
+                                                <Trigger Property="IsMouseOver" Value="False">
                                                     <Setter Property="Background" Value="#f3f3f3" />
                                                     <Setter Property="Foreground" Value="Black" />
                                                     <Setter Property="Margin" Value="12 8 12 8" />
@@ -636,7 +1158,9 @@
                                     <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"></TextBlock>
+                                                <TextBlock Text="{Binding}" Margin="0" HorizontalAlignment="Center"
+                                                           VerticalAlignment="Center" Focusable="True" FontSize="13"
+                                                           TextWrapping="Wrap" Padding="10" />
                                             </Grid>
                                         </DataTemplate>
                                     </ListBox.ItemTemplate>
@@ -650,56 +1174,50 @@
                             </Border>
                             <Border>
                                 <TextBlock DockPanel.Dock="Top" Margin="10" HorizontalAlignment="Right">
-                                    <Hyperlink NavigateUri="{Binding Theme, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
-                                            <Run Text="{DynamicResource browserMoreThemes}" />
+                                    <Hyperlink NavigateUri="{Binding Theme, Mode=OneWay}"
+                                               RequestNavigate="OnRequestNavigate">
+                                        <Run Text="{DynamicResource browserMoreThemes}" />
                                     </Hyperlink>
                                 </TextBlock>
                             </Border>
                         </StackPanel>
-                        
-                        <StackPanel Grid.Row="2">
-                            <Border Style="{DynamicResource SettingGroupBox}" Margin="0 12 0 0">
-                                <ItemsControl Style="{StaticResource SettingGrid}">
-                                    <StackPanel Style="{StaticResource TextPanel}">
-                                        <TextBlock Text="{DynamicResource queryWindowShadowEffect}" Style="{DynamicResource SettingTitleLabel}" />
-                                        <TextBlock Text="{DynamicResource shadowEffectCPUUsage}" Style="{DynamicResource SettingSubTitleLabel}" />
-                                    </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">
-                                      &#xeb91;
-                                    </TextBlock>
-                                </ItemsControl>
-                            </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">
+                            <Border Style="{DynamicResource SettingGroupBox}" Padding="0" CornerRadius="5"
+                                    Margin="0 30 0 0">
                                 <StackPanel Orientation="Vertical">
                                     <Border Style="{DynamicResource SettingGroupBox}" Margin="0" BorderThickness="0">
                                         <ItemsControl Style="{StaticResource SettingGrid}">
                                             <StackPanel Style="{StaticResource TextPanel}">
-                                                <TextBlock Text="{DynamicResource useGlyphUI}" Style="{DynamicResource SettingTitleLabel}" />
-                                                <TextBlock Text="{DynamicResource useGlyphUIEffect}" Style="{DynamicResource SettingSubTitleLabel}" />
+                                                <TextBlock Text="{DynamicResource useGlyphUI}"
+                                                           Style="{DynamicResource SettingTitleLabel}" />
+                                                <TextBlock Text="{DynamicResource useGlyphUIEffect}"
+                                                           Style="{DynamicResource SettingSubTitleLabel}" />
                                             </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">
-                                      &#xf6b8;
+                                            <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">
+                                                &#xf6b8;
                                             </TextBlock>
                                         </ItemsControl>
                                     </Border>
-                                    <Separator BorderBrush="#e5e5e5" BorderThickness="1" Width="Auto"/>
+                                    <Separator BorderBrush="#e5e5e5" BorderThickness="1" Width="Auto" />
                                     <Border Style="{DynamicResource SettingGroupBox}" Margin="0" BorderThickness="0">
                                         <ItemsControl Style="{StaticResource SettingGrid}">
-                                            <TextBlock Grid.Column="1" Text="{DynamicResource queryBoxFont}" VerticalAlignment="Center" />
+                                            <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" />
+                                                          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">
+                                                          SelectedItem="{Binding SelectedQueryBoxFontFaces}"
+                                                          HorizontalAlignment="Left" VerticalAlignment="Top"
+                                                          Width="130" Margin="10 0 0 0">
                                                     <ComboBox.ItemTemplate>
                                                         <DataTemplate>
                                                             <ItemsControl ItemsSource="{Binding AdjustedFaceNames}">
@@ -713,24 +1231,26 @@
                                                     </ComboBox.ItemTemplate>
                                                 </ComboBox>
                                             </StackPanel>
-                                            <TextBlock FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20" Grid.Column="0" VerticalAlignment="Center" Margin="24 0 16 0">
+                                            <TextBlock FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20"
+                                                       Grid.Column="0" VerticalAlignment="Center" Margin="24 0 16 0">
                                                 &#xe990;
                                             </TextBlock>
                                         </ItemsControl>
                                     </Border>
-                                    <Separator BorderBrush="#e5e5e5" BorderThickness="1" Width="Auto"/>
+                                    <Separator BorderBrush="#e5e5e5" BorderThickness="1" Width="Auto" />
                                     <Border Style="{DynamicResource SettingGroupBox}" Margin="0" BorderThickness="0">
                                         <ItemsControl Style="{StaticResource SettingGrid}">
-                                            <TextBlock Grid.Column="1" Text="{DynamicResource resultItemFont}" VerticalAlignment="Center"/>
+                                            <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" />
+                                                          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">
+                                                          SelectedItem="{Binding SelectedResultFontFaces}"
+                                                          HorizontalAlignment="Left" VerticalAlignment="Top"
+                                                          Width="130" Margin="10 -2 0 0">
                                                     <ComboBox.ItemTemplate>
                                                         <DataTemplate>
                                                             <ItemsControl ItemsSource="{Binding AdjustedFaceNames}">
@@ -744,7 +1264,8 @@
                                                     </ComboBox.ItemTemplate>
                                                 </ComboBox>
                                             </StackPanel>
-                                            <TextBlock FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20" Grid.Column="0" VerticalAlignment="Center" Margin="24 0 16 0">
+                                            <TextBlock FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20"
+                                                       Grid.Column="0" VerticalAlignment="Center" Margin="24 0 16 0">
                                                 &#xe8fd;
                                             </TextBlock>
                                         </ItemsControl>
@@ -756,12 +1277,15 @@
                                 <Border Style="{DynamicResource SettingGroupBox}" Margin="0 12 0 18">
                                     <ItemsControl Style="{StaticResource SettingGrid}">
                                         <StackPanel Style="{StaticResource TextPanel}">
-                                            <TextBlock Text="Theme Folder" Style="{DynamicResource SettingTitleLabel}" />
+                                            <TextBlock Text="{DynamicResource ThemeFolder}" Style="{DynamicResource SettingTitleLabel}" />
                                         </StackPanel>
-                                        <Button DockPanel.Dock="Top" Margin="0,0,18,0" Width="180" HorizontalAlignment="Center" 
-                            Click="OpenPluginFolder" Grid.Column="2">Open Theme Folder</Button>
-                                        <TextBlock FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20" Grid.Column="0" VerticalAlignment="Center" Margin="24 0 16 0">
-                                &#xe838;
+                                        <Button DockPanel.Dock="Top" Margin="0,0,18,0" Width="180"
+                                                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">
+                                            &#xe838;
                                         </TextBlock>
                                     </ItemsControl>
                                 </Border>
@@ -771,80 +1295,101 @@
                 </ScrollViewer>
             </Border>
         </TabItem>
-                
-   
+
+
         <TabItem>
             <TabItem.Header>
                 <Grid>
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition/>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition />
                     </Grid.ColumnDefinitions>
-                    <TextBlock Grid.Column="0" FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20" Margin="0 0 12 0">&#xe92e;</TextBlock>
-                    <TextBlock Grid.Column="1" Text="{DynamicResource hotkey}"></TextBlock>
+                    <TextBlock Grid.Column="0" FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20"
+                               Margin="0 0 12 0">
+                        &#xe92e;
+                    </TextBlock>
+                    <TextBlock Grid.Column="1" Text="{DynamicResource hotkey}" />
                 </Grid>
             </TabItem.Header>
-            <ScrollViewer ScrollViewer.CanContentScroll="False" ui:ScrollViewerHelper.AutoHideScrollBars="{Binding AutoHideScrollBar, Mode=OneWay}" Margin="0,0,0,0" Background="#f3f3f3">
+            <ScrollViewer ScrollViewer.CanContentScroll="False"
+                          Margin="0,0,0,0" Background="#f3f3f3" Padding="0 0 6 0">
                 <Border Background="#f3f3f3">
                     <Grid Margin="5 18 18 10">
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="50" />
+                            <RowDefinition Height="43" />
                             <RowDefinition Height="80" />
-                            <RowDefinition Height="150"/>
+                            <RowDefinition Height="150" />
                             <RowDefinition Height="50" />
                             <RowDefinition Height="250" />
                             <RowDefinition Height="70" />
                         </Grid.RowDefinitions>
-                        <TextBlock Text="{DynamicResource hotkey}" Grid.Row="0" TextAlignment="left" FontSize="30" Margin="0 5 0 5"/>
+                        <TextBlock Text="{DynamicResource hotkey}" Grid.Row="0" TextAlignment="left" FontSize="30"
+                                   Margin="0 5 0 2" />
 
                         <StackPanel Grid.Row="1">
                             <Border Style="{DynamicResource SettingGroupBox}" Margin="0 12 0 0">
                                 <ItemsControl Style="{StaticResource SettingGrid}">
                                     <StackPanel Style="{StaticResource TextPanel}">
-                                        <TextBlock Text="{DynamicResource flowlauncherHotkey}" Style="{DynamicResource SettingTitleLabel}" />
-                                        <TextBlock Text="Choose what you want" Style="{DynamicResource SettingSubTitleLabel}" />
+                                        <TextBlock Text="{DynamicResource flowlauncherHotkey}"
+                                                   Style="{DynamicResource SettingTitleLabel}" />
+                                        <TextBlock Text="{DynamicResource flowlauncherHotkeyToolTip}"
+                                                   Style="{DynamicResource SettingSubTitleLabel}" />
                                     </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"/>
+                                                                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">
-                                      &#xeda7;
+                                    <TextBlock FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20"
+                                               Grid.Column="0" VerticalAlignment="Center" Margin="24 0 16 0">
+                                        &#xeda7;
                                     </TextBlock>
                                 </ItemsControl>
                             </Border>
                         </StackPanel>
 
-                        <Border Style="{DynamicResource SettingGroupBox}" Padding="0" CornerRadius="5" Margin="0 12 0 0" Grid.Row="2">
+                        <Border Style="{DynamicResource SettingGroupBox}" Padding="0" CornerRadius="5"
+                                Margin="0 12 0 0" Grid.Row="2">
                             <StackPanel Orientation="Vertical">
                                 <Border Style="{DynamicResource SettingGroupBox}" Margin="0" BorderThickness="0">
                                     <ItemsControl Style="{StaticResource SettingGrid}">
-                                        <TextBlock Grid.Column="1" Text="{DynamicResource openResultModifiers}" VerticalAlignment="Center" />
-                                        <ComboBox Margin="0 0 18 0" Width="120"
-                              ItemsSource="{Binding OpenResultModifiersList}" 
-                              SelectedItem="{Binding Settings.OpenResultModifiers}" FontSize="14" Grid.Column="2"/>
+                                        <StackPanel Style="{StaticResource TextPanel}">
+                                        <TextBlock Grid.Column="1" Text="{DynamicResource openResultModifiers}"
+                                                   VerticalAlignment="Center" />
+                                            <TextBlock Text="{DynamicResource openResultModifiersToolTip}"
+                                                   Style="{DynamicResource SettingSubTitleLabel}" />
+                                        </StackPanel>
+                            <ComboBox Margin="0 0 18 0" Width="120"
+                                                  ItemsSource="{Binding OpenResultModifiersList}"
+                                                  SelectedItem="{Binding Settings.OpenResultModifiers}" FontSize="14"
+                                                  Grid.Column="2" />
                                     </ItemsControl>
                                 </Border>
 
-                                <Separator BorderBrush="#e5e5e5" BorderThickness="1" Width="Auto"/>
+                                <Separator BorderBrush="#e5e5e5" BorderThickness="1" Width="Auto" />
                                 <Border Style="{DynamicResource SettingGroupBox}" Margin="0" BorderThickness="0">
                                     <ItemsControl Style="{StaticResource SettingGrid}">
                                         <StackPanel Style="{StaticResource TextPanel}" Grid.Column="1">
-                                            <TextBlock Text="{DynamicResource showOpenResultHotkey}" VerticalAlignment="Center"/>
-                                            <TextBlock Text="Display Hotkey in Query Result " Style="{DynamicResource SettingSubTitleLabel}" />
+                                            <TextBlock Text="{DynamicResource showOpenResultHotkey}"
+                                                       VerticalAlignment="Center" />
+                                            <TextBlock Text="{DynamicResource showOpenResultHotkeyToolTip}"
+                                                       Style="{DynamicResource SettingSubTitleLabel}" />
                                         </StackPanel>
-                                        <CheckBox IsChecked="{Binding Settings.ShowOpenResultHotkey}" Style="{DynamicResource SideControlCheckBox}">
-                                        </CheckBox>
+                                        <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 "/>
+                        <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}"
-                          SelectedItem="{Binding SelectedCustomPluginHotkey}"
-                          Style="{StaticResource {x:Static GridView.GridViewStyleKey}}"
-                          BorderBrush="DarkGray" BorderThickness="1" Background="#ffffff"
-                          Margin="0 0 0 0">
+                                  SelectedItem="{Binding SelectedCustomPluginHotkey}"
+                                  Style="{StaticResource {x:Static GridView.GridViewStyleKey}}"
+                                  BorderBrush="DarkGray" BorderThickness="1" Background="#ffffff"
+                                  Margin="0 0 0 0">
                             <ListView.View>
                                 <GridView>
                                     <GridViewColumn Header="{DynamicResource hotkey}" Width="180">
@@ -854,7 +1399,7 @@
                                             </DataTemplate>
                                         </GridViewColumn.CellTemplate>
                                     </GridViewColumn>
-                                    <GridViewColumn Header="{DynamicResource customQuery}" Width="546">
+                                    <GridViewColumn Header="{DynamicResource customQuery}" Width="540">
                                         <GridViewColumn.CellTemplate>
                                             <DataTemplate DataType="userSettings:CustomPluginHotkey">
                                                 <TextBlock Text="{Binding ActionKeyword}" />
@@ -865,82 +1410,106 @@
                             </ListView.View>
                         </ListView>
                         <StackPanel Grid.Row="5" HorizontalAlignment="Right" VerticalAlignment="Top"
-                            Orientation="Horizontal" Width="350" Margin="0">
+                                    Orientation="Horizontal" Width="350" Margin="0">
                             <Button Click="OnDeleteCustomHotkeyClick" Width="100"
-                            Margin="10" Content="{DynamicResource delete}" />
+                                    Margin="10" Content="{DynamicResource delete}" />
                             <Button Click="OnnEditCustomHotkeyClick" Width="100" Margin="10"
-                            Content="{DynamicResource edit}" />
+                                    Content="{DynamicResource edit}" />
                             <Button Click="OnAddCustomeHotkeyClick" Width="100" Margin="10 10 0 10"
-                            Content="{DynamicResource add}" />
+                                    Content="{DynamicResource add}" />
                         </StackPanel>
                     </Grid>
                 </Border>
             </ScrollViewer>
         </TabItem>
-        
-        
+
+
         <TabItem>
             <TabItem.Header>
                 <Grid>
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition/>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition />
                     </Grid.ColumnDefinitions>
-                    <TextBlock Grid.Column="0" FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20" Margin="0 0 12 0">&#xec27;</TextBlock>
-                    <TextBlock Grid.Column="1" Text="{DynamicResource proxy}"></TextBlock>
+                    <TextBlock Grid.Column="0" FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20"
+                               Margin="0 0 12 0">
+                        &#xec27;
+                    </TextBlock>
+                    <TextBlock Grid.Column="1" Text="{DynamicResource proxy}" />
                 </Grid>
             </TabItem.Header>
-            <ScrollViewer ScrollViewer.CanContentScroll="False" ui:ScrollViewerHelper.AutoHideScrollBars="{Binding AutoHideScrollBar, Mode=OneWay}" Margin="0,0,0,0" Background="#f3f3f3" Padding="5 0 18 0">
+            <ScrollViewer ScrollViewer.CanContentScroll="False"
+                          Margin="0,0,0,0" Background="#f3f3f3" Padding="5 0 24 0">
                 <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 5"/>
+                            <TextBlock Text="{DynamicResource proxy}" Grid.Row="0" TextAlignment="left" FontSize="30"
+                                       Margin="0 5 0 0" />
                         </Border>
 
 
-                        <Border Style="{DynamicResource SettingGroupBox}" Padding="0" CornerRadius="5" Margin="0 12 0 0">
+                        <Border Style="{DynamicResource SettingGroupBox}" Padding="0" CornerRadius="5"
+                                Margin="0 10 0 0">
                             <StackPanel Orientation="Vertical">
                                 <Border Style="{DynamicResource SettingGroupBox}" Margin="0" BorderThickness="0">
                                     <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" Text="{DynamicResource enableProxy}"
+                                                   VerticalAlignment="Center" />
+                                        <CheckBox IsChecked="{Binding Settings.Proxy.Enabled}"
+                                                  Style="{DynamicResource SideControlCheckBox}" />
                                     </ItemsControl>
                                 </Border>
-                                <Separator BorderBrush="#e5e5e5" BorderThickness="1" Width="Auto"/>
+                                <Separator BorderBrush="#e5e5e5" BorderThickness="1" Width="Auto" />
                                 <Border Style="{DynamicResource SettingGroupBox}" Margin="0" BorderThickness="0">
                                     <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" 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" />
                                     </ItemsControl>
                                 </Border>
-                                <Separator BorderBrush="#e5e5e5" BorderThickness="1" Width="Auto"/>
+                                <Separator BorderBrush="#e5e5e5" BorderThickness="1" Width="Auto" />
                                 <Border Style="{DynamicResource SettingGroupBox}" Margin="0" BorderThickness="0">
                                     <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" 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" />
                                     </ItemsControl>
                                 </Border>
-                                <Separator BorderBrush="#e5e5e5" BorderThickness="1" Width="Auto"/>
+                                <Separator BorderBrush="#e5e5e5" BorderThickness="1" Width="Auto" />
                                 <Border Style="{DynamicResource SettingGroupBox}" Margin="0" BorderThickness="0">
                                     <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" 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" />
                                     </ItemsControl>
                                 </Border>
-                                <Separator BorderBrush="#e5e5e5" BorderThickness="1" Width="Auto"/>
+                                <Separator BorderBrush="#e5e5e5" BorderThickness="1" Width="Auto" />
                                 <Border Style="{DynamicResource SettingGroupBox}" Margin="0" BorderThickness="0">
                                     <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" 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" />
                                     </ItemsControl>
                                 </Border>
                             </StackPanel>
                         </Border>
                         <Border Style="{DynamicResource SettingGroupBox}" Margin="0 12 0 0" BorderThickness="0">
                             <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" 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" />
                             </ItemsControl>
                         </Border>
                     </StackPanel>
@@ -951,61 +1520,65 @@
             <TabItem.Header>
                 <Grid>
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition/>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition />
                     </Grid.ColumnDefinitions>
-                    <TextBlock Grid.Column="0" FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20" Margin="0 0 12 0">&#xe946;</TextBlock>
-                    <TextBlock Grid.Column="1" Text="{DynamicResource about}"></TextBlock>
+                    <TextBlock Grid.Column="0" FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20"
+                               Margin="0 0 12 0">
+                        &#xe946;
+                    </TextBlock>
+                    <TextBlock Grid.Column="1" Text="{DynamicResource about}" />
                 </Grid>
             </TabItem.Header>
             <Border Background="#f3f3f3">
-            <Grid Height="400" Margin="65,0">
-                <!--<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="FontSize" Value="14" />
-                    </Style>
-                </Grid.Resources>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <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="1" Grid.Column="0" Text="{DynamicResource website}"/>
-                <TextBlock Grid.Row="1" Grid.Column="1" HorizontalAlignment="Left">
-                    <Hyperlink NavigateUri="{Binding Website, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
-                        <Run Text="{Binding Website, Mode=OneWay}" />
-                    </Hyperlink>
-                </TextBlock>
-                <TextBlock Grid.Row="2" Grid.Column="0" Text="Version" />
-                <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">
-                        <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">
-                        <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" />
-            </Grid>
+                <Grid Height="400" Margin="65,0">
+                    <!--<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="FontSize" Value="14" />
+                        </Style>
+                    </Grid.Resources>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <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="1" Grid.Column="0" Text="{DynamicResource website}" />
+                    <TextBlock Grid.Row="1" Grid.Column="1" HorizontalAlignment="Left">
+                        <Hyperlink NavigateUri="{Binding Website, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
+                            <Run Text="{Binding Website, Mode=OneWay}" />
+                        </Hyperlink>
+                    </TextBlock>
+                    <TextBlock Grid.Row="2" Grid.Column="0" Text="Version" />
+                    <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">
+                            <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">
+                            <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" />
+                </Grid>
             </Border>
         </TabItem>
     </TabControl>
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 5e8e194d4da..0431c9c7848 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -13,6 +13,8 @@
 using Flow.Launcher.Plugin.SharedCommands;
 using Flow.Launcher.ViewModel;
 using Flow.Launcher.Helper;
+using System.Windows.Controls;
+using Flow.Launcher.Core.ExternalPlugins;
 
 namespace Flow.Launcher
 {
@@ -185,23 +187,20 @@ private void OnPluginToggled(object sender, RoutedEventArgs e)
             settings.PluginSettings.Plugins[id].Disabled = viewModel.SelectedPlugin.PluginPair.Metadata.Disabled;
         }
 
-        private void OnPluginPriorityClick(object sender, MouseButtonEventArgs e)
+        private void OnPluginPriorityClick(object sender, RoutedEventArgs e)
         {
-            if (e.ChangedButton == MouseButton.Left)
+            if (sender is Control { DataContext: PluginViewModel pluginViewModel })
             {
-                PriorityChangeWindow priorityChangeWindow = new PriorityChangeWindow(viewModel.SelectedPlugin.PluginPair.Metadata.ID, settings, viewModel.SelectedPlugin);
+                PriorityChangeWindow priorityChangeWindow = new PriorityChangeWindow(pluginViewModel.PluginPair.Metadata.ID, settings, pluginViewModel);
                 priorityChangeWindow.ShowDialog();
             }
         }
 
-        private void OnPluginActionKeywordsClick(object sender, MouseButtonEventArgs e)
+        private void OnPluginActionKeywordsClick(object sender, RoutedEventArgs e)
         {
-            if (e.ChangedButton == MouseButton.Left)
-            {
-                var id = viewModel.SelectedPlugin.PluginPair.Metadata.ID;
-                ActionKeywords changeKeywordsWindow = new ActionKeywords(id, settings, viewModel.SelectedPlugin);
-                changeKeywordsWindow.ShowDialog();
-            }
+            var id = viewModel.SelectedPlugin.PluginPair.Metadata.ID;
+            ActionKeywords changeKeywordsWindow = new ActionKeywords(id, settings, viewModel.SelectedPlugin);
+            changeKeywordsWindow.ShowDialog();
         }
 
         private void OnPluginNameClick(object sender, MouseButtonEventArgs e)
@@ -267,5 +266,20 @@ private void OpenPluginFolder(object sender, RoutedEventArgs e)
             FilesFolders.OpenPath(Path.Combine(DataLocation.DataDirectory(), Constant.Themes));
         }
 
+        private void OnPluginStoreRefreshClick(object sender, RoutedEventArgs e)
+        {
+            _ = viewModel.RefreshExternalPluginsAsync();
+        }
+
+        private void OnExternalPluginInstallClick(object sender, RoutedEventArgs e)
+        {
+            if(sender is Button { DataContext: UserPlugin plugin })
+            {
+                var pluginsManagerPlugin = PluginManager.GetPluginForId("9f8f9b14-2518-4907-b211-35ab6290dee7");
+                var actionKeywrod = pluginsManagerPlugin.Metadata.ActionKeywords.Count == 0 ? "" : pluginsManagerPlugin.Metadata.ActionKeywords[0];
+                API.ChangeQuery($"{actionKeywrod} install {plugin.Name}");
+                API.ShowMainWindow();
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/Flow.Launcher/ViewModel/PluginViewModel.cs b/Flow.Launcher/ViewModel/PluginViewModel.cs
index b0db8bca056..209198822e0 100644
--- a/Flow.Launcher/ViewModel/PluginViewModel.cs
+++ b/Flow.Launcher/ViewModel/PluginViewModel.cs
@@ -3,24 +3,39 @@
 using Flow.Launcher.Plugin;
 using Flow.Launcher.Infrastructure.Image;
 using Flow.Launcher.Core.Plugin;
+using System.Windows.Controls;
 
 namespace Flow.Launcher.ViewModel
 {
     public class PluginViewModel : BaseModel
     {
-        public PluginPair PluginPair { get; set; }
+        private readonly PluginPair _pluginPair;
+        public PluginPair PluginPair
+        {
+            get => _pluginPair;
+            init
+            {
+                _pluginPair = value;
+                value.Metadata.PropertyChanged += (_, args) =>
+                {
+                    if (args.PropertyName == nameof(PluginPair.Metadata.AvgQueryTime))
+                        OnPropertyChanged(nameof(QueryTime));
+                };
+            }
+        }
 
         public ImageSource Image => ImageLoader.Load(PluginPair.Metadata.IcoPath);
         public bool PluginState
         {
-            get { return !PluginPair.Metadata.Disabled; }
-            set 
-            {
-                PluginPair.Metadata.Disabled = !value; 
-            }
+            get => !PluginPair.Metadata.Disabled;
+            set => PluginPair.Metadata.Disabled = !value;
         }
+
+        private Control _settingControl;
+        public Control SettingControl => _settingControl ??= PluginPair.Plugin is not ISettingProvider settingProvider ? new Control() : settingProvider.CreateSettingPanel();
+
         public Visibility ActionKeywordsVisibility => PluginPair.Metadata.ActionKeywords.Count == 1 ? Visibility.Visible : Visibility.Collapsed;
-        public string InitilizaTime => PluginPair.Metadata.InitTime.ToString() + "ms";
+        public string InitilizaTime => PluginPair.Metadata.InitTime + "ms";
         public string QueryTime => PluginPair.Metadata.AvgQueryTime + "ms";
         public string ActionKeywordsText => string.Join(Query.ActionKeywordSeparator, PluginPair.Metadata.ActionKeywords);
         public int Priority => PluginPair.Metadata.Priority;
@@ -28,7 +43,6 @@ public bool PluginState
         public void ChangeActionKeyword(string newActionKeyword, string oldActionKeyword)
         {
             PluginManager.ReplaceActionKeyword(PluginPair.Metadata.ID, oldActionKeyword, newActionKeyword);
-            
             OnPropertyChanged(nameof(ActionKeywordsText));
         }
 
@@ -38,6 +52,7 @@ public void ChangePriority(int newPriority)
             OnPropertyChanged(nameof(Priority));
         }
 
-        public bool IsActionKeywordRegistered(string newActionKeyword) => PluginManager.ActionKeywordRegistered(newActionKeyword);
+        public static bool IsActionKeywordRegistered(string newActionKeyword) => PluginManager.ActionKeywordRegistered(newActionKeyword);
     }
-}
+
+}
\ No newline at end of file
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index e85d01b1ba1..dde540b0c78 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -3,12 +3,14 @@
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using Flow.Launcher.Core;
 using Flow.Launcher.Core.Configuration;
+using Flow.Launcher.Core.ExternalPlugins;
 using Flow.Launcher.Core.Plugin;
 using Flow.Launcher.Core.Resource;
 using Flow.Launcher.Helper;
@@ -61,12 +63,6 @@ public bool AutoUpdates
             }
         }
 
-        public bool AutoHideScrollBar
-        {
-            get => Settings.AutoHideScrollBar;
-            set => Settings.AutoHideScrollBar = value;
-        }
-
         // This is only required to set at startup. When portable mode enabled/disabled a restart is always required
         private bool _portableMode = DataLocation.PortableDataLocationInUse();
         public bool PortableMode
@@ -237,6 +233,14 @@ public IList<PluginViewModel> PluginViewModels
             }
         }
 
+        public IList<UserPlugin> ExternalPlugins
+        {
+            get
+            {
+                return PluginsManifest.UserPlugins;
+            }
+        }
+
         public Control SettingProvider
         {
             get
@@ -256,6 +260,12 @@ public Control SettingProvider
             }
         }
 
+        public async Task RefreshExternalPluginsAsync()
+        {
+            await PluginsManifest.UpdateManifestAsync();
+            OnPropertyChanged(nameof(ExternalPlugins));
+        }
+
 
 
         #endregion
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
index 7b7ccbeea29..abe1f0ad5ea 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
@@ -22,12 +22,12 @@
                 </Grid.ColumnDefinitions>
                 <Label Grid.Column="0" Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_openBookmarks}"
                        FontSize="15" Margin="10 5 0 0"/>
-                <RadioButton Grid.Column="1" Name="NewWindowBrowser" GroupName="OpenSearchBehaviour" 
-                             Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_newWindow}"
-                             Click="OnNewBrowserWindowClick" />
-                <RadioButton Grid.Column="2" Name="NewTabInBrowser" GroupName="OpenSearchBehaviour" 
-                             Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_newTab}" 
-                             Click="OnNewTabClick" />
+                <RadioButton Grid.Column="1" Name="NewWindowBrowser"
+                             IsChecked="{Binding OpenInNewBrowserWindow}"
+                             Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_newWindow}"/>
+                <RadioButton Grid.Column="2" Name="NewTabInBrowser"
+                             IsChecked="{Binding OpenInNewTab, Mode=OneTime}"
+                             Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_newTab}"/>
             </Grid>
         </StackPanel>
         <StackPanel Orientation="Horizontal" VerticalAlignment="Top" Grid.Row="1" Height="60" Margin="30,20,0,0">
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs
index 2f67b999c7e..56fa58acf79 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs
@@ -3,35 +3,39 @@
 using System.Windows.Controls;
 using Flow.Launcher.Plugin.BrowserBookmark.Models;
 using System.Windows.Input;
+using System.ComponentModel;
 
 namespace Flow.Launcher.Plugin.BrowserBookmark.Views
 {
     /// <summary>
     /// Interaction logic for BrowserBookmark.xaml
     /// </summary>
-    public partial class SettingsControl
+    public partial class SettingsControl : INotifyPropertyChanged
     {
         public Settings Settings { get; }
         public CustomBrowser SelectedCustomBrowser { get; set; }
-
-        public SettingsControl(Settings settings)
+        public bool OpenInNewBrowserWindow
         {
-            Settings = settings;
-            InitializeComponent();
-            NewWindowBrowser.IsChecked = Settings.OpenInNewBrowserWindow;
-            NewTabInBrowser.IsChecked = !Settings.OpenInNewBrowserWindow;
+            get => Settings.OpenInNewBrowserWindow;
+            set
+            {
+                Settings.OpenInNewBrowserWindow = value;
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(OpenInNewBrowserWindow)));
+            }
         }
-
-        private void OnNewBrowserWindowClick(object sender, RoutedEventArgs e)
+        public bool OpenInNewTab
         {
-            Settings.OpenInNewBrowserWindow = true;
+            get => !OpenInNewBrowserWindow;
         }
 
-        private void OnNewTabClick(object sender, RoutedEventArgs e)
+        public SettingsControl(Settings settings)
         {
-            Settings.OpenInNewBrowserWindow = false;
+            Settings = settings;
+            InitializeComponent();
         }
 
+        public event PropertyChangedEventHandler PropertyChanged;
+
         private void OnChooseClick(object sender, RoutedEventArgs e)
         {
             var fileBrowserDialog = new OpenFileDialog();
@@ -61,7 +65,7 @@ private void NewCustomBrowser(object sender, RoutedEventArgs e)
 
         private void DeleteCustomBrowser(object sender, RoutedEventArgs e)
         {
-            if(CustomBrowsers.SelectedItem is CustomBrowser selectedCustomBrowser)
+            if (CustomBrowsers.SelectedItem is CustomBrowser selectedCustomBrowser)
             {
                 Settings.CustomChromiumBrowsers.Remove(selectedCustomBrowser);
             }
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/plugin.json b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/plugin.json
index 3ff0c672341..7d124169b94 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/plugin.json
@@ -4,7 +4,7 @@
   "Name": "Browser Bookmarks",
   "Description": "Search your browser bookmarks",
   "Author": "qianlifeng, Ioannis G.",
-  "Version": "1.5.1",
+  "Version": "1.5.2",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.BrowserBookmark.dll",
diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml b/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml
index 1330247b2ab..01108895d3c 100644
--- a/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml
@@ -15,7 +15,7 @@
         <core:LocalizationConverter x:Key="LocalizationConverter"/>
     </UserControl.Resources>
 
-    <Grid Margin="20 50 0 0">
+    <Grid Margin="20 14 0 14">
         <Grid.RowDefinitions>
             <RowDefinition Height="auto"/>
             <RowDefinition Height="auto"/>
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/ContextMenu.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/ContextMenu.cs
index 364216778bd..035ae629a80 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/ContextMenu.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/ContextMenu.cs
@@ -1,5 +1,5 @@
-using Flow.Launcher.Infrastructure.UserSettings;
-using Flow.Launcher.Plugin.PluginsManager.Models;
+using Flow.Launcher.Core.ExternalPlugins;
+using Flow.Launcher.Infrastructure.UserSettings;
 using System;
 using System.Collections.Generic;
 using System.Text;
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/Main.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/Main.cs
index 5f200aa217a..89a8e0ff5a1 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/Main.cs
@@ -38,7 +38,7 @@ public Task InitAsync(PluginInitContext context)
             viewModel = new SettingsViewModel(context, Settings);
             contextMenu = new ContextMenu(Context);
             pluginManager = new PluginsManager(Context, Settings);
-            _manifestUpdateTask = pluginManager.UpdateManifest().ContinueWith(_ =>
+            _manifestUpdateTask = pluginManager.UpdateManifestAsync().ContinueWith(_ =>
              {
                  lastUpdateTime = DateTime.Now;
              }, TaskContinuationOptions.OnlyOnRanToCompletion);
@@ -62,7 +62,7 @@ public async Task<List<Result>> QueryAsync(Query query, CancellationToken token)
 
             if ((DateTime.Now - lastUpdateTime).TotalHours > 12 && _manifestUpdateTask.IsCompleted) // 12 hours
             {
-                _manifestUpdateTask = pluginManager.UpdateManifest().ContinueWith(t =>
+                _manifestUpdateTask = pluginManager.UpdateManifestAsync().ContinueWith(t =>
                 {
                     lastUpdateTime = DateTime.Now;
                 }, TaskContinuationOptions.OnlyOnRanToCompletion);
@@ -93,7 +93,7 @@ public string GetTranslatedPluginDescription()
 
         public async Task ReloadDataAsync()
         {
-            await pluginManager.UpdateManifest();
+            await pluginManager.UpdateManifestAsync();
             lastUpdateTime = DateTime.Now;
         }
     }
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/Models/PluginsManifest.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/Models/PluginsManifest.cs
deleted file mode 100644
index 31ffdfd8b61..00000000000
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/Models/PluginsManifest.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using Flow.Launcher.Infrastructure.Http;
-using Flow.Launcher.Infrastructure.Logger;
-using System;
-using System.Collections.Generic;
-using System.Text.Json;
-using System.Threading.Tasks;
-
-namespace Flow.Launcher.Plugin.PluginsManager.Models
-{
-    internal class PluginsManifest
-    {
-        internal List<UserPlugin> UserPlugins { get; private set; } = new List<UserPlugin>();
-
-        internal async Task DownloadManifest()
-        {
-            try
-            {
-                await using var jsonStream = await Http.GetStreamAsync("https://cdn.jsdelivr.net/gh/Flow-Launcher/Flow.Launcher.PluginsManifest/plugins.json")
-                                 .ConfigureAwait(false);
-
-                UserPlugins = await JsonSerializer.DeserializeAsync<List<UserPlugin>>(jsonStream).ConfigureAwait(false);
-            }
-            catch (Exception e)
-            {
-                Log.Exception("|PluginManagement.GetManifest|Encountered error trying to download plugins manifest", e);
-
-                UserPlugins = new List<UserPlugin>();
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index c950288e07b..cd1ab45715a 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -1,9 +1,9 @@
+using Flow.Launcher.Core.ExternalPlugins;
 using Flow.Launcher.Core.Plugin;
 using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Infrastructure.Http;
 using Flow.Launcher.Infrastructure.Logger;
 using Flow.Launcher.Infrastructure.UserSettings;
-using Flow.Launcher.Plugin.PluginsManager.Models;
 using Flow.Launcher.Plugin.SharedCommands;
 using System;
 using System.Collections.Generic;
@@ -17,8 +17,6 @@ namespace Flow.Launcher.Plugin.PluginsManager
 {
     internal class PluginsManager
     {
-        private PluginsManifest pluginsManifest;
-
         private PluginInitContext Context { get; set; }
 
         private Settings Settings { get; set; }
@@ -43,7 +41,6 @@ private bool ShouldHideWindow
 
         internal PluginsManager(PluginInitContext context, Settings settings)
         {
-            pluginsManifest = new PluginsManifest();
             Context = context;
             Settings = settings;
         }
@@ -51,7 +48,7 @@ internal PluginsManager(PluginInitContext context, Settings settings)
         private Task _downloadManifestTask = Task.CompletedTask;
 
 
-        internal Task UpdateManifest()
+        internal Task UpdateManifestAsync()
         {
             if (_downloadManifestTask.Status == TaskStatus.Running)
             {
@@ -59,7 +56,7 @@ internal Task UpdateManifest()
             }
             else
             {
-                _downloadManifestTask = pluginsManifest.DownloadManifest();
+                _downloadManifestTask = PluginsManifest.UpdateTask;
                 _downloadManifestTask.ContinueWith(_ =>
                         Context.API.ShowMsg(Context.API.GetTranslation("plugin_pluginsmanager_update_failed_title"),
                             Context.API.GetTranslation("plugin_pluginsmanager_update_failed_subtitle"), icoPath, false),
@@ -171,9 +168,9 @@ internal async Task InstallOrUpdate(UserPlugin plugin)
 
         internal async ValueTask<List<Result>> RequestUpdate(string search, CancellationToken token)
         {
-            if (!pluginsManifest.UserPlugins.Any())
+            if (!PluginsManifest.UserPlugins.Any())
             {
-                await UpdateManifest();
+                await UpdateManifestAsync();
             }
 
             token.ThrowIfCancellationRequested();
@@ -190,7 +187,7 @@ internal async ValueTask<List<Result>> RequestUpdate(string search, Cancellation
 
             var resultsForUpdate =
                 from existingPlugin in Context.API.GetAllPlugins()
-                join pluginFromManifest in pluginsManifest.UserPlugins
+                join pluginFromManifest in PluginsManifest.UserPlugins
                     on existingPlugin.Metadata.ID equals pluginFromManifest.ID
                 where existingPlugin.Metadata.Version.CompareTo(pluginFromManifest.Version) <
                       0 // if current version precedes manifest version
@@ -307,9 +304,9 @@ internal List<Result> Search(IEnumerable<Result> results, string searchName)
 
         internal async ValueTask<List<Result>> RequestInstallOrUpdate(string searchName, CancellationToken token)
         {
-            if (!pluginsManifest.UserPlugins.Any())
+            if (!PluginsManifest.UserPlugins.Any())
             {
-                await UpdateManifest();
+                await UpdateManifestAsync();
             }
 
             token.ThrowIfCancellationRequested();
@@ -317,7 +314,7 @@ internal async ValueTask<List<Result>> RequestInstallOrUpdate(string searchName,
             var searchNameWithoutKeyword = searchName.Replace(Settings.HotKeyInstall, string.Empty).Trim();
 
             var results =
-                pluginsManifest
+                PluginsManifest
                     .UserPlugins
                     .Select(x =>
                         new Result
diff --git a/Plugins/Flow.Launcher.Plugin.Shell/ShellSetting.xaml b/Plugins/Flow.Launcher.Plugin.Shell/ShellSetting.xaml
index 4cd4d8fa3a8..d9b1942f1c1 100644
--- a/Plugins/Flow.Launcher.Plugin.Shell/ShellSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Shell/ShellSetting.xaml
@@ -6,7 +6,7 @@
              mc:Ignorable="d" 
              Loaded="CMDSetting_OnLoaded"
              d:DesignHeight="300" d:DesignWidth="300">
-    <Grid Margin="7,50" VerticalAlignment="Top" >
+    <Grid Margin="7,10" VerticalAlignment="Top" >
         <Grid.RowDefinitions>
             <RowDefinition/>
             <RowDefinition/>
diff --git a/Plugins/Flow.Launcher.Plugin.Shell/plugin.json b/Plugins/Flow.Launcher.Plugin.Shell/plugin.json
index cb02f66079f..6b20eeef9ef 100644
--- a/Plugins/Flow.Launcher.Plugin.Shell/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.Shell/plugin.json
@@ -4,7 +4,7 @@
   "Name": "Shell",
   "Description": "Provide executing commands from Flow Launcher",
   "Author": "qianlifeng",
-  "Version": "1.4.4",
+  "Version": "1.4.5",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.Shell.dll",
diff --git a/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml
index 9219a000930..8c27fd66789 100644
--- a/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml
@@ -11,9 +11,9 @@
         </Grid.RowDefinitions>
         <StackPanel Orientation="Horizontal" Grid.Row="0">
             <Label Content="{DynamicResource flowlauncher_plugin_url_open_search_in}" Margin="0 10 15 0" />
-            <RadioButton x:Name="NewWindowBrowser" GroupName="OpenSearchBehaviour" 
+            <RadioButton x:Name="NewWindowBrowser"
                          Content="{DynamicResource flowlauncher_plugin_new_window}" Click="OnNewBrowserWindowClick" />
-            <RadioButton x:Name="NewTabInBrowser" GroupName="OpenSearchBehaviour" 
+            <RadioButton x:Name="NewTabInBrowser"
                          Content="{DynamicResource flowlauncher_plugin_new_tab}" Click="OnNewTabClick" />
         </StackPanel>
         <StackPanel VerticalAlignment="Top" Grid.Row="1" Height="106" Margin="0 20 0 0">
diff --git a/Plugins/Flow.Launcher.Plugin.Url/plugin.json b/Plugins/Flow.Launcher.Plugin.Url/plugin.json
index fd150b9e49b..e1481f8420a 100644
--- a/Plugins/Flow.Launcher.Plugin.Url/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.Url/plugin.json
@@ -4,7 +4,7 @@
   "Name": "URL",
   "Description": "Open the typed URL from Flow Launcher",
   "Author": "qianlifeng",
-  "Version": "1.1.6",
+  "Version": "1.1.7",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.Url.dll",
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
index c2f64bc7eda..efdd9ec9b0f 100644
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
@@ -32,7 +32,7 @@
             </DockPanel>
         </DataTemplate>
     </UserControl.Resources>
-    <Grid Margin="15 0 0 0">
+    <Grid Margin="14">
         <Grid.RowDefinitions>
             <RowDefinition Height="30" />
             <RowDefinition Height="48" />