diff --git a/Flow.Launcher/ActionKeywords.xaml b/Flow.Launcher/ActionKeywords.xaml
index 9d032efd9cb..32892768d04 100644
--- 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>
\ No newline at end of file
diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml b/Flow.Launcher/CustomQueryHotkeySetting.xaml
index a97f9073316..23bd8990658 100644
--- 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"
-                    Content="{DynamicResource preview}" />
-        </StackPanel>
+                    <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" 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 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>
+            </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>
diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs b/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
index b18bbcfadc1..0109474e12d 100644
--- a/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
+++ b/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
@@ -7,6 +7,7 @@
 using System.Linq;
 using System.Windows;
 using System.Windows.Input;
+using System.Windows.Controls;
 
 namespace Flow.Launcher
 {
@@ -99,5 +100,15 @@ private void cmdEsc_OnPress(object sender, ExecutedRoutedEventArgs e)
         {
             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);
+            }
+        }
     }
 }
diff --git a/Flow.Launcher/HotkeyControl.xaml b/Flow.Launcher/HotkeyControl.xaml
index ab786fd5657..285a282ef32 100644
--- 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>
\ No newline at end of file
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 051891a2b9f..d1dcf14d304 100644
--- 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>
@@ -145,10 +147,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>
diff --git a/Flow.Launcher/PriorityChangeWindow.xaml b/Flow.Launcher/PriorityChangeWindow.xaml
index 60a289e61ea..fbf4394f7c1 100644
--- 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>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index ac613864444..88a9172b0fb 100644
--- 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}">
@@ -645,6 +646,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}"
@@ -1176,7 +1178,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>
@@ -1582,4 +1584,4 @@
             </Border>
         </TabItem>
     </TabControl>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 0431c9c7848..203248ad658 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -281,5 +281,15 @@ private void OnExternalPluginInstallClick(object sender, RoutedEventArgs e)
                 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);
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index dde540b0c78..bfaddb701d6 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -272,7 +272,7 @@ public async Task RefreshExternalPluginsAsync()
 
         #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
         {
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/Images/netflix.png b/Plugins/Flow.Launcher.Plugin.WebSearch/Images/netflix.png
new file mode 100644
index 00000000000..9d702bcae87
Binary files /dev/null and b/Plugins/Flow.Launcher.Plugin.WebSearch/Images/netflix.png differ
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/Images/youtubemusic.png b/Plugins/Flow.Launcher.Plugin.WebSearch/Images/youtubemusic.png
new file mode 100644
index 00000000000..682c005d232
Binary files /dev/null and b/Plugins/Flow.Launcher.Plugin.WebSearch/Images/youtubemusic.png differ
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/en.xaml
index cc137c3dca2..632b6d3a3a6 100644
--- 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>
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceSetting.xaml b/Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceSetting.xaml
index 02809be3ad9..fbf12a6b557 100644
--- 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>
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
index efdd9ec9b0f..68f5adc3bba 100644
--- 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 Title}"/>
+                            </DataTemplate>
+                        </GridViewColumn.CellTemplate>
+                    </GridViewColumn>
+                    <GridViewColumn Header="{DynamicResource flowlauncher_plugin_websearch_enable}"
+                                    DisplayMemberBinding="{Binding Enabled}"
+                                    Width="80">
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
-                                <TextBlock Text="{Binding Url}"/>
+                                <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>
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/plugin.json b/Plugins/Flow.Launcher.Plugin.WebSearch/plugin.json
index 679f976d316..f83b1e40bbe 100644
--- 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",
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/setting.json b/Plugins/Flow.Launcher.Plugin.WebSearch/setting.json
index ef9c63d679a..c8f52165337 100644
--- 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",