diff --git a/Plugins/Wox.Plugin.Program/AddProgramSource.xaml b/Plugins/Wox.Plugin.Program/AddProgramSource.xaml
new file mode 100644
index 0000000000..4819a2f18d
--- /dev/null
+++ b/Plugins/Wox.Plugin.Program/AddProgramSource.xaml
@@ -0,0 +1,27 @@
+<Window x:Class="Wox.Plugin.Program.AddProgramSource"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d" 
+                Width="400"
+                Height="180"
+        WindowStartupLocation="CenterScreen"
+             d:DesignHeight="400" d:DesignWidth="300">
+    <StackPanel Orientation="Vertical">
+        <StackPanel Orientation="Horizontal">
+            <Label Content="{DynamicResource wox_plugin_program_directory}"/>
+            <TextBox Name="Directory" VerticalAlignment="Center" Width="238" Margin="0,7" />
+            <Button Name="BrowseButton" Content="{DynamicResource wox_plugin_program_browse}" HorizontalAlignment="Left" VerticalAlignment="Center" Width="75" Click="BrowseButton_Click" />
+        </StackPanel>
+        <StackPanel Orientation="Horizontal">
+            <Label Content="{DynamicResource wox_plugin_program_file_suffixes}" />
+            <TextBox x:Name="Suffixes" VerticalAlignment="Center" Width="297" Margin="0,7" />
+        </StackPanel>
+        <StackPanel Orientation="Horizontal">
+            <Label Content="{DynamicResource wox_plugin_program_max_search_depth}" />
+            <TextBox Name="MaxDepth" Text="-1" VerticalAlignment="Center" Width="146" Margin="0,7" />
+        </StackPanel>
+        <Button VerticalAlignment="Center" HorizontalAlignment="Right" Margin="10" Height="20" Width="70"  Click="ButtonAdd_OnClick"  Content="{DynamicResource wox_plugin_program_update}"   />
+    </StackPanel>
+</Window>
diff --git a/Plugins/Wox.Plugin.Program/AddProgramSource.xaml.cs b/Plugins/Wox.Plugin.Program/AddProgramSource.xaml.cs
new file mode 100644
index 0000000000..c93df57d13
--- /dev/null
+++ b/Plugins/Wox.Plugin.Program/AddProgramSource.xaml.cs
@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Wox.Plugin.Program
+{
+    /// <summary>
+    /// Interaction logic for AddProgramSource.xaml
+    /// </summary>
+    public partial class AddProgramSource
+    {
+        private ProgramSource _editing;
+
+        public AddProgramSource()
+        {
+            InitializeComponent();
+        }
+
+        public AddProgramSource(ProgramSource edit) : this()
+        {
+            this._editing = edit;
+            this.Directory.Text = this._editing.Location;
+            this.MaxDepth.Text = this._editing.MaxDepth.ToString();
+            this.Suffixes.Text = this._editing.Suffixes;
+        }
+
+        private void BrowseButton_Click(object sender, RoutedEventArgs e)
+        {
+            var dialog = new System.Windows.Forms.FolderBrowserDialog();
+            System.Windows.Forms.DialogResult result = dialog.ShowDialog();
+            if (result == System.Windows.Forms.DialogResult.OK)
+            {
+                this.Directory.Text = dialog.SelectedPath;
+            }
+        }
+
+        private void ButtonAdd_OnClick(object sender, RoutedEventArgs e)
+        {
+            int max;
+            if(!int.TryParse(this.MaxDepth.Text, out max))
+            {
+                max = -1;
+            }
+
+            if(this._editing == null)
+            {
+                ProgramStorage.Instance.ProgramSources.Add(new ProgramSource()
+                {
+                    Location = this.Directory.Text,
+                    MaxDepth = max,
+                    Suffixes = this.Suffixes.Text,
+                    Type = "FileSystemProgramSource",
+                    Enabled = true
+                });
+            }
+            else
+            {
+                this._editing.Location = this.Directory.Text;
+                this._editing.MaxDepth = max;
+                this._editing.Suffixes = this.Suffixes.Text;
+            }
+
+            ProgramStorage.Instance.Save();
+            this.DialogResult = true;
+            this.Close();
+        }
+    }
+}
diff --git a/Plugins/Wox.Plugin.Program/Languages/en.xaml b/Plugins/Wox.Plugin.Program/Languages/en.xaml
index 84a3e064f4..07630a1cda 100644
--- a/Plugins/Wox.Plugin.Program/Languages/en.xaml
+++ b/Plugins/Wox.Plugin.Program/Languages/en.xaml
@@ -10,6 +10,15 @@
     <system:String x:Key="wox_plugin_program_suffixes">Index file suffixes</system:String>
     <system:String x:Key="wox_plugin_program_reindex">Reindex</system:String>
     <system:String x:Key="wox_plugin_program_indexing">Indexing</system:String>
+    <system:String x:Key="wox_plugin_program_index_start">Index Start Menu</system:String>
+    <system:String x:Key="wox_plugin_program_index_registry">Index Registry</system:String>
+    <system:String x:Key="wox_plugin_program_suffixes_header">Suffixes</system:String>
+    <system:String x:Key="wox_plugin_program_max_depth_header">Max Depth</system:String>
+
+    <system:String x:Key="wox_plugin_program_directory">Directory:</system:String>
+    <system:String x:Key="wox_plugin_program_browse">Browse</system:String>
+    <system:String x:Key="wox_plugin_program_file_suffixes">File Suffixes:</system:String>
+    <system:String x:Key="wox_plugin_program_max_search_depth">Maximum Search Depth (-1 is unlimited):</system:String>
 
     <system:String x:Key="wox_plugin_program_pls_select_program_source">Please select a program source</system:String>
     <system:String x:Key="wox_plugin_program_delete_program_source">Are your sure to delete {0}?</system:String>
diff --git a/Plugins/Wox.Plugin.Program/Languages/zh-cn.xaml b/Plugins/Wox.Plugin.Program/Languages/zh-cn.xaml
index 39e5f3b32a..ee397b26be 100644
--- a/Plugins/Wox.Plugin.Program/Languages/zh-cn.xaml
+++ b/Plugins/Wox.Plugin.Program/Languages/zh-cn.xaml
@@ -1,30 +1,38 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:system="clr-namespace:System;assembly=mscorlib">
-
-    <!--Program setting-->
-    <system:String x:Key="wox_plugin_program_delete">删除</system:String>
-    <system:String x:Key="wox_plugin_program_edit">编辑</system:String>
-    <system:String x:Key="wox_plugin_program_add">增加</system:String>
-    <system:String x:Key="wox_plugin_program_location">位置</system:String>
-    <system:String x:Key="wox_plugin_program_suffixes">索引文件后缀</system:String>
-    <system:String x:Key="wox_plugin_program_reindex">重新索引</system:String>
-    <system:String x:Key="wox_plugin_program_indexing">索引中</system:String>
-    
-
-    <system:String x:Key="wox_plugin_program_pls_select_program_source">请先选择一项</system:String>
-    <system:String x:Key="wox_plugin_program_delete_program_source">你确定要删除{0}吗？</system:String>
-
-    <system:String x:Key="wox_plugin_program_update">更新</system:String>
-    <system:String x:Key="wox_plugin_program_only_index_tip">Wox仅索引下列后缀的文件：</system:String>
-    <system:String x:Key="wox_plugin_program_split_by_tip">（每个后缀以英文状态下的分号分隔）</system:String>
-    <system:String x:Key="wox_plugin_program_update_file_suffixes">成功更新索引文件后缀</system:String>
-    <system:String x:Key="wox_plugin_program_suffixes_cannot_empty">文件后缀不能为空</system:String>
-
-    <system:String x:Key="wox_plugin_program_run_as_administrator">以管理员身份运行</system:String>
-    <system:String x:Key="wox_plugin_program_open_containing_folder">打开所属文件夹</system:String>
-
-    <system:String x:Key="wox_plugin_program_plugin_name">程序</system:String>
-    <system:String x:Key="wox_plugin_program_plugin_description">在Wox中搜索程序</system:String>
-
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib">
+
+    <!--Program setting-->
+    <system:String x:Key="wox_plugin_program_delete">删除</system:String>
+    <system:String x:Key="wox_plugin_program_edit">编辑</system:String>
+    <system:String x:Key="wox_plugin_program_add">增加</system:String>
+    <system:String x:Key="wox_plugin_program_location">位置</system:String>
+    <system:String x:Key="wox_plugin_program_suffixes">索引文件后缀</system:String>
+    <system:String x:Key="wox_plugin_program_reindex">重新索引</system:String>
+    <system:String x:Key="wox_plugin_program_indexing">索引中</system:String>
+    <system:String x:Key="wox_plugin_program_index_start">指数开始菜单</system:String>
+    <system:String x:Key="wox_plugin_program_index_registry">指数注册</system:String>
+    <system:String x:Key="wox_plugin_program_suffixes_header">后缀</system:String>
+    <system:String x:Key="wox_plugin_program_max_depth_header">最大深度</system:String>
+
+    <system:String x:Key="wox_plugin_program_directory">目录</system:String>
+    <system:String x:Key="wox_plugin_program_browse">浏览</system:String>
+    <system:String x:Key="wox_plugin_program_file_suffixes">文件后缀</system:String>
+    <system:String x:Key="wox_plugin_program_max_search_depth">最大搜索深度（-1是无限的）：</system:String>
+
+    <system:String x:Key="wox_plugin_program_pls_select_program_source">请先选择一项</system:String>
+    <system:String x:Key="wox_plugin_program_delete_program_source">你确定要删除{0}吗？</system:String>
+
+    <system:String x:Key="wox_plugin_program_update">更新</system:String>
+    <system:String x:Key="wox_plugin_program_only_index_tip">Wox仅索引下列后缀的文件：</system:String>
+    <system:String x:Key="wox_plugin_program_split_by_tip">（每个后缀以英文状态下的分号分隔）</system:String>
+    <system:String x:Key="wox_plugin_program_update_file_suffixes">成功更新索引文件后缀</system:String>
+    <system:String x:Key="wox_plugin_program_suffixes_cannot_empty">文件后缀不能为空</system:String>
+
+    <system:String x:Key="wox_plugin_program_run_as_administrator">以管理员身份运行</system:String>
+    <system:String x:Key="wox_plugin_program_open_containing_folder">打开所属文件夹</system:String>
+
+    <system:String x:Key="wox_plugin_program_plugin_name">程序</system:String>
+    <system:String x:Key="wox_plugin_program_plugin_description">在Wox中搜索程序</system:String>
+
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Plugins/Wox.Plugin.Program/Languages/zh-tw.xaml b/Plugins/Wox.Plugin.Program/Languages/zh-tw.xaml
index 93cf54cb9f..e520458d84 100644
--- a/Plugins/Wox.Plugin.Program/Languages/zh-tw.xaml
+++ b/Plugins/Wox.Plugin.Program/Languages/zh-tw.xaml
@@ -1,29 +1,37 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:system="clr-namespace:System;assembly=mscorlib">
-
-    <!--Program setting-->
-    <system:String x:Key="wox_plugin_program_delete">刪除</system:String>
-    <system:String x:Key="wox_plugin_program_edit">編輯</system:String>
-    <system:String x:Key="wox_plugin_program_add">增加</system:String>
-    <system:String x:Key="wox_plugin_program_location">位置</system:String>
-    <system:String x:Key="wox_plugin_program_suffixes">索引文件後綴</system:String>
-    <system:String x:Key="wox_plugin_program_reindex">重新索引</system:String>
-    <system:String x:Key="wox_plugin_program_indexing">索引中</system:String>
-
-
-    <system:String x:Key="wox_plugin_program_pls_select_program_source">請先選擇一項</system:String>
-    <system:String x:Key="wox_plugin_program_delete_program_source">你確定要刪除{0}嗎？</system:String>
-
-    <system:String x:Key="wox_plugin_program_update">更新</system:String>
-    <system:String x:Key="wox_plugin_program_only_index_tip">Wox僅索引下列後綴的文件：</system:String>
-    <system:String x:Key="wox_plugin_program_split_by_tip">（每個後綴以英文狀態下的分號分隔）</system:String>
-    <system:String x:Key="wox_plugin_program_update_file_suffixes">成功更新索引文件後綴</system:String>
-    <system:String x:Key="wox_plugin_program_suffixes_cannot_empty">文件後綴不能為空</system:String>
-    
-    <system:String x:Key="wox_plugin_program_run_as_administrator">以管理員身份運行</system:String>
-    <system:String x:Key="wox_plugin_program_open_containing_folder">打開所屬文件夾</system:String>
-
-    <system:String x:Key="wox_plugin_program_plugin_name">程序</system:String>
-    <system:String x:Key="wox_plugin_program_plugin_description">在Wox中搜索程序</system:String>
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib">
+
+    <!--Program setting-->
+    <system:String x:Key="wox_plugin_program_delete">刪除</system:String>
+    <system:String x:Key="wox_plugin_program_edit">編輯</system:String>
+    <system:String x:Key="wox_plugin_program_add">增加</system:String>
+    <system:String x:Key="wox_plugin_program_location">位置</system:String>
+    <system:String x:Key="wox_plugin_program_suffixes">索引文件後綴</system:String>
+    <system:String x:Key="wox_plugin_program_reindex">重新索引</system:String>
+    <system:String x:Key="wox_plugin_program_indexing">索引中</system:String>
+    <system:String x:Key="wox_plugin_program_index_start">指数开始菜单</system:String>
+    <system:String x:Key="wox_plugin_program_index_registry">指数注册</system:String>
+    <system:String x:Key="wox_plugin_program_suffixes_header">后缀</system:String>
+    <system:String x:Key="wox_plugin_program_max_depth_header">最大深度</system:String>
+
+    <system:String x:Key="wox_plugin_program_directory">目录</system:String>
+    <system:String x:Key="wox_plugin_program_browse">浏览</system:String>
+    <system:String x:Key="wox_plugin_program_file_suffixes">文件后缀</system:String>
+    <system:String x:Key="wox_plugin_program_max_search_depth">最大搜索深度（-1是无限的）：</system:String>
+
+    <system:String x:Key="wox_plugin_program_pls_select_program_source">請先選擇一項</system:String>
+    <system:String x:Key="wox_plugin_program_delete_program_source">你確定要刪除{0}嗎？</system:String>
+
+    <system:String x:Key="wox_plugin_program_update">更新</system:String>
+    <system:String x:Key="wox_plugin_program_only_index_tip">Wox僅索引下列後綴的文件：</system:String>
+    <system:String x:Key="wox_plugin_program_split_by_tip">（每個後綴以英文狀態下的分號分隔）</system:String>
+    <system:String x:Key="wox_plugin_program_update_file_suffixes">成功更新索引文件後綴</system:String>
+    <system:String x:Key="wox_plugin_program_suffixes_cannot_empty">文件後綴不能為空</system:String>
+    
+    <system:String x:Key="wox_plugin_program_run_as_administrator">以管理員身份運行</system:String>
+    <system:String x:Key="wox_plugin_program_open_containing_folder">打開所屬文件夾</system:String>
+
+    <system:String x:Key="wox_plugin_program_plugin_name">程序</system:String>
+    <system:String x:Key="wox_plugin_program_plugin_description">在Wox中搜索程序</system:String>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Plugins/Wox.Plugin.Program/ProgramSetting.xaml b/Plugins/Wox.Plugin.Program/ProgramSetting.xaml
index 18b6b9f843..af8616cab3 100644
--- a/Plugins/Wox.Plugin.Program/ProgramSetting.xaml
+++ b/Plugins/Wox.Plugin.Program/ProgramSetting.xaml
@@ -12,7 +12,11 @@
             <RowDefinition Height="*"/>
             <RowDefinition Height="50"/>
         </Grid.RowDefinitions>
-        <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Right">
+        <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Stretch">
+            <StackPanel Orientation="Vertical" Width="310">
+                <CheckBox Name="StartMenuEnabled" Click="StartMenuEnabled_Click" Margin="5" Content="{DynamicResource wox_plugin_program_index_start}"></CheckBox>
+                <CheckBox Name="RegistryEnabled" Click="RegistryEnabled_Click"  Margin="5" Content="{DynamicResource wox_plugin_program_index_registry}"></CheckBox>
+            </StackPanel>
             <Button Height="30" HorizontalAlignment="Right" x:Name="btnProgramSuffixes" Width="130" Click="BtnProgramSuffixes_OnClick" Content="{DynamicResource wox_plugin_program_suffixes}"></Button>
             <Button Height="30" HorizontalAlignment="Right" Margin="10 0 0 0" x:Name="btnReindex" Width="100" Click="btnReindex_Click" Content="{DynamicResource wox_plugin_program_reindex}"></Button>
         </StackPanel>
@@ -21,13 +25,27 @@
             Drop="programSourceView_Drop" >
             <ListView.View>
                 <GridView>
-                    <GridViewColumn Header="{DynamicResource wox_plugin_program_location}"  Width="400">
+                    <GridViewColumn Header="{DynamicResource wox_plugin_program_location}"  Width="250">
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
                                 <TextBlock Text="{Binding Location, ConverterParameter=(null), Converter={program:StringEmptyConverter}}"/>
                             </DataTemplate>
                         </GridViewColumn.CellTemplate>
                     </GridViewColumn>
+                    <GridViewColumn Header="{DynamicResource wox_plugin_program_suffixes_header}"  Width="220">
+                        <GridViewColumn.CellTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding Suffixes, ConverterParameter=(null), Converter={program:StringEmptyConverter}}"/>
+                            </DataTemplate>
+                        </GridViewColumn.CellTemplate>
+                    </GridViewColumn>
+                    <GridViewColumn Header="{DynamicResource wox_plugin_program_max_depth_header}"  Width="75">
+                        <GridViewColumn.CellTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding MaxDepth, ConverterParameter=(null)}"/>
+                            </DataTemplate>
+                        </GridViewColumn.CellTemplate>
+                    </GridViewColumn>
                 </GridView>
             </ListView.View>
         </ListView>
diff --git a/Plugins/Wox.Plugin.Program/ProgramSetting.xaml.cs b/Plugins/Wox.Plugin.Program/ProgramSetting.xaml.cs
index 3037997dfa..3d4b50a89b 100644
--- a/Plugins/Wox.Plugin.Program/ProgramSetting.xaml.cs
+++ b/Plugins/Wox.Plugin.Program/ProgramSetting.xaml.cs
@@ -22,6 +22,8 @@ namespace Wox.Plugin.Program
         private void Setting_Loaded(object sender, RoutedEventArgs e)
         {
             programSourceView.ItemsSource = ProgramStorage.Instance.ProgramSources;
+            StartMenuEnabled.IsChecked = ProgramStorage.Instance.EnableStartMenuSource;
+            RegistryEnabled.IsChecked = ProgramStorage.Instance.EnableRegistrySource;
         }
 
         private void ReIndexing()
@@ -37,19 +39,10 @@ namespace Wox.Plugin.Program
 
         private void btnAddProgramSource_OnClick(object sender, RoutedEventArgs e)
         {
-            var folderBrowserDialog = new System.Windows.Forms.FolderBrowserDialog();
-            if (folderBrowserDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+            var add = new AddProgramSource();
+            if(add.ShowDialog() ?? false)
             {
-                string path = folderBrowserDialog.SelectedPath;
-
-                ProgramStorage.Instance.ProgramSources.Add(new ProgramSource()
-                {
-                    Location = path,
-                    Type = "FileSystemProgramSource",
-                    Enabled = true
-                });
-                ProgramStorage.Instance.Save();
-                ReIndexing();
+                this.ReIndexing();
             }
         }
 
@@ -79,14 +72,10 @@ namespace Wox.Plugin.Program
             ProgramSource selectedProgramSource = programSourceView.SelectedItem as ProgramSource;
             if (selectedProgramSource != null)
             {
-                //todo: update
-                var folderBrowserDialog = new System.Windows.Forms.FolderBrowserDialog();
-                if (folderBrowserDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+                var add = new AddProgramSource(selectedProgramSource);
+                if (add.ShowDialog() ?? false)
                 {
-                    string path = folderBrowserDialog.SelectedPath;
-                    selectedProgramSource.Location = path;
-                    ProgramStorage.Instance.Save();
-                    ReIndexing();
+                    this.ReIndexing();
                 }
             }
             else
@@ -142,5 +131,19 @@ namespace Wox.Plugin.Program
                 }
             }
         }
+
+        private void StartMenuEnabled_Click(object sender, RoutedEventArgs e)
+        {
+            ProgramStorage.Instance.EnableStartMenuSource = StartMenuEnabled.IsChecked ?? false;
+            ProgramStorage.Instance.Save();
+            ReIndexing();
+        }
+
+        private void RegistryEnabled_Click(object sender, RoutedEventArgs e)
+        {
+            ProgramStorage.Instance.EnableRegistrySource = RegistryEnabled.IsChecked ?? false;
+            ProgramStorage.Instance.Save();
+            ReIndexing();
+        }
     }
 }
\ No newline at end of file
diff --git a/Plugins/Wox.Plugin.Program/ProgramSource.cs b/Plugins/Wox.Plugin.Program/ProgramSource.cs
index 99548b89e0..97a779d969 100644
--- a/Plugins/Wox.Plugin.Program/ProgramSource.cs
+++ b/Plugins/Wox.Plugin.Program/ProgramSource.cs
@@ -10,6 +10,8 @@ namespace Wox.Plugin.Program
         public string Type { get; set; }
         public int BonusPoints { get; set; }
         public bool Enabled { get; set; }
+        public string Suffixes { get; set; }
+        public int MaxDepth { get; set; }
         public Dictionary<string, string> Meta { get; set; }
 
         public override string ToString()
diff --git a/Plugins/Wox.Plugin.Program/ProgramSources/FileSystemProgramSource.cs b/Plugins/Wox.Plugin.Program/ProgramSources/FileSystemProgramSource.cs
index f4997615e8..b1ef2dcd4c 100644
--- a/Plugins/Wox.Plugin.Program/ProgramSources/FileSystemProgramSource.cs
+++ b/Plugins/Wox.Plugin.Program/ProgramSources/FileSystemProgramSource.cs
@@ -10,14 +10,21 @@ namespace Wox.Plugin.Program.ProgramSources
     public class FileSystemProgramSource : AbstractProgramSource
     {
         private string baseDirectory;
+        private int maxDepth;
+        private string suffixes;
 
-        public FileSystemProgramSource(string baseDirectory)
+        public FileSystemProgramSource(string baseDirectory, int maxDepth, string suffixes)
         {
             this.baseDirectory = baseDirectory;
+            this.maxDepth = maxDepth;
+            this.suffixes = suffixes;
         }
 
+        public FileSystemProgramSource(string baseDirectory)
+            : this(baseDirectory, -1, "") {}
+
         public FileSystemProgramSource(ProgramSource source)
-            : this(source.Location)
+            : this(source.Location, source.MaxDepth, source.Suffixes)
         {
             this.BonusPoints = source.BonusPoints;
         }
@@ -35,11 +42,21 @@ namespace Wox.Plugin.Program.ProgramSources
 
         private void GetAppFromDirectory(string path, List<Program> list)
         {
+            GetAppFromDirectory(path, list, 0);
+        }
+
+        private void GetAppFromDirectory(string path, List<Program> list, int depth)
+        {
+            if(maxDepth != -1 && depth > maxDepth)
+            {
+                return;
+            }
             try
             {
                 foreach (string file in Directory.GetFiles(path))
                 {
-                    if (ProgramStorage.Instance.ProgramSuffixes.Split(';').Any(o => file.EndsWith("." + o)))
+                    if (ProgramStorage.Instance.ProgramSuffixes.Split(';').Any(o => file.EndsWith("." + o)) ||
+                        suffixes.Split(';').Any(o => file.EndsWith("." + o)))
                     {
                         Program p = CreateEntry(file);
                         list.Add(p);
@@ -48,7 +65,7 @@ namespace Wox.Plugin.Program.ProgramSources
 
                 foreach (var subDirectory in Directory.GetDirectories(path))
                 {
-                    GetAppFromDirectory(subDirectory, list);
+                    GetAppFromDirectory(subDirectory, list, depth + 1);
                 }
             }
             catch (Exception e)
diff --git a/Plugins/Wox.Plugin.Program/ProgramStorage.cs b/Plugins/Wox.Plugin.Program/ProgramStorage.cs
index d6607c768c..a274237f87 100644
--- a/Plugins/Wox.Plugin.Program/ProgramStorage.cs
+++ b/Plugins/Wox.Plugin.Program/ProgramStorage.cs
@@ -6,6 +6,7 @@ using System.Reflection;
 using System.Text;
 using Newtonsoft.Json;
 using Wox.Infrastructure.Storage;
+using System.ComponentModel;
 
 namespace Wox.Plugin.Program
 {
@@ -17,6 +18,14 @@ namespace Wox.Plugin.Program
         [JsonProperty]
         public string ProgramSuffixes { get; set; }
 
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
+        [DefaultValue(true)]
+        public bool EnableStartMenuSource { get; set; }
+
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
+        [DefaultValue(true)]
+        public bool EnableRegistrySource { get; set; }
+
         protected override string ConfigFolder
         {
             get { return Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); }
@@ -25,6 +34,8 @@ namespace Wox.Plugin.Program
         protected override ProgramStorage LoadDefault()
         {
             ProgramSources = new List<ProgramSource>();
+            EnableStartMenuSource = true;
+            EnableRegistrySource = true;
             return this;
         }
 
diff --git a/Plugins/Wox.Plugin.Program/Programs.cs b/Plugins/Wox.Plugin.Program/Programs.cs
index fad46efa3f..d6a3a35183 100644
--- a/Plugins/Wox.Plugin.Program/Programs.cs
+++ b/Plugins/Wox.Plugin.Program/Programs.cs
@@ -28,6 +28,7 @@ namespace Wox.Plugin.Program
 
         public List<Result> Query(Query query)
         {
+            
             var fuzzyMather = FuzzyMatcher.Create(query.Search);
             List<Program> returnList = programs.Where(o => MatchProgram(o, fuzzyMather)).ToList();
             returnList.ForEach(ScoreFilter);
@@ -97,11 +98,11 @@ namespace Wox.Plugin.Program
                 if (ProgramStorage.Instance.ProgramSources != null &&
                     ProgramStorage.Instance.ProgramSources.Count(o => o.Enabled) > 0)
                 {
-                    programSources.AddRange(ProgramStorage.Instance.ProgramSources.Where(o => o.Enabled));
+                    programSources.AddRange(ProgramStorage.Instance.ProgramSources);
                 }
 
                 sources.Clear();
-                programSources.ForEach(source =>
+                foreach(var source in programSources.Where(o => o.Enabled))
                 {
                     Type sourceClass;
                     if (SourceTypes.TryGetValue(source.Type, out sourceClass))
@@ -114,7 +115,7 @@ namespace Wox.Plugin.Program
                             sources.Add(programSource);
                         }
                     }
-                });
+                }
 
                 var tempPrograms = new List<Program>();
                 foreach (var source in sources)
@@ -145,19 +146,19 @@ namespace Wox.Plugin.Program
             list.Add(new ProgramSource()
             {
                 BonusPoints = 0,
-                Enabled = true,
+                Enabled = ProgramStorage.Instance.EnableStartMenuSource,
                 Type = "CommonStartMenuProgramSource"
             });
             list.Add(new ProgramSource()
             {
                 BonusPoints = 0,
-                Enabled = true,
+                Enabled = ProgramStorage.Instance.EnableStartMenuSource,
                 Type = "UserStartMenuProgramSource"
             });
             list.Add(new ProgramSource()
             {
                 BonusPoints = -10,
-                Enabled = true,
+                Enabled = ProgramStorage.Instance.EnableRegistrySource,
                 Type = "AppPathsProgramSource"
             });
             return list;
diff --git a/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj b/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj
index 0f357736f1..70e612ac2a 100644
--- a/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj
+++ b/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj
@@ -1,153 +1,156 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{FDB3555B-58EF-4AE6-B5F1-904719637AB4}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Wox.Plugin.Program</RootNamespace>
-    <AssemblyName>Wox.Plugin.Program</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\Output\Debug\Plugins\Wox.Plugin.Program\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\Output\Release\Plugins\Wox.Plugin.Program\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net35\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="FileChangeWatcher.cs" />
-    <Compile Include="IProgramSource.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="ProgramCacheStorage.cs" />
-    <Compile Include="Programs.cs" />
-    <Compile Include="ProgramSetting.xaml.cs">
-      <DependentUpon>ProgramSetting.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="ProgramSource.cs" />
-    <Compile Include="ProgramSources\AppPathsProgramSource.cs" />
-    <Compile Include="ProgramSources\CommonStartMenuProgramSource.cs" />
-    <Compile Include="ProgramSources\FileSystemProgramSource.cs" />
-    <Compile Include="ProgramSources\UserStartMenuProgramSource.cs" />
-    <Compile Include="ProgramStorage.cs" />
-    <Compile Include="ProgramSuffixes.xaml.cs">
-      <DependentUpon>ProgramSuffixes.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="StringEmptyConverter.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="plugin.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Images\program.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Images\cmd.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Images\folder.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <Content Include="Languages\en.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Languages\zh-cn.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Languages\zh-tw.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <Page Include="ProgramSetting.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="ProgramSuffixes.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Wox.Infrastructure\Wox.Infrastructure.csproj">
-      <Project>{4fd29318-a8ab-4d8f-aa47-60bc241b8da3}</Project>
-      <Name>Wox.Infrastructure</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Wox.Plugin\Wox.Plugin.csproj">
-      <Project>{8451ecdd-2ea4-4966-bb0a-7bbc40138e80}</Project>
-      <Name>Wox.Plugin</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <COMReference Include="IWshRuntimeLibrary">
-      <Guid>{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>tlbimp</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。启用“NuGet 程序包还原”可下载这些程序包。有关详细信息，请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{FDB3555B-58EF-4AE6-B5F1-904719637AB4}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Wox.Plugin.Program</RootNamespace>
+    <AssemblyName>Wox.Plugin.Program</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\Output\Debug\Plugins\Wox.Plugin.Program\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\Output\Release\Plugins\Wox.Plugin.Program\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net35\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="AddProgramSource.xaml" />
+    <Compile Include="AddProgramSource.xaml.cs">
+      <DependentUpon>AddProgramSource.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="FileChangeWatcher.cs" />
+    <Compile Include="IProgramSource.cs" />
+    <Compile Include="Program.cs" />
+    <Compile Include="ProgramCacheStorage.cs" />
+    <Compile Include="Programs.cs" />
+    <Compile Include="ProgramSetting.xaml.cs">
+      <DependentUpon>ProgramSetting.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ProgramSource.cs" />
+    <Compile Include="ProgramSources\AppPathsProgramSource.cs" />
+    <Compile Include="ProgramSources\CommonStartMenuProgramSource.cs" />
+    <Compile Include="ProgramSources\FileSystemProgramSource.cs" />
+    <Compile Include="ProgramSources\UserStartMenuProgramSource.cs" />
+    <Compile Include="ProgramStorage.cs" />
+    <Compile Include="ProgramSuffixes.xaml.cs">
+      <DependentUpon>ProgramSuffixes.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="StringEmptyConverter.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+    <None Include="plugin.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Images\program.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Images\cmd.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Images\folder.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <Content Include="Languages\en.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Languages\zh-cn.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Languages\zh-tw.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <Page Include="ProgramSetting.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="ProgramSuffixes.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Wox.Infrastructure\Wox.Infrastructure.csproj">
+      <Project>{4fd29318-a8ab-4d8f-aa47-60bc241b8da3}</Project>
+      <Name>Wox.Infrastructure</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Wox.Plugin\Wox.Plugin.csproj">
+      <Project>{8451ecdd-2ea4-4966-bb0a-7bbc40138e80}</Project>
+      <Name>Wox.Plugin</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <COMReference Include="IWshRuntimeLibrary">
+      <Guid>{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}</Guid>
+      <VersionMajor>1</VersionMajor>
+      <VersionMinor>0</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>tlbimp</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。启用“NuGet 程序包还原”可下载这些程序包。有关详细信息，请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  -->
 </Project>
\ No newline at end of file