Merge remote-tracking branch 'upstream/dev' into FileManager

2026-03-11 08:54:32 +00:00 · 2021-11-05 12:52:31 -05:00 · 2021-11-05 12:52:31 -05:00 · de7c462487
commit de7c462487
parent 6f004a4774 74aa9e40a2
24 changed files with 381 additions and 225 deletions
--- a/Flow.Launcher.Core/Resource/Internationalization.cs
+++ b/Flow.Launcher.Core/Resource/Internationalization.cs
@ -9,6 +9,7 @@ using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Infrastructure.Logger;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
+using System.Globalization;

 namespace Flow.Launcher.Core.Resource
 {
@ -96,7 +97,8 @@ namespace Flow.Launcher.Core.Resource
            }
            UpdatePluginMetadataTranslations();
            Settings.Language = language.LanguageCode;
-
+            CultureInfo.CurrentCulture = new CultureInfo(language.LanguageCode);
+            CultureInfo.CurrentUICulture = CultureInfo.CurrentCulture;
        }

        public bool PromptShouldUsePinyin(string languageCodeToSet)
--- a/Flow.Launcher/ActionKeywords.xaml
+++ b/Flow.Launcher/ActionKeywords.xaml
@ -1,13 +1,54 @@
 <Window x:Class="Flow.Launcher.ActionKeywords"
        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="ActionKeywords"
+        Title="{DynamicResource actionKeywordsTitle}"
        Icon="Images\app.png"
        ResizeMode="NoResize"
        Loaded="ActionKeyword_OnLoaded"
        WindowStartupLocation="CenterScreen"
-        Height="250" Width="500">
+        Height="365" Width="450" Background="#F3F3F3" BorderBrush="#cecece">
    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition Height="80"/>
+        </Grid.RowDefinitions>
+        <Border BorderThickness="0 0 0 1" BorderBrush="#e5e5e5" Background="#ffffff" Padding="26 26 26 0">
+            <Grid>
+                <StackPanel>
+                    <StackPanel Grid.Row="0" Margin="0 0 0 12">
+                        <TextBlock Grid.Column="0" Text="{DynamicResource actionKeywordsTitle}"  FontSize="20" FontWeight="SemiBold" FontFamily="Segoe UI" TextAlignment="Left"
+                                       Margin="0 0 0 0" />
+                    </StackPanel>
+                    <StackPanel>
+                        <TextBlock 
+                           Text="{DynamicResource actionkeyword_tips}" Foreground="#1b1b1b" FontSize="14" TextWrapping="WrapWithOverflow" TextAlignment="Left"/>
+                    </StackPanel>
+
+                    <StackPanel Orientation="Horizontal" Margin="0 18 0 0">
+                        <TextBlock FontSize="14" Grid.Row="0" Grid.Column="1" VerticalAlignment="Center"
+                   HorizontalAlignment="Left" Text="{DynamicResource currentActionKeywords}" />
+                        <TextBlock x:Name="tbOldActionKeyword" Grid.Row="0" Grid.Column="1" Margin="14 10 10 10" FontSize="14"
+                   VerticalAlignment="Center" HorizontalAlignment="Left" FontWeight="SemiBold"/>
+                    </StackPanel>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock FontSize="14" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"
+                   HorizontalAlignment="Left" Text="{DynamicResource newActionKeyword}" />
+
+                        <TextBox x:Name="tbAction" Margin="10 10 15 10" Width="105" VerticalAlignment="Center" HorizontalAlignment="Left" />
+
+                    </StackPanel>
+                </StackPanel>
+            </Grid>
+        </Border>
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Grid.Row="1">
+            <Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="10 0 5 0" Width="100" Height="30"
+                    Content="{DynamicResource cancel}" />
+            <Button x:Name="btnDone" Margin="5 0 10 0" Width="100" Height="30" Click="btnDone_OnClick">
+                <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
+            </Button>
+        </StackPanel>
+    </Grid>
+    <!--
        <Grid.RowDefinitions>
            <RowDefinition />
            <RowDefinition Height="60"/>
@ -40,4 +81,5 @@
            </Button>
        </StackPanel>
    </Grid>
+        -->
 </Window>
--- a/Flow.Launcher/CustomQueryHotkeySetting.xaml
+++ b/Flow.Launcher/CustomQueryHotkeySetting.xaml
@ -5,7 +5,8 @@
        Icon="Images\app.png"
        ResizeMode="NoResize"
        WindowStartupLocation="CenterScreen"
-        Title="{DynamicResource customeQueryHotkeyTitle}" Height="200" Width="674.766">
+        MouseDown="window_MouseDown"
+        Title="{DynamicResource customeQueryHotkeyTitle}" Height="345" Width="500" Background="#F3F3F3" BorderBrush="#cecece">
    <Window.InputBindings>
        <KeyBinding Key="Escape" Command="Close"/>
    </Window.InputBindings>
@ -15,29 +16,42 @@
    <Grid>
        <Grid.RowDefinitions>
            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
+            <RowDefinition Height="80"/>
        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="150" />
-            <ColumnDefinition />
-        </Grid.ColumnDefinitions>
-        <TextBlock Margin="10" FontSize="14" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center"
-                   HorizontalAlignment="Right" Text="{DynamicResource hotkey}" />
-        <flowlauncher:HotkeyControl x:Name="ctlHotkey" Margin="10,0,10,0" Grid.Column="1" VerticalAlignment="Center" Height="32" />
+        <Border BorderThickness="0 0 0 1" BorderBrush="#e5e5e5" Background="#ffffff" Padding="26 26 26 0">
+            <Grid>
+                <StackPanel>
+                    <StackPanel Grid.Row="0" Margin="0 0 0 12">
+                        <TextBlock Grid.Column="0" Text="{DynamicResource customeQueryHotkeyTitle}"  FontSize="20" FontWeight="SemiBold" FontFamily="Segoe UI" TextAlignment="Left"
+                                       Margin="0 0 0 0" />
+                    </StackPanel>
+                    <StackPanel>
+                        <TextBlock 
+                           Text="{DynamicResource customeQueryHotkeyTips}" Foreground="#1b1b1b" FontSize="14" TextWrapping="WrapWithOverflow" TextAlignment="Left"/>
+                    </StackPanel>

-        <TextBlock Margin="10" FontSize="14" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center"
-                   HorizontalAlignment="Right" Text="{DynamicResource actionKeyword}" />
-        <StackPanel Grid.Row="1" Orientation="Horizontal" Grid.Column="1">
-            <TextBox x:Name="tbAction" Margin="10" Width="400" VerticalAlignment="Center" HorizontalAlignment="Left" />
-            <Button x:Name="btnTestActionKeyword" Padding="10 5 10 5" Height="30" Click="BtnTestActionKeyword_OnClick"
+                    <StackPanel Orientation="Horizontal" Margin="0 20 0 0">
+                        <TextBlock Margin="10" FontSize="14" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center"
+                   HorizontalAlignment="Left" Text="{DynamicResource hotkey}" Width="60"/>
+                        <flowlauncher:HotkeyControl x:Name="ctlHotkey" Margin="10,0,10,0" Grid.Column="1" VerticalAlignment="Center" Height="32" HorizontalAlignment="Left" HorizontalContentAlignment="Left" Width="200"/>
+                        <TextBlock Margin="10" FontSize="14" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center"
+                   HorizontalAlignment="Left" Text="{DynamicResource actionKeyword}" />
+                    </StackPanel>
+
+                    <StackPanel Orientation="Horizontal" Margin="0 0 0 0">
+                        <TextBlock Margin="10" FontSize="14" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Width="60"
+                   HorizontalAlignment="Left" Text="{DynamicResource customQuery}" />
+                        <TextBox x:Name="tbAction" Margin="10" Width="250" VerticalAlignment="Center" HorizontalAlignment="Left" />
+                        <Button x:Name="btnTestActionKeyword" Padding="10 5 10 5" Height="30" Click="BtnTestActionKeyword_OnClick"
                    Content="{DynamicResource preview}" />
-        </StackPanel>
-
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="2" Grid.Column="1">
-            <Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="10 0 10 0" Width="80" Height="32"
+                    </StackPanel>
+                </StackPanel>
+            </Grid>
+        </Border>
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Grid.Row="1">
+            <Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="10 0 5 0" Width="100" Height="32"
                    Content="{DynamicResource cancel}" />
-            <Button x:Name="btnAdd" Margin="10 0 10 0" Width="80" Height="32" Click="btnAdd_OnClick">
+            <Button x:Name="btnAdd" Margin="5 0 10 0" Width="100" Height="32" Click="btnAdd_OnClick">
                <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
            </Button>
        </StackPanel>
--- a/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
+++ b/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
@ -7,6 +7,7 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows;
 using System.Windows.Input;
+using System.Windows.Controls;

 namespace Flow.Launcher
 {
@ -99,5 +100,15 @@ namespace Flow.Launcher
        {
            Close();
        }
+
+        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);
+            }
+        }
    }
 }
--- a/Flow.Launcher/HotkeyControl.xaml
+++ b/Flow.Launcher/HotkeyControl.xaml
@ -9,11 +9,18 @@
             d:DesignHeight="300" d:DesignWidth="300">
    <Grid>
        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="125" />
-            <ColumnDefinition Width="160" />
+            <ColumnDefinition Width="200"/>
        </Grid.ColumnDefinitions>
-        <TextBlock x:Name="tbMsg" Visibility="Hidden" Margin="8 0 0 0" VerticalAlignment="Center" Grid.Column="0" HorizontalAlignment="Right"/>
-        <TextBox x:Name="tbHotkey" TabIndex="100" VerticalContentAlignment="Center" Grid.Column="1"
-                 PreviewKeyDown="TbHotkey_OnPreviewKeyDown" input:InputMethod.IsInputMethodEnabled="False" Margin="5 0 18 0"/>
+        <Popup x:Name="popup" AllowDrop="True" PopupAnimation="Fade" PlacementTarget="{Binding ElementName=tbHotkey}" IsOpen="{Binding IsKeyboardFocused, ElementName=tbHotkey, Mode=OneWay}" StaysOpen="True" AllowsTransparency="True" Placement="Top" VerticalOffset="-5">
+            <Border Background="#f6f6f6" BorderBrush="#cecece" BorderThickness="1" CornerRadius="6" Width="120" Height="30">
+                <TextBlock x:Name="tbMsg" FontSize="13" FontWeight="SemiBold" Visibility="Visible" Margin="0 0 0 0" VerticalAlignment="Center" HorizontalAlignment="Center">
+                    press key
+                </TextBlock>
+            </Border>
+        </Popup>
+        
+        <TextBox x:Name="tbHotkey" TabIndex="100" VerticalContentAlignment="Center"
+                 PreviewKeyDown="TbHotkey_OnPreviewKeyDown" input:InputMethod.IsInputMethodEnabled="False" Margin="0 0 18 0">
+        </TextBox>
    </Grid>
 </UserControl>
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@ -49,6 +49,7 @@
    <system:String x:Key="browserMorePlugins">Find more plugins</system:String>
    <system:String x:Key="enable">On</system:String>
    <system:String x:Key="disable">Off</system:String>
+    <system:String x:Key="actionKeywordsTitle">Action keyword Setting</system:String>
    <system:String x:Key="actionKeywords">Action keyword</system:String>
    <system:String x:Key="currentActionKeywords">Current action keyword:</system:String>
    <system:String x:Key="newActionKeyword">New action keyword:</system:String>
@ -68,7 +69,8 @@

    <!--Setting Theme-->
    <system:String x:Key="theme">Theme</system:String>
-    <system:String x:Key="browserMoreThemes">Browse for more themes</system:String>
+    <system:String x:Key="browserMoreThemes">Theme Gallery</system:String>
+    <system:String x:Key="howToCreateTheme">How to create a theme</system:String>
    <system:String x:Key="hiThere">Hi There</system:String>
    <system:String x:Key="queryBoxFont">Query Box Font</system:String>
    <system:String x:Key="resultItemFont">Result Item Font</system:String>
@ -153,10 +155,11 @@
    <system:String x:Key="newActionKeywordsHasBeenAssigned">This new Action Keyword is already assigned to another plugin, please choose a different one</system:String>
    <system:String x:Key="success">Success</system:String>
    <system:String x:Key="completedSuccessfully">Completed successfully</system:String>
-    <system:String x:Key="actionkeyword_tips">Use * if you don't want to specify an action keyword</system:String>
+    <system:String x:Key="actionkeyword_tips">Enter the action keyword you need to start the plug-in. Use * if you don't want to specify an action keyword. In the case, The plug-in works without keywords. </system:String>

    <!--Custom Query Hotkey Dialog-->
-    <system:String x:Key="customeQueryHotkeyTitle">Custom Plugin Hotkey</system:String>
+    <system:String x:Key="customeQueryHotkeyTitle">Custom Query Hotkey</system:String>
+    <system:String x:Key="customeQueryHotkeyTips">Press the custom hotkey to automatically insert the specified query.</system:String>
    <system:String x:Key="preview">Preview</system:String>
    <system:String x:Key="hotkeyIsNotUnavailable">Hotkey is unavailable, please select a new hotkey</system:String>
    <system:String x:Key="invalidPluginHotkey">Invalid plugin hotkey</system:String>
--- a/Flow.Launcher/Languages/sk.xaml
+++ b/Flow.Launcher/Languages/sk.xaml
@ -13,51 +13,64 @@
    <system:String x:Key="iconTraySettings">Nastavenia</system:String>
    <system:String x:Key="iconTrayAbout">O aplikácii</system:String>
    <system:String x:Key="iconTrayExit">Ukončiť</system:String>
+    <system:String x:Key="closeWindow">Zavrieť</system:String>

    <!--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="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>
    <system:String x:Key="rememberLastLocation">Zapamätať si posledné umiestnenie</system:String>
    <system:String x:Key="language">Jazyk</system:String>
    <system:String x:Key="lastQueryMode">Posledné vyhľadávanie</system:String>
+    <system:String x:Key="lastQueryModeToolTip">Zobrazí/skryje predchádzajúce výsledky pri opätovnej aktivácii Flow Launchera.</system:String>
    <system:String x:Key="LastQueryPreserved">Ponechať</system:String>
    <system:String x:Key="LastQuerySelected">Označiť</system:String>
    <system:String x:Key="LastQueryEmpty">Vymazať</system:String>
    <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="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>
    <system:String x:Key="hideOnStartup">Schovať Flow Launcher po spustení</system:String>
    <system:String x:Key="hideNotifyIcon">Schovať ikonu z oblasti oznámení</system:String>
    <system:String x:Key="querySearchPrecision">Presnosť vyhľadávania</system:String>
+    <system:String x:Key="querySearchPrecisionToolTip">Mení minimálne skóre zhody potrebné na zobrazenie výsledkov.</system:String>
    <system:String x:Key="ShouldUsePinyin">Použiť Pinyin</system:String>
    <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-->
-    <system:String x:Key="plugin">Plugin</system:String>
+    <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">Povolené</system:String>
-    <system:String x:Key="disable">Zakázané</system:String>
+    <system:String x:Key="enable">Zap.</system:String>
+    <system:String x:Key="disable">Vyp.</system:String>
+    <system:String x:Key="actionKeywordsTitle">Nastavenie kľúčového slova akcie</system:String>
    <system:String x:Key="actionKeywords">Skratka akcie</system:String>
    <system:String x:Key="currentActionKeywords">Aktuálna akcia skratky:</system:String>
    <system:String x:Key="newActionKeyword">Nová akcia skratky:</system:String>
    <system:String x:Key="currentPriority">Aktuálna priorita:</system:String>
    <system:String x:Key="newPriority">Nová priorita:</system:String>
-    <system:String x:Key="priority">Priorita:</system:String>
+    <system:String x:Key="priority">Priorita</system:String>
    <system:String x:Key="pluginDirectory">Priečinok s pluginmi</system:String>
-    <system:String x:Key="author">Autor</system:String>
+    <system:String x:Key="author">Autor:</system:String>
    <system:String x:Key="plugin_init_time">Príprava:</system:String>
    <system:String x:Key="plugin_query_time">Čas dopytu:</system:String>
+    
+
+    <!--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-->
    <system:String x:Key="theme">Motív</system:String>
-    <system:String x:Key="browserMoreThemes">Prehliadať viac motívov</system:String>
+    <system:String x:Key="browserMoreThemes">Galéria motívov</system:String>
+    <system:String x:Key="howToCreateTheme">Ako vytvoriť motív</system:String>
    <system:String x:Key="hiThere">Ahojte</system:String>
    <system:String x:Key="queryBoxFont">Písmo vyhľadávacieho poľa</system:String>
    <system:String x:Key="resultItemFont">Písmo výsledkov</system:String>
@ -65,12 +78,17 @@
    <system:String x:Key="opacity">Nepriehľadnosť</system:String>
    <system:String x:Key="theme_load_failure_path_not_exists">Motív {0} neexistuje, návrat na predvolený motív</system:String>
    <system:String x:Key="theme_load_failure_parse_error">Nepodarilo sa nečítať motív {0}, návrat na predvolený motív</system:String>
+    <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-->
    <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="openResultModifiers">Modifikáčné klávesy na otvorenie výsledkov</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="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>
    <system:String x:Key="customQuery">Dopyt</system:String>
    <system:String x:Key="delete">Odstrániť</system:String>
@ -88,7 +106,7 @@
    <system:String x:Key="enableProxy">Povoliť HTTP Proxy</system:String>
    <system:String x:Key="server">HTTP Server</system:String>
    <system:String x:Key="port">Port</system:String>
-    <system:String x:Key="userName">Použív. meno</system:String>
+    <system:String x:Key="userName">Používateľské meno</system:String>
    <system:String x:Key="password">Heslo</system:String>
    <system:String x:Key="testProxy">Test Proxy</system:String>
    <system:String x:Key="save">Uložiť</system:String>
@ -115,6 +133,7 @@
    <system:String x:Key="documentation">Tipy na používanie:</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>

@ -128,10 +147,11 @@
    <system:String x:Key="newActionKeywordsHasBeenAssigned">Nová skratka pre akciu bola priradená pre iný plugin, prosím, zvoľte inú skratku</system:String>
    <system:String x:Key="success">Úspešné</system:String>
    <system:String x:Key="completedSuccessfully">Úspešne dokončené</system:String>
-    <system:String x:Key="actionkeyword_tips">Použite * ak nechcete určiť skratku pre akciu</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-->
-    <system:String x:Key="customeQueryHotkeyTitle">Vlastná klávesová skratka pre plugin</system:String>
+    <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>
    <system:String x:Key="hotkeyIsNotUnavailable">Klávesová skratka je nedostupná, prosím, zadajte novú</system:String>
    <system:String x:Key="invalidPluginHotkey">Neplatná klávesová skratka pluginu</system:String>
@ -160,8 +180,8 @@
    <system:String x:Key="pleaseWait">Čakajte, prosím…</system:String>

    <!--update-->
-    <system:String x:Key="update_flowlauncher_update_check">Kontrolujú sa akutalizácie</system:String>
-    <system:String x:Key="update_flowlauncher_already_on_latest">Už máte najnovšiu verizu Flow Launchera</system:String>
+    <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.
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@ -11,6 +11,7 @@ using Flow.Launcher.Core.Resource;
 using Flow.Launcher.Helper;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.ViewModel;
+using Microsoft.AspNetCore.Authorization;
 using Application = System.Windows.Application;
 using Screen = System.Windows.Forms.Screen;
 using ContextMenuStrip = System.Windows.Forms.ContextMenuStrip;
@ -30,6 +31,7 @@ namespace Flow.Launcher
        private bool isProgressBarStoryboardPaused;
        private Settings _settings;
        private NotifyIcon _notifyIcon;
+        private ContextMenu contextMenu;
        private MainViewModel _viewModel;

        #endregion
@ -159,14 +161,10 @@ namespace Flow.Launcher

        private void UpdateNotifyIconText()
        {
-            var menu = _notifyIcon.ContextMenuStrip;
-            var open = menu.Items[0];
-            var setting = menu.Items[1];
-            var exit = menu.Items[2];
-
-            open.Text = InternationalizationManager.Instance.GetTranslation("iconTrayOpen");
-            setting.Text = InternationalizationManager.Instance.GetTranslation("iconTraySettings");
-            exit.Text = InternationalizationManager.Instance.GetTranslation("iconTrayExit");
+            var menu = contextMenu;
+            ((MenuItem)menu.Items[1]).Header = InternationalizationManager.Instance.GetTranslation("iconTrayOpen");
+            ((MenuItem)menu.Items[2]).Header = InternationalizationManager.Instance.GetTranslation("iconTraySettings");
+            ((MenuItem)menu.Items[3]).Header = InternationalizationManager.Instance.GetTranslation("iconTrayExit");
        }

        private void InitializeNotifyIcon()
@ -177,30 +175,46 @@ namespace Flow.Launcher
                Icon = Properties.Resources.app,
                Visible = !_settings.HideNotifyIcon
            };
-            var menu = new ContextMenuStrip();
-            var items = menu.Items;
+            contextMenu = new ContextMenu();
+
+            var header = new MenuItem
+            {
+                Header = "Flow Launcher", 
+                IsEnabled = false
+            };
+            var open = new MenuItem
+            {
+                Header = InternationalizationManager.Instance.GetTranslation("iconTrayOpen")
+            };
+            var settings = new MenuItem
+            {
+                Header = InternationalizationManager.Instance.GetTranslation("iconTraySettings")
+            };
+            var exit = new MenuItem
+            {
+                Header = InternationalizationManager.Instance.GetTranslation("iconTrayExit")
+            };

-            var open = items.Add(InternationalizationManager.Instance.GetTranslation("iconTrayOpen"));
            open.Click += (o, e) => Visibility = Visibility.Visible;
-            var setting = items.Add(InternationalizationManager.Instance.GetTranslation("iconTraySettings"));
-            setting.Click += (o, e) => App.API.OpenSettingDialog();
-            var exit = items.Add(InternationalizationManager.Instance.GetTranslation("iconTrayExit"));
+            settings.Click += (o, e) => App.API.OpenSettingDialog();
            exit.Click += (o, e) => Close();
+            contextMenu.Items.Add(header);
+            contextMenu.Items.Add(open);
+            contextMenu.Items.Add(settings);
+            contextMenu.Items.Add(exit);

-            _notifyIcon.ContextMenuStrip = menu;
+            _notifyIcon.ContextMenuStrip = new ContextMenuStrip(); // it need for close the context menu. if not, context menu can't close. 
            _notifyIcon.MouseClick += (o, e) =>
            {
-                if (e.Button == MouseButtons.Left)
+                switch (e.Button)
                {
-                    if (menu.Visible)
-                    {
-                        menu.Close();
-                    }
-                    else
-                    {
-                        var p = System.Windows.Forms.Cursor.Position;
-                        menu.Show(p);
-                    }
+                    case MouseButtons.Left:
+                        _viewModel.ToggleFlowLauncher();
+                        break;
+
+                    case MouseButtons.Right:
+                        contextMenu.IsOpen = true;
+                        break;
                }
            };
        }
--- a/Flow.Launcher/PriorityChangeWindow.xaml
+++ b/Flow.Launcher/PriorityChangeWindow.xaml
@ -6,52 +6,45 @@
        xmlns:local="clr-namespace:Flow.Launcher"
        Loaded="PriorityChangeWindow_Loaded"
        mc:Ignorable="d"
+        ResizeMode="NoResize"
        WindowStartupLocation="CenterScreen"
-        Title="{DynamicResource changePriorityWindow}" Height="400" Width="350" ResizeMode="NoResize" Background="#f3f3f3">
+        Title="{DynamicResource changePriorityWindow}" Height="365" Width="350" Background="#F3F3F3" BorderBrush="#cecece">
    <Grid>
        <Grid.RowDefinitions>
-            <RowDefinition />
-            <RowDefinition />
            <RowDefinition />
            <RowDefinition Height="80"/>
        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition />
-        </Grid.ColumnDefinitions>
-        <StackPanel Grid.Row="0" VerticalAlignment="Center">
-        <TextBlock Grid.Column="0" FontFamily="/Resources/#Segoe Fluent Icons" FontSize="40"  TextAlignment="Center"
-                               Margin="0 0 0 0">
-                        &#xe8d0;
-        </TextBlock>
-        </StackPanel>
-
-        <Border Background="#ffffff" Grid.Row="1" BorderBrush="#cecece" BorderThickness="1" Margin="14 0 14 0" Padding="0 14 0 0" CornerRadius="5">
-        <StackPanel Orientation="Vertical" >
-            
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Grid.Row="1">
-            <TextBlock FontSize="14" Grid.Column="1" VerticalAlignment="Center"
+        <Border BorderThickness="0 0 0 1" BorderBrush="#e5e5e5" Background="#ffffff" Padding="26 26 26 0">
+            <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>
+                    <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="14 0 10 0" FontSize="14"
+                        <TextBlock x:Name="OldPriority" Grid.Row="0" Grid.Column="1" Margin="10 0 10 0" FontSize="14"
                       VerticalAlignment="Center" HorizontalAlignment="Left" FontWeight="Bold" />
-            </StackPanel>
+                    </StackPanel>

-            <StackPanel Orientation="Horizontal" Grid.Column="1" HorizontalAlignment="Center">
-                <TextBlock FontSize="14" VerticalAlignment="Center"
+                    <StackPanel Orientation="Horizontal" Margin="0 10 0 0">
+                        <TextBlock FontSize="14" VerticalAlignment="Center"
                       HorizontalAlignment="Right" Text="{DynamicResource newPriority}" />
-                <TextBox x:Name="tbAction" Margin="14 10 15 10" Width="105" VerticalAlignment="Center" HorizontalAlignment="Left" />
-            </StackPanel>
-            
-        </StackPanel>
+                        <TextBox x:Name="tbAction" Margin="10 0 15 0" Width="105" VerticalAlignment="Center" HorizontalAlignment="Left" />
+                    </StackPanel>
+                </StackPanel>
+            </Grid>
        </Border>
-        <StackPanel Grid.Row="2" VerticalAlignment="Center">
-        <TextBlock  Foreground="Gray"
-                   Text="{DynamicResource priority_tips}" TextWrapping="WrapWithOverflow" TextAlignment="Center"
-                   Margin="20,0,20,0"/>
-        </StackPanel>
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Grid.Row="3" Grid.Column="1">
-            <Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="0 0 10 0" Width="80" Height="30"
+            <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="10 0 0 0" Width="80" Height="30" Click="btnDone_OnClick">
+            <Button x:Name="btnDone" Margin="5 0 0 0" Width="100" Height="30" Click="btnDone_OnClick">
                <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
            </Button>
        </StackPanel>
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@ -19,6 +19,7 @@
        Height="700" Width="1000"
        MinWidth="900"
        MinHeight="600"
+        MouseDown="window_MouseDown"
        Loaded="OnLoaded"
        Closed="OnClosed"
        d:DataContext="{d:DesignInstance vm:SettingWindowViewModel}">
@ -674,6 +675,7 @@
                </Border>
                <Border Grid.Column="0" Grid.Row="1" Background="#f3f3f3" Padding="0 0 0 0">
                    <ListBox SelectedItem="{Binding SelectedPlugin}"
+                             ScrollViewer.CanContentScroll="False"
                             ItemsSource="{Binding PluginViewModels}"
                             Margin="5, 0, 0, 0" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                             ItemContainerStyle="{StaticResource PluginList}"
@ -1205,7 +1207,7 @@
                                <TextBlock DockPanel.Dock="Top" Margin="10" HorizontalAlignment="Right">
                                    <Hyperlink NavigateUri="{Binding Theme, Mode=OneWay}"
                                               RequestNavigate="OnRequestNavigate">
-                                        <Run Text="{DynamicResource browserMoreThemes}" />
+                                        <Run Text="{DynamicResource howToCreateTheme}" />
                                    </Hyperlink>
                                </TextBlock>
                            </Border>
@ -1611,4 +1613,4 @@
            </Border>
        </TabItem>
    </TabControl>
-</Window>
+</Window>
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@ -287,5 +287,15 @@ namespace Flow.Launcher
                API.ShowMainWindow();
            }
        }
+
+        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);
+            }
+        }
    }
 }
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@ -272,7 +272,7 @@ namespace Flow.Launcher.ViewModel

        #region theme

-        public static string Theme => @"http://www.wox.one/theme/builder";
+        public static string Theme => @"https://flow-launcher.github.io/docs/#/how-to-create-a-theme";

        public string SelectedTheme
        {
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/sk.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/sk.xaml
@ -14,7 +14,7 @@
    <system:String x:Key="flowlauncher_plugin_browserbookmark_settings_choose">Prehliadať</system:String>
    <system:String x:Key="flowlauncher_plugin_browserbookmark_copyurl_title">Kopírovať URL</system:String>
    <system:String x:Key="flowlauncher_plugin_browserbookmark_copyurl_subtitle">Kopírovať URL záložky do schránky</system:String>
-    <system:String x:Key="flowlauncher_plugin_browserbookmark_loadBrowserFrom" >Načítať prehliadač z:</system:String>
+    <system:String x:Key="flowlauncher_plugin_browserbookmark_loadBrowserFrom">Načítať prehliadač z:</system:String>
    <system:String x:Key="flowlauncher_plugin_browserbookmark_browserName">Názov prehliadača</system:String>
    <system:String x:Key="flowlauncher_plugin_browserbookmark_browserBookDataDirectory">Umiestnenie priečinka Data</system:String>
    <system:String x:Key="flowlauncher_plugin_browserbookmark_addBrowserBookmark">Pridať</system:String>
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/plugin.json
@ -4,7 +4,7 @@
  "Name": "Browser Bookmarks",
  "Description": "Search your browser bookmarks",
  "Author": "qianlifeng, Ioannis G.",
-  "Version": "1.5.2",
+  "Version": "1.5.3",
  "Language": "csharp",
  "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
  "ExecuteFileName": "Flow.Launcher.Plugin.BrowserBookmark.dll",
--- a/Plugins/Flow.Launcher.Plugin.Sys/Languages/sk.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Sys/Languages/sk.xaml
@ -8,6 +8,7 @@

    <system:String x:Key="flowlauncher_plugin_sys_shutdown_computer">Vypnúť počítač</system:String>
    <system:String x:Key="flowlauncher_plugin_sys_restart_computer">Reštartovať počítač</system:String>
+    <system:String x:Key="flowlauncher_plugin_sys_restart_advanced">Reštartovať počítač s rozšírenými možnosťami spúšťania pre núdzový režim a režim ladenia, ako aj s ďalšími možnosťami</system:String>
    <system:String x:Key="flowlauncher_plugin_sys_log_off">Odhlásiť</system:String>
    <system:String x:Key="flowlauncher_plugin_sys_lock">Zamknúť počítač</system:String>
    <system:String x:Key="flowlauncher_plugin_sys_exit">Zavrieť Flow Launcher</system:String>
@ -29,6 +30,7 @@
    <system:String x:Key="flowlauncher_plugin_sys_dlgtext_all_applicableplugins_reloaded">Všetky dáta pluginov aktualizované</system:String>
    <system:String x:Key="flowlauncher_plugin_sys_dlgtext_shutdown_computer">Naozaj chcete počítač vypnúť?</system:String>
    <system:String x:Key="flowlauncher_plugin_sys_dlgtext_restart_computer">Naozaj chcete počítač reštartovať?</system:String>
+    <system:String x:Key="flowlauncher_plugin_sys_dlgtext_restart_computer_advanced">Naozaj chcete počítač reštartovať s pokročilými možnosťami spúšťania?</system:String>

    <system:String x:Key="flowlauncher_plugin_sys_plugin_name">Systémové príkazy</system:String>
    <system:String x:Key="flowlauncher_plugin_sys_plugin_description">Poskytuje príkazy súvisiace so systémom ako je vypnutie, uzamknutie počítača atď.</system:String>
--- 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.0",
+  "Version": "1.4.1",
  "Language": "csharp",
  "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
  "ExecuteFileName": "Flow.Launcher.Plugin.Sys.dll",
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/Images/netflix.png
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/Images/netflix.png
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/Images/youtubemusic.png
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/Images/youtubemusic.png
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/en.xaml
@ -2,6 +2,7 @@
                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                    xmlns:system="clr-namespace:System;assembly=mscorlib">

+    <system:String x:Key="flowlauncher_plugin_websearch_window_title">Search Source Setting</system:String>
    <system:String x:Key="flowlauncher_plugin_websearch_open_search_in">Open search in:</system:String>
    <system:String x:Key="flowlauncher_plugin_websearch_new_window">New Window</system:String>
    <system:String x:Key="flowlauncher_plugin_websearch_new_tab">New Tab</system:String>
@ -14,9 +15,14 @@
    <system:String x:Key="flowlauncher_plugin_websearch_action_keyword">Action Keyword</system:String>
    <system:String x:Key="flowlauncher_plugin_websearch_url">URL</system:String>
    <system:String x:Key="flowlauncher_plugin_websearch_search">Search</system:String>
-    <system:String x:Key="flowlauncher_plugin_websearch_enable_suggestion">Search suggestions</system:String>
+    <system:String x:Key="flowlauncher_plugin_websearch_enable_suggestion">Use Search Query Autocomplete: </system:String>
+    <system:String x:Key="flowlauncher_plugin_websearch_enable_suggestion_provider">Autocomplete Data from: </system:String>
    <system:String x:Key="flowlauncher_plugin_websearch_pls_select_web_search">Please select a web search</system:String>
    <system:String x:Key="flowlauncher_plugin_websearch_delete_warning">Are you sure you want to delete {0}?</system:String>
+    <system:String x:Key="flowlauncher_plugin_websearch_guide_1">If you have a web search service you want to use, you can add it to Flow. For example, you can follow the url format in the address bar if you want to search 'casino' on Netflix: "https://www.netflix.com/search?q=Casino". To do this, change the search term 'Casino' as follows.</system:String>
+    <system:String x:Key="flowlauncher_plugin_websearch_guide_2">https://www.netflix.com/search?q={q}</system:String>
+    <system:String x:Key="flowlauncher_plugin_websearch_guide_3">Add it to the URL section below. You can now search Netflix with Flow using any search terms.</system:String>
+   

    <!--web search edit-->
    <system:String x:Key="flowlauncher_plugin_websearch_title">Title</system:String>
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceSetting.xaml
@ -4,59 +4,71 @@
        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
        xmlns:vm="clr-namespace:Flow.Launcher.Plugin.WebSearch"
-        mc:Ignorable="d"
-        ResizeMode="NoResize"
+        mc:Ignorable="d" ResizeMode="NoResize"
        WindowStartupLocation="CenterScreen"
-        Title="Search Source Setting" Height="400" Width="500"
-        d:DataContext="{d:DesignInstance vm:SearchSourceViewModel}">
+        Title="{DynamicResource flowlauncher_plugin_websearch_window_title}" Height="590" Width="550"
+        d:DataContext="{d:DesignInstance vm:SearchSourceViewModel}" Background="#F3F3F3" BorderBrush="#cecece">
    <Grid>
        <Grid.RowDefinitions>
            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition Height="60" />
-            <RowDefinition />
+            <RowDefinition Height="80"/>
        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="120" />
-            <ColumnDefinition />
-        </Grid.ColumnDefinitions>
-        <TextBlock Margin="10" FontSize="14" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center"
-                   HorizontalAlignment="Right" Text="{DynamicResource flowlauncher_plugin_websearch_title}" />
-        <TextBox Text="{Binding SearchSource.Title}" Margin="10" Grid.Row="0" Width="300" Grid.Column="1"
-                 VerticalAlignment="Center"
-                 HorizontalAlignment="Left" />
-
-        <TextBlock Margin="10" FontSize="14" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center"
-                   HorizontalAlignment="Right" Text="{DynamicResource flowlauncher_plugin_websearch_url}" />
-        <TextBox Text="{Binding SearchSource.Url}" Margin="10" Grid.Row="1" Width="300" Grid.Column="1"
-                 VerticalAlignment="Center"
-                 HorizontalAlignment="Left" />
-
-        <TextBlock Margin="10" FontSize="14" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center"
-                   HorizontalAlignment="Right" Text="{DynamicResource flowlauncher_plugin_websearch_action_keyword}" />
-        <TextBox Text="{Binding SearchSource.ActionKeyword}" Margin="10" Grid.Row="2" Width="300" Grid.Column="1"
-                 VerticalAlignment="Center" HorizontalAlignment="Left" />
-
-        <TextBlock Margin="10" FontSize="14" Grid.Row="3" Grid.Column="0" VerticalAlignment="Center"
-                   HorizontalAlignment="Right" Text="{DynamicResource flowlauncher_plugin_websearch_enable}" />
-        <CheckBox IsChecked="{Binding SearchSource.Enabled}" Margin="10" Grid.Row="3" Grid.Column="1"
-                  VerticalAlignment="Center" />
-
-        <TextBlock Margin="10" FontSize="14" Grid.Row="4" Grid.Column="0" VerticalAlignment="Center"
-                   HorizontalAlignment="Right" Text="{DynamicResource flowlauncher_plugin_websearch_icon}" />
-        <StackPanel Orientation="Horizontal" Grid.Row="4" Grid.Column="1" Margin="10">
-            <Image Name="imgPreviewIcon" Width="24" Height="24" Margin="0 0 20 0" />
-            <Button Click="OnSelectIconClick" Height="35"
-                    Content="{DynamicResource flowlauncher_plugin_websearch_select_icon}" />
-        </StackPanel>
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="5" Grid.Column="1">
+        <Border BorderThickness="0 0 0 1" BorderBrush="#e5e5e5" Background="#ffffff" Padding="26 26 26 0">
+            <Grid>
+                <StackPanel>
+                    <StackPanel Grid.Row="0" Margin="0 0 0 12">
+                        <TextBlock Grid.Column="0" Text="{DynamicResource flowlauncher_plugin_websearch_window_title}"  FontSize="20" FontWeight="SemiBold" FontFamily="Segoe UI" TextAlignment="Left"
+                                       Margin="0 0 0 0" />
+                    </StackPanel>
+                    <StackPanel Orientation="Vertical">
+                        <TextBlock 
+                           Text="{DynamicResource flowlauncher_plugin_websearch_guide_1}" Foreground="#1b1b1b" FontSize="14" TextWrapping="WrapWithOverflow" TextAlignment="Left"/>
+                        <TextBlock 
+                           Text="{DynamicResource flowlauncher_plugin_websearch_guide_2}" FontWeight="SemiBold" Foreground="#1b1b1b" FontSize="14" TextWrapping="WrapWithOverflow" TextAlignment="Center" Margin="0 12 0 12"/>
+                        <TextBlock 
+                           Text="{DynamicResource flowlauncher_plugin_websearch_guide_3}" Foreground="#1b1b1b" FontSize="14" TextWrapping="WrapWithOverflow" TextAlignment="Left" Margin="0 0 0 14"/>
+                    </StackPanel>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Margin="10" FontSize="14" VerticalAlignment="Center" Width="100"
+                                HorizontalAlignment="Stretch" Text="{DynamicResource flowlauncher_plugin_websearch_title}" />
+                        <TextBox Text="{Binding SearchSource.Title}" Margin="10" Width="330"
+                                VerticalAlignment="Center" HorizontalAlignment="Left" />
+                        
+                    </StackPanel>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Margin="10" FontSize="14" Grid.Row="4" Grid.Column="0" VerticalAlignment="Center"
+                           HorizontalAlignment="Left" Text="{DynamicResource flowlauncher_plugin_websearch_icon}" Width="100" />
+                        <Button Click="OnSelectIconClick" Height="35" VerticalAlignment="Center" Margin="10 0 0 0"
+                              Content="{DynamicResource flowlauncher_plugin_websearch_select_icon}" />
+                        <Image Name="imgPreviewIcon" Width="24" Height="24" Margin="14 0 0 0" VerticalAlignment="Center"/>
+                    </StackPanel>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Margin="10" FontSize="14" VerticalAlignment="Center" Width="100"
+                                HorizontalAlignment="Left" Text="{DynamicResource flowlauncher_plugin_websearch_url}" />
+                        <TextBox Text="{Binding SearchSource.Url}" Margin="10" Grid.Row="1" Width="330" Grid.Column="1"
+                                VerticalAlignment="Center" HorizontalAlignment="Left" />
+                    </StackPanel>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Margin="10" FontSize="14" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Width="100"
+                                HorizontalAlignment="Left" Text="{DynamicResource flowlauncher_plugin_websearch_action_keyword}" />
+                        <TextBox Text="{Binding SearchSource.ActionKeyword}" Margin="10 0 10 0" Grid.Row="2" Width="330" Grid.Column="1"
+                                VerticalAlignment="Center" HorizontalAlignment="Left" />
+                    </StackPanel>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Margin="10" FontSize="14" Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Width="100"
+                           HorizontalAlignment="Left" Text="{DynamicResource flowlauncher_plugin_websearch_enable}" />
+                        <CheckBox IsChecked="{Binding SearchSource.Enabled}" Margin="10" Grid.Row="3" Grid.Column="1"
+                             VerticalAlignment="Center" />
+                    </StackPanel>
+                </StackPanel>
+            </Grid>
+        </Border>
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Grid.Row="1">
            <Button Click="OnCancelButtonClick"
-                    Margin="10 0 10 0" Width="80" Height="35"
+                    Margin="10 0 5 0" Width="100" Height="35"
                    Content="{DynamicResource flowlauncher_plugin_websearch_cancel}" />
            <Button Click="OnConfirmButtonClick"
-                    Margin="10 0 10 0" Width="80" Height="35"
+                    Margin="5 0 10 0" Width="100" Height="35"
                    Content="{DynamicResource flowlauncher_plugin_websearch_confirm}" />
        </StackPanel>
    </Grid>
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
@ -32,42 +32,31 @@
            </DockPanel>
        </DataTemplate>
    </UserControl.Resources>
-    <Grid Margin="14">
+    <Grid Margin="14 14 14 0">
        <Grid.RowDefinitions>
-            <RowDefinition Height="30" />
            <RowDefinition Height="48" />
-            <RowDefinition Height="45" />
+            <RowDefinition Height="40" />
            <RowDefinition />
+            <RowDefinition Height="56"/>
            <RowDefinition Height="50" />
        </Grid.RowDefinitions>
-        <StackPanel Orientation="Horizontal" Grid.Row="0">
-            <CheckBox IsChecked="{Binding Settings.EnableSuggestion}"
-                      Margin="0 0 20 0"
-                      Name="EnableSuggestion"
-                      Content="{DynamicResource flowlauncher_plugin_websearch_enable_suggestion}" />
-            <ComboBox ItemsSource="{Binding Settings.Suggestions}"
-                      SelectedItem="{Binding Settings.SelectedSuggestion}"
-                      IsEnabled="{Binding ElementName=EnableSuggestion, Path=IsChecked}" />
-            <!-- Not sure why binding IsEnabled directly to Settings.EnableWebSaerchSuggestion is not working -->
-        </StackPanel>
-        <StackPanel Grid.Row="1" HorizontalAlignment="Left" Orientation="Horizontal">
+        <StackPanel Grid.Row="0" HorizontalAlignment="Left" Orientation="Horizontal" Margin="14 0 0 0">
            <Label Content="{DynamicResource flowlauncher_plugin_websearch_open_search_in}" Margin="0 15 20 0"/>
            <RadioButton Name="NewWindowBrowser" GroupName="OpenSearchBehaviour" Content="{DynamicResource flowlauncher_plugin_websearch_new_window}" Click="OnNewBrowserWindowClick" 
                         Margin="0 0 20 0"/>
            <RadioButton Name="NewTabInBrowser" GroupName="OpenSearchBehaviour" Content="{DynamicResource flowlauncher_plugin_websearch_new_tab}" Click="OnNewTabClick" />
        </StackPanel>
-        <StackPanel Grid.Row="2" HorizontalAlignment="Left" Margin="0 3 0 0">
-            <Label Content="{DynamicResource flowlaucnher_plugin_websearch_set_browser_path}" Margin="0 0 350 0" HorizontalAlignment="Left" Width="140"/>
-            <TextBox x:Name="browserPathBox" HorizontalAlignment="Left" Margin="160,-22,0,0" TextChanged="OnBrowserPathTextChanged"
-                     Width="214" Style="{StaticResource BrowserPathBoxStyle}"/>
-            <Button x:Name="viewButton" HorizontalAlignment="Left" Margin="400,-30,0,0"  
+        <StackPanel Grid.Row="1" HorizontalAlignment="Left" Margin="14 3 0 0" Orientation="Horizontal">
+            <Label Content="{DynamicResource flowlaucnher_plugin_websearch_set_browser_path}" Margin="0 0 10 0" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+            <TextBox x:Name="browserPathBox" HorizontalAlignment="Left" Margin="0,0,0,0" TextChanged="OnBrowserPathTextChanged"
+                     Width="250" Style="{StaticResource BrowserPathBoxStyle}"/>
+            <Button x:Name="viewButton" HorizontalAlignment="Left" Margin="10,0,0,0"  
                    Click="OnChooseClick" FontSize="13" Content="{DynamicResource flowlauncher_plugin_websearch_choose}" Width="80"/>
        </StackPanel>
-        <ListView ItemsSource="{Binding Settings.SearchSources}"
+        <ListView Margin="0 18 0 0" ItemsSource="{Binding Settings.SearchSources}"
                  SelectedItem="{Binding Settings.SelectedSearchSource}"
                  x:Name="SearchSourcesListView"
-                  
-                  Grid.Row="3"
+                  Grid.Row="2"
                  Style="{StaticResource {x:Static GridView.GridViewStyleKey}}"
                  BorderBrush="DarkGray"
                  BorderThickness="1"
@ -75,43 +64,65 @@
                  MouseDoubleClick="MouseDoubleClickItem">
            <ListView.View>
                <GridView>
-                    <GridViewColumn Header="{DynamicResource flowlauncher_plugin_websearch_title}"
-                                    DisplayMemberBinding="{Binding Title}"
-                                    Width="130">
+                    <GridViewColumn Width="50">
                        <GridViewColumn.CellTemplate>
                            <DataTemplate>
-                                <TextBlock Text="{Binding Title}"/>
+                                <Image Source="{Binding Path=IconPath}" Width="20" Height="20" Margin="6 0 0 0"/>
                            </DataTemplate>
                        </GridViewColumn.CellTemplate>
                    </GridViewColumn>
+
                    <GridViewColumn Header="{DynamicResource flowlauncher_plugin_websearch_action_keyword}"
                                    DisplayMemberBinding="{Binding ActionKeyword}"
-                                    Width="137">
+                                    Width="130">
                        <GridViewColumn.CellTemplate>
                            <DataTemplate>
                                <TextBlock Text="{Binding ActionKeyword}"/>
                            </DataTemplate>
                        </GridViewColumn.CellTemplate>
                    </GridViewColumn>
-                    <GridViewColumn Header="{DynamicResource flowlauncher_plugin_websearch_url}"
-                                    DisplayMemberBinding="{Binding Url}"
-                                    Width="auto">
+                    <GridViewColumn Header="{DynamicResource flowlauncher_plugin_websearch_title}"
+                                    DisplayMemberBinding="{Binding Title}" Width="350">
                        <GridViewColumn.CellTemplate>
                            <DataTemplate>
-                                <TextBlock Text="{Binding Url}"/>
+                                <TextBlock Text="{Binding Title}"/>
+                            </DataTemplate>
+                        </GridViewColumn.CellTemplate>
+                    </GridViewColumn>
+                    <GridViewColumn Header="{DynamicResource flowlauncher_plugin_websearch_enable}"
+                                    DisplayMemberBinding="{Binding Enabled}"
+                                    Width="80">
+                        <GridViewColumn.CellTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding Enabled}"/>
                            </DataTemplate>
                        </GridViewColumn.CellTemplate>
                    </GridViewColumn>
                </GridView>
            </ListView.View>
        </ListView>
-        <StackPanel Grid.Row="4" HorizontalAlignment="Right" Orientation="Horizontal">
+        <StackPanel Grid.Row="3" HorizontalAlignment="Right" Orientation="Horizontal">
            <Button Click="OnDeleteSearchSearchClick" Width="100" Margin="10"
                    Content="{DynamicResource flowlauncher_plugin_websearch_delete}" />
            <Button Click="OnEditSearchSourceClick" Width="100" Margin="10"
                    Content="{DynamicResource flowlauncher_plugin_websearch_edit}" />
-            <Button Click="OnAddSearchSearchClick" Width="100" Margin="10 10 10 10"
+            <Button Click="OnAddSearchSearchClick" Width="100" Margin="10 10 0 10"
                    Content="{DynamicResource flowlauncher_plugin_websearch_add}" />
        </StackPanel>
+        <Border BorderThickness="0 1 0 0" Grid.Row="4" Margin="0 0 0 0" BorderBrush="#cecece" HorizontalAlignment="Stretch">
+            <DockPanel HorizontalAlignment="Right" Margin="0 14 0 0">
+                <StackPanel Orientation="Horizontal" DockPanel.Dock="Right">
+                    <Label Content="{DynamicResource flowlauncher_plugin_websearch_enable_suggestion_provider}" Margin="14 0 10 0" HorizontalAlignment="Right" VerticalAlignment="Center"/>
+                    <ComboBox ItemsSource="{Binding Settings.Suggestions}" VerticalAlignment="Center"
+                      SelectedItem="{Binding Settings.SelectedSuggestion}"
+                      IsEnabled="{Binding ElementName=EnableSuggestion, Path=IsChecked}" Margin="0 0 20 0" FontSize="11" Height="30"/>
+                    <Label Content="{DynamicResource flowlauncher_plugin_websearch_enable_suggestion}" Margin="0 0 10 0" HorizontalAlignment="Right" VerticalAlignment="Center"/>
+                    <CheckBox IsChecked="{Binding Settings.EnableSuggestion}"
+                      Margin="0 0 0 0"
+                      Name="EnableSuggestion"/>
+                </StackPanel>
+                <!-- Not sure why binding IsEnabled directly to Settings.EnableWebSaerchSuggestion is not working -->
+        </DockPanel>
+        </Border>
    </Grid>
 </UserControl>
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/plugin.json
@ -26,7 +26,7 @@
  "Name": "Web Searches",
  "Description": "Provide the web search ability",
  "Author": "qianlifeng",
-  "Version": "1.4.0",
+  "Version": "1.4.1",
  "Language": "csharp",
  "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
  "ExecuteFileName": "Flow.Launcher.Plugin.WebSearch.dll",
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/setting.json
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/setting.json
@ -7,6 +7,48 @@
      "Url": "https://www.google.com/search?q={q}",
      "Enabled": true
    },
+    {
+      "Title": "Youtube",
+      "ActionKeyword": "youtube",
+      "IconPath": "Images\\youtube.png",
+      "Url": "http://www.youtube.com/results?search_query={q}",
+      "Enabled": true
+    },
+    {
+      "Title": "Netflix",
+      "ActionKeyword": "netflix",
+      "IconPath": "Images\\netflix.png",
+      "Url": "https://www.netflix.com/search?q={q}",
+      "Enabled": true
+    },
+    {
+      "Title": "Google Translate",
+      "ActionKeyword": "translate",
+      "IconPath": "Images\\google_translate.png",
+      "Url": "http://translate.google.com/#auto|en|{q}",
+      "Enabled": true
+    },
+    {
+      "Title": "Gmail",
+      "ActionKeyword": "gmail",
+      "IconPath": "Images\\gmail.png",
+      "Url": "https://mail.google.com/mail/ca/u/0/#apps/{q}",
+      "Enabled": true
+    },
+    {
+      "Title": "Google Drive",
+      "ActionKeyword": "drive",
+      "IconPath": "Images\\google_drive.png",
+      "Url": "http://drive.google.com/?hl=en&tab=bo#search/{q}",
+      "Enabled": true
+    },
+    {
+      "Title": "Youtube Music",
+      "ActionKeyword": "ytmusic",
+      "IconPath": "Images\\youtubemusic.png",
+      "Url": "https://music.youtube.com/search?q={q}",
+      "Enabled": true
+    },
    {
      "Title": "Wikipedia",
      "ActionKeyword": "wiki",
@ -14,13 +56,6 @@
      "Url": "http://en.wikipedia.org/wiki/{q}",
      "Enabled": true
    },
-    {
-      "Title": "FindIcon",
-      "ActionKeyword": "findicon",
-      "IconPath": "Images\\pictures.png",
-      "Url": "http://findicons.com/search/{q}",
-      "Enabled": true
-    },
    {
      "Title": "Facebook",
      "ActionKeyword": "facebook",
@ -42,13 +77,6 @@
      "Url": "http://maps.google.com/maps?q={q}",
      "Enabled": true
    },
-    {
-      "Title": "Google Translate",
-      "ActionKeyword": "translate",
-      "IconPath": "Images\\google_translate.png",
-      "Url": "http://translate.google.com/#auto|en|{q}",
-      "Enabled": true
-    },
    {
      "Title": "Duckduckgo",
      "ActionKeyword": "duckduckgo",
@ -70,20 +98,6 @@
      "Url": "https://gist.github.com/search?q={q}",
      "Enabled": true
    },
-    {
-      "Title": "Gmail",
-      "ActionKeyword": "gmail",
-      "IconPath": "Images\\gmail.png",
-      "Url": "https://mail.google.com/mail/ca/u/0/#apps/{q}",
-      "Enabled": true
-    },
-    {
-      "Title": "Google Drive",
-      "ActionKeyword": "drive",
-      "IconPath": "Images\\google_drive.png",
-      "Url": "http://drive.google.com/?hl=en&tab=bo#search/{q}",
-      "Enabled": true
-    },
    {
      "Title": "Wolframalpha",
      "ActionKeyword": "wolframalpha",
@ -112,13 +126,6 @@
      "Url": "https://www.google.com/search?q={q}&tbm=isch",
      "Enabled": true
    },
-    {
-      "Title": "Youtube",
-      "ActionKeyword": "youtube",
-      "IconPath": "Images\\youtube.png",
-      "Url": "http://www.youtube.com/results?search_query={q}",
-      "Enabled": true
-    },
    {
      "Title": "Bing",
      "ActionKeyword": "bing",
--- a/appveyor.yml
+++ b/appveyor.yml
@ -78,6 +78,6 @@ on_success:
  - ps: |
        if ($env:APPVEYOR_REPO_BRANCH -eq "master" -and $env:APPVEYOR_REPO_TAG -eq "true")
        {
-            iwr https://aka.ms/wingetcreate/latest -OutFile wingetcreate.exe
+            iwr https://github.com/microsoft/winget-create/releases/download/v0.2.0.29-preview/wingetcreate.exe -OutFile wingetcreate.exe
            .\wingetcreate.exe update Flow-Launcher.Flow-Launcher -s true -u https://github.com/Flow-Launcher/Flow.Launcher/releases/download/v$env:flowVersion/Flow-Launcher-Setup.exe -v $env:flowVersion -t $env:winget_token
        }