diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 051891a2b9f..570e4c86e5c 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -68,7 +68,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>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index ac613864444..3a2d4f31149 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -645,6 +645,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 +1177,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 +1583,4 @@
             </Border>
         </TabItem>
     </TabControl>
-</Window>
\ No newline at end of file
+</Window>
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
         {