diff --git a/Flow.Launcher.Infrastructure/Constant.cs b/Flow.Launcher.Infrastructure/Constant.cs
index a5b89c300..564e03638 100644
--- a/Flow.Launcher.Infrastructure/Constant.cs
+++ b/Flow.Launcher.Infrastructure/Constant.cs
@@ -33,7 +33,7 @@ namespace Flow.Launcher.Infrastructure
 
         public static readonly string QueryTextBoxIconImagePath = $"{ProgramDirectory}\\Images\\mainsearch.svg";
 
-        public const string DefaultTheme = "Darker";
+        public const string DefaultTheme = "Win11Light";
 
         public const string Themes = "Themes";
 
diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index f918dcead..34e86a3ed 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -5,6 +5,7 @@ using System.Drawing;
 using System.Text.Json.Serialization;
 using Flow.Launcher.Plugin;
 using Flow.Launcher.Plugin.SharedModels;
+using Flow.Launcher;
 using Flow.Launcher.ViewModel;
 
 namespace Flow.Launcher.Infrastructure.UserSettings
@@ -39,9 +40,11 @@ namespace Flow.Launcher.Infrastructure.UserSettings
         public bool UseGlyphIcons { get; set; } = true;
 
         public int CustomExplorerIndex { get; set; } = 0;
+
+        [JsonIgnore]
         public CustomExplorerViewModel CustomExplorer
         {
-            get => CustomExplorerList[CustomExplorerIndex];
+            get => CustomExplorerList[CustomExplorerIndex < CustomExplorerList.Count ? CustomExplorerIndex : 0];
             set => CustomExplorerList[CustomExplorerIndex] = value;
         }
 
diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index 066188882..3abdaf01f 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -192,7 +192,7 @@ namespace Flow.Launcher.Plugin
         void SaveSettingJsonStorage<T>() where T : new();
 
         /// <summary>
-        /// Open Directory in explorer configured by user
+        /// Open directory in an explorer configured by user via Flow's Settings. The default is Windows Explorer
         /// </summary>
         /// <param name="DirectoryPath">Directory Path to open</param>
         /// <param name="FileName">Extra FileName Info</param>
diff --git a/Flow.Launcher/App.xaml b/Flow.Launcher/App.xaml
index 68ba806d2..c5214d7ab 100644
--- a/Flow.Launcher/App.xaml
+++ b/Flow.Launcher/App.xaml
@@ -10,7 +10,7 @@
                 <ui:ThemeResources RequestedTheme="Light" />
                 <ui:XamlControlsResources />
                 <ResourceDictionary Source="pack://application:,,,/Resources/CustomControlTemplate.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/Themes/Darker.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/Themes/Win11Light.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/Languages/en.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 6c3fbe777..4cc4e4d17 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -140,12 +140,13 @@
 
     <!--  FileManager Setting Dialog  -->
     <system:String x:Key="fileManagerWindow">Select File Manager</system:String>
-    <system:String x:Key="fileManager_tips">Please specify the file location of the file manager you using and add arguments if necessary. The default arguments is &quot;%d&quot;, and a path is entered at that location. For example, If a command is required such as &quot;totalcmd.exe /A c:\windows&quot;, Argument is /A &quot;%d&quot;.</system:String>
+    <system:String x:Key="fileManager_tips">Please specify the file location of the file manager you using and add arguments if necessary. The default arguments is &quot;%d&quot;, and a path is entered at that location. For example, If a command is required such as &quot;totalcmd.exe /A c:\windows&quot;, argument is /A &quot;%d&quot;.</system:String>
+    <system:String x:Key="fileManager_tips2">&quot;%f&quot; is an argument that represent the file path.  It is used to emphasize the file/folder name when opening a specific file location in 3rd party file manager. This argument is only available in the &quot;Arg for File&quot; item. If the file manager does not have that function, you can use &quot;%d&quot;.</system:String>
     <system:String x:Key="fileManager_name">File Manager</system:String>
     <system:String x:Key="fileManager_profile_name">Profile Name</system:String>
     <system:String x:Key="fileManager_path">File Manager Path</system:String>
-    <system:String x:Key="fileManager_directory_arg">Arguments For Folder</system:String>
-    <system:String x:Key="fileManager_file_arg">Arguments For File</system:String>
+    <system:String x:Key="fileManager_directory_arg">Arg For Folder</system:String>
+    <system:String x:Key="fileManager_file_arg">Arg For File</system:String>
 
     <!--  DefaultBrowser Setting Dialog  -->
     <system:String x:Key="defaultBrowserTitle">Default Web Browser</system:String>
diff --git a/Flow.Launcher/Languages/sk.xaml b/Flow.Launcher/Languages/sk.xaml
index 4014d215f..8c0a96f98 100644
--- a/Flow.Launcher/Languages/sk.xaml
+++ b/Flow.Launcher/Languages/sk.xaml
@@ -1,7 +1,8 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary
+                    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:system="clr-namespace:System;assembly=mscorlib">
-    <!--MainWindow-->
+    <!--  MainWindow  -->
     <system:String x:Key="registerHotkeyFailed">Nepodarilo sa registrovať klávesovú skratku {0}</system:String>
     <system:String x:Key="couldnotStartCmd">Nepodarilo sa spustiť {0}</system:String>
     <system:String x:Key="invalidFlowLauncherPluginFileFormat">Neplatný formát súboru pre plugin Flow Launchera</system:String>
@@ -15,11 +16,11 @@
     <system:String x:Key="iconTrayExit">Ukončiť</system:String>
     <system:String x:Key="closeWindow">Zavrieť</system:String>
 
-    <!--Setting General-->
+    <!--  Setting General  -->
     <system:String x:Key="flowlauncher_settings">Nastavenia Flow Launchera</system:String>
     <system:String x:Key="general">Všeobecné</system:String>
     <system:String x:Key="portableMode">Prenosný režim</system:String>
-    <system:String x:Key="portableModeToolTIp">Uloží všetky nastavenia a používateľské údaje do jedného centrálneho priečinka (Užitočné pri vyberateľných diskoch a cloudových službách).</system:String>
+    <system:String x:Key="portableModeToolTIp">Uloží všetky nastavenia a používateľské údaje do jedného priečinka (Užitočné pri vyberateľných diskoch a cloudových službách).</system:String>
     <system:String x:Key="startFlowLauncherOnSystemStartup">Spustiť Flow Launcher po štarte systému</system:String>
     <system:String x:Key="hideFlowLauncherWhenLoseFocus">Schovať Flow Launcher po strate fokusu</system:String>
     <system:String x:Key="dontPromptUpdateMsg">Nezobrazovať upozornenia na novú verziu</system:String>
@@ -33,6 +34,8 @@
     <system:String x:Key="maxShowResults">Max. výsledkov</system:String>
     <system:String x:Key="ignoreHotkeysOnFullscreen">Ignorovať klávesové skratky v režime na celú obrazovku</system:String>
     <system:String x:Key="ignoreHotkeysOnFullscreenToolTip">Zakázať aktiváciu Flow Launchera, keď je aktívna aplikácia na celú obrazovku (odporúčané pre hry).</system:String>
+    <system:String x:Key="defaultFileManager">Predvolený správca súborov</system:String>
+    <system:String x:Key="defaultFileManagerToolTip">Vyberte správcu súborov, ktorý sa má použiť pri otváraní priečinka.</system:String>
     <system:String x:Key="pythonDirectory">Priečinok s Pythonom</system:String>
     <system:String x:Key="autoUpdates">Automatická aktualizácia</system:String>
     <system:String x:Key="selectPythonDirectory">Vybrať</system:String>
@@ -44,7 +47,7 @@
     <system:String x:Key="ShouldUsePinyinToolTip">Umožňuje vyhľadávanie pomocou Pinyin. Pinyin je štandardný systém romanizovaného pravopisu pre transliteráciu čínštiny</system:String>
     <system:String x:Key="shadowEffectNotAllowed">Efekt tieňa nie je povolený, kým má aktuálny motív povolený efekt rozostrenia</system:String>
     
-    <!--Setting Plugin-->
+    <!--  Setting Plugin  -->
     <system:String x:Key="plugin">Pluginy</system:String>
     <system:String x:Key="browserMorePlugins">Nájsť ďalšie pluginy</system:String>
     <system:String x:Key="enable">Zap.</system:String>
@@ -62,12 +65,12 @@
     <system:String x:Key="plugin_query_time">Čas dopytu:</system:String>
     
 
-    <!--Setting Plugin Store-->
+    <!--  Setting Plugin Store  -->
     <system:String x:Key="pluginStore">Repozitár pluginov</system:String>
     <system:String x:Key="refresh">Obnoviť</system:String>
     <system:String x:Key="install">Inštalovať</system:String>
 
-    <!--Setting Theme-->
+    <!--  Setting Theme  -->
     <system:String x:Key="theme">Motív</system:String>
     <system:String x:Key="browserMoreThemes">Galéria motívov</system:String>
     <system:String x:Key="howToCreateTheme">Ako vytvoriť motív</system:String>
@@ -81,12 +84,12 @@
     <system:String x:Key="ThemeFolder">Priečinok s motívmi</system:String>
     <system:String x:Key="OpenThemeFolder">Otvoriť priečinok s motívmi</system:String>
 
-    <!--Setting Hotkey-->
+    <!--  Setting Hotkey  -->
     <system:String x:Key="hotkey">Klávesové skratky</system:String>
     <system:String x:Key="flowlauncherHotkey">Klávesová skratka pre Flow Launcher</system:String>
     <system:String x:Key="flowlauncherHotkeyToolTip">Zadajte skratku na zobrazenie/skrytie Flow Launchera.</system:String>
-    <system:String x:Key="openResultModifiers">Otvoriť výsledok modifikačným klávesom</system:String>
-    <system:String x:Key="openResultModifiersToolTip">Vyberte modifikačný kláves na otvorenie výsledku pomocou klávesnice.</system:String>
+    <system:String x:Key="openResultModifiers">Modifikačný kláves na otvorenie výsledkov</system:String>
+    <system:String x:Key="openResultModifiersToolTip">Vyberte modifikačný kláves na otvorenie vybraného výsledku pomocou klávesnice.</system:String>
     <system:String x:Key="showOpenResultHotkey">Zobraziť klávesovú skratku</system:String>
     <system:String x:Key="showOpenResultHotkeyToolTip">Zobrazí klávesovú skratku spolu s výsledkami.</system:String>
     <system:String x:Key="customQueryHotkey">Vlastná klávesová skratka na vyhľadávanie</system:String>
@@ -98,10 +101,11 @@
     <system:String x:Key="deleteCustomHotkeyWarning">Ste si istý, že chcete odstrániť klávesovú skratku {0} pre plugin?</system:String>
     <system:String x:Key="queryWindowShadowEffect">Tieňový efekt v poli vyhľadávania</system:String>
     <system:String x:Key="shadowEffectCPUUsage">Tieňový efekt významne využíva GPU. Neodporúča sa, ak je výkon počítača obmedzený.</system:String>
+    <system:String x:Key="windowWidthSize">Veľkosť šírky okna</system:String>
     <system:String x:Key="useGlyphUI">Použiť ikony Segoe Fluent</system:String>
     <system:String x:Key="useGlyphUIEffect">Použiť ikony Segoe Fluent, ak sú podporované</system:String>
 
-    <!--Setting Proxy-->
+    <!--  Setting Proxy  -->
     <system:String x:Key="proxy">HTTP Proxy</system:String>
     <system:String x:Key="enableProxy">Povoliť HTTP Proxy</system:String>
     <system:String x:Key="server">HTTP Server</system:String>
@@ -117,7 +121,7 @@
     <system:String x:Key="proxyIsCorrect">Nastavenie proxy je v poriadku</system:String>
     <system:String x:Key="proxyConnectFailed">Pripojenie proxy zlyhalo</system:String>
 
-    <!--Setting About-->
+    <!--  Setting About  -->
     <system:String x:Key="about">O aplikácii</system:String>
     <system:String x:Key="website">Webstránka</system:String>
     <system:String x:Key="version">Verzia</system:String>
@@ -126,18 +130,28 @@
     <system:String x:Key="newVersionTips">Je dostupná nová verzia {0}, chcete reštartovať Flow Launcher, aby sa mohol aktualizovať?</system:String>
     <system:String x:Key="checkUpdatesFailed">Kontrola aktualizácií zlyhala, prosím, skontrolujte pripojenie na internet a nastavenie proxy k api.github.com.</system:String>
     <system:String x:Key="downloadUpdatesFailed">
-        Sťahovanie aktualizácií zlyhalo, skontrolujte pripojenie na internet a nastavenie proxy k github-cloud.s3.amazonaws.com, 
+        Sťahovanie aktualizácií zlyhalo, skontrolujte pripojenie na internet a nastavenie proxy k github-cloud.s3.amazonaws.com,
         alebo prejdite na https://github.com/Flow-Launcher/Flow.Launcher/releases pre manuálne stiahnutie aktualizácie.
     </system:String>
     <system:String x:Key="releaseNotes">Poznámky k vydaniu</system:String>
     <system:String x:Key="documentation">Tipy na používanie:</system:String>
 
-    <!--Priority Setting Dialog-->
+    <!--  FileManager Setting Dialog  -->
+    <system:String x:Key="fileManagerWindow">Vyberte správcu súborov</system:String>
+    <system:String x:Key="fileManager_tips" >Zadajte umiestnenie súboru správcu súborov, ktorého používate, a v prípade potreby pridajte argumenty. Predvolené argumenty sú &quot;%d&quot; a cesta sa zadáva na tomto mieste. Napríklad, ak sa vyžaduje príkaz, ako napríklad &quot;totalcmd.exe /A c:\windows&quot;, argument je /A &quot;%d&quot;.</system:String>
+    <system:String x:Key="fileManager_tips2">&quot;%f&quot; je argument, ktorý predstavuje cestu k súboru.  Používa sa na zvýraznenie názvu súboru/priečinka pri otváraní konkrétneho umiestnenia súboru v správcovi súborov tretej strany. Tento argument je k dispozícii len v položke &quot;Arg pre súbor&quot;. Ak správca súborov nemá túto funkciu, môžete použiť &quot;%d&quot;.</system:String>
+    <system:String x:Key="fileManager_name">Správca súborov</system:String>
+    <system:String x:Key="fileManager_profile_name">Názov profilu</system:String>
+    <system:String x:Key="fileManager_path">Cesta k správcovi súborov</system:String>
+    <system:String x:Key="fileManager_directory_arg">Arg. pre priečinok</system:String>
+    <system:String x:Key="fileManager_file_arg">Arg. pre súbor</system:String>
+
+    <!--  Priority Setting Dialog  -->
     <system:String x:Key="changePriorityWindow">Zmena priority</system:String>
     <system:String x:Key="priority_tips">Vyššie číslo znamená, že výsledok bude vyššie. Skúste nastaviť napr. 5. Ak chcete, aby boli výsledky nižšie ako ktorékoľvek iné doplnky, zadajte záporné číslo</system:String>
     <system:String x:Key="invalidPriority">Prosím, zadajte platné číslo pre prioritu!</system:String>
 
-    <!--Action Keyword Setting Dialog-->
+    <!--  Action Keyword Setting Dialog  -->
     <system:String x:Key="oldActionKeywords">Stará skratka akcie</system:String>
     <system:String x:Key="newActionKeywords">Nová skratka akcie</system:String>
     <system:String x:Key="cancel">Zrušiť</system:String>
@@ -149,7 +163,7 @@
     <system:String x:Key="completedSuccessfully">Úspešne dokončené</system:String>
     <system:String x:Key="actionkeyword_tips">Zadajte skratku akcie, ktorá je potrebná na spustenie pluginu. Ak nechcete zadať skratku akcie, použite *. V tom prípade plugin funguje bez kľúčových slov. </system:String>
 
-    <!--Custom Query Hotkey Dialog-->
+    <!--  Custom Query Hotkey Dialog  -->
     <system:String x:Key="customeQueryHotkeyTitle">Klávesová skratka pre vlastné vyhľadávanie</system:String>
     <system:String x:Key="customeQueryHotkeyTips">Stlačením klávesovej skratky sa automaticky vloží zadaný výraz.</system:String>
     <system:String x:Key="preview">Náhľad</system:String>
@@ -157,10 +171,10 @@
     <system:String x:Key="invalidPluginHotkey">Neplatná klávesová skratka pluginu</system:String>
     <system:String x:Key="update">Aktualizovať</system:String>
 
-    <!--Hotkey Control-->
+    <!--  Hotkey Control  -->
     <system:String x:Key="hotkeyUnavailable">Klávesová skratka nedostupná</system:String>
 
-    <!--Crash Reporter-->
+    <!--  Crash Reporter  -->
     <system:String x:Key="reportWindow_version">Verzia</system:String>
     <system:String x:Key="reportWindow_time">Čas</system:String>
     <system:String x:Key="reportWindow_reproduce">Prosím, napíšte nám, ako došlo k pádu aplikácie, aby sme to mohli opraviť</system:String>
@@ -176,16 +190,18 @@
     <system:String x:Key="reportWindow_report_failed">Odoslanie hlásenia zlyhalo</system:String>
     <system:String x:Key="reportWindow_flowlauncher_got_an_error">Flow Launcher zaznamenal chybu</system:String>
 
-    <!--General Notice-->
+    <!--  General Notice  -->
     <system:String x:Key="pleaseWait">Čakajte, prosím…</system:String>
 
-    <!--update-->
+    <!--  update  -->
     <system:String x:Key="update_flowlauncher_update_check">Kontrolujú sa aktualizácie</system:String>
     <system:String x:Key="update_flowlauncher_already_on_latest">Už máte najnovšiu verziu Flow Launchera</system:String>
     <system:String x:Key="update_flowlauncher_update_found">Bola nájdená aktualizácia</system:String>
     <system:String x:Key="update_flowlauncher_updating">Aktualizuje sa…</system:String>
-    <system:String x:Key="update_flowlauncher_fail_moving_portable_user_profile_data">Flow Launcher nedokázal presunúť používateľské údaje do aktualizovanej verzie.
-        Prosím, presuňte profilový priečinok data z {0} do {1}</system:String>
+    <system:String x:Key="update_flowlauncher_fail_moving_portable_user_profile_data">
+            Flow Launcher nedokázal presunúť používateľské údaje do aktualizovanej verzie.
+            Prosím, presuňte profilový priečinok data z {0} do {1}
+    </system:String>
     <system:String x:Key="update_flowlauncher_new_update">Nová aktualizácia</system:String>
     <system:String x:Key="update_flowlauncher_update_new_version_available">Je dostupná nová verzia Flow Launchera {0}</system:String>
     <system:String x:Key="update_flowlauncher_update_error">Počas inštalácie aktualizácií došlo k chybe</system:String>
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 5fc3f2fc9..16e4be8a0 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -56,7 +56,7 @@ namespace Flow.Launcher
             _viewModel.Save();
             e.Cancel = true;
             await PluginManager.DisposePluginsAsync();
-            Application.Current.Shutdown();
+            Environment.Exit(0);
         }
 
         private void OnInitialized(object sender, EventArgs e)
diff --git a/Flow.Launcher/Notification.cs b/Flow.Launcher/Notification.cs
index 2c82e1451..d8f9fd45e 100644
--- a/Flow.Launcher/Notification.cs
+++ b/Flow.Launcher/Notification.cs
@@ -11,8 +11,8 @@ namespace Flow.Launcher
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "<Pending>")]
         public static void Show(string title, string subTitle, string iconPath)
         {
-            var legacy = Environment.OSVersion.Version.Major < 10;
-            // Handle notification for win7/8
+            var legacy = Environment.OSVersion.Version.Build < 19041;
+            // Handle notification for win7/8/early win10
             if (legacy)
             {
                 LegacyShow(title, subTitle, iconPath);
diff --git a/Flow.Launcher/PriorityChangeWindow.xaml b/Flow.Launcher/PriorityChangeWindow.xaml
index fbf4394f7..bbe601010 100644
--- a/Flow.Launcher/PriorityChangeWindow.xaml
+++ b/Flow.Launcher/PriorityChangeWindow.xaml
@@ -1,50 +1,88 @@
-<Window x:Class="Flow.Launcher.PriorityChangeWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:Flow.Launcher"
-        Loaded="PriorityChangeWindow_Loaded"
-        mc:Ignorable="d"
-        ResizeMode="NoResize"
-        WindowStartupLocation="CenterScreen"
-        Title="{DynamicResource changePriorityWindow}" Height="365" Width="350" Background="#F3F3F3" BorderBrush="#cecece">
-    <Grid>
+<Window
+    x:Class="Flow.Launcher.PriorityChangeWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:Flow.Launcher"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="http://schemas.modernwpf.com/2019"
+    Title="{DynamicResource changePriorityWindow}"
+    Background="#F3F3F3"
+    BorderBrush="#cecece"
+    Loaded="PriorityChangeWindow_Loaded"
+    MouseDown="window_MouseDown"
+    ResizeMode="NoResize"
+    SizeToContent="WidthAndHeight"
+    WindowStartupLocation="CenterScreen"
+    mc:Ignorable="d">
+    <Grid Width="350">
         <Grid.RowDefinitions>
             <RowDefinition />
-            <RowDefinition Height="80"/>
+            <RowDefinition Height="80" />
         </Grid.RowDefinitions>
-        <Border BorderThickness="0 0 0 1" BorderBrush="#e5e5e5" Background="#ffffff" Padding="26 26 26 0">
+        <Border
+            Padding="26,26,26,0"
+            Background="#ffffff"
+            BorderBrush="#e5e5e5"
+            BorderThickness="0,0,0,1">
             <Grid>
                 <StackPanel>
-                    <StackPanel Grid.Row="0" Margin="0 0 0 12">
-                        <TextBlock Grid.Column="0" Text="{DynamicResource changePriorityWindow}"  FontSize="20" FontWeight="SemiBold" FontFamily="Segoe UI" TextAlignment="Left"
-                                       Margin="0 0 0 0" />
+                    <StackPanel Grid.Row="0" Margin="0,0,0,12">
+                        <TextBlock
+                            Grid.Column="0"
+                            Margin="0,0,0,0"
+                            FontFamily="Segoe UI"
+                            FontSize="20"
+                            FontWeight="SemiBold"
+                            Text="{DynamicResource changePriorityWindow}"
+                            TextAlignment="Left" />
                     </StackPanel>
                     <StackPanel>
-                         <TextBlock 
-                           Text="{DynamicResource priority_tips}" Foreground="#1b1b1b" FontSize="14" TextWrapping="WrapWithOverflow" TextAlignment="Left"/>
-                    </StackPanel>
-                    
-                    <StackPanel Orientation="Horizontal" Margin="0 28 0 0">
-                        <TextBlock FontSize="14" Grid.Column="1" VerticalAlignment="Center"
-                       HorizontalAlignment="Left" Text="{DynamicResource currentPriority}" />
-                        <TextBlock x:Name="OldPriority" Grid.Row="0" Grid.Column="1" Margin="10 0 10 0" FontSize="14"
-                       VerticalAlignment="Center" HorizontalAlignment="Left" FontWeight="Bold" />
+                        <TextBlock
+                            FontSize="14"
+                            Foreground="#1b1b1b"
+                            Text="{DynamicResource priority_tips}"
+                            TextAlignment="Left"
+                            TextWrapping="WrapWithOverflow" />
                     </StackPanel>
 
-                    <StackPanel Orientation="Horizontal" Margin="0 10 0 0">
-                        <TextBlock FontSize="14" VerticalAlignment="Center"
-                       HorizontalAlignment="Right" Text="{DynamicResource newPriority}" />
-                        <TextBox x:Name="tbAction" Margin="10 0 15 0" Width="105" VerticalAlignment="Center" HorizontalAlignment="Left" />
+                    <StackPanel Margin="0,24,0,24" Orientation="Horizontal">
+                        <TextBlock
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Center"
+                            FontSize="14"
+                            Text="{DynamicResource priority}" />
+                        <ui:NumberBox
+                            x:Name="tbAction"
+                            Width="190"
+                            Height="34"
+                            Margin="10,0,15,0"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            Minimum="0"
+                            SmallChange="1"
+                            SpinButtonPlacementMode="Inline" />
                     </StackPanel>
                 </StackPanel>
             </Grid>
         </Border>
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Grid.Row="1">
-            <Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="0 0 5 0" Width="100" Height="30"
-                    Content="{DynamicResource cancel}" />
-            <Button x:Name="btnDone" Margin="5 0 0 0" Width="100" Height="30" Click="btnDone_OnClick">
+        <StackPanel
+            Grid.Row="1"
+            HorizontalAlignment="Center"
+            Orientation="Horizontal">
+            <Button
+                x:Name="btnCancel"
+                Width="100"
+                Height="30"
+                Margin="0,0,5,0"
+                Click="BtnCancel_OnClick"
+                Content="{DynamicResource cancel}" />
+            <Button
+                x:Name="btnDone"
+                Width="100"
+                Height="30"
+                Margin="5,0,0,0"
+                Click="btnDone_OnClick">
                 <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
             </Button>
         </StackPanel>
diff --git a/Flow.Launcher/PriorityChangeWindow.xaml.cs b/Flow.Launcher/PriorityChangeWindow.xaml.cs
index 0adb1f080..fe846e78b 100644
--- a/Flow.Launcher/PriorityChangeWindow.xaml.cs
+++ b/Flow.Launcher/PriorityChangeWindow.xaml.cs
@@ -26,7 +26,6 @@ namespace Flow.Launcher
         private Settings settings;
         private readonly Internationalization translater = InternationalizationManager.Instance;
         private readonly PluginViewModel pluginViewModel;
-
         public PriorityChangeWindow(string pluginId, Settings settings, PluginViewModel pluginViewModel)
         {
             InitializeComponent();
@@ -62,8 +61,17 @@ namespace Flow.Launcher
 
         private void PriorityChangeWindow_Loaded(object sender, RoutedEventArgs e)
         {
-            OldPriority.Text = pluginViewModel.Priority.ToString();
+            tbAction.Text = pluginViewModel.Priority.ToString();
             tbAction.Focus();
         }
+        private void window_MouseDown(object sender, MouseButtonEventArgs e) /* for close hotkey popup */
+        {
+            TextBox textBox = Keyboard.FocusedElement as TextBox;
+            if (textBox != null)
+            {
+                TraversalRequest tRequest = new TraversalRequest(FocusNavigationDirection.Next);
+                textBox.MoveFocus(tRequest);
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index cc27d5eb5..877a97645 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -4,6 +4,673 @@
     xmlns:system="clr-namespace:System;assembly=mscorlib"
     xmlns:ui="http://schemas.modernwpf.com/2019">
 
+    <!--  Repeat Button  -->
+    <Style x:Key="DefaultRepeatButtonStyle" TargetType="RepeatButton">
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Background" Value="{DynamicResource RepeatButtonBackground}" />
+        <Setter Property="Foreground" Value="{DynamicResource RepeatButtonForeground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource ButtonBorderThemeThickness}" />
+        <Setter Property="Padding" Value="{DynamicResource ButtonPadding}" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
+        <Setter Property="FontWeight" Value="Normal" />
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <Setter Property="ui:ControlHelper.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource {x:Static SystemParameters.FocusVisualStyleKey}}" />
+        <Setter Property="ui:FocusVisualHelper.UseSystemFocusVisuals" Value="{DynamicResource UseSystemFocusVisuals}" />
+        <Setter Property="ui:FocusVisualHelper.FocusVisualMargin" Value="-3" />
+        <Setter Property="Stylus.IsPressAndHoldEnabled" Value="False" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="RepeatButton">
+                    <Border
+                        x:Name="Background"
+                        Background="{TemplateBinding Background}"
+                        CornerRadius="4"
+                        SnapsToDevicePixels="True">
+                        <Border
+                            x:Name="Border"
+                            Padding="{TemplateBinding Padding}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}">
+                            <ContentPresenter
+                                x:Name="ContentPresenter"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Focusable="False"
+                                RecognizesAccessKey="True"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        </Border>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Background" Property="Background" Value="#f2f2f2" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrushPointerOver}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource RepeatButtonForegroundPointerOver}" />
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="Background" Property="Background" Value="#f5f5f5" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrushPressed}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="#878787" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="Background" Property="Background" Value="transparent" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource RepeatButtonBorderBrushDisabled}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="#878787" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style BasedOn="{StaticResource DefaultRepeatButtonStyle}" TargetType="RepeatButton" />
+
+    <!--  Number Box  -->
+
+    <Thickness x:Key="NumberBoxPopupIndicatorMargin">0,0,8,0</Thickness>
+
+    <Style
+        x:Key="NumberBoxSpinButtonStyle"
+        BasedOn="{StaticResource DefaultRepeatButtonStyle}"
+        TargetType="RepeatButton">
+        <Style.Setters>
+            <Setter Property="IsTabStop" Value="False" />
+            <Setter Property="MinWidth" Value="34" />
+            <Setter Property="Height" Value="34" />
+            <Setter Property="Margin" Value="4,0,0,0" />
+            <Setter Property="VerticalAlignment" Value="Stretch" />
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrush}" />
+            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="FontFamily" Value="{DynamicResource SymbolThemeFontFamily}" />
+            <Setter Property="ContentTemplate">
+                <Setter.Value>
+                    <DataTemplate>
+                        <Border CornerRadius="4">
+                            <ui:FontIconFallback Data="{Binding}" />
+                        </Border>
+                    </DataTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style.Setters>
+    </Style>
+
+    <Style
+        x:Key="NumberBoxPopupSpinButtonStyle"
+        BasedOn="{StaticResource DefaultRepeatButtonStyle}"
+        TargetType="RepeatButton">
+        <Style.Setters>
+            <Setter Property="Focusable" Value="False" />
+            <Setter Property="Width" Value="32" />
+            <Setter Property="Height" Value="24" />
+            <Setter Property="Background" Value="{DynamicResource NumberBoxPopupSpinButtonBackground}" />
+            <Setter Property="BorderThickness" Value="{DynamicResource NumberBoxPopupSpinButtonBorderThickness}" />
+            <Setter Property="FontFamily" Value="{DynamicResource SymbolThemeFontFamily}" />
+            <Setter Property="ContentTemplate">
+                <Setter.Value>
+                    <DataTemplate>
+                        <ui:FontIconFallback Data="{Binding}" />
+                    </DataTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style.Setters>
+    </Style>
+
+    <Style
+        x:Key="NumberBoxTextBoxStyle"
+        BasedOn="{StaticResource DefaultTextBoxStyle}"
+        TargetType="TextBox">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="TextBox">
+                    <ControlTemplate.Resources>
+                        <StreamGeometry x:Key="ScrollUpDown">M 10 2.138672 L 4.189453 7.939453 L 3.310547 7.060547 L 10 0.361328 L 16.689453 7.060547 L 15.810547 7.939453 Z M 10 17.861328 L 15.810547 12.060547 L 16.689453 12.939453 L 10 19.638672 L 3.310547 12.939453 L 4.189453 12.060547 Z</StreamGeometry>
+                        <Style x:Key="DeleteButtonStyle" TargetType="Button">
+                            <Setter Property="Template">
+                                <Setter.Value>
+                                    <ControlTemplate TargetType="Button">
+                                        <ControlTemplate.Resources>
+                                            <StreamGeometry x:Key="Cancel">M 10.888672 10 L 17.626953 16.748047 L 16.748047 17.626953 L 10 10.888672 L 3.251953 17.626953 L 2.373047 16.748047 L 9.111328 10 L 2.373047 3.251953 L 3.251953 2.373047 L 10 9.111328 L 16.748047 2.373047 L 17.626953 3.251953 Z</StreamGeometry>
+                                        </ControlTemplate.Resources>
+                                        <Border
+                                            x:Name="ButtonLayoutGrid"
+                                            Background="{DynamicResource TextControlButtonBackground}"
+                                            BorderBrush="{DynamicResource TextControlButtonBorderBrush}"
+                                            BorderThickness="{TemplateBinding BorderThickness}">
+                                            <ui:FontIconFallback
+                                                x:Name="GlyphElement"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                Data="{StaticResource Cancel}"
+                                                FontFamily="{DynamicResource SymbolThemeFontFamily}"
+                                                FontSize="12"
+                                                FontStyle="Normal"
+                                                Foreground="{DynamicResource TextControlButtonForeground}" />
+                                        </Border>
+                                        <ControlTemplate.Triggers>
+                                            <Trigger Property="IsMouseOver" Value="true">
+                                                <Setter TargetName="ButtonLayoutGrid" Property="Background" Value="{DynamicResource TextControlButtonBackgroundPointerOver}" />
+                                                <Setter TargetName="ButtonLayoutGrid" Property="BorderBrush" Value="{DynamicResource TextControlButtonBorderBrushPointerOver}" />
+                                                <Setter TargetName="GlyphElement" Property="Foreground" Value="{DynamicResource TextControlButtonForegroundPointerOver}" />
+                                            </Trigger>
+                                            <Trigger Property="IsPressed" Value="true">
+                                                <Setter TargetName="ButtonLayoutGrid" Property="Background" Value="{DynamicResource TextControlButtonBackgroundPressed}" />
+                                                <Setter TargetName="ButtonLayoutGrid" Property="BorderBrush" Value="{DynamicResource TextControlButtonBorderBrushPressed}" />
+                                                <Setter TargetName="GlyphElement" Property="Foreground" Value="{DynamicResource TextControlButtonForegroundPressed}" />
+                                            </Trigger>
+                                            <Trigger Property="IsEnabled" Value="false">
+                                                <Setter TargetName="ButtonLayoutGrid" Property="Background" Value="{DynamicResource TextControlButtonBackgroundPressed}" />
+                                                <Setter TargetName="ButtonLayoutGrid" Property="Opacity" Value="0" />
+                                            </Trigger>
+                                        </ControlTemplate.Triggers>
+                                    </ControlTemplate>
+                                </Setter.Value>
+                            </Setter>
+                        </Style>
+                    </ControlTemplate.Resources>
+                    <Grid SnapsToDevicePixels="True">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <ui:ContentPresenterEx
+                            x:Name="HeaderContentPresenter"
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Margin="{DynamicResource TextBoxTopHeaderMargin}"
+                            VerticalAlignment="Top"
+                            Content="{TemplateBinding ui:ControlHelper.Header}"
+                            ContentTemplate="{TemplateBinding ui:ControlHelper.HeaderTemplate}"
+                            FontWeight="Normal"
+                            Foreground="{DynamicResource TextControlHeaderForeground}"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                            TextWrapping="Wrap"
+                            Visibility="{TemplateBinding ui:ControlHelper.HeaderVisibility}" />
+                        <Border
+                            x:Name="BorderElement"
+                            Grid.Row="1"
+                            Grid.RowSpan="1"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="3"
+                            MinWidth="{TemplateBinding MinWidth}"
+                            MinHeight="{TemplateBinding MinHeight}"
+                            ui:ValidationHelper.IsTemplateValidationAdornerSite="True"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}" />
+                        <ScrollViewer
+                            x:Name="PART_ContentHost"
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Margin="{TemplateBinding BorderThickness}"
+                            Padding="{TemplateBinding Padding}"
+                            Focusable="False"
+                            HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                            IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
+                            IsTabStop="False"
+                            Style="{DynamicResource TextControlContentHostStyle}"
+                            VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" />
+                        <TextBlock
+                            x:Name="PlaceholderTextContentPresenter"
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Margin="{TemplateBinding BorderThickness}"
+                            Padding="{TemplateBinding Padding}"
+                            Foreground="{TemplateBinding ui:ControlHelper.PlaceholderForeground}"
+                            IsHitTestVisible="False"
+                            Text="{TemplateBinding ui:ControlHelper.PlaceholderText}"
+                            TextAlignment="{TemplateBinding TextAlignment}"
+                            TextWrapping="{TemplateBinding TextWrapping}" />
+                        <Button
+                            x:Name="DeleteButton"
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            MinWidth="34"
+                            Padding="{DynamicResource HelperButtonThemePadding}"
+                            VerticalAlignment="Stretch"
+                            ui:ControlHelper.CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius,
+                                                                            Converter={StaticResource RightCornerRadiusFilterConverter}}"
+                            ui:TextBoxHelper.IsDeleteButton="True"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Focusable="False"
+                            FontSize="{TemplateBinding FontSize}"
+                            IsTabStop="False"
+                            Style="{StaticResource DeleteButtonStyle}"
+                            Visibility="Collapsed" />
+                        <ContentPresenter
+                            x:Name="DescriptionPresenter"
+                            Grid.Row="2"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Content="{TemplateBinding ui:ControlHelper.Description}"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                            TextElement.Foreground="{DynamicResource SystemControlDescriptionTextForegroundBrush}"
+                            Visibility="{TemplateBinding ui:ControlHelper.DescriptionVisibility}" />
+                        <ui:FontIconFallback
+                            Grid.Row="1"
+                            Grid.Column="2"
+                            Margin="{StaticResource NumberBoxPopupIndicatorMargin}"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Data="{StaticResource ScrollUpDown}"
+                            FontFamily="{DynamicResource SymbolThemeFontFamily}"
+                            FontSize="12"
+                            Foreground="{DynamicResource NumberBoxPopupIndicatorForeground}" />
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="ButtonStates">
+                                <VisualState x:Name="ButtonVisible">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="DeleteButton" Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="ButtonCollapsed" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="ui:ControlHelper.PlaceholderForeground" Value="{x:Null}">
+                            <Setter TargetName="PlaceholderTextContentPresenter" Property="Foreground" Value="{DynamicResource TextControlPlaceholderForeground}" />
+                        </Trigger>
+                        <Trigger Property="ui:TextBoxHelper.HasText" Value="True">
+                            <Setter TargetName="PlaceholderTextContentPresenter" Property="Visibility" Value="Collapsed" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter TargetName="HeaderContentPresenter" Property="Foreground" Value="{DynamicResource TextControlHeaderForegroundDisabled}" />
+                            <Setter TargetName="BorderElement" Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushDisabled}" />
+                            <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundDisabled}" />
+                            <Setter TargetName="PlaceholderTextContentPresenter" Property="Foreground" Value="{DynamicResource TextControlPlaceholderForegroundDisabled}" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter TargetName="BorderElement" Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushPointerOver}" />
+                            <Setter Property="Background" Value="{DynamicResource TextControlBackgroundPointerOver}" />
+                            <Setter TargetName="PlaceholderTextContentPresenter" Property="Foreground" Value="{DynamicResource TextControlPlaceholderForegroundPointerOver}" />
+                            <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundPointerOver}" />
+                        </Trigger>
+                        <Trigger Property="IsSelectionActive" Value="true">
+                            <Setter TargetName="PlaceholderTextContentPresenter" Property="Foreground" Value="{DynamicResource TextControlPlaceholderForegroundFocused}" />
+                            <Setter Property="Background" Value="{DynamicResource TextControlBackgroundFocused}" />
+                            <Setter TargetName="BorderElement" Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushFocused}" />
+                            <Setter TargetName="BorderElement" Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThicknessFocused}" />
+                            <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundFocused}" />
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsKeyboardFocused" Value="True" />
+                                <Condition Property="ui:TextBoxHelper.HasText" Value="True" />
+                                <Condition Property="IsReadOnly" Value="False" />
+                                <Condition Property="AcceptsReturn" Value="False" />
+                                <Condition Property="TextWrapping" Value="NoWrap" />
+                            </MultiTrigger.Conditions>
+                            <Setter Property="ui:TextBoxHelper.IsDeleteButtonVisible" Value="True" />
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="ui:NumberBox">
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="SelectionBrush" Value="{DynamicResource TextControlSelectionHighlightColor}" />
+        <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ui:NumberBox">
+                    <ControlTemplate.Resources>
+                        <StreamGeometry x:Key="ChevronDown">M 18.935547 4.560547 L 19.814453 5.439453 L 10 15.253906 L 0.185547 5.439453 L 1.064453 4.560547 L 10 13.496094 Z</StreamGeometry>
+                        <StreamGeometry x:Key="ChevronUp">M 19.091797 14.970703 L 10 5.888672 L 0.908203 14.970703 L 0.029297 14.091797 L 10 4.111328 L 19.970703 14.091797 Z</StreamGeometry>
+                    </ControlTemplate.Resources>
+
+                    <Grid ui:ThemeManager.HasThemeResources="True">
+                        <Grid.Resources>
+                            <ui:ResourceDictionaryEx>
+                                <ui:ResourceDictionaryEx.ThemeDictionaries>
+                                    <ResourceDictionary x:Key="Light" ui:ThemeDictionary.Key="Light">
+                                        <ui:StaticResource x:Key="RepeatButtonBorderBrushPointerOver" ResourceKey="TextControlBorderBrush" />
+                                        <ui:StaticResource x:Key="RepeatButtonBorderBrushPressed" ResourceKey="TextControlBorderBrush" />
+                                    </ResourceDictionary>
+
+                                    <ResourceDictionary x:Key="Dark" ui:ThemeDictionary.Key="Dark">
+                                        <ui:StaticResource x:Key="RepeatButtonBorderBrushPointerOver" ResourceKey="TextControlBorderBrush" />
+                                        <ui:StaticResource x:Key="RepeatButtonBorderBrushPressed" ResourceKey="TextControlBorderBrush" />
+                                    </ResourceDictionary>
+
+                                    <ResourceDictionary x:Key="HighContrast" ui:ThemeDictionary.Key="HighContrast">
+                                        <ui:StaticResource x:Key="RepeatButtonBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
+                                        <ui:StaticResource x:Key="RepeatButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
+                                    </ResourceDictionary>
+                                </ui:ResourceDictionaryEx.ThemeDictionaries>
+                            </ui:ResourceDictionaryEx>
+                        </Grid.Resources>
+
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+
+                        <ui:ContentPresenterEx
+                            x:Name="HeaderContentPresenter"
+                            Grid.ColumnSpan="3"
+                            Margin="{DynamicResource TextBoxTopHeaderMargin}"
+                            VerticalAlignment="Top"
+                            Content="{TemplateBinding Header}"
+                            ContentTemplate="{TemplateBinding HeaderTemplate}"
+                            FontFamily="{TemplateBinding FontFamily}"
+                            FontSize="{TemplateBinding FontSize}"
+                            FontWeight="Normal"
+                            Foreground="{DynamicResource TextControlHeaderForeground}"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                            TextWrapping="Wrap"
+                            Visibility="Collapsed" />
+
+                        <TextBox
+                            x:Name="InputBox"
+                            Grid.Row="1"
+                            ui:ControlHelper.CornerRadius="{TemplateBinding CornerRadius}"
+                            ui:ControlHelper.PlaceholderText="{TemplateBinding PlaceholderText}"
+                            FontFamily="{TemplateBinding FontFamily}"
+                            FontSize="{TemplateBinding FontSize}"
+                            FontWeight="{TemplateBinding FontWeight}"
+                            InputScope="{TemplateBinding InputScope}"
+                            SelectionBrush="{TemplateBinding SelectionBrush}"
+                            TextAlignment="{TemplateBinding TextAlignment}" />
+
+                        <Popup
+                            x:Name="UpDownPopup"
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            HorizontalAlignment="Left"
+                            AllowsTransparency="True"
+                            HorizontalOffset="{DynamicResource NumberBoxPopupHorizonalOffset}"
+                            Placement="Right"
+                            VerticalOffset="{DynamicResource NumberBoxPopupVerticalOffset}">
+                            <ui:ThemeShadowChrome
+                                CornerRadius="{DynamicResource OverlayCornerRadius}"
+                                Depth="{DynamicResource NumberBoxPopupShadowDepth}"
+                                IsShadowEnabled="{DynamicResource {x:Static SystemParameters.DropShadowKey}}">
+                                <Border
+                                    x:Name="PopupContentRoot"
+                                    Background="{DynamicResource NumberBoxPopupBackground}"
+                                    BorderBrush="{DynamicResource NumberBoxPopupBorderBrush}"
+                                    BorderThickness="{DynamicResource NumberBoxPopupBorderThickness}"
+                                    CornerRadius="{DynamicResource OverlayCornerRadius}">
+                                    <Grid>
+
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="*" />
+                                            <RowDefinition Height="*" />
+                                        </Grid.RowDefinitions>
+
+                                        <RepeatButton
+                                            x:Name="PopupUpSpinButton"
+                                            Content="{StaticResource ChevronUp}"
+                                            Style="{StaticResource NumberBoxPopupSpinButtonStyle}" />
+
+                                        <RepeatButton
+                                            x:Name="PopupDownSpinButton"
+                                            Grid.Row="1"
+                                            Content="{StaticResource ChevronDown}"
+                                            Style="{StaticResource NumberBoxPopupSpinButtonStyle}" />
+                                    </Grid>
+                                </Border>
+                            </ui:ThemeShadowChrome>
+                        </Popup>
+
+                        <RepeatButton
+                            x:Name="UpSpinButton"
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            ui:ControlHelper.CornerRadius="0"
+                            Content="{StaticResource ChevronUp}"
+                            FontSize="11"
+                            Style="{StaticResource NumberBoxSpinButtonStyle}"
+                            Visibility="Collapsed" />
+
+                        <RepeatButton
+                            x:Name="DownSpinButton"
+                            Grid.Row="1"
+                            Grid.Column="2"
+                            ui:ControlHelper.CornerRadius="0"
+                            Content="{StaticResource ChevronDown}"
+                            FontSize="11"
+                            Style="{StaticResource NumberBoxSpinButtonStyle}"
+                            Visibility="Collapsed" />
+
+                        <ContentPresenter
+                            x:Name="DescriptionPresenter"
+                            Grid.Row="2"
+                            Grid.ColumnSpan="2"
+                            Content="{TemplateBinding Description}"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                            TextElement.Foreground="{DynamicResource SystemControlDescriptionTextForegroundBrush}"
+                            Visibility="{TemplateBinding ui:ControlHelper.DescriptionVisibility}" />
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="Disabled" />
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="SpinButtonStates">
+                                <VisualState x:Name="SpinButtonsCollapsed" />
+                                <VisualState x:Name="SpinButtonsVisible" />
+                                <VisualState x:Name="SpinButtonsPopup" />
+                            </VisualStateGroup>
+
+                            <VisualStateGroup x:Name="UpSpinButtonEnabledStates">
+                                <VisualState x:Name="UpSpinButtonEnabled" />
+                                <VisualState x:Name="UpSpinButtonDisabled">
+                                    <Storyboard>
+                                        <BooleanAnimationUsingKeyFrames Storyboard.TargetName="UpSpinButton" Storyboard.TargetProperty="IsEnabled">
+                                            <DiscreteBooleanKeyFrame KeyTime="0" Value="False" />
+                                        </BooleanAnimationUsingKeyFrames>
+                                        <BooleanAnimationUsingKeyFrames Storyboard.TargetName="PopupUpSpinButton" Storyboard.TargetProperty="IsEnabled">
+                                            <DiscreteBooleanKeyFrame KeyTime="0" Value="False" />
+                                        </BooleanAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+
+                            <VisualStateGroup x:Name="DownSpinButtonEnabledStates">
+                                <VisualState x:Name="DownSpinButtonEnabled" />
+                                <VisualState x:Name="DownSpinButtonDisabled">
+                                    <Storyboard>
+                                        <BooleanAnimationUsingKeyFrames Storyboard.TargetName="DownSpinButton" Storyboard.TargetProperty="IsEnabled">
+                                            <DiscreteBooleanKeyFrame KeyTime="0" Value="False" />
+                                        </BooleanAnimationUsingKeyFrames>
+                                        <BooleanAnimationUsingKeyFrames Storyboard.TargetName="PopupDownSpinButton" Storyboard.TargetProperty="IsEnabled">
+                                            <DiscreteBooleanKeyFrame KeyTime="0" Value="False" />
+                                        </BooleanAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter TargetName="HeaderContentPresenter" Property="Foreground" Value="{DynamicResource TextControlHeaderForegroundDisabled}" />
+                        </Trigger>
+                        <!--  SpinButtonsVisible  -->
+                        <Trigger Property="SpinButtonPlacementMode" Value="Inline">
+                            <Setter TargetName="DownSpinButton" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="UpSpinButton" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="InputBox" Property="ui:ControlHelper.CornerRadius" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
+                        </Trigger>
+                        <!--  SpinButtonsPopup  -->
+                        <Trigger Property="SpinButtonPlacementMode" Value="Compact">
+                            <Setter TargetName="InputBox" Property="Style" Value="{StaticResource NumberBoxTextBoxStyle}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <!--  Radio Button  -->
+    <Style x:Key="DefaultRadioButtonStyle" TargetType="RadioButton">
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Background" Value="{DynamicResource RadioButtonBackground}" />
+        <Setter Property="Foreground" Value="{DynamicResource RadioButtonForeground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrush}" />
+        <Setter Property="Padding" Value="8,6,0,0" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="VerticalContentAlignment" Value="Top" />
+        <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
+        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <Setter Property="MinWidth" Value="120" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource {x:Static SystemParameters.FocusVisualStyleKey}}" />
+        <Setter Property="ui:FocusVisualHelper.UseSystemFocusVisuals" Value="{DynamicResource UseSystemFocusVisuals}" />
+        <Setter Property="ui:FocusVisualHelper.FocusVisualMargin" Value="-7,-3,-7,-3" />
+        <Setter Property="Stylus.IsPressAndHoldEnabled" Value="False" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="RadioButton">
+                    <Border
+                        x:Name="RootGrid"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}"
+                        SnapsToDevicePixels="True">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="20" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <Grid Height="32" VerticalAlignment="Top">
+                                <Ellipse
+                                    x:Name="OuterEllipse"
+                                    Width="20"
+                                    Height="20"
+                                    Fill="#ededed"
+                                    Stroke="#858585"
+                                    StrokeThickness="{DynamicResource RadioButtonBorderThemeThickness}"
+                                    UseLayoutRounding="False" />
+                                <Ellipse
+                                    x:Name="CheckOuterEllipse"
+                                    Width="20"
+                                    Height="20"
+                                    Fill="{DynamicResource RadioButtonOuterEllipseCheckedFill}"
+                                    Opacity="0"
+                                    Stroke="{DynamicResource RadioButtonOuterEllipseCheckedStroke}"
+                                    StrokeThickness="{DynamicResource RadioButtonBorderThemeThickness}"
+                                    UseLayoutRounding="False" />
+                                <Ellipse
+                                    x:Name="CheckGlyph"
+                                    Width="12"
+                                    Height="12"
+                                    Fill="{DynamicResource RadioButtonCheckGlyphFill}"
+                                    Opacity="0"
+                                    Stroke="{DynamicResource RadioButtonCheckGlyphStroke}"
+                                    UseLayoutRounding="False" />
+                            </Grid>
+                            <ui:ContentPresenterEx
+                                x:Name="ContentPresenter"
+                                Grid.Column="1"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Focusable="False"
+                                RecognizesAccessKey="True"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                TextElement.Foreground="{TemplateBinding Foreground}"
+                                TextWrapping="Wrap" />
+                        </Grid>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CheckStates">
+                                <VisualState x:Name="Checked">
+                                    <Storyboard>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="CheckGlyph"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0" />
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="OuterEllipse"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="0"
+                                            Duration="0" />
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="CheckOuterEllipse"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unchecked" />
+                                <VisualState x:Name="Indeterminate" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="ContentPresenter" Property="Foreground" Value="{DynamicResource RadioButtonForegroundPointerOver}" />
+                            <Setter TargetName="RootGrid" Property="Background" Value="{DynamicResource RadioButtonBackgroundPointerOver}" />
+                            <Setter TargetName="RootGrid" Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrushPointerOver}" />
+                            <Setter TargetName="OuterEllipse" Property="Stroke" Value="#858585" />
+                            <Setter TargetName="OuterEllipse" Property="Fill" Value="#e5e5e5" />
+                            <Setter TargetName="CheckOuterEllipse" Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokePointerOver}" />
+                            <Setter TargetName="CheckOuterEllipse" Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseCheckedFillPointerOver}" />
+                            <Setter TargetName="CheckGlyph" Property="Fill" Value="{DynamicResource RadioButtonCheckGlyphFillPointerOver}" />
+                            <Setter TargetName="CheckGlyph" Property="Stroke" Value="{DynamicResource RadioButtonCheckGlyphStrokePointerOver}" />
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="ContentPresenter" Property="Foreground" Value="{DynamicResource RadioButtonForegroundPressed}" />
+                            <Setter TargetName="RootGrid" Property="Background" Value="{DynamicResource RadioButtonBackgroundPressed}" />
+                            <Setter TargetName="RootGrid" Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrushPressed}" />
+                            <Setter TargetName="OuterEllipse" Property="Stroke" Value="#b4b4b4" />
+                            <Setter TargetName="OuterEllipse" Property="Fill" Value="#dcdcdc" />
+                            <Setter TargetName="CheckOuterEllipse" Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokePressed}" />
+                            <Setter TargetName="CheckOuterEllipse" Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseCheckedFillPressed}" />
+                            <Setter TargetName="CheckGlyph" Property="Fill" Value="{DynamicResource RadioButtonCheckGlyphFillPressed}" />
+                            <Setter TargetName="CheckGlyph" Property="Opacity" Value="1" />
+                            <Setter TargetName="CheckGlyph" Property="Stroke" Value="{DynamicResource RadioButtonCheckGlyphStrokePressed}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="ContentPresenter" Property="Foreground" Value="{DynamicResource RadioButtonForegroundDisabled}" />
+                            <Setter TargetName="RootGrid" Property="Background" Value="{DynamicResource RadioButtonBackgroundDisabled}" />
+                            <Setter TargetName="RootGrid" Property="BorderBrush" Value="{DynamicResource RadioButtonBorderBrushDisabled}" />
+                            <Setter TargetName="OuterEllipse" Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseStrokeDisabled}" />
+                            <Setter TargetName="OuterEllipse" Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseFillDisabled}" />
+                            <Setter TargetName="CheckOuterEllipse" Property="Stroke" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokeDisabled}" />
+                            <Setter TargetName="CheckOuterEllipse" Property="Fill" Value="{DynamicResource RadioButtonOuterEllipseCheckedFillDisabled}" />
+                            <Setter TargetName="CheckGlyph" Property="Fill" Value="{DynamicResource RadioButtonCheckGlyphFillDisabled}" />
+                            <Setter TargetName="CheckGlyph" Property="Stroke" Value="{DynamicResource RadioButtonCheckGlyphStrokeDisabled}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style BasedOn="{StaticResource DefaultRadioButtonStyle}" TargetType="RadioButton" />
+
     <!--  CheckBox  -->
     <ui:CornerRadiusFilterConverter x:Key="TopLeftCornerRadiusDoubleValueConverter" Filter="TopLeftValue" />
     <ui:CornerRadiusFilterConverter x:Key="BottomRightCornerRadiusDoubleValueConverter" Filter="BottomRightValue" />
@@ -92,7 +759,7 @@
                             <Setter TargetName="RootGrid" Property="Background" Value="{DynamicResource CheckBoxBackgroundUnchecked}" />
                             <Setter TargetName="RootGrid" Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUnchecked}" />
                             <Setter TargetName="NormalRectangle" Property="Stroke" Value="#868686" />
-                            <Setter TargetName="NormalRectangle" Property="Fill" Value="{DynamicResource CheckBoxCheckBackgroundFillUnchecked}" />
+                            <Setter TargetName="NormalRectangle" Property="Fill" Value="#ededed" />
                             <Setter TargetName="CheckGlyph" Property="Foreground" Value="{DynamicResource CheckBoxCheckGlyphForegroundUnchecked}" />
                         </MultiTrigger>
                         <!--  UncheckedPointerOver  -->
@@ -116,9 +783,9 @@
                             </MultiTrigger.Conditions>
                             <Setter TargetName="ContentPresenter" Property="Foreground" Value="{DynamicResource CheckBoxForegroundUncheckedPressed}" />
                             <Setter TargetName="RootGrid" Property="Background" Value="{DynamicResource CheckBoxBackgroundUncheckedPressed}" />
-                            <Setter TargetName="RootGrid" Property="BorderBrush" Value="{DynamicResource CheckBoxBorderBrushUncheckedPressed}" />
-                            <Setter TargetName="NormalRectangle" Property="Stroke" Value="{DynamicResource CheckBoxCheckBackgroundStrokeUncheckedPressed}" />
-                            <Setter TargetName="NormalRectangle" Property="Fill" Value="{DynamicResource CheckBoxCheckBackgroundFillUncheckedPressed}" />
+                            <Setter TargetName="RootGrid" Property="BorderBrush" Value="#b7b7b7" />
+                            <Setter TargetName="NormalRectangle" Property="Stroke" Value="#b7b7b7" />
+                            <Setter TargetName="NormalRectangle" Property="Fill" Value="#dcdcdc" />
                             <Setter TargetName="CheckGlyph" Property="Foreground" Value="{DynamicResource CheckBoxCheckGlyphForegroundUncheckedPressed}" />
                         </MultiTrigger>
                         <!--  UncheckedDisabled  -->
@@ -536,6 +1203,7 @@
                             TextWrapping="Wrap"
                             Visibility="{TemplateBinding ui:ControlHelper.HeaderVisibility}" />
                         <Border
+                            x:Name="OutLine"
                             Grid.Row="1"
                             Grid.Column="0"
                             Grid.ColumnSpan="2"
@@ -704,19 +1372,23 @@
                         </Trigger>
                         <!--  Pressed  -->
                         <Trigger SourceName="ToggleButton" Property="IsPressed" Value="True">
-                            <Setter TargetName="Background" Property="Background" Value="{DynamicResource ComboBoxBackgroundPressed}" />
+                            <Setter TargetName="Background" Property="Background" Value="#f6f6f6" />
+                            <Setter TargetName="Background" Property="BorderThickness" Value="0" />
                             <Setter TargetName="Background" Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushPressed}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ComboBoxForegroundPressed}" />
+                            <Setter TargetName="OutLine" Property="BorderBrush" Value="#e5e5e5" />
+                            <Setter TargetName="OutLine" Property="BorderThickness" Value="1,1,1,1" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="#878787" />
                             <Setter TargetName="PlaceholderTextBlock" Property="Foreground" Value="{DynamicResource ComboBoxPlaceHolderForegroundPressed}" />
                         </Trigger>
                         <!--  Disabled  -->
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="Background" Property="Background" Value="{DynamicResource ComboBoxBackgroundDisabled}" />
-                            <Setter TargetName="Background" Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushDisabled}" />
-                            <Setter TargetName="HeaderContentPresenter" Property="Foreground" Value="{DynamicResource ComboBoxHeaderForegroundDisabled}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
-                            <Setter TargetName="PlaceholderTextBlock" Property="Foreground" Value="{DynamicResource ComboBoxPlaceHolderForegroundDisabled}" />
-                            <Setter TargetName="DropDownGlyph" Property="Foreground" Value="{DynamicResource ComboBoxDropDownGlyphForegroundDisabled}" />
+                            <Setter TargetName="Background" Property="Background" Value="#f6f6f6" />
+                            <Setter TargetName="Background" Property="BorderThickness" Value="0" />
+                            <Setter TargetName="Background" Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushPressed}" />
+                            <Setter TargetName="OutLine" Property="BorderBrush" Value="#e5e5e5" />
+                            <Setter TargetName="OutLine" Property="BorderThickness" Value="1,1,1,1" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="#878787" />
+                            <Setter TargetName="PlaceholderTextBlock" Property="Foreground" Value="{DynamicResource ComboBoxPlaceHolderForegroundPressed}" />
                         </Trigger>
 
                         <!--  Focused  -->
@@ -967,7 +1639,7 @@
                             Grid.Column="0"
                             Grid.ColumnSpan="2"
                             Background="#fbfbfb"
-                            BorderBrush="#e5e5e5"
+                            BorderBrush="#E5E5E5"
                             BorderThickness="1,1,1,1"
                             CornerRadius="4">
                             <Border
@@ -1531,9 +2203,9 @@
                         </MultiTrigger>
                         <!--  Pressed  -->
                         <Trigger SourceName="SwitchThumb" Property="IsDragging" Value="true">
-                            <Setter TargetName="OuterBorder" Property="Stroke" Value="{DynamicResource ToggleSwitchStrokeOffPressed}" />
-                            <Setter TargetName="OuterBorder" Property="Fill" Value="{DynamicResource ToggleSwitchFillOffPressed}" />
-                            <Setter TargetName="SwitchKnobOff" Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOffPressed}" />
+                            <Setter TargetName="OuterBorder" Property="Stroke" Value="#5a5a5a" />
+                            <Setter TargetName="OuterBorder" Property="Fill" Value="#dcdcdc" />
+                            <Setter TargetName="SwitchKnobOff" Property="Fill" Value="#5a5a5a" />
                             <Setter TargetName="SwitchKnobOn" Property="Fill" Value="{DynamicResource ToggleSwitchKnobFillOnPressed}" />
                             <Setter TargetName="SwitchKnobBounds" Property="Fill" Value="{DynamicResource ToggleSwitchFillOnPressed}" />
                             <Setter TargetName="SwitchKnobBounds" Property="Stroke" Value="{DynamicResource ToggleSwitchStrokeOnPressed}" />
diff --git a/Flow.Launcher/SelectFileManagerWindow.xaml b/Flow.Launcher/SelectFileManagerWindow.xaml
index 85d0d14ce..eba794c96 100644
--- a/Flow.Launcher/SelectFileManagerWindow.xaml
+++ b/Flow.Launcher/SelectFileManagerWindow.xaml
@@ -42,6 +42,12 @@
                             Text="{DynamicResource fileManager_tips}"
                             TextAlignment="Left"
                             TextWrapping="WrapWithOverflow" />
+                        <TextBlock
+                            Margin="0,14,0,0"
+                            FontSize="14"
+                            Foreground="#1b1b1b">
+                            <TextBlock Text="{DynamicResource fileManager_tips2}" TextWrapping="WrapWithOverflow" />
+                        </TextBlock>
                     </StackPanel>
 
                     <StackPanel Margin="14,28,0,0" Orientation="Horizontal">
@@ -88,7 +94,7 @@
                         Orientation="Horizontal">
                         <Grid Width="545">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="220" />
+                                <ColumnDefinition Width="180" />
                                 <ColumnDefinition />
                             </Grid.ColumnDefinitions>
                             <Grid.RowDefinitions>
@@ -123,16 +129,35 @@
                                 VerticalAlignment="Center"
                                 FontSize="14"
                                 Text="{DynamicResource fileManager_path}" />
-                            <TextBox
-                                x:Name="PathTextBox"
-                                Grid.Row="1"
-                                Grid.Column="1"
-                                Width="Auto"
-                                Margin="10,10,15,0"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Center"
-                                IsEnabled="{Binding Editable}"
-                                Text="{Binding Path}" />
+                            <DockPanel Grid.Row="1" Grid.Column="1">
+                                <TextBox
+                                    x:Name="PathTextBox"
+                                    Width="250"
+                                    Margin="10,10,10,0"
+                                    HorizontalAlignment="Stretch"
+                                    VerticalAlignment="Center"
+                                    IsEnabled="{Binding Editable}"
+                                    Text="{Binding Path}" />
+                                <Button
+                                    Name="btnBrowseFile"
+                                    Width="80"
+                                    Margin="0,10,15,0"
+                                    HorizontalAlignment="Right"
+                                    VerticalAlignment="Center"
+                                    Click="btnBrowseFile_Click"
+                                    Content="{DynamicResource selectPythonDirectory}"
+                                    DockPanel.Dock="Right">
+                                    <Button.Style>
+                                        <Style BasedOn="{StaticResource DefaultButtonStyle}" TargetType="{x:Type Button}">
+                                            <Style.Triggers>
+                                                <DataTrigger Binding="{Binding ElementName=ProfileTextBox, UpdateSourceTrigger=PropertyChanged, Path=IsEnabled}" Value="False">
+                                                    <Setter Property="IsEnabled" Value="False" />
+                                                </DataTrigger>
+                                            </Style.Triggers>
+                                        </Style>
+                                    </Button.Style>
+                                </Button>
+                            </DockPanel>
                             <TextBlock
                                 Grid.Row="2"
                                 Grid.Column="0"
@@ -140,7 +165,8 @@
                                 HorizontalAlignment="Left"
                                 VerticalAlignment="Center"
                                 FontSize="14"
-                                Text="{DynamicResource fileManager_directory_arg}" />
+                                Text="{DynamicResource fileManager_directory_arg}"
+                                TextWrapping="WrapWithOverflow" />
                             <TextBox
                                 x:Name="directoryArgTextBox"
                                 Grid.Row="2"
@@ -158,7 +184,8 @@
                                 HorizontalAlignment="Left"
                                 VerticalAlignment="Center"
                                 FontSize="14"
-                                Text="{DynamicResource fileManager_file_arg}" />
+                                Text="{DynamicResource fileManager_file_arg}"
+                                TextWrapping="WrapWithOverflow" />
                             <TextBox
                                 x:Name="fileArgTextBox"
                                 Grid.Row="3"
diff --git a/Flow.Launcher/SelectFileManagerWindow.xaml.cs b/Flow.Launcher/SelectFileManagerWindow.xaml.cs
index 35fad276c..4f6fb3439 100644
--- a/Flow.Launcher/SelectFileManagerWindow.xaml.cs
+++ b/Flow.Launcher/SelectFileManagerWindow.xaml.cs
@@ -18,9 +18,6 @@ using System.Windows.Shapes;
 
 namespace Flow.Launcher
 {
-    /// <summary>
-    /// SelectFileManagerWindow.xaml에 대한 상호 작용 논리
-    /// </summary>
     public partial class SelectFileManagerWindow : Window, INotifyPropertyChanged
     {
         private int selectedCustomExplorerIndex;
@@ -73,5 +70,19 @@ namespace Flow.Launcher
         {
             CustomExplorers.RemoveAt(SelectedCustomExplorerIndex--);
         }
+
+        private void btnBrowseFile_Click(object sender, RoutedEventArgs e)
+        {
+            Microsoft.Win32.OpenFileDialog dlg = new Microsoft.Win32.OpenFileDialog();
+            Nullable<bool> result = dlg.ShowDialog();
+
+            if (result == true)
+            {
+                TextBox path = (TextBox)(((FrameworkElement)sender).Parent as FrameworkElement).FindName("PathTextBox");
+                path.Text = dlg.FileName;
+                path.Focus();
+                ((Button)sender).Focus();
+            }
+        }
     }
 }
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 7ef751df3..9ebfa78be 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -688,44 +688,64 @@
                         </StackPanel>
                     </Border>
 
+                    <Border Margin="0,30,0,0" Style="{DynamicResource SettingGroupBox}">
+                        <ItemsControl Style="{StaticResource SettingGrid}">
+                            <StackPanel Style="{StaticResource TextPanel}">
+                                <TextBlock
+                                    Grid.Column="1"
+                                    VerticalAlignment="Center"
+                                    Text="{DynamicResource defaultFileManager}" />
+                                <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource defaultFileManagerToolTip}" />
+                            </StackPanel>
+                            <StackPanel Grid.Column="2" Orientation="Horizontal">
+                                <Button
+                                    Width="160"
+                                    MaxWidth="250"
+                                    Margin="10,0,18,0"
+                                    Click="OnSelectFileManagerClick"
+                                    Content="{Binding Settings.CustomExplorer.Name}" />
+                            </StackPanel>
+
+                            <TextBlock
+                                Grid.Column="0"
+                                Margin="24,0,16,0"
+                                VerticalAlignment="Center"
+                                FontFamily="/Resources/#Segoe Fluent Icons"
+                                FontSize="20">
+                                &#xe838;
+                            </TextBlock>
+                        </ItemsControl>
+                    </Border>
 
 
-                    <Border
-                        Margin="0,30,0,0"
-                        Padding="0"
-                        CornerRadius="5"
-                        Style="{DynamicResource SettingGroupBox}">
-                        <StackPanel Orientation="Vertical">
-                            <Border
-                                Margin="0,0,0,0"
-                                BorderThickness="0"
-                                Style="{DynamicResource SettingGroupBox}">
-                                <ItemsControl Style="{StaticResource SettingGrid}">
-                                    <StackPanel Style="{StaticResource TextPanel}">
-                                        <TextBlock
-                                            Grid.Column="1"
-                                            VerticalAlignment="Center"
-                                            Text="{DynamicResource defaultFileManager}" />
-                                        <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource defaultFileManagerToolTip}" />
-                                    </StackPanel>
-                                    <StackPanel Grid.Column="2" Orientation="Horizontal">
-                                        <Button
-                                            Width="160"
-                                            MaxWidth="250"
-                                            Margin="10,0,18,0"
-                                            Click="OnSelectFileManagerClick"
-                                            Content="{Binding Settings.CustomExplorer.Name}" />
-                                    </StackPanel>
-                                    <TextBlock
-                                        Grid.Column="0"
-                                        Margin="24,0,16,0"
-                                        VerticalAlignment="Center"
-                                        FontFamily="/Resources/#Segoe Fluent Icons"
-                                        FontSize="20">
-                                        &#xe838;
-                                    </TextBlock>
-                                </ItemsControl>
-                            </Border>
+                   <Border Margin="0,30,0,0" Style="{DynamicResource SettingGroupBox}">
+                        <ItemsControl Style="{StaticResource SettingGrid}">
+                            <StackPanel Style="{StaticResource TextPanel}">
+                                <TextBlock
+                                    Grid.Column="1"
+                                    VerticalAlignment="Center"
+                                    Text="{DynamicResource defaultFileManager}" />
+                                <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource defaultFileManagerToolTip}" />
+                            </StackPanel>
+                            <StackPanel Grid.Column="2" Orientation="Horizontal">
+                                <Button
+                                    Width="160"
+                                    MaxWidth="250"
+                                    Margin="10,0,18,0"
+                                    Click="OnSelectFileManagerClick"
+                                    Content="{Binding Settings.CustomExplorer.Name}" />
+                            </StackPanel>
+
+                            <TextBlock
+                                Grid.Column="0"
+                                Margin="24,0,16,0"
+                                VerticalAlignment="Center"
+                                FontFamily="/Resources/#Segoe Fluent Icons"
+                                FontSize="20">
+                                &#xe838;
+                            </TextBlock>
+                        </ItemsControl>
+                    </Border>
                             <Separator
                                 Width="Auto"
                                 BorderBrush="#e5e5e5"
@@ -892,7 +912,9 @@
                                                     Height="32"
                                                     Margin="32,0,0,0"
                                                     FlowDirection="LeftToRight"
-                                                    Source="{Binding Image, IsAsync=True}" />
+                                                    RenderOptions.BitmapScalingMode="HighQuality"
+                                                    Source="{Binding Image, IsAsync=True}"
+                                                    Stretch="Uniform" />
                                             </StackPanel>
                                             <StackPanel Grid.Column="1" Margin="12,0,14,0">
                                                 <TextBlock
@@ -902,7 +924,7 @@
                                                 <TextBlock
                                                     Margin="0,2,0,0"
                                                     Foreground="#5f5f5f"
-                                                    TextWrapping="Wrap">
+                                                    TextWrapping="WrapWithOverflow">
                                                     <Run FontSize="12" Text="{Binding PluginPair.Metadata.Description}" />
                                                 </TextBlock>
                                             </StackPanel>
@@ -913,10 +935,10 @@
                                                     VerticalAlignment="Center"
                                                     FontSize="12"
                                                     Text="{DynamicResource priority}" />
-                                                <Border CornerRadius="5">
+                                                <Border>
                                                     <Button
                                                         x:Name="PriorityButton"
-                                                        Margin="5,0,0,0"
+                                                        Margin="0,0,0,0"
                                                         VerticalAlignment="Center"
                                                         Click="OnPluginPriorityClick"
                                                         Content="{Binding Priority, UpdateSourceTrigger=PropertyChanged}"
@@ -929,7 +951,7 @@
                                                             </Style>
                                                         </Button.Resources>
                                                         <Button.Style>
-                                                            <Style TargetType="Button">
+                                                            <Style BasedOn="{StaticResource DefaultButtonStyle}" TargetType="Button">
                                                                 <Setter Property="Padding" Value="12,8,12,8" />
                                                                 <Setter Property="BorderThickness" Value="0" />
                                                                 <Setter Property="FontWeight" Value="DemiBold" />
@@ -1299,12 +1321,17 @@
                                                     </Style.Triggers>
                                                 </Style>
                                             </StackPanel.Style>
-                                            <Image
-                                                Width="32"
-                                                Height="32"
-                                                Margin="8,0,6,0"
-                                                VerticalAlignment="Center"
-                                                Source="{Binding IcoPath, IsAsync=True}" />
+
+                                            <Border Margin="8,0,0,0">
+                                                <Image
+                                                    Width="32"
+                                                    Height="32"
+                                                    Margin="0,0,0,0"
+                                                    VerticalAlignment="Center"
+                                                    RenderOptions.BitmapScalingMode="HighQuality"
+                                                    Source="{Binding IcoPath, IsAsync=True}"
+                                                    Stretch="Uniform" />
+                                            </Border>
                                         </StackPanel>
                                         <StackPanel
                                             Grid.Column="1"
@@ -1472,7 +1499,7 @@
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
                                 Orientation="Horizontal">
-                                <Border Width="500" Style="{DynamicResource WindowBorderStyle}">
+                                <Border Width="{Binding WindowWidthSize}" Style="{DynamicResource WindowBorderStyle}">
                                     <Border Style="{DynamicResource WindowRadius}">
                                         <Border.Clip>
                                             <MultiBinding Converter="{StaticResource BorderClipConverter}">
@@ -1543,7 +1570,7 @@
                                     </TextBlock>
                                 </ItemsControl>
                             </Border>
-                            <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 windowWidthSize}" />
@@ -1585,7 +1612,7 @@
                                 HorizontalAlignment="Stretch"
                                 Style="{DynamicResource SettingGroupBox}">
                                 <ListBox
-                                    Padding="18"
+                                    Margin="12,12,12,12"
                                     HorizontalAlignment="Center"
                                     HorizontalContentAlignment="Center"
                                     ui:ScrollViewerHelper.AutoHideScrollBars="True"
@@ -1596,24 +1623,46 @@
                                     SelectedItem="{Binding SelectedTheme}">
                                     <ListBox.ItemContainerStyle>
                                         <Style TargetType="ListBoxItem">
-                                            <Style.Triggers>
-                                                <Trigger Property="IsSelected" Value="True">
-                                                    <Setter Property="FontWeight" Value="Bold" />
-                                                    <Setter Property="Background" Value="#cccccc" />
-                                                    <Setter Property="Foreground" Value="Black" />
-                                                    <Setter Property="Margin" Value="12,8,12,8" />
-                                                    <Setter Property="BorderBrush" Value="#cccccc" />
-                                                </Trigger>
-                                                <Trigger Property="IsMouseOver" Value="True">
-                                                    <Setter Property="Margin" Value="12,8,12,8" />
-                                                    <Setter Property="Foreground" Value="#3E99D1" />
-                                                </Trigger>
-                                                <Trigger Property="IsMouseOver" Value="False">
-                                                    <Setter Property="Background" Value="#f3f3f3" />
-                                                    <Setter Property="Foreground" Value="Black" />
-                                                    <Setter Property="Margin" Value="12,8,12,8" />
-                                                </Trigger>
-                                            </Style.Triggers>
+                                            <Setter Property="Background" Value="Transparent" />
+                                            <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="Padding" Value="0,0,0,0" />
+                                            <Setter Property="Margin" Value="4" />
+                                            <Setter Property="Template">
+                                                <Setter.Value>
+                                                    <ControlTemplate TargetType="{x:Type ListBoxItem}">
+                                                        <Border
+                                                            x:Name="Bd"
+                                                            Padding="{TemplateBinding Padding}"
+                                                            Background="#fefefe"
+                                                            BorderBrush="#e5e5e5"
+                                                            BorderThickness="1,1,1,0"
+                                                            CornerRadius="4"
+                                                            SnapsToDevicePixels="true">
+                                                            <Border
+                                                                x:Name="Bd2"
+                                                                BorderBrush="#d3d3d3"
+                                                                BorderThickness="0,0,0,2"
+                                                                CornerRadius="4">
+                                                                <ContentPresenter
+                                                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                                            </Border>
+                                                        </Border>
+                                                        <ControlTemplate.Triggers>
+                                                            <Trigger Property="IsMouseOver" Value="true">
+                                                                <Setter TargetName="Bd" Property="Background" Value="#f6f6f6" />
+                                                            </Trigger>
+                                                            <Trigger Property="IsSelected" Value="true">
+                                                                <Setter TargetName="Bd" Property="Background" Value="{DynamicResource ToggleSwitchFillOn}" />
+                                                                <Setter TargetName="Bd2" Property="BorderThickness" Value="0" />
+                                                                <Setter TargetName="Bd2" Property="TextElement.Foreground" Value="#ffffff" />
+                                                            </Trigger>
+                                                        </ControlTemplate.Triggers>
+                                                    </ControlTemplate>
+                                                </Setter.Value>
+                                            </Setter>
                                         </Style>
                                     </ListBox.ItemContainerStyle>
                                     <ListBox.Template>
@@ -1626,15 +1675,15 @@
                                         <DataTemplate>
                                             <Grid
                                                 Width="Auto"
-                                                Height="40"
+                                                Height="34"
                                                 Margin="0,0,0,0">
                                                 <TextBlock
                                                     Margin="0"
-                                                    Padding="10"
+                                                    Padding="14,12,14,12"
                                                     HorizontalAlignment="Center"
                                                     VerticalAlignment="Center"
                                                     Focusable="True"
-                                                    FontSize="13"
+                                                    FontSize="12"
                                                     Text="{Binding}"
                                                     TextWrapping="Wrap" />
                                             </Grid>
@@ -1642,7 +1691,7 @@
                                     </ListBox.ItemTemplate>
                                     <ListBox.ItemsPanel>
                                         <ItemsPanelTemplate>
-                                            <WrapPanel HorizontalAlignment="Right" />
+                                            <WrapPanel />
                                         </ItemsPanelTemplate>
                                     </ListBox.ItemsPanel>
                                 </ListBox>
@@ -1867,7 +1916,7 @@
                         <Grid.RowDefinitions>
                             <RowDefinition Height="43" />
                             <RowDefinition Height="80" />
-                            <RowDefinition Height="160" />
+                            <RowDefinition Height="146" />
                             <RowDefinition Height="50" />
                             <RowDefinition Height="250" />
                             <RowDefinition Height="70" />
@@ -1945,6 +1994,7 @@
                                     BorderThickness="1" />
                                 <Border
                                     Margin="0"
+                                    Padding="0,10,0,0"
                                     BorderThickness="0"
                                     Style="{DynamicResource SettingGroupBox}">
                                     <ItemsControl Style="{StaticResource SettingGrid}">
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index 92e22f753..547228ee3 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -281,7 +281,7 @@ namespace Flow.Launcher.ViewModel
             ReloadPluginDataCommand = new RelayCommand(_ =>
             {
                 Hide();
-                
+
                 PluginManager
                     .ReloadData()
                     .ContinueWith(_ =>
@@ -323,7 +323,7 @@ namespace Flow.Launcher.ViewModel
         /// <param name="queryText"></param>
         public void ChangeQueryText(string queryText, bool reQuery = false)
         {
-            if (QueryText!=queryText) 
+            if (QueryText != queryText)
             {
                 // re-query is done in QueryText's setter method
                 QueryText = queryText;
@@ -706,7 +706,7 @@ namespace Flow.Launcher.ViewModel
             OpenResultCommandModifiers = _settings.OpenResultModifiers ?? DefaultOpenResultModifiers;
         }
 
-        public async void ToggleFlowLauncher()
+        public void ToggleFlowLauncher()
         {
             if (MainWindowVisibility != Visibility.Visible)
             {
@@ -714,33 +714,30 @@ namespace Flow.Launcher.ViewModel
             }
             else
             {
-                switch (_settings.LastQueryMode)
-                {
-                    case LastQueryMode.Empty:
-                        ChangeQueryText(string.Empty);
-                        Application.Current.MainWindow.Opacity = 0; // Trick for no delay
-                        await Task.Delay(100);
-                        Application.Current.MainWindow.Opacity = 1;
-                        break;
-                    case LastQueryMode.Preserved:
-                        LastQuerySelected = true;
-                        break;
-                    case LastQueryMode.Selected:
-                        LastQuerySelected = false;
-                        break;
-                    default:
-                        throw new ArgumentException($"wrong LastQueryMode: <{_settings.LastQueryMode}>");
-                }
-                MainWindowVisibility = Visibility.Collapsed;
+                Hide();
             }
         }
 
-        public void Hide()
+        public async void Hide()
         {
-            if (MainWindowVisibility != Visibility.Collapsed)
+            switch (_settings.LastQueryMode)
             {
-                ToggleFlowLauncher();
+                case LastQueryMode.Empty:
+                    ChangeQueryText(string.Empty);
+                    Application.Current.MainWindow.Opacity = 0; // Trick for no delay
+                    await Task.Delay(100);
+                    Application.Current.MainWindow.Opacity = 1;
+                    break;
+                case LastQueryMode.Preserved:
+                    LastQuerySelected = true;
+                    break;
+                case LastQueryMode.Selected:
+                    LastQuerySelected = false;
+                    break;
+                default:
+                    throw new ArgumentException($"wrong LastQueryMode: <{_settings.LastQueryMode}>");
             }
+            MainWindowVisibility = Visibility.Collapsed;
         }
 
         #endregion
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/plugin.json b/Plugins/Flow.Launcher.Plugin.Explorer/plugin.json
index c525c001b..8d5d97af1 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/plugin.json
@@ -10,7 +10,7 @@
   "Name": "Explorer",
   "Description": "Search and manage files and folders. Explorer utilises Windows Index Search",
   "Author": "Jeremy Wu",
-  "Version": "1.9.1",
+  "Version": "1.10.0",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.Explorer.dll",
diff --git a/Plugins/Flow.Launcher.Plugin.Program/plugin.json b/Plugins/Flow.Launcher.Plugin.Program/plugin.json
index 5f762f7b6..cbcc00f2b 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.Program/plugin.json
@@ -4,7 +4,7 @@
   "Name": "Program",
   "Description": "Search programs in Flow.Launcher",
   "Author": "qianlifeng",
-  "Version": "1.6.1",
+  "Version": "1.7.0",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.Program.dll",
diff --git a/Plugins/Flow.Launcher.Plugin.Sys/plugin.json b/Plugins/Flow.Launcher.Plugin.Sys/plugin.json
index 826a1b756..42e8058e5 100644
--- a/Plugins/Flow.Launcher.Plugin.Sys/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.Sys/plugin.json
@@ -4,7 +4,7 @@
   "Name": "System Commands",
   "Description": "Provide System related commands. e.g. shutdown,lock, setting etc.",
   "Author": "qianlifeng",
-  "Version": "1.4.1",
+  "Version": "1.5.0",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.Sys.dll",