diff --git a/Flow.Launcher.Infrastructure/Constant.cs b/Flow.Launcher.Infrastructure/Constant.cs
index 57b39e46e..5ace46376 100644
--- a/Flow.Launcher.Infrastructure/Constant.cs
+++ b/Flow.Launcher.Infrastructure/Constant.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics;
+using System.Diagnostics;
 using System.IO;
 using System.Reflection;
 
@@ -21,6 +21,7 @@ namespace Flow.Launcher.Infrastructure
         public static readonly string PreinstalledDirectory = Path.Combine(ProgramDirectory, Plugins);
         public const string Issue = "https://github.com/Flow-Launcher/Flow.Launcher/issues/new";
         public static readonly string Version = FileVersionInfo.GetVersionInfo(Assembly.Location.NonNull()).ProductVersion;
+        public static readonly string Dev = "Dev";
         public const string Documentation = "https://flowlauncher.com/docs/#/usage-tips";
 
         public static readonly int ThumbnailSize = 64;
diff --git a/Flow.Launcher/HotkeyControl.xaml b/Flow.Launcher/HotkeyControl.xaml
index 9b5f671d8..5a593d20a 100644
--- a/Flow.Launcher/HotkeyControl.xaml
+++ b/Flow.Launcher/HotkeyControl.xaml
@@ -38,9 +38,8 @@
                     FontSize="13"
                     FontWeight="SemiBold"
                     Foreground="{DynamicResource Color05B}"
-                    Visibility="Visible">
-                    Press key
-                </TextBlock>
+                    Text="{DynamicResource flowlauncherPressHotkey}"
+                    Visibility="Visible" />
             </Border>
         </Popup>
 
@@ -49,8 +48,8 @@
             Margin="0,0,18,0"
             VerticalContentAlignment="Center"
             input:InputMethod.IsInputMethodEnabled="False"
+            LostFocus="tbHotkey_LostFocus"
             PreviewKeyDown="TbHotkey_OnPreviewKeyDown"
-            TabIndex="100"
-            LostFocus="tbHotkey_LostFocus"/>
+            TabIndex="100" />
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/Flow.Launcher/HotkeyControl.xaml.cs b/Flow.Launcher/HotkeyControl.xaml.cs
index 7e07695d8..d746c8fd2 100644
--- a/Flow.Launcher/HotkeyControl.xaml.cs
+++ b/Flow.Launcher/HotkeyControl.xaml.cs
@@ -9,6 +9,7 @@ using Flow.Launcher.Helper;
 using Flow.Launcher.Infrastructure.Hotkey;
 using Flow.Launcher.Plugin;
 using System.Threading;
+using System.Windows.Interop;
 
 namespace Flow.Launcher
 {
@@ -113,7 +114,7 @@ namespace Flow.Launcher
         private void tbHotkey_LostFocus(object sender, RoutedEventArgs e)
         {
             tbMsg.Text = tbMsgTextOriginal;
-            tbMsg.Foreground = tbMsgForegroundColorOriginal;
+            tbMsg.SetResourceReference(TextBox.ForegroundProperty, "Color05B");
         }
     }
 }
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index f55be8a66..4dc4b3fbc 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -27,7 +27,7 @@
     <system:String x:Key="PositionResetToolTip">Reset search window position</system:String>
 
     <!--  Setting General  -->
-    <system:String x:Key="flowlauncher_settings">Flow Launcher Settings</system:String>
+    <system:String x:Key="flowlauncher_settings">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>
@@ -107,9 +107,9 @@
     <system:String x:Key="installbtn">Install</system:String>
     <system:String x:Key="uninstallbtn">Uninstall</system:String>
     <system:String x:Key="updatebtn">Update</system:String>
-    <system:String x:Key="LabelInstalledToolTip">Plug-in already installed</system:String>
+    <system:String x:Key="LabelInstalledToolTip">Plugin already installed</system:String>
     <system:String x:Key="LabelNew">New Version</system:String>
-    <system:String x:Key="LabelNewToolTip">This plug-in has been updated within the last 7 days</system:String>
+    <system:String x:Key="LabelNewToolTip">This plugin has been updated within the last 7 days</system:String>
     <system:String x:Key="LabelUpdateToolTip">New Update is Available</system:String>
 
 
@@ -148,6 +148,7 @@
     <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="customQueryShortcut">Custom Query Shortcut</system:String>
+    <system:String x:Key="builtinShortcuts">Built-in Shortcuts</system:String>
     <system:String x:Key="customQuery">Query</system:String>
     <system:String x:Key="customShortcut">Shortcut</system:String>
     <system:String x:Key="customShortcutExpansion">Expanded</system:String>
@@ -165,6 +166,7 @@
     <system:String x:Key="windowWidthSizeToolTip">You can also quickly adjust this by using Ctrl+[ and Ctrl+].</system:String>
     <system:String x:Key="useGlyphUI">Use Segoe Fluent Icons</system:String>
     <system:String x:Key="useGlyphUIEffect">Use Segoe Fluent Icons for query results where supported</system:String>
+    <system:String x:Key="flowlauncherPressHotkey">Press Key</system:String>
 
     <!--  Setting Proxy  -->
     <system:String x:Key="proxy">HTTP Proxy</system:String>
@@ -188,6 +190,7 @@
     <system:String x:Key="github">Github</system:String>
     <system:String x:Key="docs">Docs</system:String>
     <system:String x:Key="version">Version</system:String>
+    <system:String x:Key="icons">Icons</system:String>
     <system:String x:Key="about_activate_times">You have activated Flow Launcher {0} times</system:String>
     <system:String x:Key="checkUpdates">Check for Updates</system:String>
     <system:String x:Key="newVersionTips">New version {0} is available, would you like to restart Flow Launcher to use the update?</system:String>
diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index 8a9e026a2..a0d2b6f94 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -7,6 +7,7 @@
     xmlns:flowlauncher="clr-namespace:Flow.Launcher"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:svgc="http://sharpvectors.codeplex.com/svgc/"
+    xmlns:ui="http://schemas.modernwpf.com/2019"
     xmlns:vm="clr-namespace:Flow.Launcher.ViewModel"
     Name="FlowMainWindow"
     Title="Flow Launcher"
@@ -208,15 +209,35 @@
                         </TextBox.CommandBindings>
                         <TextBox.ContextMenu>
                             <ContextMenu>
-                                <MenuItem Command="ApplicationCommands.Cut" Header="{DynamicResource cut}" />
-                                <MenuItem Command="ApplicationCommands.Copy" Header="{DynamicResource copy}" />
-                                <MenuItem Command="ApplicationCommands.Paste" Header="{DynamicResource paste}" />
+                                <MenuItem Command="ApplicationCommands.Cut" Header="{DynamicResource cut}">
+                                    <MenuItem.Icon>
+                                        <ui:FontIcon Glyph="&#xe8c6;" />
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                                <MenuItem Command="ApplicationCommands.Copy" Header="{DynamicResource copy}">
+                                    <MenuItem.Icon>
+                                        <ui:FontIcon Glyph="&#xe8c8;" />
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                                <MenuItem Command="ApplicationCommands.Paste" Header="{DynamicResource paste}">
+                                    <MenuItem.Icon>
+                                        <ui:FontIcon Glyph="&#xe77f;" />
+                                    </MenuItem.Icon>
+                                </MenuItem>
                                 <Separator
                                     Margin="0"
                                     Padding="0,4,0,4"
                                     Background="{DynamicResource ContextSeparator}" />
-                                <MenuItem Click="OnContextMenusForSettingsClick" Header="{DynamicResource flowlauncher_settings}" />
-                                <MenuItem Command="{Binding EscCommand}" Header="{DynamicResource closeWindow}" />
+                                <MenuItem Click="OnContextMenusForSettingsClick" Header="{DynamicResource flowlauncher_settings}">
+                                    <MenuItem.Icon>
+                                        <ui:FontIcon Glyph="&#xe713;" />
+                                    </MenuItem.Icon>
+                                </MenuItem>
+                                <MenuItem Command="{Binding EscCommand}" Header="{DynamicResource closeWindow}">
+                                    <MenuItem.Icon>
+                                        <ui:FontIcon Glyph="&#xe711;" />
+                                    </MenuItem.Icon>
+                                </MenuItem>
                             </ContextMenu>
                         </TextBox.ContextMenu>
                     </TextBox>
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 914c4b48f..46d27e8cd 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel;
 using System.Threading.Tasks;
 using System.Windows;
@@ -27,6 +27,9 @@ using Microsoft.AspNetCore.Http;
 using System.IO;
 using System.Windows.Threading;
 using System.Windows.Data;
+using ModernWpf.Controls;
+using System.Drawing;
+using System.Windows.Forms.Design.Behavior;
 
 namespace Flow.Launcher
 {
@@ -225,11 +228,12 @@ namespace Flow.Launcher
         private void UpdateNotifyIconText()
         {
             var menu = contextMenu;
-            ((MenuItem)menu.Items[1]).Header = InternationalizationManager.Instance.GetTranslation("iconTrayOpen") + " (" + _settings.Hotkey + ")";
-            ((MenuItem)menu.Items[2]).Header = InternationalizationManager.Instance.GetTranslation("GameMode");
-            ((MenuItem)menu.Items[3]).Header = InternationalizationManager.Instance.GetTranslation("PositionReset");
-            ((MenuItem)menu.Items[4]).Header = InternationalizationManager.Instance.GetTranslation("iconTraySettings");
-            ((MenuItem)menu.Items[5]).Header = InternationalizationManager.Instance.GetTranslation("iconTrayExit");
+            ((MenuItem)menu.Items[0]).Header = InternationalizationManager.Instance.GetTranslation("iconTrayOpen") + " (" + _settings.Hotkey + ")";
+            ((MenuItem)menu.Items[1]).Header = InternationalizationManager.Instance.GetTranslation("GameMode");
+            ((MenuItem)menu.Items[2]).Header = InternationalizationManager.Instance.GetTranslation("PositionReset");
+            ((MenuItem)menu.Items[3]).Header = InternationalizationManager.Instance.GetTranslation("iconTraySettings");
+            ((MenuItem)menu.Items[4]).Header = InternationalizationManager.Instance.GetTranslation("iconTrayExit");
+
         }
 
         private void InitializeNotifyIcon()
@@ -241,31 +245,35 @@ namespace Flow.Launcher
                 Visible = !_settings.HideNotifyIcon
             };
             contextMenu = new ContextMenu();
-
-            var header = new MenuItem
-            {
-                Header = "Flow Launcher",
-                IsEnabled = false
-            };
+            var openIcon = new FontIcon { Glyph = "\ue71e" };
             var open = new MenuItem
             {
-                Header = InternationalizationManager.Instance.GetTranslation("iconTrayOpen") + " (" +_settings.Hotkey + ")"
+                Header = InternationalizationManager.Instance.GetTranslation("iconTrayOpen") + " (" + _settings.Hotkey + ")",
+                Icon = openIcon
             };
+            var gamemodeIcon = new FontIcon { Glyph = "\ue7fc" };
             var gamemode = new MenuItem
             {
-                Header = InternationalizationManager.Instance.GetTranslation("GameMode")
+                Header = InternationalizationManager.Instance.GetTranslation("GameMode"),
+                Icon = gamemodeIcon
             };
+            var positionresetIcon = new FontIcon { Glyph = "\ue73f" };
             var positionreset = new MenuItem
             {
-                Header = InternationalizationManager.Instance.GetTranslation("PositionReset")
+                Header = InternationalizationManager.Instance.GetTranslation("PositionReset"),
+                Icon = positionresetIcon
             };
+            var settingsIcon = new FontIcon { Glyph = "\ue713" };
             var settings = new MenuItem
             {
-                Header = InternationalizationManager.Instance.GetTranslation("iconTraySettings")
+                Header = InternationalizationManager.Instance.GetTranslation("iconTraySettings"),
+                Icon = settingsIcon
             };
+            var exitIcon = new FontIcon { Glyph = "\ue7e8" };
             var exit = new MenuItem
             {
-                Header = InternationalizationManager.Instance.GetTranslation("iconTrayExit")
+                Header = InternationalizationManager.Instance.GetTranslation("iconTrayExit"),
+                Icon = exitIcon
             };
 
             open.Click += (o, e) => _viewModel.ToggleFlowLauncher();
@@ -273,7 +281,6 @@ namespace Flow.Launcher
             positionreset.Click += (o, e) => PositionReset();
             settings.Click += (o, e) => App.API.OpenSettingDialog();
             exit.Click += (o, e) => Close();
-            contextMenu.Items.Add(header);
             contextMenu.Items.Add(open);
             gamemode.ToolTip = InternationalizationManager.Instance.GetTranslation("GameModeToolTip");
             positionreset.ToolTip = InternationalizationManager.Instance.GetTranslation("PositionResetToolTip");
diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 6e8294031..07897361c 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -1407,7 +1407,8 @@
                             Padding="{TemplateBinding Padding}"
                             BorderBrush="{DynamicResource ButtonInsideBorder}"
                             BorderThickness="{DynamicResource CustomButtonInsideBorderThickness}"
-                            CornerRadius="4">
+                            CornerRadius="4"
+                            SnapsToDevicePixels="True">
                             <ContentPresenter
                                 x:Name="ContentPresenter"
                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -2727,73 +2728,491 @@
     </Style>
     <!--#endregion-->
 
-    <Style TargetType="{x:Type MenuItem}">
-        <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
-        <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
-        <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-        <Setter Property="OverridesDefaultStyle" Value="True" />
+
+    <system:Double x:Key="MenuBarHeight">40</system:Double>
+    <Thickness x:Key="MenuFlyoutScrollerMargin">4,4,4,4</Thickness>
+    <Thickness x:Key="MenuFlyoutItemRevealBorderThickness">1</Thickness>
+    <Thickness x:Key="ToggleMenuFlyoutItemRevealBorderThickness">1</Thickness>
+    <Thickness x:Key="MenuFlyoutSubItemRevealBorderThickness">1</Thickness>
+
+    <ui:SharedSizeGroupConverter x:Key="SharedSizeGroupConverter" />
+
+    <Style x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type FrameworkElement}, ResourceId=MenuScrollViewer}" TargetType="ScrollViewer">
+        <Setter Property="HorizontalScrollBarVisibility" Value="Disabled" />
+        <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
+        <Setter Property="PanningMode" Value="VerticalOnly" />
+    </Style>
+
+    <Style x:Key="DefaultMenuItemSeparatorStyle" TargetType="Separator">
+        <Setter Property="Background" Value="{DynamicResource MenuFlyoutSeparatorBackground}" />
+        <Setter Property="Padding" Value="{DynamicResource MenuFlyoutSeparatorThemePadding}" />
+        <Setter Property="SnapsToDevicePixels" Value="true" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type MenuItem}">
-                    <Border
-                        Name="bdr"
-                        Padding="24,6,24,6"
-                        Background="Transparent">
-                        <TextBlock
-                            Name="Menu"
-                            VerticalAlignment="Center"
-                            FontSize="14"
-                            Foreground="{DynamicResource Color05B}"
-                            Text="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=Header}" />
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsVisible" Value="True">
-                            <Setter TargetName="bdr" Property="Background" Value="{DynamicResource CustomContextBackground}" />
-                            <Setter TargetName="Menu" Property="Foreground" Value="{DynamicResource Color05B}" />
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="bdr" Property="Background" Value="{DynamicResource CustomContextHover}" />
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="Menu" Property="Foreground" Value="{DynamicResource CustomContextDisabled}" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
+                <ControlTemplate TargetType="Separator">
+                    <Rectangle
+                        Height="{DynamicResource MenuFlyoutSeparatorThemeHeight}"
+                        Margin="{TemplateBinding Padding}"
+                        Fill="{TemplateBinding Background}" />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style TargetType="{x:Type ContextMenu}">
+    <Style
+        x:Key="{x:Static MenuItem.SeparatorStyleKey}"
+        BasedOn="{StaticResource DefaultMenuItemSeparatorStyle}"
+        TargetType="Separator" />
+
+    <ControlTemplate x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=TopLevelItemTemplateKey}" TargetType="{x:Type MenuItem}">
+        <Grid
+            x:Name="ContentRoot"
+            Background="{TemplateBinding Background}"
+            SnapsToDevicePixels="True">
+            <Border
+                x:Name="Background"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}" />
+
+            <ContentPresenter
+                Margin="12,0,12,0"
+                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                ContentSource="Header"
+                RecognizesAccessKey="True"
+                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="Background" Property="Background" Value="{DynamicResource MenuBarItemBackgroundPointerOver}" />
+                <Setter TargetName="Background" Property="BorderBrush" Value="{DynamicResource MenuBarItemBorderBrushPointerOver}" />
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter TargetName="Background" Property="Background" Value="{DynamicResource MenuBarItemBackgroundPressed}" />
+                <Setter TargetName="Background" Property="BorderBrush" Value="{DynamicResource MenuBarItemBorderBrushPressed}" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <ControlTemplate x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=TopLevelHeaderTemplateKey}" TargetType="{x:Type MenuItem}">
+        <Grid
+            x:Name="ContentRoot"
+            Background="{TemplateBinding Background}"
+            SnapsToDevicePixels="True">
+            <Border
+                x:Name="Background"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}" />
+
+            <ContentPresenter
+                Margin="12,0,12,0"
+                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                ContentSource="Header"
+                RecognizesAccessKey="True"
+                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+
+            <ui:MenuPopup
+                x:Name="PART_Popup"
+                AllowsTransparency="true"
+                Focusable="false"
+                IsOpen="{Binding IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                Placement="Bottom"
+                PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimationKey}}">
+                <ui:ThemeShadowChrome CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}" IsShadowEnabled="{DynamicResource {x:Static SystemParameters.DropShadowKey}}">
+                    <Border
+                        x:Name="SubMenuRoot"
+                        Background="{DynamicResource MenuFlyoutPresenterBackground}"
+                        CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}">
+                        <Grid>
+                            <ScrollViewer
+                                x:Name="SubMenuScrollViewer"
+                                MinWidth="{DynamicResource FlyoutThemeMinWidth}"
+                                Margin="{DynamicResource MenuFlyoutPresenterThemePadding}"
+                                Style="{DynamicResource {ComponentResourceKey ResourceId=MenuScrollViewer,
+                                                                              TypeInTargetAssembly={x:Type FrameworkElement}}}">
+                                <ItemsPresenter
+                                    Grid.IsSharedSizeScope="true"
+                                    KeyboardNavigation.DirectionalNavigation="Cycle"
+                                    KeyboardNavigation.TabNavigation="Cycle"
+                                    RenderOptions.ClearTypeHint="Enabled"
+                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            </ScrollViewer>
+                            <Border
+                                x:Name="SubMenuBorder"
+                                BorderBrush="{DynamicResource MenuFlyoutPresenterBorderBrush}"
+                                BorderThickness="{DynamicResource MenuFlyoutPresenterBorderThemeThickness}"
+                                CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}" />
+                        </Grid>
+                    </Border>
+                </ui:ThemeShadowChrome>
+            </ui:MenuPopup>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsSuspendingPopupAnimation" Value="true">
+                <Setter TargetName="PART_Popup" Property="PopupAnimation" Value="None" />
+            </Trigger>
+            <Trigger SourceName="PART_Popup" Property="IsSuspendingAnimation" Value="true">
+                <Setter TargetName="PART_Popup" Property="PopupAnimation" Value="None" />
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="Background" Property="Background" Value="{DynamicResource MenuBarItemBackgroundPointerOver}" />
+                <Setter TargetName="Background" Property="BorderBrush" Value="{DynamicResource MenuBarItemBorderBrushPointerOver}" />
+            </Trigger>
+            <!--  Selected  -->
+            <Trigger Property="IsSubmenuOpen" Value="True">
+                <Setter TargetName="Background" Property="Background" Value="{DynamicResource MenuBarItemBackgroundSelected}" />
+                <Setter TargetName="Background" Property="BorderBrush" Value="{DynamicResource MenuBarItemBorderBrushSelected}" />
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter TargetName="Background" Property="Background" Value="{DynamicResource MenuBarItemBackgroundPressed}" />
+                <Setter TargetName="Background" Property="BorderBrush" Value="{DynamicResource MenuBarItemBorderBrushPressed}" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <!--  DefaultMenuFlyoutSubItemStyle  -->
+    <ControlTemplate x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=SubmenuItemTemplateKey}" TargetType="{x:Type MenuItem}">
+        <ControlTemplate.Resources>
+            <StreamGeometry x:Key="CheckMark">F1 M 17.939453 5.439453 L 7.5 15.888672 L 2.060547 10.439453 L 2.939453 9.560547 L 7.5 14.111328 L 17.060547 4.560547 Z</StreamGeometry>
+        </ControlTemplate.Resources>
+        <Border
+            x:Name="LayoutRoot"
+            Height="Auto"
+            Margin="5,2,5,2"
+            Padding="{TemplateBinding Padding}"
+            Background="{TemplateBinding Background}"
+            BorderBrush="{TemplateBinding BorderBrush}"
+            BorderThickness="{TemplateBinding BorderThickness}"
+            CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}"
+            SnapsToDevicePixels="true"
+            TextElement.Foreground="{DynamicResource Color05B}"
+            UseLayoutRounding="True">
+            <Grid x:Name="AnimationRoot">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" SharedSizeGroup="{TemplateBinding Visibility, Converter={StaticResource SharedSizeGroupConverter}, ConverterParameter=MenuItemCheckColumnGroup}" />
+                    <ColumnDefinition Width="Auto" SharedSizeGroup="{TemplateBinding Visibility, Converter={StaticResource SharedSizeGroupConverter}, ConverterParameter=MenuItemIconColumnGroup}" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <ui:FontIconFallback
+                    x:Name="CheckGlyph"
+                    Margin="0,0,16,0"
+                    Data="{StaticResource CheckMark}"
+                    FontFamily="{DynamicResource SymbolThemeFontFamily}"
+                    FontSize="12"
+                    Foreground="{DynamicResource ToggleMenuFlyoutItemCheckGlyphForeground}"
+                    Opacity="0"
+                    Visibility="Collapsed" />
+                <Viewbox
+                    x:Name="IconRoot"
+                    Grid.Column="1"
+                    Width="16"
+                    Height="16"
+                    Margin="0,1,12,0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Stretch"
+                    TextBlock.FontFamily="/Resources/#Segoe Fluent Icons">
+                    <ContentPresenter
+                        x:Name="IconContent"
+                        ContentSource="Icon"
+                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                </Viewbox>
+                <ContentPresenter
+                    x:Name="ContentPresenter"
+                    Grid.Column="2"
+                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                    ContentSource="Header"
+                    RecognizesAccessKey="True"
+                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                    TextElement.Foreground="{DynamicResource Color05B}" />
+                <TextBlock
+                    x:Name="KeyboardAcceleratorTextBlock"
+                    Grid.Column="3"
+                    Margin="24,4,0,0"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                    Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
+                    Style="{StaticResource CaptionTextBlockStyle}"
+                    Text="{TemplateBinding InputGestureText}"
+                    Visibility="Collapsed" />
+            </Grid>
+        </Border>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsVisible" Value="True">
+                <Setter TargetName="LayoutRoot" Property="TextElement.Foreground" Value="{DynamicResource Color05B}" />
+                <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource Color05B}" />
+            </Trigger>
+            <Trigger Property="Icon" Value="{x:Null}">
+                <Setter TargetName="IconRoot" Property="Visibility" Value="Collapsed" />
+            </Trigger>
+            <Trigger Property="InputGestureText" Value="">
+                <Setter TargetName="KeyboardAcceleratorTextBlock" Property="Visibility" Value="Collapsed" />
+            </Trigger>
+            <Trigger Property="IsChecked" Value="True">
+                <Setter TargetName="CheckGlyph" Property="Opacity" Value="1" />
+            </Trigger>
+            <Trigger Property="IsCheckable" Value="True">
+                <Setter TargetName="CheckGlyph" Property="Visibility" Value="Visible" />
+            </Trigger>
+            <Trigger Property="IsHighlighted" Value="True">
+                <Setter TargetName="LayoutRoot" Property="Background" Value="{DynamicResource CustomContextHover}" />
+                <Setter TargetName="LayoutRoot" Property="TextElement.Foreground" Value="{DynamicResource Color05B}" />
+                <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource Color05B}" />
+                <Setter TargetName="KeyboardAcceleratorTextBlock" Property="Foreground" Value="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForegroundPointerOver}" />
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter TargetName="LayoutRoot" Property="Background" Value="{DynamicResource CustomContextClick}" />
+                <Setter TargetName="LayoutRoot" Property="TextElement.Foreground" Value="{DynamicResource Color05B}" />
+                <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource Color05B}" />
+                <Setter TargetName="KeyboardAcceleratorTextBlock" Property="Foreground" Value="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForegroundPressed}" />
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter TargetName="LayoutRoot" Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundDisabled}" />
+                <Setter TargetName="LayoutRoot" Property="TextElement.Foreground" Value="{DynamicResource MenuFlyoutItemForegroundDisabled}" />
+                <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource MenuFlyoutItemForegroundDisabled}" />
+                <Setter TargetName="KeyboardAcceleratorTextBlock" Property="Foreground" Value="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForegroundDisabled}" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <!--  DefaultMenuFlyoutItemStyle  -->
+    <ControlTemplate x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=SubmenuHeaderTemplateKey}" TargetType="{x:Type MenuItem}">
+        <ControlTemplate.Resources>
+            <StreamGeometry x:Key="ChevronRight">M 5.029297 19.091797 L 14.111328 10 L 5.029297 0.908203 L 5.908203 0.029297 L 15.888672 10 L 5.908203 19.970703 Z</StreamGeometry>
+        </ControlTemplate.Resources>
+        <Border
+            x:Name="LayoutRoot"
+            Margin="{DynamicResource MenuFlyoutItemMargin}"
+            Padding="{TemplateBinding Padding}"
+            Background="{TemplateBinding Background}"
+            BorderBrush="{TemplateBinding BorderBrush}"
+            BorderThickness="{TemplateBinding BorderThickness}"
+            CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}"
+            SnapsToDevicePixels="True">
+            <Grid x:Name="AnimationRoot">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemCheckColumnGroup" />
+                    <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIconColumnGroup" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <Viewbox
+                    x:Name="IconRoot"
+                    Grid.Column="1"
+                    Width="16"
+                    Height="16"
+                    Margin="0,0,12,0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center">
+                    <ContentPresenter
+                        x:Name="IconContent"
+                        ContentSource="Icon"
+                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                </Viewbox>
+                <ContentPresenter
+                    x:Name="ContentPresenter"
+                    Grid.Column="2"
+                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                    ContentSource="Header"
+                    RecognizesAccessKey="True"
+                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                    TextElement.Foreground="{TemplateBinding Foreground}" />
+                <ui:FontIconFallback
+                    x:Name="SubItemChevron"
+                    Grid.Column="3"
+                    Margin="{DynamicResource MenuFlyoutItemChevronMargin}"
+                    Data="{StaticResource ChevronRight}"
+                    FontFamily="{DynamicResource SymbolThemeFontFamily}"
+                    FontSize="12"
+                    Foreground="{DynamicResource MenuFlyoutSubItemChevron}">
+                    <UIElement.RenderTransform>
+                        <TranslateTransform Y="1" />
+                    </UIElement.RenderTransform>
+                </ui:FontIconFallback>
+                <Popup
+                    x:Name="PART_Popup"
+                    AllowsTransparency="true"
+                    Focusable="false"
+                    IsOpen="{Binding IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                    Placement="Right"
+                    PlacementTarget="{Binding ElementName=LayoutRoot}"
+                    PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimationKey}}">
+                    <Popup.PlacementRectangle>
+                        <MultiBinding>
+                            <MultiBinding.Converter>
+                                <ui:PlacementRectangleConverter Margin="4,-1" />
+                            </MultiBinding.Converter>
+                            <Binding ElementName="LayoutRoot" Path="ActualWidth" />
+                            <Binding ElementName="LayoutRoot" Path="ActualHeight" />
+                        </MultiBinding>
+                    </Popup.PlacementRectangle>
+                    <ui:ThemeShadowChrome CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}" IsShadowEnabled="{DynamicResource {x:Static SystemParameters.DropShadowKey}}">
+                        <Border
+                            x:Name="SubMenuRoot"
+                            Background="{DynamicResource MenuFlyoutPresenterBackground}"
+                            CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}">
+                            <Grid>
+                                <ScrollViewer
+                                    x:Name="SubMenuScrollViewer"
+                                    MinWidth="{DynamicResource FlyoutThemeMinWidth}"
+                                    Margin="{DynamicResource MenuFlyoutPresenterThemePadding}"
+                                    Style="{DynamicResource {ComponentResourceKey ResourceId=MenuScrollViewer,
+                                                                                  TypeInTargetAssembly={x:Type FrameworkElement}}}">
+                                    <ItemsPresenter
+                                        Grid.IsSharedSizeScope="true"
+                                        KeyboardNavigation.DirectionalNavigation="Cycle"
+                                        KeyboardNavigation.TabNavigation="Cycle"
+                                        RenderOptions.ClearTypeHint="Enabled"
+                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                </ScrollViewer>
+                                <Border
+                                    x:Name="SubMenuBorder"
+                                    BorderBrush="{DynamicResource MenuFlyoutPresenterBorderBrush}"
+                                    BorderThickness="{DynamicResource MenuFlyoutPresenterBorderThemeThickness}"
+                                    CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}" />
+                            </Grid>
+                        </Border>
+                    </ui:ThemeShadowChrome>
+                </Popup>
+            </Grid>
+        </Border>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsVisible" Value="True">
+                <Setter TargetName="LayoutRoot" Property="TextElement.Foreground" Value="{DynamicResource Color05B}" />
+                <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource Color05B}" />
+            </Trigger>
+            <Trigger Property="IsSuspendingPopupAnimation" Value="true">
+                <Setter TargetName="PART_Popup" Property="PopupAnimation" Value="None" />
+            </Trigger>
+            <Trigger Property="Icon" Value="{x:Null}">
+                <Setter TargetName="IconRoot" Property="Visibility" Value="Collapsed" />
+            </Trigger>
+            <Trigger Property="IsHighlighted" Value="True">
+                <Setter TargetName="LayoutRoot" Property="Background" Value="{DynamicResource MenuFlyoutSubItemBackgroundPointerOver}" />
+                <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource MenuFlyoutSubItemForegroundPointerOver}" />
+                <Setter TargetName="SubItemChevron" Property="Foreground" Value="{DynamicResource MenuFlyoutSubItemChevronPointerOver}" />
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter TargetName="LayoutRoot" Property="Background" Value="{DynamicResource MenuFlyoutSubItemBackgroundPressed}" />
+                <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource MenuFlyoutSubItemForegroundPressed}" />
+                <Setter TargetName="SubItemChevron" Property="Foreground" Value="{DynamicResource MenuFlyoutSubItemChevronPressed}" />
+            </Trigger>
+            <Trigger Property="IsSubmenuOpen" Value="True">
+                <Setter TargetName="LayoutRoot" Property="Background" Value="{DynamicResource MenuFlyoutSubItemBackgroundSubMenuOpened}" />
+                <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource MenuFlyoutSubItemForegroundSubMenuOpened}" />
+                <Setter TargetName="SubItemChevron" Property="Foreground" Value="{DynamicResource MenuFlyoutSubItemChevronSubMenuOpened}" />
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter TargetName="LayoutRoot" Property="Background" Value="{DynamicResource MenuFlyoutSubItemBackgroundDisabled}" />
+                <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource MenuFlyoutSubItemForegroundDisabled}" />
+                <Setter TargetName="SubItemChevron" Property="Foreground" Value="{DynamicResource MenuFlyoutSubItemChevronDisabled}" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <Style x:Key="DefaultMenuItemStyle" TargetType="{x:Type MenuItem}">
         <Setter Property="OverridesDefaultStyle" Value="True" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackground}" />
+        <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForeground}" />
+        <Setter Property="Padding" Value="{DynamicResource MenuFlyoutItemThemePaddingNarrow}" />
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="ScrollViewer.PanningMode" Value="Both" />
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource {x:Static SystemParameters.FocusVisualStyleKey}}" />
+        <Setter Property="ui:FocusVisualHelper.UseSystemFocusVisuals" Value="{DynamicResource UseSystemFocusVisuals}" />
+        <Setter Property="ui:ControlHelper.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+        <Setter Property="Template" Value="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=SubmenuItemTemplateKey}}" />
+        <Style.Triggers>
+            <Trigger Property="Role" Value="TopLevelHeader">
+                <Setter Property="Background" Value="{DynamicResource MenuBarItemBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource MenuBarItemBorderBrush}" />
+                <Setter Property="BorderThickness" Value="{DynamicResource MenuBarItemBorderThickness}" />
+                <Setter Property="Template" Value="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=TopLevelHeaderTemplateKey}}" />
+                <Setter Property="IsTabStop" Value="True" />
+                <Setter Property="Height" Value="{StaticResource MenuBarHeight}" />
+            </Trigger>
+            <Trigger Property="Role" Value="TopLevelItem">
+                <Setter Property="Background" Value="{DynamicResource MenuBarItemBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource MenuBarItemBorderBrush}" />
+                <Setter Property="BorderThickness" Value="{DynamicResource MenuBarItemBorderThickness}" />
+                <Setter Property="Template" Value="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=TopLevelItemTemplateKey}}" />
+                <Setter Property="IsTabStop" Value="True" />
+                <Setter Property="Height" Value="{StaticResource MenuBarHeight}" />
+            </Trigger>
+            <Trigger Property="Role" Value="SubmenuHeader">
+                <Setter Property="Background" Value="{DynamicResource MenuFlyoutSubItemBackground}" />
+                <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutSubItemForeground}" />
+                <Setter Property="Template" Value="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=SubmenuHeaderTemplateKey}}" />
+            </Trigger>
+            <Trigger Property="IsCheckable" Value="True">
+                <Setter Property="Background" Value="Transparent" />
+                <Setter Property="ui:FocusVisualHelper.UseSystemFocusVisuals" Value="True" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style BasedOn="{StaticResource DefaultMenuItemStyle}" TargetType="{x:Type MenuItem}" />
+
+
+
+    <Style TargetType="{x:Type ContextMenu}">
+        <Setter Property="Background" Value="{DynamicResource CustomContextBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CustomContextBorder}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource MenuFlyoutPresenterBorderThemeThickness}" />
+        <Setter Property="Padding" Value="{DynamicResource MenuFlyoutPresenterThemePadding}" />
+        <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <Setter Property="FontStyle" Value="Normal" />
+        <Setter Property="FontWeight" Value="Normal" />
+        <Setter Property="Grid.IsSharedSizeScope" Value="true" />
+        <Setter Property="HasDropShadow" Value="{DynamicResource {x:Static SystemParameters.DropShadowKey}}" />
+        <!--<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />-->
+        <!--<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />-->
+        <!--<Setter Property="ScrollViewer.PanningMode" Value="VerticalOnly" />-->
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+        <Setter Property="MaxWidth" Value="{DynamicResource FlyoutThemeMaxWidth}" />
+        <Setter Property="MinHeight" Value="{DynamicResource MenuFlyoutThemeMinHeight}" />
+        <Setter Property="ui:ControlHelper.CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ContextMenu}">
-                    <Border
-                        x:Name="Border"
-                        Margin="5,4,5,12"
-                        Padding="0,4,0,4"
-                        Background="{DynamicResource CustomContextBackground}"
-                        BorderBrush="{DynamicResource CustomContextBorder}"
-                        BorderThickness="1"
-                        CornerRadius="8"
-                        UseLayoutRounding="True">
-                        <Border.Effect>
-                            <DropShadowEffect
-                                BlurRadius="12"
-                                Direction="-90"
-                                Opacity=".15"
-                                ShadowDepth="6"
-                                Color="Black" />
-                        </Border.Effect>
-                        <StackPanel
-                            x:Name="Panel"
-                            ClipToBounds="True"
-                            IsItemsHost="True"
-                            Orientation="Vertical" />
-                    </Border>
+                    <ui:ThemeShadowChrome
+                        x:Name="Shdw"
+                        CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}"
+                        IsShadowEnabled="{TemplateBinding HasDropShadow}"
+                        SnapsToDevicePixels="True">
+                        <Border
+                            x:Name="Border"
+                            Padding="0,4,0,4"
+                            Background="{DynamicResource CustomContextBackground}"
+                            BorderBrush="{DynamicResource CustomContextBorder}"
+                            BorderThickness="1"
+                            CornerRadius="8">
+                            <Grid>
+                                <ScrollViewer
+                                    x:Name="ContextMenuScrollViewer"
+                                    MinWidth="{DynamicResource FlyoutThemeMinWidth}"
+                                    Margin="{TemplateBinding Padding}"
+                                    Style="{DynamicResource {ComponentResourceKey ResourceId=MenuScrollViewer,
+                                                                                  TypeInTargetAssembly={x:Type FrameworkElement}}}">
+                                    <ItemsPresenter
+                                        KeyboardNavigation.DirectionalNavigation="Cycle"
+                                        RenderOptions.ClearTypeHint="Enabled"
+                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                </ScrollViewer>
+                                <Border
+                                    x:Name="ContextMenuBorder"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="0"
+                                    CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}" />
+                            </Grid>
+                        </Border>
+                    </ui:ThemeShadowChrome>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsVisible" Value="true">
                             <Setter TargetName="Border" Property="Background" Value="{DynamicResource CustomContextBackground}" />
@@ -2808,4 +3227,7 @@
             </Setter.Value>
         </Setter>
     </Style>
+
+    <ui:TextContextMenu x:Key="TextControlContextMenu" x:Shared="False" />
+
 </ResourceDictionary>
diff --git a/Flow.Launcher/Resources/Dark.xaml b/Flow.Launcher/Resources/Dark.xaml
index 674e04deb..a5eec29ab 100644
--- a/Flow.Launcher/Resources/Dark.xaml
+++ b/Flow.Launcher/Resources/Dark.xaml
@@ -65,7 +65,8 @@
 
     <SolidColorBrush x:Key="CustomContextBorder" Color="#1b1b1b" />
     <SolidColorBrush x:Key="CustomContextBackground" Color="#2b2b2b" />
-    <SolidColorBrush x:Key="CustomContextHover" Color="#3c3c3c" />
+    <SolidColorBrush x:Key="CustomContextHover" Color="#3a3a3a" />
+    <SolidColorBrush x:Key="CustomContextClick" Color="#353535" />
     <SolidColorBrush x:Key="CustomContextDisabled" Color="#868686" />
     <SolidColorBrush x:Key="ContextSeparator" Color="#3c3c3c" />
 
diff --git a/Flow.Launcher/Resources/Light.xaml b/Flow.Launcher/Resources/Light.xaml
index 8b04196dd..a78b14d65 100644
--- a/Flow.Launcher/Resources/Light.xaml
+++ b/Flow.Launcher/Resources/Light.xaml
@@ -58,7 +58,8 @@
 
     <SolidColorBrush x:Key="CustomContextBorder" Color="#dadada" />
     <SolidColorBrush x:Key="CustomContextBackground" Color="#f2f2f2" />
-    <SolidColorBrush x:Key="CustomContextHover" Color="#DBDBDB" />
+    <SolidColorBrush x:Key="CustomContextHover" Color="#e4e4e4" />
+    <SolidColorBrush x:Key="CustomContextClick" Color="#ececec" />
     <SolidColorBrush x:Key="CustomContextDisabled" Color="#868686" />
     <SolidColorBrush x:Key="ContextSeparator" Color="#dadada" />
 
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index e16135e2d..7b66b60c7 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -15,7 +15,7 @@
     Title="{DynamicResource flowlauncher_settings}"
     Width="{Binding SettingWindowWidth, Mode=TwoWay}"
     Height="{Binding SettingWindowHeight, Mode=TwoWay}"
-    MinWidth="900"
+    MinWidth="940"
     MinHeight="600"
     d:DataContext="{d:DesignInstance vm:SettingWindowViewModel}"
     Closed="OnClosed"
@@ -98,6 +98,7 @@
         <Style x:Key="SettingTitleLabel" TargetType="{x:Type TextBlock}">
             <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
             <Setter Property="Margin" Value="0,0,0,0" />
+            <Setter Property="TextWrapping" Value="Wrap" />
         </Style>
 
         <Style x:Key="SettingSubTitleLabel" TargetType="{x:Type TextBlock}">
@@ -201,52 +202,46 @@
             </Setter>
             <!--#endregion-->
         </Style>
-        <Style TargetType="{x:Type TabItem}">
+        <Style x:Key="NavTabItem" TargetType="{x:Type TabItem}">
+            <Setter Property="DockPanel.Dock" Value="Top" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type TabItem}">
-                        <Border>
-                            <Grid>
+                        <Grid>
+                            <Border
+                                x:Name="border"
+                                Height="40"
+                                Margin="14,4,8,4"
+                                Padding="0,0,0,0"
+                                HorizontalAlignment="Stretch"
+                                Background="{DynamicResource Color01B}"
+                                CornerRadius="5">
                                 <Grid>
-                                    <Border
-                                        x:Name="Spacer"
-                                        Width="Auto"
-                                        Height="Auto"
-                                        Margin="14,4,8,4"
-                                        Padding="0,0,0,0"
-                                        BorderBrush="Transparent"
-                                        BorderThickness="0">
-                                        <Border
-                                            x:Name="border"
-                                            Height="40"
-                                            Background="{DynamicResource Color01B}"
-                                            CornerRadius="5">
-                                            <Grid>
-                                                <Canvas>
-                                                    <Rectangle
-                                                        x:Name="Bullet"
-                                                        Canvas.Left="0"
-                                                        Width="4"
-                                                        Height="18"
-                                                        Margin="0,11,0,11"
-                                                        Fill="{DynamicResource ToggleSwitchFillOn}"
-                                                        RadiusX="2"
-                                                        RadiusY="2"
-                                                        Visibility="Hidden" />
-                                                    <ContentPresenter
-                                                        x:Name="ContentSite"
-                                                        Margin="12,11,0,11"
-                                                        HorizontalAlignment="LEFT"
-                                                        VerticalAlignment="Center"
-                                                        ContentSource="Header"
-                                                        TextBlock.Foreground="#000" />
-                                                </Canvas>
-                                            </Grid>
-                                        </Border>
-                                    </Border>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="4" />
+                                        <ColumnDefinition />
+                                    </Grid.ColumnDefinitions>
+                                    <Rectangle
+                                        x:Name="Bullet"
+                                        Grid.Column="0"
+                                        Width="4"
+                                        Height="18"
+                                        Margin="0,11,0,11"
+                                        Fill="{DynamicResource ToggleSwitchFillOn}"
+                                        RadiusX="2"
+                                        RadiusY="2"
+                                        Visibility="Hidden" />
+                                    <ContentPresenter
+                                        x:Name="ContentSite"
+                                        Grid.Column="1"
+                                        Margin="12,11,18,11"
+                                        HorizontalAlignment="Stretch"
+                                        VerticalAlignment="Center"
+                                        ContentSource="Header"
+                                        TextBlock.Foreground="#000" />
                                 </Grid>
-                            </Grid>
-                        </Border>
+                            </Border>
+                        </Grid>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="True">
                                 <Setter TargetName="border" Property="Background" Value="{DynamicResource Color06B}" />
@@ -418,30 +413,62 @@
             </Style.Triggers>
         </Style>
         <!--  For Tab Header responsive Width  -->
-        <Style TargetType="{x:Type TabControl}">
+        <Style x:Key="NavTabControl" TargetType="{x:Type TabControl}">
+            <Setter Property="Padding" Value="0" />
+            <Setter Property="HorizontalContentAlignment" Value="Left" />
+            <Setter Property="VerticalContentAlignment" Value="Top" />
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="BorderBrush" Value="Transparent" />
+            <Setter Property="BorderThickness" Value="1" />
             <Setter Property="FontSize" Value="14" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type TabControl}">
-                        <Grid>
+                        <Grid
+                            x:Name="templateRoot"
+                            ClipToBounds="true"
+                            KeyboardNavigation.TabNavigation="Local"
+                            SnapsToDevicePixels="true">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="2.2*" />
-                                <ColumnDefinition Width="7.8*" />
+                                <ColumnDefinition
+                                    x:Name="ColumnDefinition0"
+                                    Width="Auto"
+                                    MinWidth="230" />
+                                <ColumnDefinition x:Name="ColumnDefinition1" Width="7.5*" />
                             </Grid.ColumnDefinitions>
-                            <TabPanel
+                            <!--  here is the edit  -->
+                            <DockPanel
+                                x:Name="headerPanel"
+                                Grid.Row="0"
                                 Grid.Column="0"
-                                Margin="0,0,0,0"
+                                Margin="2,2,2,0"
                                 Panel.ZIndex="1"
-                                Background="{DynamicResource Color01B}"
-                                IsItemsHost="True" />
+                                Background="Transparent"
+                                IsItemsHost="true"
+                                KeyboardNavigation.TabIndex="1"
+                                LastChildFill="False" />
                             <Border
+                                x:Name="contentPanel"
+                                Grid.Row="0"
                                 Grid.Column="1"
-                                BorderBrush="Black"
-                                BorderThickness="0"
-                                CornerRadius="0">
-                                <ContentPresenter Grid.Column="1" ContentSource="SelectedContent" />
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                KeyboardNavigation.DirectionalNavigation="Contained"
+                                KeyboardNavigation.TabIndex="2"
+                                KeyboardNavigation.TabNavigation="Local">
+                                <ContentPresenter
+                                    x:Name="PART_SelectedContentHost"
+                                    Margin="{TemplateBinding Padding}"
+                                    ContentSource="SelectedContent"
+                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                             </Border>
                         </Grid>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsEnabled" Value="false">
+                                <Setter TargetName="templateRoot" Property="TextElement.Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
                     </ControlTemplate>
                 </Setter.Value>
             </Setter>
@@ -568,8 +595,9 @@
                 Grid.ColumnSpan="5"
                 Height="auto"
                 SelectedIndex="1"
+                Style="{DynamicResource NavTabControl}"
                 TabStripPlacement="Left">
-                <TabItem Style="{DynamicResource logo}">
+                <TabItem DockPanel.Dock="Top" Style="{DynamicResource logo}">
                     <TabItem.Header>
                         <Grid Margin="0,18,0,0">
                             <Grid.RowDefinitions>
@@ -591,7 +619,7 @@
                         </Grid>
                     </TabItem.Header>
                 </TabItem>
-                <TabItem>
+                <TabItem DockPanel.Dock="Top" Style="{DynamicResource NavTabItem}">
                     <!--  LEFT TAB WIDTH  -->
                     <TabItem.Header>
                         <Grid>
@@ -963,7 +991,7 @@
                         </VirtualizingStackPanel>
                     </ScrollViewer>
                 </TabItem>
-                <TabItem KeyDown="OnPluginSettingKeydown">
+                <TabItem KeyDown="OnPluginSettingKeydown" Style="{DynamicResource NavTabItem}">
                     <TabItem.Header>
                         <Grid>
                             <Grid.ColumnDefinitions>
@@ -1063,7 +1091,7 @@
                                 Background="{DynamicResource Color01B}"
                                 ItemContainerStyle="{StaticResource PluginList}"
                                 ItemsSource="{Binding PluginViewModels}"
-                                ScrollViewer.CanContentScroll="True"
+                                ScrollViewer.CanContentScroll="False"
                                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                                 SelectedItem="{Binding SelectedPlugin}"
                                 SnapsToDevicePixels="True"
@@ -1073,7 +1101,7 @@
                                 VirtualizingStackPanel.VirtualizationMode="Recycling">
                                 <ListBox.ItemsPanel>
                                     <ItemsPanelTemplate>
-                                        <VirtualizingStackPanel Margin="0,0,0,0" />
+                                        <VirtualizingStackPanel Margin="0,0,0,10" />
                                     </ItemsPanelTemplate>
                                 </ListBox.ItemsPanel>
                                 <ListBox.ItemTemplate>
@@ -1384,7 +1412,7 @@
                 </TabItem>
 
                 <!--#region Plugin Store-->
-                <TabItem KeyDown="PluginStore_OnKeyDown">
+                <TabItem KeyDown="PluginStore_OnKeyDown" Style="{DynamicResource NavTabItem}">
                     <TabItem.Header>
                         <Grid>
                             <Grid.ColumnDefinitions>
@@ -1737,7 +1765,7 @@
                 </TabItem>
                 <!--#endregion-->
 
-                <TabItem>
+                <TabItem Style="{DynamicResource NavTabItem}">
                     <TabItem.Header>
                         <Grid>
                             <Grid.ColumnDefinitions>
@@ -1864,7 +1892,7 @@
                                             </StackPanel>
                                             <StackPanel Grid.Column="2" Orientation="Horizontal">
                                                 <TextBlock
-                                                    Width="100"
+                                                    Width="Auto"
                                                     Margin="0,0,8,2"
                                                     VerticalAlignment="Center"
                                                     Foreground="{DynamicResource Color05B}"
@@ -1872,7 +1900,7 @@
                                                     TextAlignment="Right" />
                                                 <Slider
                                                     Name="WindowWidthValue"
-                                                    Width="300"
+                                                    Width="250"
                                                     Margin="0,0,18,0"
                                                     VerticalAlignment="Center"
                                                     IsMoveToPointEnabled="True"
@@ -2316,7 +2344,7 @@
                 </TabItem>
 
 
-                <TabItem>
+                <TabItem Style="{DynamicResource NavTabItem}">
                     <TabItem.Header>
                         <Grid>
                             <Grid.ColumnDefinitions>
@@ -2339,23 +2367,7 @@
                         VirtualizingStackPanel.IsVirtualizing="True"
                         VirtualizingStackPanel.ScrollUnit="Pixel">
                         <Border>
-                            <Grid Margin="5,18,18,10">
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="43" />
-                                    <RowDefinition Height="80" />
-                                    <RowDefinition Height="146" />
-
-                                    <RowDefinition Height="50" />
-                                    <RowDefinition Height="*" />
-                                    <RowDefinition Height="50" />
-
-                                    <RowDefinition Height="50" />
-                                    <RowDefinition Height="*" />
-                                    <RowDefinition Height="50" />
-
-                                    <RowDefinition Height="50" />
-                                    <RowDefinition Height="*" />
-                                </Grid.RowDefinitions>
+                            <StackPanel Margin="5,18,18,10">
                                 <TextBlock
                                     Grid.Row="0"
                                     Margin="0,5,0,2"
@@ -2365,7 +2377,7 @@
                                     TextAlignment="left" />
 
                                 <StackPanel Grid.Row="1">
-                                    <Border Margin="0,12,0,0" Style="{DynamicResource SettingGroupBox}">
+                                    <Border Margin="0,8,0,0" Style="{DynamicResource SettingGroupBox}">
                                         <ItemsControl Style="{StaticResource SettingGrid}">
                                             <StackPanel Style="{StaticResource TextPanel}">
                                                 <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource flowlauncherHotkey}" />
@@ -2427,7 +2439,7 @@
                                             Style="{StaticResource SettingSeparatorStyle}" />
                                         <Border
                                             Margin="0"
-                                            Padding="0,10,0,0"
+                                            Padding="0,10,0,10"
                                             BorderThickness="0"
                                             Style="{DynamicResource SettingGroupBox}">
                                             <ItemsControl Style="{StaticResource SettingGrid}">
@@ -2450,7 +2462,7 @@
 
                                 <TextBlock
                                     Grid.Row="3"
-                                    Margin="0,0,12,2"
+                                    Margin="0,10,12,10"
                                     Padding="0,12,0,0"
                                     VerticalAlignment="Center"
                                     FontSize="14"
@@ -2475,7 +2487,7 @@
                                                     </DataTemplate>
                                                 </GridViewColumn.CellTemplate>
                                             </GridViewColumn>
-                                            <GridViewColumn Width="540" Header="{DynamicResource customQuery}">
+                                            <GridViewColumn Width="430" Header="{DynamicResource customQuery}">
                                                 <GridViewColumn.CellTemplate>
                                                     <DataTemplate DataType="userSettings:CustomPluginHotkey">
                                                         <TextBlock Text="{Binding ActionKeyword}" />
@@ -2536,7 +2548,7 @@
                                                     </DataTemplate>
                                                 </GridViewColumn.CellTemplate>
                                             </GridViewColumn>
-                                            <GridViewColumn Width="540" Header="{DynamicResource customShortcutExpansion}">
+                                            <GridViewColumn Width="430" Header="{DynamicResource customShortcutExpansion}">
                                                 <GridViewColumn.CellTemplate>
                                                     <DataTemplate>
                                                         <TextBlock Text="{Binding Value}" />
@@ -2576,11 +2588,11 @@
                                     VerticalAlignment="Center"
                                     FontSize="14"
                                     Foreground="{DynamicResource Color05B}"
-                                    Text="Built-in Shortcuts" />
+                                    Text="{DynamicResource builtinShortcuts}" />
                                 <ListView
                                     Grid.Row="10"
                                     MinHeight="160"
-                                    Margin="0,6,0,0"
+                                    Margin="0,6,0,20"
                                     Background="{DynamicResource Color02B}"
                                     BorderBrush="DarkGray"
                                     BorderThickness="1"
@@ -2595,7 +2607,7 @@
                                                     </DataTemplate>
                                                 </GridViewColumn.CellTemplate>
                                             </GridViewColumn>
-                                            <GridViewColumn Width="540" Header="{DynamicResource builtinShortcutDescription}">
+                                            <GridViewColumn Width="430" Header="{DynamicResource builtinShortcutDescription}">
                                                 <GridViewColumn.CellTemplate>
                                                     <DataTemplate>
                                                         <TextBlock Text="{Binding Description, Converter={StaticResource TranlationConverter}}" />
@@ -2605,13 +2617,13 @@
                                         </GridView>
                                     </ListView.View>
                                 </ListView>
-                            </Grid>
+                            </StackPanel>
                         </Border>
                     </ScrollViewer>
                 </TabItem>
 
 
-                <TabItem>
+                <TabItem Style="{DynamicResource NavTabItem}">
                     <TabItem.Header>
                         <Grid>
                             <Grid.ColumnDefinitions>
@@ -2787,7 +2799,7 @@
                         </Border>
                     </ScrollViewer>
                 </TabItem>
-                <TabItem>
+                <TabItem Style="{DynamicResource NavTabItem}">
                     <TabItem.Header>
                         <Grid>
                             <Grid.ColumnDefinitions>
@@ -2818,54 +2830,54 @@
                                     Style="{DynamicResource PageTitle}"
                                     Text="{DynamicResource about}"
                                     TextAlignment="left" />
-                                <StackPanel Orientation="Horizontal">
-                                    <Border
-                                        Width="200"
-                                        Height="120"
-                                        Margin="0,8,0,0"
-                                        Padding="24,24,24,24"
-                                        HorizontalAlignment="Left"
-                                        Style="{DynamicResource SettingGroupBox}">
-                                        <Grid>
-                                            <TextBlock
-                                                FontSize="14"
-                                                Foreground="{DynamicResource Color05B}"
-                                                Text="{DynamicResource version}"
-                                                TextWrapping="WrapWithOverflow" />
-                                            <TextBlock
-                                                HorizontalAlignment="Right"
-                                                VerticalAlignment="Bottom"
-                                                DockPanel.Dock="Bottom"
-                                                FontSize="22"
-                                                Foreground="{DynamicResource Color05B}"
-                                                Text="{Binding Version}"
-                                                TextWrapping="WrapWithOverflow" />
-                                        </Grid>
-                                    </Border>
-                                </StackPanel>
 
-                                <Border Margin="0,4,0,0" Style="{DynamicResource SettingGroupBox}">
+
+                                <Border Margin="0,9,0,0" Style="{DynamicResource SettingGroupBox}">
                                     <ItemsControl Style="{StaticResource SettingGrid}">
                                         <StackPanel Style="{StaticResource TextPanel}">
-                                            <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource update}" />
+                                            <TextBlock
+                                                Grid.Column="1"
+                                                VerticalAlignment="Center"
+                                                FontWeight="Bold"
+                                                Style="{DynamicResource SettingTitleLabel}"
+                                                Text="{Binding Version}" />
+                                            <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource version}" />
                                         </StackPanel>
                                         <Button
                                             Grid.Column="1"
-                                            Margin="0,0,-20,0"
+                                            Margin="0,0,-14,0"
                                             HorizontalAlignment="Right"
                                             Click="OnCheckUpdates"
                                             Content="{DynamicResource checkUpdates}"
                                             Style="{StaticResource AccentButtonStyle}" />
                                         <TextBlock Style="{StaticResource Glyph}">
-                                            &#xe895;
+                                            &#xe946;
                                         </TextBlock>
                                     </ItemsControl>
                                 </Border>
 
+                                <Border Height="62" Style="{DynamicResource SettingGroupBox}">
+                                    <ItemsControl Style="{StaticResource SettingGrid}">
+                                        <StackPanel Style="{StaticResource TextPanel}">
+                                            <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource releaseNotes}" />
+                                        </StackPanel>
+                                        <TextBlock
+                                            Margin="0,0,-12,0"
+                                            VerticalAlignment="Center"
+                                            Style="{StaticResource SideTextAbout}">
+                                            <Hyperlink NavigateUri="{Binding ReleaseNotes, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
+                                                <Run Text="{DynamicResource releaseNotes}" />
+                                            </Hyperlink>
+                                        </TextBlock>
+                                        <TextBlock Style="{StaticResource Glyph}">
+                                            &#xe8fd;
+                                        </TextBlock>
+                                    </ItemsControl>
+                                </Border>
 
                                 <Border
                                     Height="62"
-                                    Margin="0,4,0,0"
+                                    Margin="0,14,0,0"
                                     Style="{DynamicResource SettingGroupBox}">
                                     <ItemsControl Style="{StaticResource SettingGrid}">
                                         <StackPanel Style="{StaticResource TextPanel}">
@@ -2893,25 +2905,6 @@
                                     </ItemsControl>
                                 </Border>
 
-                                <Border Height="62" Style="{DynamicResource SettingGroupBox}">
-                                    <ItemsControl Style="{StaticResource SettingGrid}">
-                                        <StackPanel Style="{StaticResource TextPanel}">
-                                            <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource releaseNotes}" />
-                                        </StackPanel>
-                                        <TextBlock
-                                            Margin="0,0,-12,0"
-                                            VerticalAlignment="Center"
-                                            Style="{StaticResource SideTextAbout}">
-                                            <Hyperlink NavigateUri="{Binding ReleaseNotes, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
-                                                <Run Text="{DynamicResource releaseNotes}" />
-                                            </Hyperlink>
-                                        </TextBlock>
-                                        <TextBlock Style="{StaticResource Glyph}">
-                                            &#xe8fd;
-                                        </TextBlock>
-                                    </ItemsControl>
-                                </Border>
-
                                 <Border Height="62" Style="{DynamicResource SettingGroupBox}">
                                     <ItemsControl Style="{StaticResource SettingGrid}">
                                         <StackPanel Style="{StaticResource TextPanel}">
@@ -2939,10 +2932,13 @@
                                     </ItemsControl>
                                 </Border>
 
-                                <Border Height="62" Style="{DynamicResource SettingGroupBox}">
+                                <Border
+                                    Height="62"
+                                    Margin="0,14,0,0"
+                                    Style="{DynamicResource SettingGroupBox}">
                                     <ItemsControl Style="{StaticResource SettingGrid}">
                                         <StackPanel Style="{StaticResource TextPanel}">
-                                            <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="Icons" />
+                                            <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource icons}" />
                                         </StackPanel>
                                         <TextBlock
                                             Margin="0,0,-12,0"
@@ -2969,26 +2965,43 @@
                                             Margin="0,0,-20,0"
                                             HorizontalAlignment="Right"
                                             Orientation="Horizontal">
-                                            <Button
-                                                Margin="0,0,12,0"
-                                                Click="OpenWelcomeWindow"
-                                                Content="{DynamicResource welcomewindow}" />
-                                            <Button
-                                                Margin="0,0,12,0"
-                                                Click="OpenSettingFolder"
-                                                Content="{DynamicResource settingfolder}" />
                                             <Button
                                                 Name="ClearLogFolderBtn"
                                                 Margin="0,0,12,0"
                                                 Click="ClearLogFolder"
                                                 Content="{Binding CheckLogFolder, UpdateSourceTrigger=PropertyChanged}" />
-                                            <Button Click="OpenLogFolder" Content="{DynamicResource logfolder}" />
+                                            <Button
+                                                Margin="0,0,8,0"
+                                                Content="&#xec7a;"
+                                                FontFamily="/Resources/#Segoe Fluent Icons"
+                                                FontSize="20">
+                                                <ui:FlyoutService.Flyout>
+                                                    <ui:MenuFlyout>
+                                                        <MenuItem Click="OpenWelcomeWindow" Header="{DynamicResource welcomewindow}">
+                                                            <MenuItem.Icon>
+                                                                <ui:FontIcon Glyph="&#xe939;" />
+                                                            </MenuItem.Icon>
+                                                        </MenuItem>
+                                                        <MenuItem Click="OpenSettingFolder" Header="{DynamicResource settingfolder}">
+                                                            <MenuItem.Icon>
+                                                                <ui:FontIcon Glyph="&#xe8b7;" />
+                                                            </MenuItem.Icon>
+                                                        </MenuItem>
+                                                        <MenuItem Click="OpenLogFolder" Header="{DynamicResource logfolder}">
+                                                            <MenuItem.Icon>
+                                                                <ui:FontIcon Glyph="&#xe8b7;" />
+                                                            </MenuItem.Icon>
+                                                        </MenuItem>
+                                                    </ui:MenuFlyout>
+                                                </ui:FlyoutService.Flyout>
+                                            </Button>
                                         </StackPanel>
                                         <TextBlock Style="{StaticResource Glyph}">
-                                            &#xec7a;
+                                            &#xf12b;
                                         </TextBlock>
                                     </ItemsControl>
                                 </Border>
+
                                 <TextBlock
                                     Margin="14,20,0,0"
                                     HorizontalAlignment="Center"
@@ -2998,7 +3011,6 @@
                                     Foreground="{DynamicResource Color15B}"
                                     Text="{Binding ActivatedTimes, Mode=OneWay}"
                                     TextWrapping="WrapWithOverflow" />
-
                             </StackPanel>
                         </ScrollViewer>
                     </Border>
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index fa6520523..65321e6ba 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -758,7 +758,20 @@ namespace Flow.Launcher.ViewModel
         public string Documentation => Constant.Documentation;
         public string Docs => Constant.Docs;
         public string Github => Constant.GitHub;
-        public static string Version => Constant.Version;
+        public string Version
+        {
+            get
+            {
+                if (Constant.Version == "1.0.0")
+                {
+                    return Constant.Dev;
+                }
+                else
+                {
+                    return Constant.Version;
+                }
+            }
+        }
         public string ActivatedTimes => string.Format(_translater.GetTranslation("about_activate_times"), Settings.ActivateTimes);
         
         public string CheckLogFolder
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml
index 195fc7df9..8397145cf 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml
@@ -6,12 +6,13 @@
     xmlns:local="clr-namespace:Flow.Launcher.Plugin.Explorer.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="{DynamicResource plugin_explorer_manageactionkeywords_header}"
-    Width="400"
-    SizeToContent="Height"
+    Width="Auto"
+    Height="255"
     Background="{DynamicResource PopuBGColor}"
     DataContext="{Binding RelativeSource={RelativeSource Self}}"
     Foreground="{DynamicResource PopupTextColor}"
     ResizeMode="NoResize"
+    SizeToContent="Width"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <WindowChrome.WindowChrome>
@@ -68,7 +69,7 @@
 
                 <StackPanel Margin="0,10,0,0" Orientation="Horizontal">
                     <TextBlock
-                        Width="150"
+                        MinWidth="150"
                         Margin="0,10,15,10"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
@@ -78,18 +79,19 @@
                         Name="TxtCurrentActionKeyword"
                         Grid.Row="0"
                         Grid.Column="1"
-                        Width="105"
+                        Width="135"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         PreviewKeyDown="TxtCurrentActionKeyword_OnKeyDown"
                         Text="{Binding ActionKeyword}" />
                 </StackPanel>
                 <StackPanel Margin="0,10,0,15" Orientation="Horizontal">
-                    <TextBlock Margin="0 0 15 0 "
+                    <TextBlock
+                        MinWidth="150"
+                        Margin="0,0,18,0"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         FontSize="14"
-                        Width="150"
                         Text="{DynamicResource plugin_explorer_actionkeyword_enabled}" />
                     <CheckBox
                         Name="ChkActionKeywordEnabled"
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
index 1c6c97792..6d9f916e1 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
@@ -61,7 +61,7 @@
         Insert file suffixes you want to index. Suffixes should be separated by ';'. (ex>bat;py)
     </system:String>
     <system:String x:Key="flowlauncher_plugin_program_protocol_tooltip">
-        Insert protocols of .url files you want to index. Protocols should be separated by ';'. (ex>ftp;netflix)
+        Insert protocols of .url files you want to index. Protocols should be separated by ';', and should end with "://". (ex>ftp://;mailto://)
     </system:String>
 
     <system:String x:Key="flowlauncher_plugin_program_run_as_different_user">Run As Different User</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Main.cs b/Plugins/Flow.Launcher.Plugin.Program/Main.cs
index c212bf8f4..feeb8e78a 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Main.cs
@@ -102,7 +102,7 @@ namespace Flow.Launcher.Plugin.Program
                 await Task.WhenAll(a, b);
 
             Win32.WatchProgramUpdate(_settings);
-            UWP.WatchPackageChange();
+            _ = UWP.WatchPackageChange();
         }
 
         public static void IndexWin32Programs()
diff --git a/Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml b/Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml
index fbe538b7f..e4467a8b6 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml
@@ -8,8 +8,8 @@
     Title="{DynamicResource flowlauncher_plugin_program_suffixes}"
     Width="600"
     Background="{DynamicResource PopuBGColor}"
-    Foreground="{DynamicResource PopupTextColor}"
     DataContext="{Binding RelativeSource={RelativeSource Self}}"
+    Foreground="{DynamicResource PopupTextColor}"
     ResizeMode="NoResize"
     SizeToContent="Height"
     WindowStartupLocation="CenterScreen"
@@ -163,17 +163,32 @@
                             FontSize="16"
                             FontWeight="SemiBold"
                             Text="{DynamicResource flowlauncher_plugin_program_suffixes_excutable_types}" />
-                        <CheckBox Name="apprefMS" Margin="10,0,0,0" IsChecked="{Binding SuffixesStatus[appref-ms]}">appref-ms</CheckBox>
-                        <CheckBox Name="exe" Margin="10,0,0,0" IsChecked="{Binding SuffixesStatus[exe]}">exe</CheckBox>
-                        <CheckBox Name="lnk" Margin="10,0,0,0" IsChecked="{Binding SuffixesStatus[lnk]}">lnk</CheckBox>
+                        <CheckBox
+                            Name="apprefMS"
+                            Margin="10,0,0,0"
+                            IsChecked="{Binding SuffixesStatus[appref-ms]}">
+                            appref-ms
+                        </CheckBox>
+                        <CheckBox
+                            Name="exe"
+                            Margin="10,0,0,0"
+                            IsChecked="{Binding SuffixesStatus[exe]}">
+                            exe
+                        </CheckBox>
+                        <CheckBox
+                            Name="lnk"
+                            Margin="10,0,0,0"
+                            IsChecked="{Binding SuffixesStatus[lnk]}">
+                            lnk
+                        </CheckBox>
                         <CheckBox
                             Name="CustomFiles"
                             Margin="10,0,0,0"
-                            IsChecked="{Binding UseCustomSuffixes}"
-                            Content="{DynamicResource flowlauncher_plugin_program_suffixes_custom_file_types}" />
+                            Content="{DynamicResource flowlauncher_plugin_program_suffixes_custom_file_types}"
+                            IsChecked="{Binding UseCustomSuffixes}" />
                         <TextBox
                             x:Name="tbSuffixes"
-                            Margin="10,4,0,6"
+                            Margin="10,4,0,10"
                             Style="{StaticResource CustomFileTypeTextBox}" />
                     </StackPanel>
 
@@ -189,17 +204,29 @@
                                 FontSize="16"
                                 FontWeight="SemiBold"
                                 Text="{DynamicResource flowlauncher_plugin_program_suffixes_URL_types}" />
-                            <CheckBox Name="steam" Margin="10,0,0,0" IsChecked="{Binding ProtocolsStatus[steam]}" Content="{DynamicResource flowlauncher_plugin_program_suffixes_URL_steam}"></CheckBox>
-                            <CheckBox Name="epic" Margin="10,0,0,0" IsChecked="{Binding ProtocolsStatus[epic]}" Content="{DynamicResource flowlauncher_plugin_program_suffixes_URL_epic}"></CheckBox>
-                            <CheckBox Name="http" Margin="10,0,0,0" IsChecked="{Binding ProtocolsStatus[http]}" Content="{DynamicResource flowlauncher_plugin_program_suffixes_URL_http}"></CheckBox>
+                            <CheckBox
+                                Name="steam"
+                                Margin="10,0,0,0"
+                                Content="{DynamicResource flowlauncher_plugin_program_suffixes_URL_steam}"
+                                IsChecked="{Binding ProtocolsStatus[steam]}" />
+                            <CheckBox
+                                Name="epic"
+                                Margin="10,0,0,0"
+                                Content="{DynamicResource flowlauncher_plugin_program_suffixes_URL_epic}"
+                                IsChecked="{Binding ProtocolsStatus[epic]}" />
+                            <CheckBox
+                                Name="http"
+                                Margin="10,0,0,0"
+                                Content="{DynamicResource flowlauncher_plugin_program_suffixes_URL_http}"
+                                IsChecked="{Binding ProtocolsStatus[http]}" />
                             <CheckBox
                                 Name="CustomProtocol"
                                 Margin="10,0,0,0"
-                                IsChecked="{Binding UseCustomProtocols}"
-                                Content="{DynamicResource flowlauncher_plugin_program_suffixes_custom_urls}" />
+                                Content="{DynamicResource flowlauncher_plugin_program_suffixes_custom_urls}"
+                                IsChecked="{Binding UseCustomProtocols}" />
                             <TextBox
                                 x:Name="tbProtocols"
-                                Margin="10,4,0,6"
+                                Margin="10,4,0,0"
                                 Style="{StaticResource CustomURLTypeTextBox}" />
                         </StackPanel>
                     </Border>
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
index 2ab624431..6b3782f2e 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
@@ -26,8 +26,19 @@ namespace Flow.Launcher.Plugin.Program.Programs
         public string Name { get; set; }
         public string UniqueIdentifier { get => _uid; set => _uid = value == null ? string.Empty : value.ToLowerInvariant(); }  // For path comparison
         public string IcoPath { get; set; }
+        /// <summary>
+        /// Path of the file. It's the path of .lnk or .url for .lnk and .url.
+        /// </summary>
         public string FullPath { get; set; }
+        /// <summary>
+        /// Path of the excutable for .lnk, or the URL for .url.
+        /// </summary>
         public string LnkResolvedPath { get; set; }
+        /// <summary>
+        /// Path of the actual executable file.
+        /// </summary>
+        public string ExecutablePath => LnkResolvedPath ?? FullPath;
+        public string WorkingDir => Directory.GetParent(ExecutablePath)?.FullName ?? string.Empty;
         public string ParentDirectory { get; set; }
         public string ExecutableName { get; set; }
         public string Description { get; set; }
@@ -98,10 +109,23 @@ namespace Flow.Launcher.Plugin.Program.Programs
                 matchResult.MatchData = new List<int>();
             }
 
+            string subtitle = string.Empty;
+            if (!Main._settings.HideAppsPath)
+            {
+                if (Extension(FullPath) == UrlExtension)
+                {
+                    subtitle = LnkResolvedPath;
+                }
+                else
+                {
+                    subtitle = FullPath;
+                }
+            }
+
             var result = new Result
             {
                 Title = title,
-                SubTitle = Main._settings.HideAppsPath ? string.Empty : LnkResolvedPath ?? FullPath,
+                SubTitle = subtitle,
                 IcoPath = IcoPath,
                 Score = matchResult.Score,
                 TitleHighlightData = matchResult.MatchData,
@@ -117,8 +141,8 @@ namespace Flow.Launcher.Plugin.Program.Programs
 
                     var info = new ProcessStartInfo
                     {
-                        FileName = LnkResolvedPath ?? FullPath,
-                        WorkingDirectory = ParentDirectory,
+                        FileName = ExecutablePath,
+                        WorkingDirectory = WorkingDir,
                         UseShellExecute = true,
                         Verb = runAsAdmin ? "runas" : null
                     };
@@ -144,8 +168,8 @@ namespace Flow.Launcher.Plugin.Program.Programs
                     {
                         var info = new ProcessStartInfo
                         {
-                            FileName = FullPath,
-                            WorkingDirectory = ParentDirectory,
+                            FileName = ExecutablePath,
+                            WorkingDirectory = WorkingDir,
                             UseShellExecute = true
                         };
 
@@ -163,8 +187,8 @@ namespace Flow.Launcher.Plugin.Program.Programs
                     {
                         var info = new ProcessStartInfo
                         {
-                            FileName = FullPath,
-                            WorkingDirectory = ParentDirectory,
+                            FileName = ExecutablePath,
+                            WorkingDirectory = WorkingDir,
                             Verb = "runas",
                             UseShellExecute = true
                         };
@@ -225,6 +249,15 @@ namespace Flow.Launcher.Plugin.Program.Programs
 
                 return Default;
             }
+#if !DEBUG
+            catch (Exception e)
+            {
+                ProgramLogger.LogException($"|Win32|Win32Program|{path}" +
+                                                "|An unexpected error occurred in the calling method Win32Program", e);
+
+                return Default;
+            }
+#endif
         }
 
         private static Win32 LnkProgram(string path)
@@ -242,8 +275,7 @@ namespace Flow.Launcher.Plugin.Program.Programs
                     var extension = Extension(target);
                     if (extension == ExeExtension && File.Exists(target))
                     {
-                        program.LnkResolvedPath = program.FullPath;
-                        program.FullPath = Path.GetFullPath(target).ToLowerInvariant();
+                        program.LnkResolvedPath = Path.GetFullPath(target);
                         program.ExecutableName = Path.GetFileName(target);
 
                         var description = _helper.description;
@@ -271,16 +303,14 @@ namespace Flow.Launcher.Plugin.Program.Programs
                                            "|Error caused likely due to trying to get the description of the program",
                     e);
 
-                program.Valid = false;
-                return program;
+                return Default;
             }
             catch (FileNotFoundException e)
             {
                 ProgramLogger.LogException($"|Win32|LnkProgram|{path}" +
                                 "|An unexpected error occurred in the calling method LnkProgram", e);
 
-                program.Valid = false;
-                return program;
+                return Default;
             }
 #if !DEBUG //Only do a catch all in production. This is so make developer aware of any unhandled exception and add the exception handling in.
             catch (Exception e)
@@ -288,8 +318,7 @@ namespace Flow.Launcher.Plugin.Program.Programs
                 ProgramLogger.LogException($"|Win32|LnkProgram|{path}" +
                                                 "|An unexpected error occurred in the calling method LnkProgram", e);
 
-                program.Valid = false;
-                return program;
+                return Default;
             }
 #endif
         }
@@ -343,6 +372,13 @@ namespace Flow.Launcher.Plugin.Program.Programs
                     program.Description = info.FileDescription;
                 return program;
             }
+            catch (FileNotFoundException e)
+            {
+                ProgramLogger.LogException($"|Win32|ExeProgram|{path}" +
+                           $"|File not found when trying to load the program from {path}", e);
+
+                return Default;
+            }
             catch (Exception e) when (e is SecurityException || e is UnauthorizedAccessException)
             {
                 ProgramLogger.LogException($"|Win32|ExeProgram|{path}" +
@@ -352,7 +388,7 @@ namespace Flow.Launcher.Plugin.Program.Programs
             }
         }
 
-        private static IEnumerable<string> ProgramPaths(string directory, string[] suffixes, bool recursive = true)
+        private static IEnumerable<string> EnumerateProgramsInDir(string directory, string[] suffixes, bool recursive = true)
         {
             if (!Directory.Exists(directory))
                 return Enumerable.Empty<string>();
@@ -377,15 +413,14 @@ namespace Flow.Launcher.Plugin.Program.Programs
             }
         }
 
-        private static IEnumerable<Win32> UnregisteredPrograms(List<ProgramSource> sources, string[] suffixes, string[] protocols)
+        private static IEnumerable<Win32> UnregisteredPrograms(List<string> directories, string[] suffixes, string[] protocols)
         {
             // Disabled custom sources are not in DisabledProgramSources
-            var paths = ExceptDisabledSource(sources.Where(s => Directory.Exists(s.Location) && s.Enabled)
-                    .AsParallel()
-                    .SelectMany(s => ProgramPaths(s.Location, suffixes)))
-                    .Distinct();
+            var paths = directories.AsParallel()
+                            .SelectMany(s => EnumerateProgramsInDir(s, suffixes));
 
-            var programs = paths.Select(x => GetProgramFromPath(x, protocols));
+            // Remove disabled programs in DisabledProgramSources
+            var programs = ExceptDisabledSource(paths).Select(x => GetProgramFromPath(x, protocols));
             return programs;
         }
 
@@ -393,8 +428,8 @@ namespace Flow.Launcher.Plugin.Program.Programs
         {
             var directory1 = Environment.GetFolderPath(Environment.SpecialFolder.Programs);
             var directory2 = Environment.GetFolderPath(Environment.SpecialFolder.CommonPrograms);
-            var paths1 = ProgramPaths(directory1, suffixes);
-            var paths2 = ProgramPaths(directory2, suffixes);
+            var paths1 = EnumerateProgramsInDir(directory1, suffixes);
+            var paths2 = EnumerateProgramsInDir(directory2, suffixes);
 
             var toFilter = paths1.Concat(paths2);
 
@@ -403,26 +438,22 @@ namespace Flow.Launcher.Plugin.Program.Programs
             return programs;
         }
 
-        private static IEnumerable<Win32> PATHPrograms(string[] suffixes, string[] protocols)
+        private static IEnumerable<Win32> PATHPrograms(string[] suffixes, string[] protocols, List<string> commonParents)
         {
             var pathEnv = Environment.GetEnvironmentVariable("Path");
-            if (String.IsNullOrEmpty(pathEnv)) 
-            { 
-                return Array.Empty<Win32>(); 
+            if (String.IsNullOrEmpty(pathEnv))
+            {
+                return Array.Empty<Win32>();
             }
 
             var paths = pathEnv.Split(";", StringSplitOptions.RemoveEmptyEntries).DistinctBy(p => p.ToLowerInvariant());
 
-            var toFilter = paths.AsParallel().SelectMany(p => ProgramPaths(p, suffixes, recursive: false));
+            var toFilter = paths.Where(x => commonParents.All(parent => !IsSubPathOf(x, parent)))
+                                .AsParallel()
+                                .SelectMany(p => EnumerateProgramsInDir(p, suffixes, recursive: false));
 
             var programs = ExceptDisabledSource(toFilter.Distinct())
-                .Select(x => Extension(x) switch
-                {
-                    ShortcutExtension => LnkProgram(x),
-                    UrlExtension => UrlProgram(x, protocols),
-                    ExeExtension => ExeProgram(x),
-                    _ => Win32Program(x)
-                });
+                .Select(x => GetProgramFromPath(x, protocols));
             return programs;
         }
 
@@ -497,9 +528,6 @@ namespace Flow.Launcher.Plugin.Program.Programs
 
             path = Environment.ExpandEnvironmentVariables(path);
 
-            if (!File.Exists(path))
-                return Default;
-
             return Extension(path) switch
             {
                 ShortcutExtension => LnkProgram(path),
@@ -546,7 +574,7 @@ namespace Flow.Launcher.Plugin.Program.Programs
 
         private static IEnumerable<Win32> ProgramsHasher(IEnumerable<Win32> programs)
         {
-            return programs.GroupBy(p => p.FullPath.ToLowerInvariant())
+            return programs.GroupBy(p => p.ExecutablePath.ToLowerInvariant())
                 .AsParallel()
                 .SelectMany(g =>
                 {
@@ -554,7 +582,7 @@ namespace Flow.Launcher.Plugin.Program.Programs
                     if (temp.Any())
                         return DistinctBy(temp, x => x.Description);
                     return g.Take(1);
-                }).ToArray();
+                });
         }
 
 
@@ -566,11 +594,15 @@ namespace Flow.Launcher.Plugin.Program.Programs
                 var suffixes = settings.GetSuffixes();
                 var protocols = settings.GetProtocols();
 
-                var unregistered = UnregisteredPrograms(settings.ProgramSources, suffixes, protocols);
+                // Disabled custom sources are not in DisabledProgramSources
+                var sources = settings.ProgramSources.Where(s => Directory.Exists(s.Location) && s.Enabled).Distinct();
+                var commonParents = GetCommonParents(sources);
+
+                var unregistered = UnregisteredPrograms(commonParents, suffixes, protocols);
 
                 programs = programs.Concat(unregistered);
 
-                var autoIndexPrograms = Enumerable.Empty<Win32>();
+                var autoIndexPrograms = Enumerable.Empty<Win32>(); // for single programs, not folders
 
                 if (settings.EnableRegistrySource)
                 {
@@ -586,11 +618,11 @@ namespace Flow.Launcher.Plugin.Program.Programs
 
                 if (settings.EnablePATHSource)
                 {
-                    var path = PATHPrograms(settings.GetSuffixes(), protocols);
-                    autoIndexPrograms = autoIndexPrograms.Concat(path);
+                    var path = PATHPrograms(settings.GetSuffixes(), protocols, commonParents);
+                    programs = programs.Concat(path);
                 }
 
-                autoIndexPrograms = ProgramsHasher(autoIndexPrograms);
+                autoIndexPrograms = ProgramsHasher(autoIndexPrograms).ToArray();
 
                 return programs.Concat(autoIndexPrograms).Where(x => x.Valid).Distinct().ToArray();
             }
@@ -652,11 +684,13 @@ namespace Flow.Launcher.Plugin.Program.Programs
             if (settings.EnableStartMenuSource)
                 paths.AddRange(GetStartMenuPaths());
 
-            paths.AddRange(from source in settings.ProgramSources where source.Enabled select source.Location);
+            var customSources = GetCommonParents(settings.ProgramSources);
+            paths.AddRange(customSources);
 
+            var fileExtensionToWatch = settings.GetSuffixes();
             foreach (var directory in from path in paths where Directory.Exists(path) select path)
             {
-                WatchDirectory(directory);
+                WatchDirectory(directory, fileExtensionToWatch);
             }
 
             _ = Task.Run(MonitorDirectoryChangeAsync);
@@ -677,7 +711,7 @@ namespace Flow.Launcher.Plugin.Program.Programs
             }
         }
 
-        public static void WatchDirectory(string directory)
+        public static void WatchDirectory(string directory, string[] extensions)
         {
             if (!Directory.Exists(directory))
             {
@@ -689,6 +723,10 @@ namespace Flow.Launcher.Plugin.Program.Programs
             watcher.Deleted += static (_, _) => indexQueue.Writer.TryWrite(default);
             watcher.EnableRaisingEvents = true;
             watcher.IncludeSubdirectories = true;
+            foreach (var extension in extensions)
+            {
+                watcher.Filters.Add($"*.{extension}");
+            }
 
             Watchers.Add(watcher);
         }
@@ -700,5 +738,38 @@ namespace Flow.Launcher.Plugin.Program.Programs
                 fileSystemWatcher.Dispose();
             }
         }
+
+        // https://stackoverflow.com/a/66877016
+        private static bool IsSubPathOf(string subPath, string basePath)
+        {
+            var rel = Path.GetRelativePath(basePath, subPath);
+            return rel != "."
+                && rel != ".."
+                && !rel.StartsWith("../")
+                && !rel.StartsWith(@"..\")
+                && !Path.IsPathRooted(rel);
+        }
+
+        private static List<string> GetCommonParents(IEnumerable<ProgramSource> programSources)
+        {
+            // To avoid unnecessary io
+            // like c:\windows and c:\windows\system32
+            var grouped = programSources.GroupBy(p => p.Location.ToLowerInvariant()[0]); // group by disk
+            List<string> result = new();
+            foreach (var group in grouped)
+            {
+                HashSet<ProgramSource> parents = group.ToHashSet();
+                foreach (var source in group)
+                {
+                    if (parents.Any(p => IsSubPathOf(source.Location, p.Location) &&
+                                            source != p))
+                    {
+                        parents.Remove(source);
+                    }
+                }
+                result.AddRange(parents.Select(x => x.Location));
+            }
+            return result.DistinctBy(x => x.ToLowerInvariant()).ToList();
+        }
     }
 }
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
index 227c23ebc..3f9e7196c 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
@@ -91,6 +91,7 @@
                 BorderThickness="1" />
             <StackPanel
                 Width="Auto"
+                Height="55"
                 Margin="60,6,0,0"
                 HorizontalAlignment="Left"
                 Orientation="Horizontal">
@@ -145,8 +146,8 @@
             DragEnter="programSourceView_DragEnter"
             Drop="programSourceView_Drop"
             GridViewColumnHeader.Click="GridViewColumnHeaderClickedHandler"
-            PreviewMouseRightButtonUp="ProgramSourceView_PreviewMouseRightButtonUp"
             MouseDoubleClick="programSourceView_MouseDoubleClick"
+            PreviewMouseRightButtonUp="ProgramSourceView_PreviewMouseRightButtonUp"
             SelectionChanged="programSourceView_SelectionChanged"
             SelectionMode="Extended">
             <ListView.View>
diff --git a/appveyor.yml b/appveyor.yml
index d467792d7..aa490fd25 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,6 +4,10 @@ init:
 - ps: |
       $version = new-object System.Version $env:APPVEYOR_BUILD_VERSION
       $env:flowVersion = "{0}.{1}.{2}" -f $version.Major, $version.Minor, $version.Build
+      if ($env:APPVEYOR_REPO_BRANCH -eq "dev")
+      {
+        $env:prereleaseTag = "{0}.{1}.{2}.{3}" -f $version.Major, $version.Minor, $version.Build, $version.Revision
+      }
 - sc config WSearch start= auto # Starts Windows Search service- Needed for running ExplorerTest
 - net start WSearch
 
@@ -18,12 +22,6 @@ assembly_info:
   assembly_file_version: $(flowVersion)
   assembly_informational_version: $(flowVersion)
 
-skip_branch_with_pr: true
-
-skip_commits:
-  files:
-    - '*.md'
-
 image: Visual Studio 2022
 platform: Any CPU
 configuration: Release
@@ -57,6 +55,17 @@ deploy:
     on:
       APPVEYOR_REPO_TAG: true
 
+  - provider: GitHub
+    repository: Flow-Launcher/Prereleases
+    release: v$(prereleaseTag)
+    description: 'This is the early access build of our upcoming release. All changes contained here are reviewed, tested and stable to use.\n\nSee our [release](https://github.com/Flow-Launcher/Flow.Launcher/pulls?q=is%3Aopen+is%3Apr+label%3Arelease) Pull Request for details.\n\nFor latest production release visit [here](https://github.com/Flow-Launcher/Flow.Launcher/releases/latest)\n\nPlease report any bugs or issues over at the [main repository](https://github.com/Flow-Launcher/Flow.Launcher/issues)'
+    auth_token:
+      secure: ij4UeXUYQBDJxn2YRAAhUOjklOGVKDB87Hn5J8tKIzj13yatoI7sLM666QDQFEgv
+    artifact: Squirrel Installer, Portable Version, Squirrel nupkg, Squirrel RELEASES
+    force_update: true
+    on:
+      branch: dev
+
   - provider: GitHub
     release: v$(flowVersion)
     auth_token: