diff --git a/AddIns/ICSharpCode.SharpDevelop.addin b/AddIns/ICSharpCode.SharpDevelop.addin
index 470f37d11d..f5887be362 100644
--- a/AddIns/ICSharpCode.SharpDevelop.addin
+++ b/AddIns/ICSharpCode.SharpDevelop.addin
@@ -51,6 +51,247 @@
 		</Import>
 	</Runtime>
 	
+	<Path name="/SharpDevelop/CommandManager/InputBindingCategories">
+		<InputBindingCategory id="Test" text="Test">
+			<InputBindingCategory id="Test" text="Test" />
+		</InputBindingCategory>
+		
+		<InputBindingCategory id="ProjectViewer" text="Project viewer" />
+		<InputBindingCategory id="Project" text="Project" />
+		<InputBindingCategory id="Debugger" text="Debugger" />
+		<InputBindingCategory id="Search" text="Search" />
+		
+		<InputBindingCategory id="MainMenu" text="Main menu" />
+		<InputBindingCategory id="ContextMenus" text="Context Menus">
+			<InputBindingCategory id="TextEditor" text="Text Editor">
+				<InputBindingCategory id="Tabs" text="Tabs" />
+				<InputBindingCategory id="Refactoring" text="Refactoring" />
+			</InputBindingCategory>
+		</InputBindingCategory>
+		
+		<InputBindingCategory id="Building" text="Building">
+			<InputBindingCategory id="Building" text="Building" />
+		</InputBindingCategory>
+	</Path>
+	
+	<Path name="/SharpDevelop/CommandManager/MenuLocations">
+		<MenuLocation menupath="/SharpDevelop/Workbench/MainMenu" categorypaths="/MainMenu" />
+	
+		<MenuLocation menupath="/SharpDevelop/ViewContent/AvalonEdit/ContextMenu" categorypaths="/ContextMenus/TextEditor" />
+		<MenuLocation menupath="/SharpDevelop/ViewContent/TextEditor/ContextMenu" categorypaths="/ContextMenus/TextEditor" />
+		<MenuLocation menupath="/SharpDevelop/ViewContent/DefaultTextEditor/ClassMemberContextMenu" categorypaths="/ContextMenus/TextEditor" />
+		<MenuLocation menupath="/SharpDevelop/ViewContent/DefaultTextEditor/ClassBookmarkContextMenu" categorypaths="/ContextMenus/TextEditor" />
+		
+		<MenuLocation menupath="/SharpDevelop/Workbench/OpenFileTab/ContextMenu" categorypaths="/ContextMenus/TextEditor/Tabs" />
+		
+		<MenuLocation menupath="/SharpDevelop/ViewContent/DefaultTextEditor/Refactoring/Common" categorypaths="/ContextMenus/TextEditor/Refactoring" />
+		<MenuLocation menupath="/SharpDevelop/ViewContent/DefaultTextEditor/Refactoring/Parameter" categorypaths="/ContextMenus/TextEditor/Refactoring" />
+		<MenuLocation menupath="/SharpDevelop/ViewContent/DefaultTextEditor/Refactoring/LocalVariable" categorypaths="/ContextMenus/TextEditor/Refactoring" />
+		<MenuLocation menupath="/SharpDevelop/ViewContent/DefaultTextEditor/Refactoring/ParameterDefinition" categorypaths="/ContextMenus/TextEditor/Refactoring" />
+		<MenuLocation menupath="/SharpDevelop/ViewContent/DefaultTextEditor/Refactoring/LocalVariableDefinition" categorypaths="/ContextMenus/TextEditor/Refactoring" />
+	</Path>
+	
+	
+	<Path name="/SharpDevelop/CommandManager/RoutedUICommands">
+		<RoutedUICommand name="SDTestCommands.Test" text="Create new file" />
+		
+		<RoutedUICommand name="SDBuildCommands.BuildSolution" text="${res:XML.MainMenu.BuildMenu.BuildSolution}" />
+		<RoutedUICommand name="SDBuildCommands.RebuildSolution" text="${res:XML.MainMenu.BuildMenu.RebuildSolution}" />
+		<RoutedUICommand name="SDBuildCommands.CleanSolution" text="${res:XML.MainMenu.BuildMenu.CleanSolution}" />
+		<RoutedUICommand name="SDBuildCommands.BuildProject" text="${res:XML.MainMenu.BuildMenu.BuildProject}" />
+		<RoutedUICommand name="SDBuildCommands.RebuildProject" text="${res:XML.MainMenu.BuildMenu.RebuildProject}" />
+		<RoutedUICommand name="SDBuildCommands.CleanProject" text="${res:XML.MainMenu.BuildMenu.CleanProject}" />
+		<RoutedUICommand name="SDBuildCommands.AbortBuild" text="${res:XML.MainMenu.BuildMenu.AbortBuild}" />
+		<RoutedUICommand name="SDBuildCommands.EditConfigurationsCommand" text="${res:XML.MainMenu.BuildMenu.EditConfigurationsPlatforms}" />
+	
+		<RoutedUICommand name="SDProjectCommands.AddNewProjectToSolution" text="${res:ProjectComponent.ContextMenu.NewProject}" />
+		<RoutedUICommand name="SDProjectCommands.AddExitingProjectToSolution" text="${res:ProjectComponent.ContextMenu.ExistingProject}" />
+		<RoutedUICommand name="SDProjectCommands.AddExistingItemToSolution" text="${res:ProjectComponent.ContextMenu.AddItem}" />
+		<RoutedUICommand name="SDProjectCommands.AddNewSolutionFolderToSolution" text="${res:ProjectComponent.ContextMenu.NewSolutionFolder}" />
+
+		<RoutedUICommand name="SDProjectCommands.ShowSelectedProjectBrowserNodeProperties" text="${res:MainWindow.Windows.PropertiesScoutLabel}" />
+		<RoutedUICommand name="SDProjectCommands.ShowHiddenFilesInProjectBrowser" text="${res:Gui.ProjectBrowser.ShowAllFiles}" />
+		<RoutedUICommand name="SDProjectCommands.RefreshProjectBrowser" text="${res:AddIns.HtmlHelp2.Refresh}" />
+		
+		<RoutedUICommand name="SDDebugCommands.Execute" text="${res:XML.MainMenu.RunMenu.Run}" />
+		<RoutedUICommand name="SDDebugCommands.ExecuteWithoutDebugger" text="${res:XML.MainMenu.DebugMenu.RunWithoutDebug}" />
+		<RoutedUICommand name="SDDebugCommands.StopDebugging" text="${res:XML.MainMenu.DebugMenu.Stop}" />
+		<RoutedUICommand name="SDDebugCommands.AttachToProcess" text="${res:XML.MainMenu.DebugMenu.Attach}" />
+		<RoutedUICommand name="SDDebugCommands.DetachFromProcess" text="${res:XML.MainMenu.DebugMenu.Detach}" />
+		<RoutedUICommand name="SDDebugCommands.BreakDebugging" text="${res:XML.MainMenu.DebugMenu.Break}" />
+		<RoutedUICommand name="SDDebugCommands.ContinueDebugging" text="${res:XML.MainMenu.DebugMenu.Continue}" />
+		<RoutedUICommand name="SDDebugCommands.StepOver" text="${res:XML.MainMenu.DebugMenu.StepOver}" />
+		<RoutedUICommand name="SDDebugCommands.StepInto" text="${res:XML.MainMenu.DebugMenu.StepInto}" />
+		<RoutedUICommand name="SDDebugCommands.StepOut" text="${res:XML.MainMenu.DebugMenu.StepOut}" />
+		<RoutedUICommand name="SDDebugCommands.ToggleBreakpoint" text="${res:XML.MainMenu.DebugMenu.ToggleBreakpoint}" />
+
+		<RoutedUICommand name="SDSearchCommands.ToggleBookmark" text="${res:XML.MainMenu.SearchMenu.ToggleBookmark}" />
+		<RoutedUICommand name="SDSearchCommands.PrevBookmark" text="${res:XML.MainMenu.SearchMenu.PrevBookmark}" />
+		<RoutedUICommand name="SDSearchCommands.NextBookmark" text="${res:XML.MainMenu.SearchMenu.NextBookmark}" />
+		<RoutedUICommand name="SDSearchCommands.ClearBookmarks" text="${res:XML.MainMenu.SearchMenu.ClearBookmarks}" />
+		<RoutedUICommand name="SDSearchCommands.GotoLineNumber" text="${res:XML.MainMenu.SearchMenu.GotoLineNr}" />
+		<RoutedUICommand name="SDSearchCommands.GotoBrace" text="${res:XML.MainMenu.SearchMenu.GotoBrace}" />
+
+		<RoutedUICommand name="SDWindowCommands.SplitView" text="Split view" />
+	</Path>
+	
+	
+	<Path name="/SharpDevelop/CommandManager/CommandBindings">
+		<CommandBindingInfo 
+			command="SDTestCommands.Test" 
+			class="ICSharpCode.SharpDevelop.Commands.TestCommand" 
+			gestures="Ctrl+M" 
+			categories="/Test" />
+		
+		
+		<CommandBindingInfo
+			command = "SDProjectCommands.ShowSelectedProjectBrowserNodeProperties"
+			class = "ICSharpCode.SharpDevelop.Project.Commands.ShowPropertiesForNode"
+			categories="/ProjectViewer" />
+		
+		<CommandBindingInfo
+			command="SDBuildCommands.BuildSolution" 
+			class="ICSharpCode.SharpDevelop.Project.Commands.Build" 
+			gestures="F8" 
+			categories="/Building"
+		/>
+		<CommandBindingInfo
+			command="SDBuildCommands.RebuildSolution" 
+			class="ICSharpCode.SharpDevelop.Project.Commands.Rebuild" 
+			gestures="Alt+F8" 
+			categories="/Building"
+		/>
+		<CommandBindingInfo 
+			command="SDBuildCommands.CleanSolution" 
+			class="ICSharpCode.SharpDevelop.Project.Commands.Clean" 
+			categories="/Building" />
+		<CommandBindingInfo
+			command="SDBuildCommands.BuildProject" 
+			class="ICSharpCode.SharpDevelop.Project.Commands.BuildProject" 
+			gestures="F9" 
+			categories="/Building" />
+		<CommandBindingInfo 
+			command="SDBuildCommands.RebuildProject" 
+			class="ICSharpCode.SharpDevelop.Project.Commands.RebuildProject" 
+			gestures="Alt+F9" 
+			categories="/Building" />
+		<CommandBindingInfo
+			command="SDBuildCommands.CleanProject" 
+			class="ICSharpCode.SharpDevelop.Project.Commands.CleanProject" 
+			categories="/Buildin" />
+		<CommandBindingInfo
+			command="SDBuildCommands.AbortBuild" 
+			class="ICSharpCode.SharpDevelop.Project.Commands.AbortBuild" 
+			categories="/Buildin" />
+		<CommandBindingInfo
+			command="SDBuildCommands.EditConfigurationsCommand" 
+			class="ICSharpCode.SharpDevelop.Project.Commands.EditConfigurationsCommand" 
+			categories="/Buildin" />
+		
+		
+		<CommandBindingInfo
+			command="SDProjectCommands.AddNewProjectToSolution" 
+			class="ICSharpCode.SharpDevelop.Project.Commands.AddNewProjectToSolution" 
+			categories="/Project" />
+		<CommandBindingInfo
+			command="SDProjectCommands.AddExitingProjectToSolution" 
+			class="ICSharpCode.SharpDevelop.Project.Commands.AddExitingProjectToSolution" 
+			categories="/Project" />
+		<CommandBindingInfo
+			command="SDProjectCommands.AddExistingItemToSolution" 
+			class="ICSharpCode.SharpDevelop.Project.Commands.AddExistingItemToSolution" 
+			categories="/Project" />
+		<CommandBindingInfo
+			command="SDProjectCommands.AddNewSolutionFolderToSolution" 
+			class="ICSharpCode.SharpDevelop.Project.Commands.AddNewSolutionFolderToSolution" 
+			categories="/Project" />
+		
+		
+		<CommandBindingInfo
+			command="SDDebugCommands.Execute" 
+			class="ICSharpCode.SharpDevelop.Project.Commands.Execute" 
+			gestures="F5" 
+			categories="/Debugger" />
+		<CommandBindingInfo
+			command="SDDebugCommands.ExecuteWithoutDebugger" 
+			class="ICSharpCode.SharpDevelop.Project.Commands.ExecuteWithoutDebugger" 
+			gestures="Ctrl+F5" 
+			categories="/Debugger" />
+		<CommandBindingInfo
+			command="SDDebugCommands.StopDebugging" 
+			class="ICSharpCode.SharpDevelop.Project.Commands.StopDebuggingCommand" 
+			categories="/Debugger" />
+		<CommandBindingInfo
+			command="SDDebugCommands.AttachToProcess" 
+			class="ICSharpCode.SharpDevelop.Project.Commands.AttachToProcessCommand" 
+			categories="/Project" />
+		<CommandBindingInfo
+			command="SDDebugCommands.DetachFromProcess" 
+			class="ICSharpCode.SharpDevelop.Project.Commands.DetachFromProcessCommand" 
+			categories="/Debugger" />
+		<CommandBindingInfo
+			command="SDDebugCommands.BreakDebugging" 
+			class="ICSharpCode.SharpDevelop.Project.Commands.BreakDebuggingCommand" 
+			gestures="Ctrl+Alt+B" 
+			categories="/Debugger" />
+		<CommandBindingInfo
+			command="SDDebugCommands.ContinueDebugging" 
+			class="ICSharpCode.SharpDevelop.Project.Commands.ContinueDebuggingCommand" 
+			gestures="Ctrl+Alt+B; Ctrl+Alt+D"
+			categories="/Debugger" />
+		<CommandBindingInfo
+			command="SDDebugCommands.StepOver" 
+			class="ICSharpCode.SharpDevelop.Project.Commands.StepDebuggingCommand" 
+			gestures="F10" 
+			categories="/Debugger" />
+		<CommandBindingInfo
+			command="SDDebugCommands.StepInto" 
+			class="ICSharpCode.SharpDevelop.Project.Commands.StepIntoDebuggingCommand" 
+			gestures="F11" 
+			categories="/Debugger" />
+		<CommandBindingInfo
+			command="SDDebugCommands.StepOut" 
+			class="ICSharpCode.SharpDevelop.Project.Commands.StepOutDebuggingCommand" 
+			gestures="Shift+F11" 
+			categories="/Debugger" />
+		<CommandBindingInfo
+			command="SDDebugCommands.ToggleBreakpoint" 
+			class="ICSharpCode.SharpDevelop.Project.Commands.ToggleBreakpointCommand" 
+			gestures="F7" 
+			categories="/Debugger" />
+		
+		
+		<CommandBindingInfo
+			command="SDSearchCommands.ToggleBookmark" 
+			class="ICSharpCode.SharpDevelop.Bookmarks.ToggleBookmark" 
+			gestures="Ctrl+F2" 
+			categories="/Search" />
+		<CommandBindingInfo
+			command="SDSearchCommands.PrevBookmark" 
+			class="ICSharpCode.SharpDevelop.Bookmarks.PrevBookmark" 
+			gestures="Alt+F2" 
+			categories="/Search" />
+		<CommandBindingInfo
+			command="SDSearchCommands.NextBookmark" 
+			class="ICSharpCode.SharpDevelop.Bookmarks.NextBookmark" 
+			gestures="F2" 
+			categories="/Search" />
+		<CommandBindingInfo
+			command="SDSearchCommands.ClearBookmarks" 
+			class="ICSharpCode.SharpDevelop.Bookmarks.ClearBookmarks" 
+			categories="/Search" />
+		<CommandBindingInfo
+			command="SDSearchCommands.GotoLineNumber" 
+			class="ICSharpCode.SharpDevelop.DefaultEditor.Commands.GotoLineNumber" 
+			gestures="Ctrl+G" 
+			categories="/Search" />
+		<CommandBindingInfo
+			command="SDSearchCommands.GotoBrace" 
+			class="ICSharpCode.SharpDevelop.DefaultEditor.Commands.GotoMatchingBrace" 
+			gestures="Ctrl+B" 
+			categories="/Search" />
+	</Path>
+	
 	<Path name = "/SharpDevelop/Workbench/Ambiences">
 		<Class id    = ".NET"
 		       class = "ICSharpCode.SharpDevelop.NetAmbience"/>
@@ -73,7 +314,7 @@
 		     category = "Main"
 		     title    = "${res:MainWindow.Windows.ProjectScoutLabel}"
 		     icon     = "PadIcons.ProjectBrowser"
-		     shortcut = "Control|Alt|L"
+		     shortcut = "Ctrl+Alt+L"
 		     class    = "ICSharpCode.SharpDevelop.Project.ProjectBrowserPad"
 		     defaultPosition = "Left" />
 		
@@ -81,7 +322,7 @@
 		     category = "Main"
 		     title    = "${res:MainWindow.Windows.ClassScoutLabel}"
 		     icon     = "PadIcons.ClassBrowser"
-		     shortcut = "Control|Shift|C"
+		     shortcut = "Ctrl+Shift+C"
 		     class    = "ICSharpCode.SharpDevelop.Gui.ClassBrowser.ClassBrowserPad"
 		     defaultPosition = "Right" />
 		
@@ -89,7 +330,7 @@
 		     category = "Main"
 		     title    = "${res:MainWindow.Windows.ToolbarLabel}"
 		     icon     = "PadIcons.Toolbar"
-		     shortcut = "Control|Alt|X"
+		     shortcut = "Ctrl+Alt+X"
 		     class    = "ICSharpCode.SharpDevelop.Gui.ToolsPad"
 		     defaultPosition = "Left" />
 		
@@ -103,7 +344,7 @@
 		<Pad id       = "ErrorList"
 		     category = "Main"
 		     title    = "${res:MainWindow.Windows.ErrorList}"
-		     shortcut = "Control|Alt|K"
+		     shortcut = "Ctrl+Alt+K"
 		     icon     = "PadIcons.ErrorList"
 		     class    = "ICSharpCode.SharpDevelop.Gui.ErrorListPad"
 		     defaultPosition = "Bottom" />
@@ -119,7 +360,7 @@
 		     category = "Main"
 		     title    = "${res:MainWindow.Windows.OutputWindow}"
 		     icon     = "PadIcons.Output"
-		     shortcut = "Control|Alt|O"
+		     shortcut = "Ctrl+Alt+O"
 		     class    = "ICSharpCode.SharpDevelop.Gui.CompilerMessageView"
 		     defaultPosition = "Bottom" />
 		
@@ -135,7 +376,7 @@
 		     category = "Tools"
 		     title    = "${res:MainWindow.Windows.FileScoutLabel}"
 		     icon     = "PadIcons.FileBrowser"
-		     shortcut = "Control|Alt|F"
+		     shortcut = "Ctrl+Alt+F"
 		     class    = "ICSharpCode.SharpDevelop.Gui.FileScout"
 		     defaultPosition = "Left, Hidden" />
 		
@@ -178,17 +419,20 @@
 			<ToolbarItem id      = "Properties"
 			             icon    = "Icons.16x16.PropertiesIcon"
 			             tooltip = "${res:MainWindow.Windows.PropertiesScoutLabel}"
-			             class   = "ICSharpCode.SharpDevelop.Project.Commands.ShowPropertiesForNode"/>
+			             class   = "ICSharpCode.SharpDevelop.Project.Commands.ShowPropertiesForNode"
+			             command = "SDProjectCommands.ShowSelectedProjectBrowserNodeProperties" />
 			<ToolbarItem id = "PropertySeparator" type = "Separator"/>
 			<ToolbarItem id      = "ShowAll"
 			             type    = "CheckBox"
 			             icon    = "ProjectBrowser.Toolbar.ShowHiddenFiles"
 			             tooltip = "${res:Gui.ProjectBrowser.ShowAllFiles}"
-			             class   = "ICSharpCode.SharpDevelop.Project.Commands.ToggleShowAll"/>
+			             class   = "ICSharpCode.SharpDevelop.Project.Commands.ToggleShowAll"
+			             command = "SDProjectCommands.ShowHiddenFilesInProjectBrowser" />
 			<ToolbarItem id      = "Refresh"
 			             icon    = "ProjectBrowser.Toolbar.Refresh"
 			             tooltip = "${res:AddIns.HtmlHelp2.Refresh}"
-			             class   = "ICSharpCode.SharpDevelop.Project.Commands.RefreshProjectBrowser"/>
+			             class   = "ICSharpCode.SharpDevelop.Project.Commands.RefreshProjectBrowser"
+			             command = "SDProjectCommands.RefreshProjectBrowser" />
 		</Condition>
 	</Path>
 	
@@ -202,35 +446,43 @@
 	<Path path = "/SharpDevelop/Pads/ProjectBrowser/ContextMenu/SolutionNode">
 		<MenuItem id = "Build"
 		          label = "${res:XML.MainMenu.BuildMenu.BuildSolution}"
-		          shortcut = "F8"
+		          shortcut = "Ctrl+B,B"
 		          icon  = "Icons.16x16.BuildCombine"
-		          class = "ICSharpCode.SharpDevelop.Project.Commands.Build"/>
+		          class = "ICSharpCode.SharpDevelop.Project.Commands.Build"
+		          command = "SDBuildCommands.Build" />
 		<MenuItem id = "Rebuild"
 		          label = "${res:XML.MainMenu.BuildMenu.RebuildSolution}"
-		          shortcut = "Alt|F8"
-		          class = "ICSharpCode.SharpDevelop.Project.Commands.Rebuild"/>
+		          shortcut = "Alt+F8"
+		          class = "ICSharpCode.SharpDevelop.Project.Commands.Rebuild"
+		          command = "SDBuildCommands.Rebuild" />
 		<MenuItem id = "Clean"
 		          label = "${res:XML.MainMenu.BuildMenu.CleanSolution}"
-		          class = "ICSharpCode.SharpDevelop.Project.Commands.Clean"/>
+		          class = "ICSharpCode.SharpDevelop.Project.Commands.Clean"
+		          command = "SDBuildCommands.Clean" />
 		<MenuItem id = "CombineBuildGroupSeparator" type = "Separator"/>
 		
+		
 		<Condition name="WriteableSolution" action="Disable">
 			<MenuItem id = "CombineAddMenu" label = "${res:ProjectComponent.ContextMenu.AddMenu}" type = "Menu">
 				<MenuItem id    = "AddNewProjectToSolution"
 				          label = "${res:ProjectComponent.ContextMenu.NewProject}"
 				          icon  = "Icons.16x16.NewProjectIcon"
-				          class = "ICSharpCode.SharpDevelop.Project.Commands.AddNewProjectToSolution"/>
+				          class = "ICSharpCode.SharpDevelop.Project.Commands.AddNewProjectToSolution"
+				          command = "SDProjectCommands.AddNewProjectToSolution" />
 				<MenuItem id    = "AddExitingProjectToSolution"
 				          label = "${res:ProjectComponent.ContextMenu.ExistingProject}"
-				          class = "ICSharpCode.SharpDevelop.Project.Commands.AddExitingProjectToSolution"/>
+				          class = "ICSharpCode.SharpDevelop.Project.Commands.AddExitingProjectToSolution"
+				          command = "SDProjectCommands.AddExitingProjectToSolution" />
 				<MenuItem id    = "Separator1" type = "Separator" />
 				<MenuItem id    = "AddItem"
 				          label = "${res:ProjectComponent.ContextMenu.AddItem}"
-				          class = "ICSharpCode.SharpDevelop.Project.Commands.AddExistingItemToSolution"/>
+				          class = "ICSharpCode.SharpDevelop.Project.Commands.AddExistingItemToSolution"
+				          command = "SDProjectCommands.AddExistingItemToSolution" />
 				<MenuItem id    = "AddNewSolutionFolderToSolution"
 				          icon  = "ProjectBrowser.SolutionFolder.CreateNew"
 				          label = "${res:ProjectComponent.ContextMenu.NewSolutionFolder}"
-				          class = "ICSharpCode.SharpDevelop.Project.Commands.AddNewSolutionFolderToSolution"/>
+				          class = "ICSharpCode.SharpDevelop.Project.Commands.AddNewSolutionFolderToSolution"
+				          command = "SDProjectCommands.AddNewSolutionFolderToSolution" />
 			</MenuItem>
 		</Condition>
 		
@@ -239,7 +491,8 @@
 		          label = "${res:XML.MainMenu.EditMenu.Paste}"
 		          icon  = "Icons.16x16.PasteIcon"
 		          loadclasslazy = "false"
-		          class = "ICSharpCode.SharpDevelop.Project.Commands.PasteProjectBrowserNode"/>
+		          class = "ICSharpCode.SharpDevelop.Project.Commands.PasteProjectBrowserNode"
+		          command = "" />
 		<MenuItem id       = "Rename"
 		          label    = "${res:ProjectComponent.ContextMenu.Rename}"
 		          shortcut = "F2"
@@ -248,7 +501,8 @@
 		<MenuItem id    = "Properties"
 		          icon  = "Icons.16x16.PropertiesIcon"
 		          label = "${res:XML.MainMenu.FormatMenu.ShowProperties}"
-		          class = "ICSharpCode.SharpDevelop.Project.Commands.ShowPropertiesForNode"/>
+		          class = "ICSharpCode.SharpDevelop.Project.Commands.ShowPropertiesForNode"
+		          command = "SDProjectCommands.ShowSelectedProjectBrowserNodeProperties" />
 	</Path>
 	
 	<Path path = "/SharpDevelop/Pads/ProjectBrowser/ContextMenu/SolutionFolderNode">
@@ -258,6 +512,7 @@
 		<Include id="CutPasteRemoveRename" path="/SharpDevelop/Pads/ProjectBrowser/ContextMenu/CutPasteRemoveRename"/>
 	</Path>
 	
+	
 	<Path path = "/SharpDevelop/Pads/ProjectBrowser/ContextMenu/SolutionItemNode">
 		<MenuItem id = "OpenFile"
 		          label = "${res:ProjectComponent.ContextMenu.Open}"
@@ -274,17 +529,21 @@
 		<Include id="CutCopyRemoveRename" path="/SharpDevelop/Pads/ProjectBrowser/ContextMenu/CutCopyRemoveRename"/>
 	</Path>
 	
+	
 	<Path path = "/SharpDevelop/Pads/ProjectBrowser/ContextMenu/ProjectNode">
 		<MenuItem id = "Build project"
 		          label = "${res:ProjectComponent.ContextMenu.Build}"
 		          icon  = "Icons.16x16.BuildCurrentSelectedProject"
-		          class = "ICSharpCode.SharpDevelop.Project.Commands.BuildProject"/>
+		          class = "ICSharpCode.SharpDevelop.Project.Commands.BuildProject"
+		          command = "SDBuildCommands.BuildProject" />
 		<MenuItem id = "Rebuild project"
 		          label = "${res:ProjectComponent.ContextMenu.Rebuild}"
-		          class = "ICSharpCode.SharpDevelop.Project.Commands.RebuildProject"/>
+		          class = "ICSharpCode.SharpDevelop.Project.Commands.RebuildProject"
+		          command = "SDBuildCommands.RebuildProject" />
 		<MenuItem id = "Clean project"
 		          label = "${res:ProjectComponent.ContextMenu.Clean}"
-		          class = "ICSharpCode.SharpDevelop.Project.Commands.CleanProject"/>
+		          class = "ICSharpCode.SharpDevelop.Project.Commands.CleanProject"
+		          command = "SDBuildCommands.CleanProject" />
 		<!--<MenuItem id = "Publish project"
 		          label = "${res:XML.MainMenu.BuildMenu.PublishProject}"
 		          class = "ICSharpCode.SharpDevelop.Project.Commands.PublishProject"/>-->
@@ -315,7 +574,8 @@
 		<MenuItem id    = "Properties"
 		          icon  = "Icons.16x16.PropertiesIcon"
 		          label = "${res:XML.MainMenu.FormatMenu.ShowProperties}"
-		          class = "ICSharpCode.SharpDevelop.Project.Commands.ShowPropertiesForNode"/>
+		          class = "ICSharpCode.SharpDevelop.Project.Commands.ShowPropertiesForNode"
+		          command = "SDProjectCommands.ShowSelectedProjectBrowserNodeProperties" />
 	</Path>
 	
 	<Path name="/SharpDevelop/Pads/ProjectBrowser/ContextMenu/MissingProjectNode">
@@ -440,7 +700,8 @@
 			<MenuItem id    = "Properties"
 			          icon  = "Icons.16x16.PropertiesIcon"
 			          label = "${res:XML.MainMenu.FormatMenu.ShowProperties}"
-			          class = "ICSharpCode.SharpDevelop.Project.Commands.ShowPropertiesForNode"/>
+			          class = "ICSharpCode.SharpDevelop.Project.Commands.ShowPropertiesForNode"
+			          command = "SDProjectCommands.ShowSelectedProjectBrowserNodeProperties" />
 		</ComplexCondition>
 	</Path>
 	
@@ -481,7 +742,8 @@
 		          type = "Item"
 		          icon  = "Icons.16x16.PasteIcon"
 		          loadclasslazy = "false"
-		          class = "ICSharpCode.SharpDevelop.Project.Commands.PasteProjectBrowserNode"/>
+		          class = "ICSharpCode.SharpDevelop.Project.Commands.PasteProjectBrowserNode"
+		/>
 		<MenuItem id = "Remove"
 		          label = "${res:Global.RemoveButtonText}"
 		          type = "Item"
@@ -494,6 +756,7 @@
 		          class    = "ICSharpCode.SharpDevelop.Project.Commands.RenameEntryEvent"/>
 	</Path>
 	
+	
 	<Path name = "/SharpDevelop/Pads/ProjectBrowser/ContextMenu/CutCopyPasteDeleteRename">
 		<MenuItem id = "Cut"
 		          label = "${res:XML.MainMenu.EditMenu.Cut}"
@@ -645,7 +908,8 @@
 			<MenuItem id = "Properties"
 			          icon  = "Icons.16x16.PropertiesIcon"
 			          label = "${res:XML.MainMenu.FormatMenu.ShowProperties}"
-			          class = "ICSharpCode.SharpDevelop.Project.Commands.ShowPropertiesForNode"/>
+			          class = "ICSharpCode.SharpDevelop.Project.Commands.ShowPropertiesForNode"
+			          command = "SDProjectCommands.ShowSelectedProjectBrowserNodeProperties" />
 		</ComplexCondition>
 	</Path>
 	
@@ -824,40 +1088,40 @@
 		<ToolbarItem id = "Cut"
 		             icon = "Icons.16x16.CutIcon"
 		             tooltip = "${res:XML.MainMenu.EditMenu.Cut.Description}"
-		             command = "Cut"/>
+		             command = "ApplicationCommands.Cut"/>
 		<ToolbarItem id = "Copy"
 		             icon = "Icons.16x16.CopyIcon"
 		             tooltip = "${res:XML.MainMenu.EditMenu.Copy.Description}"
-		             command = "Copy"/>
+		             command = "ApplicationCommands.Copy"/>
 		<ToolbarItem id = "Paste"
 		             icon = "Icons.16x16.PasteIcon"
 		             tooltip = "${res:XML.MainMenu.EditMenu.Paste.Description}"
-		             command = "Paste"/>
+		             command = "ApplicationCommands.Paste"/>
 		<ToolbarItem id = "Delete"
 		             icon = "Icons.16x16.DeleteIcon"
 		             tooltip = "${res:XML.MainMenu.EditMenu.Delete.Description}"
-		             command = "Delete"/>
+		             command = "ApplicationCommands.Delete"/>
 		<ToolbarItem id = "UndoRedoSeparator"  type = "Separator"/>
 		<ToolbarItem id      = "Undo"
 		             icon    = "Icons.16x16.UndoIcon"
 		             tooltip = "${res:XML.MainMenu.EditMenu.Undo.Description}"
-		             command = "Undo"/>
+		             command = "ApplicationCommands.Undo"/>
 		<ToolbarItem id      = "Redo"
 		             icon    = "Icons.16x16.RedoIcon"
 		             tooltip = "${res:XML.MainMenu.EditMenu.Redo.Description}"
-		             command = "Redo"/>
+		             command = "ApplicationCommands.Redo"/>
 		
 		<ToolbarItem id = "CompileSeparator" type = "Separator"/>
 		
 		<ToolbarItem id      = "Compile"
 		             icon    = "Icons.16x16.BuildCombine"
 		             tooltip = "${res:XML.MainMenu.RunMenu.Compile.Description}"
-		             class   = "ICSharpCode.SharpDevelop.Project.Commands.Build"/>
+		             class   = "ICSharpCode.SharpDevelop.Project.Commands.Build" />
 		
 		<ToolbarItem id      = "BuildProject"
 		             icon    = "Icons.16x16.BuildCurrentSelectedProject"
 		             tooltip = "${res:XML.MainMenu.RunMenu.BuildProject.Description}"
-		             class   = "ICSharpCode.SharpDevelop.Project.Commands.Rebuild"/>
+		             class   = "ICSharpCode.SharpDevelop.Project.Commands.Rebuild"  />
 		
 		<ToolbarItem id = "DebuggerSeparator" type = "Separator"  />
 		
@@ -874,14 +1138,16 @@
 						<ToolbarItem id      = "Run"
 						             icon    = "Icons.16x16.RunProgramIcon"
 						             tooltip = "${res:XML.MainMenu.RunMenu.Run.Description}"
-						             class   = "ICSharpCode.SharpDevelop.Project.Commands.Execute"/>
+						             class   = "ICSharpCode.SharpDevelop.Project.Commands.Execute"
+						/>
 					</Condition>
 					
 					<Condition name="DebuggerSupports" debuggersupports = "StartWithoutDebugging">
 						<ToolbarItem id      = "RunWithoutDebugger"
 						             icon    = "Icons.16x16.Debug.StartWithoutDebugging"
 						             tooltip = "${res:XML.MainMenu.DebugMenu.RunWithoutDebug.Description}"
-						             class   = "ICSharpCode.SharpDevelop.Project.Commands.ExecuteWithoutDebugger"/>
+						             class   = "ICSharpCode.SharpDevelop.Project.Commands.ExecuteWithoutDebugger"
+						/>
 					</Condition>
 				</Condition>
 			</Condition>
@@ -1141,13 +1407,13 @@
 				<MenuItem id           = "File"
 				          label        = "${res:XML.MainMenu.FileMenu.New.File}"
 				          icon         = "Icons.16x16.NewDocumentIcon"
-				          shortcut     = "Control|N"
+				          shortcut     = "Ctrl+N"
 				          class        = "ICSharpCode.SharpDevelop.Commands.CreateNewFile"/>
 				
 				<MenuItem id          = "Project"
 				          label       = "${res:XML.MainMenu.FileMenu.New.Project}"
 				          icon        = "Icons.16x16.NewProjectIcon"
-				          shortcut    = "Control|Shift|N"
+				          shortcut    = "Ctrl+Shift+N"
 				          class       = "ICSharpCode.SharpDevelop.Project.Commands.CreateNewSolution"/>
 			</MenuItem>
 			
@@ -1156,13 +1422,13 @@
 				<MenuItem id          = "File"
 				          label       = "${res:XML.MainMenu.FileMenu.Open.File}"
 				          icon        = "Icons.16x16.OpenFileIcon"
-				          shortcut    = "Control|O"
+				          shortcut    = "Ctrl+O"
 				          class       = "ICSharpCode.SharpDevelop.Commands.OpenFile"/>
 				
 				<MenuItem id = "Project"
 				          label = "${res:XML.MainMenu.FileMenu.Open.Project}"
 				          icon = "Icons.16x16.OpenProjectIcon"
-				          shortcut = "Control|Shift|O"
+				          shortcut = "Ctrl+Shift+O"
 				          class = "ICSharpCode.SharpDevelop.Project.Commands.LoadSolution"/>
 			</MenuItem>
 			
@@ -1171,13 +1437,13 @@
 					<MenuItem id = "CloseFile"
 					          label = "${res:XML.MainMenu.FileMenu.Close.File}"
 					          icon  = "Icons.16x16.CloseFileIcon"
-					          shortcut = "Control|F4"
+					          shortcut = "Ctrl+F4"
 					          class ="ICSharpCode.SharpDevelop.Commands.CloseFile"/>
 				</Condition>
 				<Condition name = "SolutionOpen" action="Disable">
 					<MenuItem id = "CloseCombine"
 					          label = "${res:XML.MainMenu.FileMenu.Close.Project}"
-					          shortcut = "Control|Shift|F4"
+					          shortcut = "Ctrl+Shift+F4"
 					          class = "ICSharpCode.SharpDevelop.Project.Commands.CloseSolution"/>
 				</Condition>
 			</MenuItem>
@@ -1186,7 +1452,7 @@
 			<Condition name = "WindowActive" activewindow="*" action="Disable">
 				<MenuItem id = "Reloadfile"
 				          label = "${res:XML.MainMenu.FileMenu.Reload}"
-				          shortcut = "Shift|Control|U"
+				          shortcut = "Ctrl+Shift+U"
 				          class = "ICSharpCode.SharpDevelop.Commands.ReloadFile" />
 			</Condition>
 			
@@ -1196,7 +1462,7 @@
 				<MenuItem id = "Save"
 				          label = "${res:XML.MainMenu.FileMenu.Save}"
 				          icon = "Icons.16x16.SaveIcon"
-				          shortcut = "Control|S"
+				          shortcut = "Ctrl+S"
 				          class = "ICSharpCode.SharpDevelop.Commands.SaveFile"/>
 			</Condition>
 			
@@ -1210,7 +1476,7 @@
 				<MenuItem id = "SaveAll"
 				          label = "${res:XML.MainMenu.FileMenu.SaveAll}"
 				          icon = "Icons.16x16.SaveAllIcon"
-				          shortcut = "Control|Shift|S"
+				          shortcut = "Ctrl+Shift+S"
 				          class = "ICSharpCode.SharpDevelop.Commands.SaveAllFiles"/>
 			</Condition>
 			
@@ -1219,7 +1485,7 @@
 				<MenuItem id = "Print"
 				          label = "${res:XML.MainMenu.FileMenu.Print}"
 				          icon = "Icons.16x16.Print"
-				          shortcut = "Control|P"
+				          shortcut = "Ctrl+P"
 				          command = "Print"/>
 				<MenuItem id = "PrintPreview"
 				          label = "${res:XML.MainMenu.FileMenu.PrintPreview}"
@@ -1256,38 +1522,38 @@
 			          label = "${res:XML.MainMenu.EditMenu.Undo}"
 			          icon = "Icons.16x16.UndoIcon"
 			          type = "Item"
-			          shortcut = "Control|Z"
-			          command = "Undo"/>
+			          shortcut = "Ctrl+Z"
+			          command = "ApplicationCommands.Undo"/>
 			<MenuItem id = "Redo"
 			          label = "${res:XML.MainMenu.EditMenu.Redo}"
 			          icon = "Icons.16x16.RedoIcon"
 			          type = "Item"
-			          shortcut = "Control|Y"
-			          command = "Redo"/>
+			          shortcut = "Ctrl+Y"
+			          command = "ApplicationCommands.Redo"/>
 			<MenuItem id = "Separator1" type = "Separator"  />
 			<MenuItem id = "Cut"
 			          label = "${res:XML.MainMenu.EditMenu.Cut}"
 			          icon = "Icons.16x16.CutIcon"
 			          type = "Item"
-			          shortcut = "Control|X"
-			          command = "Cut"/>
+			          shortcut = "Ctrl+X"
+			          command = "ApplicationCommands.Cut"/>
 			<MenuItem id = "Copy"
 			          label = "${res:XML.MainMenu.EditMenu.Copy}"
 			          icon = "Icons.16x16.CopyIcon"
 			          type = "Item"
-			          shortcut = "Control|C"
-			          command = "Copy"/>
+			          shortcut = "Ctrl+C"
+			          command = "ApplicationCommands.Copy"/>
 			<MenuItem id = "Paste"
 			          label = "${res:XML.MainMenu.EditMenu.Paste}"
 			          icon = "Icons.16x16.PasteIcon"
 			          type = "Item"
-			          shortcut = "Control|V"
-			          command = "Paste"/>
+			          shortcut = "Ctrl+V"
+			          command = "ApplicationCommands.Paste"/>
 			<MenuItem id = "Delete"
 			          label = "${res:XML.MainMenu.EditMenu.Delete}"
 			          icon = "Icons.16x16.DeleteIcon"
 			          type = "Item"
-			          command = "Delete"/>
+			          command = "ApplicationCommands.Delete"/>
 			<MenuItem id = "Separator2" type = "Separator"  />
 			<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditorProvider" action="Disable">
 				<MenuItem id = "Insert" label = "${res:XML.MainMenu.EditMenu.Insert}" type="Menu">
@@ -1304,7 +1570,7 @@
 					          label = "${res:XML.MainMenu.ToolMenu.InsColor}"
 					          class = "ICSharpCode.SharpDevelop.Editor.Commands.ShowColorDialog"/>
 					<MenuItem id       = "InsertGuid"
-					          shortcut = "Control|Shift|G"
+					          shortcut = "Ctrl+Shift+G"
 					          label    = "${res:XML.MainMenu.ToolMenu.InsGUID}"
 					          class    = "ICSharpCode.SharpDevelop.Editor.Commands.InsertGuidCommand"/>
 				</MenuItem>
@@ -1312,8 +1578,8 @@
 			<MenuItem id = "SelectAll"
 			          label = "${res:XML.MainMenu.EditMenu.SelectAll}"
 			          type = "Item"
-			          shortcut = "Control|A"
-			          command = "SelectAll"/>
+			          shortcut = "Ctrl+A"
+			          command = "ApplicationCommands.SelectAll"/>
 			<MenuItem id = "Separator4" type = "Separator"  />
 			<ComplexCondition action="Disable">
 				<Or>
@@ -1381,30 +1647,36 @@
 			<Condition name = "SolutionOpen" action="Disable">
 				<MenuItem id       = "Build"
 				          label    = "${res:XML.MainMenu.BuildMenu.BuildSolution}"
-				          shortcut = "F8"
 				          icon     = "Icons.16x16.BuildCombine"
-				          class    = "ICSharpCode.SharpDevelop.Project.Commands.Build"/>
+				          command  = "SDBuildCommands.BuildSolution"
+				          inputbindingcategories = "/Test/Test"
+				/>
 				<MenuItem id       = "Rebuild"
 				          label    = "${res:XML.MainMenu.BuildMenu.RebuildSolution}"
-				          shortcut = "Alt|F8"
-				          class    = "ICSharpCode.SharpDevelop.Project.Commands.Rebuild"/>
+				          shortcut = "Alt+F8"
+				          class    = "ICSharpCode.SharpDevelop.Project.Commands.Rebuild"
+				          command  = "SDBuildCommands.RebuildSolution" />
 				<MenuItem id    = "Clean"
 				          label = "${res:XML.MainMenu.BuildMenu.CleanSolution}"
-				          class = "ICSharpCode.SharpDevelop.Project.Commands.Clean"/>
+				          class = "ICSharpCode.SharpDevelop.Project.Commands.Clean"
+				          command  = "SDBuildCommands.CleanSolution" />
 				<Condition name = "ProjectActive" activeproject="*">
 					<MenuItem id = "Separator1" type = "Separator" />
 					<MenuItem id       = "Build project"
 					          label    = "${res:XML.MainMenu.BuildMenu.BuildProject}"
 					          shortcut = "F9"
 					          icon     = "Icons.16x16.BuildCurrentSelectedProject"
-					          class    = "ICSharpCode.SharpDevelop.Project.Commands.BuildProject"/>
+					          class    = "ICSharpCode.SharpDevelop.Project.Commands.BuildProject"
+					          command  = "SDBuildCommands.BuildProject" />
 					<MenuItem id       = "Rebuild project"
 					          label    = "${res:XML.MainMenu.BuildMenu.RebuildProject}"
-					          shortcut = "Alt|F9"
-					          class    = "ICSharpCode.SharpDevelop.Project.Commands.RebuildProject"/>
+					          shortcut = "Alt+F9"
+					          class    = "ICSharpCode.SharpDevelop.Project.Commands.RebuildProject"
+					          command  = "SDBuildCommands.RebuildProject" />
 					<MenuItem id    = "Clean project"
 					          label = "${res:XML.MainMenu.BuildMenu.CleanProject}"
-					          class = "ICSharpCode.SharpDevelop.Project.Commands.CleanProject"/>
+					          class = "ICSharpCode.SharpDevelop.Project.Commands.CleanProject"
+					          command  = "SDBuildCommands.CleanProject" />
 					<!--<MenuItem id    = "Publish project"
 					          label = "${res:XML.MainMenu.BuildMenu.PublishProject}"
 					          class = "ICSharpCode.SharpDevelop.Project.Commands.PublishProject"/>-->
@@ -1414,21 +1686,28 @@
 				          label="${res:XML.MainMenu.BuildMenu.AbortBuild}"
 				          shortcut="Pause"
 				          class="ICSharpCode.SharpDevelop.Project.Commands.AbortBuild"
-				          loadclasslazy="false"/>
+				          loadclasslazy="false"
+				          command="SDBuildCommands.AbortBuild" />
 				<MenuItem id = "Separator3" type = "Separator" />
 				<MenuItem id = "SetConfiguration"
 				          label = "${res:XML.MainMenu.BuildMenu.SetConfiguration}"
 				          type = "Menu">
-					<MenuItem id = "ConfigurationBuilder" type = "Builder" class = "ICSharpCode.SharpDevelop.Project.Commands.SetConfigurationMenuBuilder"/>
+					<MenuItem id = "ConfigurationBuilder"
+					          type = "Builder"
+					          class = "ICSharpCode.SharpDevelop.Project.Commands.SetConfigurationMenuBuilder" />
 				</MenuItem>
 				<MenuItem id = "SetPlatform"
 				          label = "${res:XML.MainMenu.BuildMenu.SetPlatform}"
 				          type = "Menu">
-					<MenuItem id = "PlatformBuilder" type = "Builder" class = "ICSharpCode.SharpDevelop.Project.Commands.SetPlatformMenuBuilder"/>
+					<MenuItem
+						id = "PlatformBuilder"
+						type = "Builder"
+						class = "ICSharpCode.SharpDevelop.Project.Commands.SetPlatformMenuBuilder" />
 				</MenuItem>
 				<MenuItem id = "EditConfigurations"
 				          label = "${res:XML.MainMenu.BuildMenu.EditConfigurationsPlatforms}"
-				          class = "ICSharpCode.SharpDevelop.Project.Commands.EditConfigurationsCommand"/>
+				          class = "ICSharpCode.SharpDevelop.Project.Commands.EditConfigurationsCommand"
+				          command = "SDBuildCommands.EditConfigurationsCommand" />
 			</Condition>
 		</MenuItem> <!-- end BUILD menu -->
 		
@@ -1440,7 +1719,9 @@
 						          label    = "${res:XML.MainMenu.RunMenu.Run}"
 						          icon     = "Icons.16x16.RunProgramIcon"
 						          shortcut = "F5"
-						          class    = "ICSharpCode.SharpDevelop.Project.Commands.Execute"/>
+						          class    = "ICSharpCode.SharpDevelop.Project.Commands.Execute"
+						          command  = "SDDebugCommands.Execute"
+						/>
 					</Condition>
 				</Condition>
 			</Condition>
@@ -1451,8 +1732,9 @@
 						<MenuItem id       = "RunWithoutDebugger"
 						          label    = "${res:XML.MainMenu.DebugMenu.RunWithoutDebug}"
 						          icon     = "Icons.16x16.Debug.StartWithoutDebugging"
-						          shortcut = "Control|F5"
-						          class    = "ICSharpCode.SharpDevelop.Project.Commands.ExecuteWithoutDebugger"/>
+						          shortcut = "Ctrl+F5"
+						          class    = "ICSharpCode.SharpDevelop.Project.Commands.ExecuteWithoutDebugger"
+						          command  = "SDDebugCommands.ExecuteWithoutDebugger" />
 					</Condition>
 				</Condition>
 			</Condition>
@@ -1462,7 +1744,8 @@
 					<MenuItem id    = "Stop"
 					          label = "${res:XML.MainMenu.DebugMenu.Stop}"
 					          icon  = "Icons.16x16.StopProcess"
-					          class = "ICSharpCode.SharpDevelop.Project.Commands.StopDebuggingCommand"/>
+					          class = "ICSharpCode.SharpDevelop.Project.Commands.StopDebuggingCommand"
+					          command  = "SDDebugCommands.StopDebugging" />
 				</Condition>
 			</Condition>
 			
@@ -1470,7 +1753,8 @@
 				<Condition name="IsProcessRunning" isprocessrunning="False" isdebugging="False" action="Disable">
 					<MenuItem id    = "Attach"
 					          label = "${res:XML.MainMenu.DebugMenu.Attach}"
-					          class = "ICSharpCode.SharpDevelop.Project.Commands.AttachToProcessCommand"/>
+					          class = "ICSharpCode.SharpDevelop.Project.Commands.AttachToProcessCommand"
+					          command  = "SDDebugCommands.AttachToProcess" />
 				</Condition>
 			</Condition>
 			
@@ -1478,7 +1762,8 @@
 				<Condition name="IsProcessRunning" isdebugging="True" action="Disable">
 					<MenuItem id    = "Detach"
 					          label = "${res:XML.MainMenu.DebugMenu.Detach}"
-					          class = "ICSharpCode.SharpDevelop.Project.Commands.DetachFromProcessCommand"/>
+					          class = "ICSharpCode.SharpDevelop.Project.Commands.DetachFromProcessCommand"
+					          command  = "SDDebugCommands.DetachFromProcess" />
 				</Condition>
 			</Condition>
 			
@@ -1488,15 +1773,17 @@
 					<MenuItem id       = "Break"
 					          label    = "${res:XML.MainMenu.DebugMenu.Break}"
 					          icon     = "Icons.16x16.Debug.Break"
-					          shortcut = "Control|Alt|B"
-					          class    = "ICSharpCode.SharpDevelop.Project.Commands.BreakDebuggingCommand"/>
+					          shortcut = "Ctrl+Alt+B"
+					          class    = "ICSharpCode.SharpDevelop.Project.Commands.BreakDebuggingCommand"
+					          command  = "SDDebugCommands.BreakDebugging" />
 				</Condition>
 				<Condition name="IsProcessRunning" isprocessrunning = "False" isdebugging = "True" action = "Disable">
 					<MenuItem id       = "Continue"
 					          label    = "${res:XML.MainMenu.DebugMenu.Continue}"
 					          icon     = "Icons.16x16.Debug.Continue"
 					          shortcut = "F6"
-					          class    = "ICSharpCode.SharpDevelop.Project.Commands.ContinueDebuggingCommand"/>
+					          class    = "ICSharpCode.SharpDevelop.Project.Commands.ContinueDebuggingCommand"
+					          command  = "SDDebugCommands.ContinueDebugging" />
 				</Condition>
 			</Condition>
 			
@@ -1507,17 +1794,20 @@
 					          label    = "${res:XML.MainMenu.DebugMenu.StepOver}"
 					          icon     = "Icons.16x16.Debug.StepOver"
 					          shortcut = "F10"
-					          class    = "ICSharpCode.SharpDevelop.Project.Commands.StepDebuggingCommand"/>
+					          class    = "ICSharpCode.SharpDevelop.Project.Commands.StepDebuggingCommand"
+					          command  = "SDDebugCommands.StepOver" />
 					<MenuItem id       = "Step into"
 					          label    = "${res:XML.MainMenu.DebugMenu.StepInto}"
 					          icon     = "Icons.16x16.Debug.StepInto"
 					          shortcut = "F11"
-					          class    = "ICSharpCode.SharpDevelop.Project.Commands.StepIntoDebuggingCommand"/>
+					          class    = "ICSharpCode.SharpDevelop.Project.Commands.StepDebuggingCommand"
+					          command  = "SDDebugCommands.StepInto" />
 					<MenuItem id       = "Step out"
 					          label    = "${res:XML.MainMenu.DebugMenu.StepOut}"
 					          icon     = "Icons.16x16.Debug.StepOut"
-					          shortcut = "Shift|F11"
-					          class    = "ICSharpCode.SharpDevelop.Project.Commands.StepOutDebuggingCommand"/>
+					          shortcut = "Shift+F11"
+					          class    = "ICSharpCode.SharpDevelop.Project.Commands.StepOutDebuggingCommand"
+					          command  = "SDDebugCommands.StepOut" />
 				</Condition>
 			</Condition>
 			
@@ -1531,29 +1821,30 @@
 				          label    = "${res:XML.MainMenu.DebugMenu.ToggleBreakpoint}"
 				          shortcut = "F7"
 				          icon     = "Bookmarks.Breakpoint"
-				          class    = "ICSharpCode.SharpDevelop.Project.Commands.ToggleBreakpointCommand"/>
+				          class    = "ICSharpCode.SharpDevelop.Project.Commands.ToggleBreakpointCommand"
+				          command  = "SDDebugCommands.ToggleBreakpoint" />
 			</ComplexCondition>
 		</MenuItem> <!-- end DEBUG menu -->
 		
 		<MenuItem id = "Search" label = "${res:XML.MainMenu.SearchMenu}" type="Menu">
 			<MenuItem id = "SearchIncremental"
 			          label = "${res:XML.MainMenu.SearchMenu.IncrementalSearch}"
-			          shortcut = "Control|E"
+			          shortcut = "Ctrl+E"
 			          class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.RunIncrementalSearch"/>
 			<MenuItem id = "SearchReverseIncremental"
 			          label = "${res:XML.MainMenu.SearchMenu.ReverseIncrementalSearch}"
-			          shortcut = "Control|Shift|E"
+			          shortcut = "Ctrl+Shift+E"
 			          class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.RunReverseIncrementalSearch"/>
 			<MenuItem id = "SearchInFilesSeparator" type = "Separator" />
 			<!--			<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditorProvider" action="Disable"> -->
 			<MenuItem id = "ToggleBookmark"
 			          label = "${res:XML.MainMenu.SearchMenu.ToggleBookmark}"
-			          shortcut = "Control|F2"
+			          shortcut = "Ctrl+F2"
 			          icon = "Bookmarks.ToggleMark"
 			          class = "ICSharpCode.SharpDevelop.Bookmarks.ToggleBookmark"/>
 			<MenuItem id = "PrevBookmark"
 			          label = "${res:XML.MainMenu.SearchMenu.PrevBookmark}"
-			          shortcut = "Alt|F2"
+			          shortcut = "Alt+F2"
 			          icon = "Bookmarks.GotoPrevInFile"
 			          class = "ICSharpCode.SharpDevelop.Bookmarks.PrevBookmark"/>
 			<MenuItem id = "NextBookmark"
@@ -1568,16 +1859,16 @@
 			<MenuItem id = "Separator2" type = "Separator" />
 			<MenuItem id = "GotoLineNr"
 			          label = "${res:XML.MainMenu.SearchMenu.Goto}"
-			          shortcut = "Control|G"
+			          shortcut = "Ctrl+G"
 			          class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.GotoLineNumber"/>
 			<MenuItem id = "GotoDefinition"
 			          label = "${res:ICSharpCode.NAntAddIn.GotoDefinitionMenuLabel}"
-			          shortcut = "Control|Return"
+			          shortcut = "Ctrl+Return"
 			          icon="Icons.16x16.SelectionArrow"
 			          class = "ICSharpCode.SharpDevelop.Editor.Commands.GoToDefinition"/>
 			<MenuItem id = "GotoBrace"
 			          label = "${res:XML.MainMenu.SearchMenu.GotoBrace}"
-			          shortcut = "Control|B"
+			          shortcut = "Ctrl+B"
 			          class = "ICSharpCode.SharpDevelop.Editor.Commands.GoToMatchingBrace"/>
 			<!--			</Condition> -->
 		</MenuItem>
@@ -1610,11 +1901,11 @@
 			<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditorProvider" action="Disable">
 				<MenuItem id = "GenerateCodeAction"
 				          label = "${res:XML.MainMenu.ToolMenu.GenerateCode}"
-				          shortcut = "Alt|Insert"
+				          shortcut = "Alt+Insert"
 				          class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.GenerateCodeAction"/>
 				<MenuItem id = "ShowQuickHelp"
 				          label = "${res:XML.MainMenu.ToolMenu.QuickXmlDoc}"
-				          shortcut = "Control|Q"
+				          shortcut = "Ctrl+Q"
 				          class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.QuickDocumentation"/>
 			</Condition>
 			
@@ -1623,7 +1914,8 @@
 			<MenuItem id = "Options"
 			          label = "${res:XML.MainMenu.ToolMenu.Options}"
 			          icon = "Icons.16x16.Options"
-			          class = "ICSharpCode.SharpDevelop.Commands.OptionsCommand"/>
+			          class = "ICSharpCode.SharpDevelop.Commands.OptionsCommand"
+			          shortcut = "Ctrl+OemComma" />
 		</MenuItem> <!-- end TOOLS menu -->
 		
 		<MenuItem id = "Window" label = "${res:XML.MainMenu.WindowMenu}" type="Menu">
@@ -1631,18 +1923,18 @@
 				<MenuItem id  = "NextWindow"
 				          label = "${res:XML.MainMenu.WindowMenu.NxtWindow}"
 				          icon = "Icons.16x16.NextWindowIcon"
-				          shortcut = "Control|Tab"
+				          shortcut = "Ctrl+Tab"
 				          class = "ICSharpCode.SharpDevelop.Commands.SelectNextWindow" />
 				<MenuItem id = "PrevWindow"
 				          label = "${res:XML.MainMenu.WindowMenu.PrvWindow}"
 				          icon = "Icons.16x16.PrevWindowIcon"
-				          shortcut = "Shift|Control|Tab"
+				          shortcut = "Ctrl+Shift+Tab"
 				          class = "ICSharpCode.SharpDevelop.Commands.SelectPrevWindow" />
 				<MenuItem id ="NxtPrvSeparator" type = "Separator" />
 				<MenuItem id = "SplitView"
 				          label = "${res:XML.MainMenu.WindowMenu.Split}"
 				          icon  = "Icons.16x16.SplitWindow"
-				          command = "ICSharpCode.SharpDevelop.SharpDevelopRoutedCommands.SplitView"/>
+				          command = "SDWindowCommands.SplitView"/>
 				<MenuItem id    = "CloseAll"
 				          label = "${res:XML.MainMenu.FileMenu.CloseAll}"
 				          icon  = "Icons.16x16.CloseAllDocuments"
@@ -1659,7 +1951,7 @@
 			          command = "Help"/>
 			<MenuItem id = "Help"
 			          label = "${res:XML.MainMenu.HelpMenu.Topics}"
-			          shortcut = "Alt|F1"
+			          shortcut = "Alt+F1"
 			          link = "http://wiki.sharpdevelop.net/"/>
 			<MenuItem id = "Separator1" type = "Separator" />
 			<MenuItem id    = "ViewReadme"
@@ -1770,7 +2062,7 @@
 		<MenuItem id = "Save"
 		          label = "${res:XML.MainMenu.FileMenu.Save}"
 		          icon = "Icons.16x16.SaveIcon"
-		          shortcut = "Control|S"
+		          shortcut = "Ctrl+S"
 		          class = "ICSharpCode.SharpDevelop.Commands.SaveFile"/>
 		<MenuItem id = "SaveAs"
 		          label = "${res:XML.MainMenu.FileMenu.SaveAs}"
@@ -1783,11 +2075,11 @@
 		<MenuItem id = "Comment"
 		          icon  = "Icons.16x16.CommentRegion"
 		          label = "${res:XML.TextAreaContextMenu.CommentUncommentSelection}"
-		          shortcut="Control|OemQuestion"
+		          shortcut="Ctrl+OemQuestion"
 		          class = "ICSharpCode.SharpDevelop.Editor.Commands.CommentRegion"/>
 		<MenuItem id = "Indent"
 		          label = "${res:XML.TextAreaContextMenu.Indent}"
-		          shortcut = "Control|I"
+		          shortcut = "Ctrl+I"
 		          class = "ICSharpCode.SharpDevelop.Editor.Commands.IndentSelection" />
 	</Path>
 	
@@ -1852,15 +2144,15 @@
 			<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditorProvider" action="Disable">
 				<MenuItem id          = "ToggleFolding"
 				          label       = "${res:XML.MainMenu.EditMenu.FoldingMenu.ToggleFolding}"
-				          shortcut    = "Shift|Control|M"
+				          shortcut    = "Ctrl+Shift+M"
 				          class       = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.ToggleFolding"/>
 				<MenuItem id          = "ToggleAllFoldings"
 				          label       = "${res:XML.MainMenu.EditMenu.FoldingMenu.ToggleAllFoldings}"
-				          shortcut    = "Shift|Control|L"
+				          shortcut    = "Ctrl+Shift+L"
 				          class       = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.ToggleAllFoldings"/>
 				<MenuItem id          = "ShowDefinitionsOnly"
 				          label       = "${res:XML.MainMenu.EditMenu.FoldingMenu.ShowDefinitions}"
-				          shortcut    = "Shift|Control|P"
+				          shortcut    = "Ctrl+Shift+P"
 				          class       = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.ShowDefinitionsOnly"/>
 			</Condition>
 		</MenuItem>
diff --git a/SharpDevelop.Tests.sln b/SharpDevelop.Tests.sln
index ab4fed11f0..76ab0819a0 100644
--- a/SharpDevelop.Tests.sln
+++ b/SharpDevelop.Tests.sln
@@ -1,29 +1,32 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 10
-# SharpDevelop 4.0.0.1
+# Visual Studio 2010
+# SharpDevelop 4.0.0.5216
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{256F5C28-532C-44C0-8AB8-D8EC5E492E01}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom.Tests", "src\Main\ICSharpCode.SharpDevelop.Dom\Tests\ICSharpCode.SharpDevelop.Dom.Tests\ICSharpCode.SharpDevelop.Dom.Tests.csproj", "{7DB80259-24D4-46C3-A024-53FF1987733D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "src\Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Tests", "src\Main\Base\Test\ICSharpCode.SharpDevelop.Tests.csproj", "{4980B743-B32F-4aba-AABD-45E2CAD3568D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Widgets", "src\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj", "{8035765F-D51F-4A0C-A746-2FD100E19419}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Tests", "src\Main\Core\Test\ICSharpCode.Core.Tests.csproj", "{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "src\Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "src\Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Sda", "src\Main\ICSharpCode.SharpDevelop.Sda\ICSharpCode.SharpDevelop.Sda.csproj", "{80318B5F-A25D-45AB-8A95-EF31D2370A4C}"
+	ProjectSection(ProjectDependencies) = postProject
+		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Presentation", "src\Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj", "{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom", "src\Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj", "{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
@@ -33,27 +36,29 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.WinForms",
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom", "src\Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj", "{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Presentation", "src\Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj", "{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Sda", "src\Main\ICSharpCode.SharpDevelop.Sda\ICSharpCode.SharpDevelop.Sda.csproj", "{80318B5F-A25D-45AB-8A95-EF31D2370A4C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "src\Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Tests", "src\Main\Core\Test\ICSharpCode.Core.Tests.csproj", "{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "src\Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Tests", "src\Main\Base\Test\ICSharpCode.SharpDevelop.Tests.csproj", "{4980B743-B32F-4aba-AABD-45E2CAD3568D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Widgets", "src\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj", "{8035765F-D51F-4A0C-A746-2FD100E19419}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom.Tests", "src\Main\ICSharpCode.SharpDevelop.Dom\Tests\ICSharpCode.SharpDevelop.Dom.Tests\ICSharpCode.SharpDevelop.Dom.Tests.csproj", "{7DB80259-24D4-46C3-A024-53FF1987733D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "src\Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Presentation.Tests", "src\Main\ICSharpCode.Core.Presentation\Test\ICSharpCode.Core.Presentation.Tests.csproj", "{FFA7988E-7348-4669-9E9D-27E629C873A2}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
@@ -62,50 +67,50 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit.Tests", "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit.Tests\ICSharpCode.AvalonEdit.Tests.csproj", "{6222A3A1-83CE-47A3-A4E4-A018F82D44D8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TreeView", "src\Libraries\SharpTreeView\ICSharpCode.TreeView\ICSharpCode.TreeView.csproj", "{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NRefactory", "NRefactory", "{E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}"
-	ProjectSection(SolutionItems) = postProject
-	EndProjectSection
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aga.Controls", "src\Libraries\TreeViewAdv\Aga.Controls\Aga.Controls.csproj", "{E73BB233-D88B-44A7-A98F-D71EE158381D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryTests", "src\Libraries\NRefactory\Test\NRefactoryTests.csproj", "{870115DD-960A-4406-A6B9-600BCDC36A03}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "src\Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryASTGenerator", "src\Libraries\NRefactory\NRefactoryASTGenerator\NRefactoryASTGenerator.csproj", "{B22522AA-B5BF-4A58-AC6D-D4B45805521F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Build.Tasks", "src\Libraries\ICSharpCode.Build.Tasks\Project\ICSharpCode.Build.Tasks.csproj", "{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "src\Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit", "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj", "{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonDock", "src\Libraries\AvalonDock\AvalonDock.csproj", "{2FF700C2-A38A-48BD-A637-8CAFD4FE6237}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit", "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj", "{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NRefactory", "NRefactory", "{E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "src\Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Build.Tasks", "src\Libraries\ICSharpCode.Build.Tasks\Project\ICSharpCode.Build.Tasks.csproj", "{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryASTGenerator", "src\Libraries\NRefactory\NRefactoryASTGenerator\NRefactoryASTGenerator.csproj", "{B22522AA-B5BF-4A58-AC6D-D4B45805521F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "src\Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryTests", "src\Libraries\NRefactory\Test\NRefactoryTests.csproj", "{870115DD-960A-4406-A6B9-600BCDC36A03}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aga.Controls", "src\Libraries\TreeViewAdv\Aga.Controls\Aga.Controls.csproj", "{E73BB233-D88B-44A7-A98F-D71EE158381D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TreeView", "src\Libraries\SharpTreeView\ICSharpCode.TreeView\ICSharpCode.TreeView.csproj", "{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit.Tests", "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit.Tests\ICSharpCode.AvalonEdit.Tests.csproj", "{6222A3A1-83CE-47A3-A4E4-A018F82D44D8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
@@ -114,222 +119,218 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{393278
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Profiler", "Profiler", "{C4035C32-026F-4158-AF15-113EA1EF1960}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Analysis", "Analysis", "{F355E45F-F54F-4B42-8916-9A633A392789}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.AddIn", "src\AddIns\Misc\Profiler\Frontend\AddIn\Profiler.AddIn.csproj", "{D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting.Tests", "src\AddIns\Misc\UnitTesting\Test\UnitTesting.Tests.csproj", "{44A8DE09-CAB9-49D8-9CFC-5EB0A552F181}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
-		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}
-		{68D5EE3B-0C35-4DF1-BD29-6606851A02C1} = {68D5EE3B-0C35-4DF1-BD29-6606851A02C1}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Controls", "src\AddIns\Misc\Profiler\Frontend\Controls\Profiler.Controls.csproj", "{BDA49550-5ED1-4C6B-B648-657B2CACD8E0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceAnalysis", "src\AddIns\Misc\SourceAnalysis\SourceAnalysis.csproj", "{CE498514-D12D-4B6E-AE0E-FEC29BD43748}"
 	ProjectSection(ProjectDependencies) = postProject
-		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Controller", "src\AddIns\Misc\Profiler\Controller\Profiler.Controller.csproj", "{72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage", "src\AddIns\Misc\CodeCoverage\Project\CodeCoverage.csproj", "{08CE9972-283B-44F4-82FA-966F7DFA6B7A}"
 	ProjectSection(ProjectDependencies) = postProject
-		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.X64Converter", "src\AddIns\Misc\Profiler\X64Converter\Profiler.X64Converter.csproj", "{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysis", "src\AddIns\Misc\CodeAnalysis\CodeAnalysis.csproj", "{3EAA45A9-735C-4AC7-A799-947B93EA449D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{0E96FCFA-9DAC-4534-AC18-01A90C368873}") = "Hook", "src\AddIns\Misc\Profiler\Hook\Hook.vcxproj", "{68D5EE3B-0C35-4DF1-BD29-6606851A02C1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting", "src\AddIns\Misc\UnitTesting\UnitTesting.csproj", "{1F261725-6318-4434-A1B1-6C70CE4CD324}"
+	ProjectSection(ProjectDependencies) = postProject
+		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Tests", "src\AddIns\Misc\Profiler\Tests\Profiler.Tests\Profiler.Tests.csproj", "{068F9531-5D29-49E0-980E-59982A3A0469}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage.Tests", "src\AddIns\Misc\CodeCoverage\Test\CodeCoverage.Tests.csproj", "{A5C0E8F8-9D04-46ED-91D6-1DEF1575313B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Language Bindings", "Language Bindings", "{E0646C25-36F2-4524-969F-FA621353AB94}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ComponentInspector", "ComponentInspector", "{D599885D-E161-4CCE-A66E-7A40C8C4F4CC}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CppBinding", "src\AddIns\BackendBindings\CppBinding\CppBinding\CppBinding.csproj", "{70966F84-74C9-4067-A379-0C674A929233}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector.AddIn", "src\AddIns\Misc\ComponentInspector\ComponentInspector.AddIn\ComponentInspector.AddIn.csproj", "{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding.Tests", "src\AddIns\BackendBindings\CSharpBinding\Tests\CSharpBinding.Tests.csproj", "{52006F3F-3156-45DE-89D8-C4813694FBA4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector.Core", "src\AddIns\Misc\ComponentInspector\ComponentInspector.Core\ComponentInspector.Core.csproj", "{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding.Tests", "src\AddIns\BackendBindings\VBNetBinding\Test\VBNetBinding.Tests.csproj", "{50A89267-A28B-4DF3-8E62-912E005143B8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector", "src\AddIns\Misc\ComponentInspector\ComponentInspector\ComponentInspector.csproj", "{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Boo", "Boo", "{97B3B514-AB0E-4FE1-89DE-8A945F5112AE}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding.Tests", "src\AddIns\BackendBindings\Boo\BooBinding\Test\BooBinding.Tests.csproj", "{6FA16499-896F-4C02-BB43-1AF5C6C7C713}"
-	ProjectSection(ProjectDependencies) = postProject
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WpfDesign", "WpfDesign", "{6022AC51-B658-4C54-97EF-79187AC65B47}"
+	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding", "src\AddIns\BackendBindings\Boo\BooBinding\Project\BooBinding.csproj", "{4AC2D5F1-F671-480C-A075-6BF62B3721B2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.XamlDom", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.XamlDom\Project\WpfDesign.XamlDom.csproj", "{88DA149F-21B2-48AB-82C4-28FB6BDFD783}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter", "src\AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Project\NRefactoryToBooConverter.csproj", "{DBCF20A1-BA13-4582-BFA9-74DE4D987B73}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Tests", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.Designer\Tests\WpfDesign.Tests.csproj", "{943DBBB3-E84E-4CF4-917C-C05AFA8743C1}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter.Tests", "src\AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Test\NRefactoryToBooConverter.Tests.csproj", "{C9DE556D-325C-4544-B29F-16A9EB7C9830}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Designer", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.Designer\Project\WpfDesign.Designer.csproj", "{78CC29AC-CC79-4355-B1F2-97936DF198AC}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Python", "Python", "{CA76F702-5B4E-4918-B8D8-7FF8382434FF}"
-	ProjectSection(SolutionItems) = postProject
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding.Tests", "src\AddIns\BackendBindings\Python\PythonBinding\Test\PythonBinding.Tests.csproj", "{23B517C9-1ECC-4419-A13F-0B7136D085CB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.AddIn", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.AddIn\WpfDesign.AddIn.csproj", "{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks.Tests", "src\AddIns\BackendBindings\Python\Python.Build.Tasks\Test\Python.Build.Tasks.Tests.csproj", "{833904AB-3CD4-4071-9B48-5770E44685AA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign\Project\WpfDesign.csproj", "{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks", "src\AddIns\BackendBindings\Python\Python.Build.Tasks\Project\Python.Build.Tasks.csproj", "{D332F2D1-2CF1-43B7-903C-844BD5211A7E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor.Tests", "src\AddIns\DisplayBindings\XmlEditor\Test\XmlEditor.Tests.csproj", "{FC0FE702-A87D-4D70-A9B6-1ECCD611125F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding", "src\AddIns\BackendBindings\Python\PythonBinding\Project\PythonBinding.csproj", "{8D732610-8FC6-43BA-94C9-7126FD7FE361}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IconEditor", "IconEditor", "{0773ED53-08E2-4495-A3BE-CA0B5D413C15}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditorAddIn", "src\AddIns\DisplayBindings\IconEditor\IconEditorAddIn\IconEditorAddIn.csproj", "{DFB936AD-90EE-4B4F-941E-4F4A636F0D92}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILAsmBinding", "src\AddIns\BackendBindings\ILAsmBinding\Project\ILAsmBinding.csproj", "{6E59AF58-F635-459A-9A35-C9AC41C00339}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditor", "src\AddIns\DisplayBindings\IconEditor\IconEditor\IconEditor.csproj", "{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding", "src\AddIns\BackendBindings\WixBinding\Project\WixBinding.csproj", "{E1B288A2-08EE-4318-8BBB-8AB72C69E33E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HexEditor", "src\AddIns\DisplayBindings\HexEditor\Project\HexEditor.csproj", "{E618A9CD-A39F-4925-A538-E8A3FEF24E54}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "src\AddIns\BackendBindings\CSharpBinding\Project\CSharpBinding.csproj", "{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingsEditor", "src\AddIns\DisplayBindings\SettingsEditor\Project\SettingsEditor.csproj", "{85226AFB-CE71-4851-9A75-7EEC663A8E8A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding", "src\AddIns\BackendBindings\VBNetBinding\Project\VBNetBinding.csproj", "{BF38FB72-B380-4196-AF8C-95749D726C61}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceEditor", "src\AddIns\DisplayBindings\ResourceEditor\Project\ResourceEditor.csproj", "{CBC6C247-747B-4908-B09A-4D2E0F640B6B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlBinding", "src\AddIns\BackendBindings\XamlBinding\XamlBinding\XamlBinding.csproj", "{7C96B65D-28A5-4F28-A35B-8D83CE831EE8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonEdit.AddIn", "src\AddIns\DisplayBindings\AvalonEdit.AddIn\AvalonEdit.AddIn.csproj", "{0162E499-42D0-409B-AA25-EED21F75336B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlBinding.Tests", "src\AddIns\BackendBindings\XamlBinding\XamlBinding.Tests\XamlBinding.Tests.csproj", "{F390DA70-1FE1-4715-81A0-389AB010C130}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor", "src\AddIns\DisplayBindings\XmlEditor\Project\XmlEditor.csproj", "{DCA2703D-250A-463E-A68A-07ED105AE6BD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding.Tests", "src\AddIns\BackendBindings\WixBinding\Test\WixBinding.Tests.csproj", "{388E7B64-0393-4EB4-A3E3-5C474F141853}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormsDesigner", "src\AddIns\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj", "{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ClassDiagram", "ClassDiagram", "{BFA3BF26-33BD-4A65-B84D-C7F30D131668}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Tests", "src\AddIns\Debugger\Debugger.Tests\Debugger.Tests.csproj", "{A4C858C8-51B6-4265-A695-A20FCEBA1D19}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassCanvas", "src\AddIns\DisplayBindings\ClassDiagram\ClassCanvas\ClassCanvas.csproj", "{08F772A1-F0BE-433E-8B37-F6522953DB05}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Core", "src\AddIns\Debugger\Debugger.Core\Debugger.Core.csproj", "{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassDiagramAddin", "src\AddIns\DisplayBindings\ClassDiagram\ClassDiagramAddin\ClassDiagramAddin.csproj", "{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.AddIn", "src\AddIns\Debugger\Debugger.AddIn\Debugger.AddIn.csproj", "{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Diagrams", "src\AddIns\DisplayBindings\ClassDiagram\DiagramRouter\Diagrams.csproj", "{0991423A-DBF6-4C89-B365-A1DF1EB32E42}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{F3662720-9EA2-4591-BBC6-97361DCE50A9}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{C7F29FC2-1B03-4CDD-9E30-400F4765FF04}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace", "src\AddIns\Misc\SearchAndReplace\Project\SearchAndReplace.csproj", "{9196DD8A-B4D4-4780-8742-C5762E547FC2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Addin", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Addin\ICSharpCode.Data.Addin.csproj", "{A9F12710-24E4-46D4-832C-6ECB395B9EAD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReflectorAddIn", "src\AddIns\Misc\ReflectorAddIn\ReflectorAddIn\Project\ReflectorAddIn.csproj", "{8AA421C8-D7AF-4957-9F43-5135328ACB24}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Core", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Core\ICSharpCode.Data.Core.csproj", "{B7823AE9-4B43-4859-8796-2EBDC116FBB8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartPage", "src\AddIns\Misc\StartPage\Project\StartPage.csproj", "{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Core.UI", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Core.UI\ICSharpCode.Data.Core.UI.csproj", "{BAD94D6E-4159-4CB6-B991-486F412D9BB6}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddInManager", "src\AddIns\Misc\AddInManager\Project\AddInManager.csproj", "{F93E52FD-DA66-4CE5-A0CB-BCD902811122}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.EDMDesigner.Core", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.EDMDesigner.Core\ICSharpCode.Data.EDMDesigner.Core.csproj", "{5C70D6AB-0A33-43F9-B8B5-54558C35BBB1}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddinScout", "src\AddIns\Misc\AddinScout\Project\AddinScout.csproj", "{4B8F0F98-8BE1-402B-AA8B-C8D548577B38}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.EDMDesigner.Core.UI", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.EDMDesigner.Core.UI\ICSharpCode.Data.EDMDesigner.Core.UI.csproj", "{EEF5E054-4192-4A57-8FBF-E860D808A51D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FiletypeRegisterer", "src\AddIns\Misc\FiletypeRegisterer\Project\FiletypeRegisterer.csproj", "{D022A6CE-7438-41E8-AC64-F2DE18EC54C6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.SQLServer", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.SQLServer\ICSharpCode.Data.SQLServer.csproj", "{AFE34868-AFA1-4E1C-9450-47AB4BE329D5}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HtmlHelp2", "src\AddIns\Misc\HtmlHelp2\Project\HtmlHelp2.csproj", "{918487B7-2153-4618-BBB3-344DBDDF2A2A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{F3662720-9EA2-4591-BBC6-97361DCE50A9}"
+	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "HtmlHelp2JScriptGlobals", "src\AddIns\Misc\HtmlHelp2\JScriptGlobals\HtmlHelp2JScriptGlobals.vbproj", "{E54A5AD2-418D-4A85-BA5E-CD803DE38715}"
-	ProjectSection(ProjectDependencies) = postProject
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UsageDataCollector", "UsageDataCollector", "{DEFC8584-BEC3-4921-BD0F-40482E450B7B}"
+	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PInvokeAddIn", "src\AddIns\Misc\PInvokeAddIn\Project\PInvokeAddIn.csproj", "{5EEB99CF-EA2B-4733-80A6-CE9192D68170}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UsageDataCollector.AddIn", "src\AddIns\Misc\UsageDataCollector\UsageDataCollector.AddIn\UsageDataCollector.AddIn.csproj", "{0008FCE9-9EB4-4E2E-979B-553278E5BBA6}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegExpTk", "src\AddIns\Misc\RegExpTk\Project\RegExpTk.csproj", "{64A3E5E6-90BF-47F6-94DF-68C94B62C817}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UsageDataCollector", "src\AddIns\Misc\UsageDataCollector\UsageDataCollector\UsageDataCollector.csproj", "{6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceToolkit", "src\AddIns\Misc\ResourceToolkit\Project\ResourceToolkit.csproj", "{461606BD-E824-4D0A-8CBA-01810B1F5E02}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace.Tests", "src\AddIns\Misc\SearchAndReplace\Test\SearchAndReplace.Tests.csproj", "{A569DCC1-C608-45FD-B770-4F79335EF154}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpRefactoring", "src\AddIns\Misc\SharpRefactoring\SharpRefactoring.csproj", "{3CA90546-3B4C-4663-9445-C4E9371750A7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceToolkit.Tests", "src\AddIns\Misc\ResourceToolkit\Test\ResourceToolkit.Tests.csproj", "{DD9AE6A5-2B9D-443A-BC71-38BE578C36BD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
@@ -339,216 +340,225 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubversionAddIn", "src\AddI
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceToolkit.Tests", "src\AddIns\Misc\ResourceToolkit\Test\ResourceToolkit.Tests.csproj", "{DD9AE6A5-2B9D-443A-BC71-38BE578C36BD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpRefactoring", "src\AddIns\Misc\SharpRefactoring\SharpRefactoring.csproj", "{3CA90546-3B4C-4663-9445-C4E9371750A7}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace.Tests", "src\AddIns\Misc\SearchAndReplace\Test\SearchAndReplace.Tests.csproj", "{A569DCC1-C608-45FD-B770-4F79335EF154}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceToolkit", "src\AddIns\Misc\ResourceToolkit\Project\ResourceToolkit.csproj", "{461606BD-E824-4D0A-8CBA-01810B1F5E02}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UsageDataCollector", "UsageDataCollector", "{DEFC8584-BEC3-4921-BD0F-40482E450B7B}"
-	ProjectSection(SolutionItems) = postProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegExpTk", "src\AddIns\Misc\RegExpTk\Project\RegExpTk.csproj", "{64A3E5E6-90BF-47F6-94DF-68C94B62C817}"
+	ProjectSection(ProjectDependencies) = postProject
+		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UsageDataCollector", "src\AddIns\Misc\UsageDataCollector\UsageDataCollector\UsageDataCollector.csproj", "{6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PInvokeAddIn", "src\AddIns\Misc\PInvokeAddIn\Project\PInvokeAddIn.csproj", "{5EEB99CF-EA2B-4733-80A6-CE9192D68170}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UsageDataCollector.AddIn", "src\AddIns\Misc\UsageDataCollector\UsageDataCollector.AddIn\UsageDataCollector.AddIn.csproj", "{0008FCE9-9EB4-4E2E-979B-553278E5BBA6}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "HtmlHelp2JScriptGlobals", "src\AddIns\Misc\HtmlHelp2\JScriptGlobals\HtmlHelp2JScriptGlobals.vbproj", "{E54A5AD2-418D-4A85-BA5E-CD803DE38715}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}"
-	ProjectSection(SolutionItems) = postProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HtmlHelp2", "src\AddIns\Misc\HtmlHelp2\Project\HtmlHelp2.csproj", "{918487B7-2153-4618-BBB3-344DBDDF2A2A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{C7F29FC2-1B03-4CDD-9E30-400F4765FF04}"
-	ProjectSection(SolutionItems) = postProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FiletypeRegisterer", "src\AddIns\Misc\FiletypeRegisterer\Project\FiletypeRegisterer.csproj", "{D022A6CE-7438-41E8-AC64-F2DE18EC54C6}"
+	ProjectSection(ProjectDependencies) = postProject
+		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.SQLServer", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.SQLServer\ICSharpCode.Data.SQLServer.csproj", "{AFE34868-AFA1-4E1C-9450-47AB4BE329D5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddinScout", "src\AddIns\Misc\AddinScout\Project\AddinScout.csproj", "{4B8F0F98-8BE1-402B-AA8B-C8D548577B38}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.EDMDesigner.Core.UI", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.EDMDesigner.Core.UI\ICSharpCode.Data.EDMDesigner.Core.UI.csproj", "{EEF5E054-4192-4A57-8FBF-E860D808A51D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddInManager", "src\AddIns\Misc\AddInManager\Project\AddInManager.csproj", "{F93E52FD-DA66-4CE5-A0CB-BCD902811122}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.EDMDesigner.Core", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.EDMDesigner.Core\ICSharpCode.Data.EDMDesigner.Core.csproj", "{5C70D6AB-0A33-43F9-B8B5-54558C35BBB1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartPage", "src\AddIns\Misc\StartPage\Project\StartPage.csproj", "{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Core.UI", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Core.UI\ICSharpCode.Data.Core.UI.csproj", "{BAD94D6E-4159-4CB6-B991-486F412D9BB6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReflectorAddIn", "src\AddIns\Misc\ReflectorAddIn\ReflectorAddIn\Project\ReflectorAddIn.csproj", "{8AA421C8-D7AF-4957-9F43-5135328ACB24}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Core", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Core\ICSharpCode.Data.Core.csproj", "{B7823AE9-4B43-4859-8796-2EBDC116FBB8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace", "src\AddIns\Misc\SearchAndReplace\Project\SearchAndReplace.csproj", "{9196DD8A-B4D4-4780-8742-C5762E547FC2}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Addin", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Addin\ICSharpCode.Data.Addin.csproj", "{A9F12710-24E4-46D4-832C-6ECB395B9EAD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShortcutsManagement", "src\AddIns\Misc\ShortcutsManagement\ShortcutsManagement.csproj", "{745869FF-80E9-4589-A366-E775D2103843}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ClassDiagram", "ClassDiagram", "{BFA3BF26-33BD-4A65-B84D-C7F30D131668}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Diagrams", "src\AddIns\DisplayBindings\ClassDiagram\DiagramRouter\Diagrams.csproj", "{0991423A-DBF6-4C89-B365-A1DF1EB32E42}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.AddIn", "src\AddIns\Debugger\Debugger.AddIn\Debugger.AddIn.csproj", "{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassDiagramAddin", "src\AddIns\DisplayBindings\ClassDiagram\ClassDiagramAddin\ClassDiagramAddin.csproj", "{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Core", "src\AddIns\Debugger\Debugger.Core\Debugger.Core.csproj", "{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassCanvas", "src\AddIns\DisplayBindings\ClassDiagram\ClassCanvas\ClassCanvas.csproj", "{08F772A1-F0BE-433E-8B37-F6522953DB05}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Tests", "src\AddIns\Debugger\Debugger.Tests\Debugger.Tests.csproj", "{A4C858C8-51B6-4265-A695-A20FCEBA1D19}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormsDesigner", "src\AddIns\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj", "{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Language Bindings", "Language Bindings", "{E0646C25-36F2-4524-969F-FA621353AB94}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding.Tests", "src\AddIns\BackendBindings\WixBinding\Test\WixBinding.Tests.csproj", "{388E7B64-0393-4EB4-A3E3-5C474F141853}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor", "src\AddIns\DisplayBindings\XmlEditor\Project\XmlEditor.csproj", "{DCA2703D-250A-463E-A68A-07ED105AE6BD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlBinding.Tests", "src\AddIns\BackendBindings\XamlBinding\XamlBinding.Tests\XamlBinding.Tests.csproj", "{F390DA70-1FE1-4715-81A0-389AB010C130}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonEdit.AddIn", "src\AddIns\DisplayBindings\AvalonEdit.AddIn\AvalonEdit.AddIn.csproj", "{0162E499-42D0-409B-AA25-EED21F75336B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlBinding", "src\AddIns\BackendBindings\XamlBinding\XamlBinding\XamlBinding.csproj", "{7C96B65D-28A5-4F28-A35B-8D83CE831EE8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceEditor", "src\AddIns\DisplayBindings\ResourceEditor\Project\ResourceEditor.csproj", "{CBC6C247-747B-4908-B09A-4D2E0F640B6B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding", "src\AddIns\BackendBindings\VBNetBinding\Project\VBNetBinding.csproj", "{BF38FB72-B380-4196-AF8C-95749D726C61}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingsEditor", "src\AddIns\DisplayBindings\SettingsEditor\Project\SettingsEditor.csproj", "{85226AFB-CE71-4851-9A75-7EEC663A8E8A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "src\AddIns\BackendBindings\CSharpBinding\Project\CSharpBinding.csproj", "{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HexEditor", "src\AddIns\DisplayBindings\HexEditor\Project\HexEditor.csproj", "{E618A9CD-A39F-4925-A538-E8A3FEF24E54}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding", "src\AddIns\BackendBindings\WixBinding\Project\WixBinding.csproj", "{E1B288A2-08EE-4318-8BBB-8AB72C69E33E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IconEditor", "IconEditor", "{0773ED53-08E2-4495-A3BE-CA0B5D413C15}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILAsmBinding", "src\AddIns\BackendBindings\ILAsmBinding\Project\ILAsmBinding.csproj", "{6E59AF58-F635-459A-9A35-C9AC41C00339}"
+	ProjectSection(ProjectDependencies) = postProject
+		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Python", "Python", "{CA76F702-5B4E-4918-B8D8-7FF8382434FF}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditor", "src\AddIns\DisplayBindings\IconEditor\IconEditor\IconEditor.csproj", "{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding", "src\AddIns\BackendBindings\Python\PythonBinding\Project\PythonBinding.csproj", "{8D732610-8FC6-43BA-94C9-7126FD7FE361}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditorAddIn", "src\AddIns\DisplayBindings\IconEditor\IconEditorAddIn\IconEditorAddIn.csproj", "{DFB936AD-90EE-4B4F-941E-4F4A636F0D92}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks", "src\AddIns\BackendBindings\Python\Python.Build.Tasks\Project\Python.Build.Tasks.csproj", "{D332F2D1-2CF1-43B7-903C-844BD5211A7E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor.Tests", "src\AddIns\DisplayBindings\XmlEditor\Test\XmlEditor.Tests.csproj", "{FC0FE702-A87D-4D70-A9B6-1ECCD611125F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks.Tests", "src\AddIns\BackendBindings\Python\Python.Build.Tasks\Test\Python.Build.Tasks.Tests.csproj", "{833904AB-3CD4-4071-9B48-5770E44685AA}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WpfDesign", "WpfDesign", "{6022AC51-B658-4C54-97EF-79187AC65B47}"
-	ProjectSection(SolutionItems) = postProject
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign\Project\WpfDesign.csproj", "{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding.Tests", "src\AddIns\BackendBindings\Python\PythonBinding\Test\PythonBinding.Tests.csproj", "{23B517C9-1ECC-4419-A13F-0B7136D085CB}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.AddIn", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.AddIn\WpfDesign.AddIn.csproj", "{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865}"
-	ProjectSection(ProjectDependencies) = postProject
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Boo", "Boo", "{97B3B514-AB0E-4FE1-89DE-8A945F5112AE}"
+	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Designer", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.Designer\Project\WpfDesign.Designer.csproj", "{78CC29AC-CC79-4355-B1F2-97936DF198AC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter.Tests", "src\AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Test\NRefactoryToBooConverter.Tests.csproj", "{C9DE556D-325C-4544-B29F-16A9EB7C9830}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Tests", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.Designer\Tests\WpfDesign.Tests.csproj", "{943DBBB3-E84E-4CF4-917C-C05AFA8743C1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter", "src\AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Project\NRefactoryToBooConverter.csproj", "{DBCF20A1-BA13-4582-BFA9-74DE4D987B73}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.XamlDom", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.XamlDom\Project\WpfDesign.XamlDom.csproj", "{88DA149F-21B2-48AB-82C4-28FB6BDFD783}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding", "src\AddIns\BackendBindings\Boo\BooBinding\Project\BooBinding.csproj", "{4AC2D5F1-F671-480C-A075-6BF62B3721B2}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ComponentInspector", "ComponentInspector", "{D599885D-E161-4CCE-A66E-7A40C8C4F4CC}"
-	ProjectSection(SolutionItems) = postProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding.Tests", "src\AddIns\BackendBindings\Boo\BooBinding\Test\BooBinding.Tests.csproj", "{6FA16499-896F-4C02-BB43-1AF5C6C7C713}"
+	ProjectSection(ProjectDependencies) = postProject
+		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector", "src\AddIns\Misc\ComponentInspector\ComponentInspector\ComponentInspector.csproj", "{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding.Tests", "src\AddIns\BackendBindings\VBNetBinding\Test\VBNetBinding.Tests.csproj", "{50A89267-A28B-4DF3-8E62-912E005143B8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector.Core", "src\AddIns\Misc\ComponentInspector\ComponentInspector.Core\ComponentInspector.Core.csproj", "{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding.Tests", "src\AddIns\BackendBindings\CSharpBinding\Tests\CSharpBinding.Tests.csproj", "{52006F3F-3156-45DE-89D8-C4813694FBA4}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector.AddIn", "src\AddIns\Misc\ComponentInspector\ComponentInspector.AddIn\ComponentInspector.AddIn.csproj", "{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CppBinding", "src\AddIns\BackendBindings\CppBinding\CppBinding\CppBinding.csproj", "{70966F84-74C9-4067-A379-0C674A929233}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Analysis", "Analysis", "{F355E45F-F54F-4B42-8916-9A633A392789}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Profiler", "Profiler", "{C4035C32-026F-4158-AF15-113EA1EF1960}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage.Tests", "src\AddIns\Misc\CodeCoverage\Test\CodeCoverage.Tests.csproj", "{A5C0E8F8-9D04-46ED-91D6-1DEF1575313B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Tests", "src\AddIns\Misc\Profiler\Tests\Profiler.Tests\Profiler.Tests.csproj", "{068F9531-5D29-49E0-980E-59982A3A0469}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting", "src\AddIns\Misc\UnitTesting\UnitTesting.csproj", "{1F261725-6318-4434-A1B1-6C70CE4CD324}"
-	ProjectSection(ProjectDependencies) = postProject
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
-	EndProjectSection
+Project("{0E96FCFA-9DAC-4534-AC18-01A90C368873}") = "Hook", "src\AddIns\Misc\Profiler\Hook\Hook.vcxproj", "{68D5EE3B-0C35-4DF1-BD29-6606851A02C1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysis", "src\AddIns\Misc\CodeAnalysis\CodeAnalysis.csproj", "{3EAA45A9-735C-4AC7-A799-947B93EA449D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.X64Converter", "src\AddIns\Misc\Profiler\X64Converter\Profiler.X64Converter.csproj", "{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage", "src\AddIns\Misc\CodeCoverage\Project\CodeCoverage.csproj", "{08CE9972-283B-44F4-82FA-966F7DFA6B7A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Controller", "src\AddIns\Misc\Profiler\Controller\Profiler.Controller.csproj", "{72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F}"
 	ProjectSection(ProjectDependencies) = postProject
+		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceAnalysis", "src\AddIns\Misc\SourceAnalysis\SourceAnalysis.csproj", "{CE498514-D12D-4B6E-AE0E-FEC29BD43748}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Controls", "src\AddIns\Misc\Profiler\Frontend\Controls\Profiler.Controls.csproj", "{BDA49550-5ED1-4C6B-B648-657B2CACD8E0}"
 	ProjectSection(ProjectDependencies) = postProject
+		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting.Tests", "src\AddIns\Misc\UnitTesting\Test\UnitTesting.Tests.csproj", "{44A8DE09-CAB9-49D8-9CFC-5EB0A552F181}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.AddIn", "src\AddIns\Misc\Profiler\Frontend\AddIn\Profiler.AddIn.csproj", "{D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}
+		{68D5EE3B-0C35-4DF1-BD29-6606851A02C1} = {68D5EE3B-0C35-4DF1-BD29-6606851A02C1}
 	EndProjectSection
 EndProject
 Project("{00000000-0000-0000-0000-000000000000}") = "Tools", "src\Tools\Tools.build", "{3DF4060F-5EE0-41CF-8096-F27355FD5511}"
@@ -957,122 +967,140 @@ Global
 		{068F9531-5D29-49E0-980E-59982A3A0469}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{068F9531-5D29-49E0-980E-59982A3A0469}.Release|Any CPU.Build.0 = Release|Any CPU
 		{068F9531-5D29-49E0-980E-59982A3A0469}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FFA7988E-7348-4669-9E9D-27E629C873A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FFA7988E-7348-4669-9E9D-27E629C873A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FFA7988E-7348-4669-9E9D-27E629C873A2}.Debug|Win32.Build.0 = Debug|Any CPU
+		{FFA7988E-7348-4669-9E9D-27E629C873A2}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{FFA7988E-7348-4669-9E9D-27E629C873A2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FFA7988E-7348-4669-9E9D-27E629C873A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FFA7988E-7348-4669-9E9D-27E629C873A2}.Release|Win32.Build.0 = Release|Any CPU
+		{FFA7988E-7348-4669-9E9D-27E629C873A2}.Release|Win32.ActiveCfg = Release|Any CPU
+		{745869FF-80E9-4589-A366-E775D2103843}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{745869FF-80E9-4589-A366-E775D2103843}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{745869FF-80E9-4589-A366-E775D2103843}.Debug|Win32.Build.0 = Debug|Any CPU
+		{745869FF-80E9-4589-A366-E775D2103843}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{745869FF-80E9-4589-A366-E775D2103843}.Release|Any CPU.Build.0 = Release|Any CPU
+		{745869FF-80E9-4589-A366-E775D2103843}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{745869FF-80E9-4589-A366-E775D2103843}.Release|Win32.Build.0 = Release|Any CPU
+		{745869FF-80E9-4589-A366-E775D2103843}.Release|Win32.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{1152B71B-3C05-4598-B20D-823B5D40559E} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{8035765F-D51F-4A0C-A746-2FD100E19419} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{2748AD25-9C63-4E12-877B-4DCE96FBED54} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{80318B5F-A25D-45AB-8A95-EF31D2370A4C} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{924EE450-603D-49C1-A8E5-4AFAA31CE6F3} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{4980B743-B32F-4aba-AABD-45E2CAD3568D} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{FFA7988E-7348-4669-9E9D-27E629C873A2} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
 		{7DB80259-24D4-46C3-A024-53FF1987733D} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{DDE2A481-8271-4EAC-A330-8FA6A38D13D1} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
-		{E73BB233-D88B-44A7-A98F-D71EE158381D} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
-		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
-		{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
-		{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
-		{2FF700C2-A38A-48BD-A637-8CAFD4FE6237} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
-		{E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
+		{4980B743-B32F-4aba-AABD-45E2CAD3568D} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{924EE450-603D-49C1-A8E5-4AFAA31CE6F3} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{80318B5F-A25D-45AB-8A95-EF31D2370A4C} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{2748AD25-9C63-4E12-877B-4DCE96FBED54} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{8035765F-D51F-4A0C-A746-2FD100E19419} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{1152B71B-3C05-4598-B20D-823B5D40559E} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
 		{6222A3A1-83CE-47A3-A4E4-A018F82D44D8} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
-		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
-		{B22522AA-B5BF-4A58-AC6D-D4B45805521F} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
+		{E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
+		{2FF700C2-A38A-48BD-A637-8CAFD4FE6237} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
+		{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
+		{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
+		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
+		{E73BB233-D88B-44A7-A98F-D71EE158381D} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
+		{DDE2A481-8271-4EAC-A330-8FA6A38D13D1} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
 		{870115DD-960A-4406-A6B9-600BCDC36A03} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
-		{F355E45F-F54F-4B42-8916-9A633A392789} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
-		{D599885D-E161-4CCE-A66E-7A40C8C4F4CC} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
-		{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
-		{F3662720-9EA2-4591-BBC6-97361DCE50A9} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
-		{CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
-		{E0646C25-36F2-4524-969F-FA621353AB94} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{B22522AA-B5BF-4A58-AC6D-D4B45805521F} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
+		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
 		{C4035C32-026F-4158-AF15-113EA1EF1960} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
-		{068F9531-5D29-49E0-980E-59982A3A0469} = {C4035C32-026F-4158-AF15-113EA1EF1960}
-		{68D5EE3B-0C35-4DF1-BD29-6606851A02C1} = {C4035C32-026F-4158-AF15-113EA1EF1960}
-		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {C4035C32-026F-4158-AF15-113EA1EF1960}
-		{72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F} = {C4035C32-026F-4158-AF15-113EA1EF1960}
-		{BDA49550-5ED1-4C6B-B648-657B2CACD8E0} = {C4035C32-026F-4158-AF15-113EA1EF1960}
-		{D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B} = {C4035C32-026F-4158-AF15-113EA1EF1960}
-		{388E7B64-0393-4EB4-A3E3-5C474F141853} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{F390DA70-1FE1-4715-81A0-389AB010C130} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{7C96B65D-28A5-4F28-A35B-8D83CE831EE8} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{BF38FB72-B380-4196-AF8C-95749D726C61} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{E1B288A2-08EE-4318-8BBB-8AB72C69E33E} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{6E59AF58-F635-459A-9A35-C9AC41C00339} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{CA76F702-5B4E-4918-B8D8-7FF8382434FF} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{97B3B514-AB0E-4FE1-89DE-8A945F5112AE} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{50A89267-A28B-4DF3-8E62-912E005143B8} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{52006F3F-3156-45DE-89D8-C4813694FBA4} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{70966F84-74C9-4067-A379-0C674A929233} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{C9DE556D-325C-4544-B29F-16A9EB7C9830} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE}
-		{DBCF20A1-BA13-4582-BFA9-74DE4D987B73} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE}
-		{4AC2D5F1-F671-480C-A075-6BF62B3721B2} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE}
-		{6FA16499-896F-4C02-BB43-1AF5C6C7C713} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE}
-		{8D732610-8FC6-43BA-94C9-7126FD7FE361} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF}
-		{D332F2D1-2CF1-43B7-903C-844BD5211A7E} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF}
-		{833904AB-3CD4-4071-9B48-5770E44685AA} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF}
-		{23B517C9-1ECC-4419-A13F-0B7136D085CB} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF}
-		{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C} = {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}
-		{1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}
-		{A4C858C8-51B6-4265-A695-A20FCEBA1D19} = {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}
-		{DEFC8584-BEC3-4921-BD0F-40482E450B7B} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{A569DCC1-C608-45FD-B770-4F79335EF154} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{DD9AE6A5-2B9D-443A-BC71-38BE578C36BD} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{17F4D7E0-6933-4C2E-8714-FD7E98D625D5} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{3CA90546-3B4C-4663-9445-C4E9371750A7} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{461606BD-E824-4D0A-8CBA-01810B1F5E02} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{64A3E5E6-90BF-47F6-94DF-68C94B62C817} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{5EEB99CF-EA2B-4733-80A6-CE9192D68170} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{E54A5AD2-418D-4A85-BA5E-CD803DE38715} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{918487B7-2153-4618-BBB3-344DBDDF2A2A} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{D022A6CE-7438-41E8-AC64-F2DE18EC54C6} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{4B8F0F98-8BE1-402B-AA8B-C8D548577B38} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{F93E52FD-DA66-4CE5-A0CB-BCD902811122} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{8AA421C8-D7AF-4957-9F43-5135328ACB24} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{9196DD8A-B4D4-4780-8742-C5762E547FC2} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{0008FCE9-9EB4-4E2E-979B-553278E5BBA6} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B}
-		{6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B}
-		{6022AC51-B658-4C54-97EF-79187AC65B47} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{FC0FE702-A87D-4D70-A9B6-1ECCD611125F} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{0773ED53-08E2-4495-A3BE-CA0B5D413C15} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{E618A9CD-A39F-4925-A538-E8A3FEF24E54} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{85226AFB-CE71-4851-9A75-7EEC663A8E8A} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{CBC6C247-747B-4908-B09A-4D2E0F640B6B} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{0162E499-42D0-409B-AA25-EED21F75336B} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{DCA2703D-250A-463E-A68A-07ED105AE6BD} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{BFA3BF26-33BD-4A65-B84D-C7F30D131668} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{E0646C25-36F2-4524-969F-FA621353AB94} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{F3662720-9EA2-4591-BBC6-97361DCE50A9} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{D599885D-E161-4CCE-A66E-7A40C8C4F4CC} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{F355E45F-F54F-4B42-8916-9A633A392789} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{A5C0E8F8-9D04-46ED-91D6-1DEF1575313B} = {F355E45F-F54F-4B42-8916-9A633A392789}
+		{1F261725-6318-4434-A1B1-6C70CE4CD324} = {F355E45F-F54F-4B42-8916-9A633A392789}
+		{3EAA45A9-735C-4AC7-A799-947B93EA449D} = {F355E45F-F54F-4B42-8916-9A633A392789}
+		{08CE9972-283B-44F4-82FA-966F7DFA6B7A} = {F355E45F-F54F-4B42-8916-9A633A392789}
+		{CE498514-D12D-4B6E-AE0E-FEC29BD43748} = {F355E45F-F54F-4B42-8916-9A633A392789}
+		{44A8DE09-CAB9-49D8-9CFC-5EB0A552F181} = {F355E45F-F54F-4B42-8916-9A633A392789}
+		{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD} = {D599885D-E161-4CCE-A66E-7A40C8C4F4CC}
+		{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF} = {D599885D-E161-4CCE-A66E-7A40C8C4F4CC}
+		{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446} = {D599885D-E161-4CCE-A66E-7A40C8C4F4CC}
 		{C7F29FC2-1B03-4CDD-9E30-400F4765FF04} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{A9F12710-24E4-46D4-832C-6ECB395B9EAD} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
-		{B7823AE9-4B43-4859-8796-2EBDC116FBB8} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
-		{BAD94D6E-4159-4CB6-B991-486F412D9BB6} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
-		{5C70D6AB-0A33-43F9-B8B5-54558C35BBB1} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
-		{EEF5E054-4192-4A57-8FBF-E860D808A51D} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
-		{AFE34868-AFA1-4E1C-9450-47AB4BE329D5} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
-		{08F772A1-F0BE-433E-8B37-F6522953DB05} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668}
-		{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668}
-		{0991423A-DBF6-4C89-B365-A1DF1EB32E42} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668}
-		{DFB936AD-90EE-4B4F-941E-4F4A636F0D92} = {0773ED53-08E2-4495-A3BE-CA0B5D413C15}
-		{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD} = {0773ED53-08E2-4495-A3BE-CA0B5D413C15}
-		{88DA149F-21B2-48AB-82C4-28FB6BDFD783} = {6022AC51-B658-4C54-97EF-79187AC65B47}
-		{943DBBB3-E84E-4CF4-917C-C05AFA8743C1} = {6022AC51-B658-4C54-97EF-79187AC65B47}
-		{78CC29AC-CC79-4355-B1F2-97936DF198AC} = {6022AC51-B658-4C54-97EF-79187AC65B47}
-		{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865} = {6022AC51-B658-4C54-97EF-79187AC65B47}
+		{BFA3BF26-33BD-4A65-B84D-C7F30D131668} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{DCA2703D-250A-463E-A68A-07ED105AE6BD} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{0162E499-42D0-409B-AA25-EED21F75336B} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{CBC6C247-747B-4908-B09A-4D2E0F640B6B} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{85226AFB-CE71-4851-9A75-7EEC663A8E8A} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{E618A9CD-A39F-4925-A538-E8A3FEF24E54} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{0773ED53-08E2-4495-A3BE-CA0B5D413C15} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{FC0FE702-A87D-4D70-A9B6-1ECCD611125F} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{6022AC51-B658-4C54-97EF-79187AC65B47} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
 		{66A378A1-E9F4-4AD5-8946-D0EC06C2902F} = {6022AC51-B658-4C54-97EF-79187AC65B47}
-		{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446} = {D599885D-E161-4CCE-A66E-7A40C8C4F4CC}
-		{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF} = {D599885D-E161-4CCE-A66E-7A40C8C4F4CC}
-		{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD} = {D599885D-E161-4CCE-A66E-7A40C8C4F4CC}
-		{44A8DE09-CAB9-49D8-9CFC-5EB0A552F181} = {F355E45F-F54F-4B42-8916-9A633A392789}
-		{CE498514-D12D-4B6E-AE0E-FEC29BD43748} = {F355E45F-F54F-4B42-8916-9A633A392789}
-		{08CE9972-283B-44F4-82FA-966F7DFA6B7A} = {F355E45F-F54F-4B42-8916-9A633A392789}
-		{3EAA45A9-735C-4AC7-A799-947B93EA449D} = {F355E45F-F54F-4B42-8916-9A633A392789}
-		{1F261725-6318-4434-A1B1-6C70CE4CD324} = {F355E45F-F54F-4B42-8916-9A633A392789}
-		{A5C0E8F8-9D04-46ED-91D6-1DEF1575313B} = {F355E45F-F54F-4B42-8916-9A633A392789}
+		{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865} = {6022AC51-B658-4C54-97EF-79187AC65B47}
+		{78CC29AC-CC79-4355-B1F2-97936DF198AC} = {6022AC51-B658-4C54-97EF-79187AC65B47}
+		{943DBBB3-E84E-4CF4-917C-C05AFA8743C1} = {6022AC51-B658-4C54-97EF-79187AC65B47}
+		{88DA149F-21B2-48AB-82C4-28FB6BDFD783} = {6022AC51-B658-4C54-97EF-79187AC65B47}
+		{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD} = {0773ED53-08E2-4495-A3BE-CA0B5D413C15}
+		{DFB936AD-90EE-4B4F-941E-4F4A636F0D92} = {0773ED53-08E2-4495-A3BE-CA0B5D413C15}
+		{0991423A-DBF6-4C89-B365-A1DF1EB32E42} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668}
+		{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668}
+		{08F772A1-F0BE-433E-8B37-F6522953DB05} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668}
+		{AFE34868-AFA1-4E1C-9450-47AB4BE329D5} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
+		{EEF5E054-4192-4A57-8FBF-E860D808A51D} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
+		{5C70D6AB-0A33-43F9-B8B5-54558C35BBB1} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
+		{BAD94D6E-4159-4CB6-B991-486F412D9BB6} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
+		{B7823AE9-4B43-4859-8796-2EBDC116FBB8} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
+		{A9F12710-24E4-46D4-832C-6ECB395B9EAD} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
+		{745869FF-80E9-4589-A366-E775D2103843} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{9196DD8A-B4D4-4780-8742-C5762E547FC2} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{8AA421C8-D7AF-4957-9F43-5135328ACB24} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{F93E52FD-DA66-4CE5-A0CB-BCD902811122} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{4B8F0F98-8BE1-402B-AA8B-C8D548577B38} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{D022A6CE-7438-41E8-AC64-F2DE18EC54C6} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{918487B7-2153-4618-BBB3-344DBDDF2A2A} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{E54A5AD2-418D-4A85-BA5E-CD803DE38715} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{5EEB99CF-EA2B-4733-80A6-CE9192D68170} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{64A3E5E6-90BF-47F6-94DF-68C94B62C817} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{461606BD-E824-4D0A-8CBA-01810B1F5E02} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{3CA90546-3B4C-4663-9445-C4E9371750A7} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{17F4D7E0-6933-4C2E-8714-FD7E98D625D5} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{DD9AE6A5-2B9D-443A-BC71-38BE578C36BD} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{A569DCC1-C608-45FD-B770-4F79335EF154} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{DEFC8584-BEC3-4921-BD0F-40482E450B7B} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B}
+		{0008FCE9-9EB4-4E2E-979B-553278E5BBA6} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B}
+		{A4C858C8-51B6-4265-A695-A20FCEBA1D19} = {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}
+		{1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}
+		{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C} = {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}
+		{70966F84-74C9-4067-A379-0C674A929233} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{52006F3F-3156-45DE-89D8-C4813694FBA4} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{50A89267-A28B-4DF3-8E62-912E005143B8} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{97B3B514-AB0E-4FE1-89DE-8A945F5112AE} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{CA76F702-5B4E-4918-B8D8-7FF8382434FF} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{6E59AF58-F635-459A-9A35-C9AC41C00339} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{E1B288A2-08EE-4318-8BBB-8AB72C69E33E} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{BF38FB72-B380-4196-AF8C-95749D726C61} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{7C96B65D-28A5-4F28-A35B-8D83CE831EE8} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{F390DA70-1FE1-4715-81A0-389AB010C130} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{388E7B64-0393-4EB4-A3E3-5C474F141853} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{23B517C9-1ECC-4419-A13F-0B7136D085CB} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF}
+		{833904AB-3CD4-4071-9B48-5770E44685AA} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF}
+		{D332F2D1-2CF1-43B7-903C-844BD5211A7E} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF}
+		{8D732610-8FC6-43BA-94C9-7126FD7FE361} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF}
+		{6FA16499-896F-4C02-BB43-1AF5C6C7C713} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE}
+		{4AC2D5F1-F671-480C-A075-6BF62B3721B2} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE}
+		{DBCF20A1-BA13-4582-BFA9-74DE4D987B73} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE}
+		{C9DE556D-325C-4544-B29F-16A9EB7C9830} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE}
+		{D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B} = {C4035C32-026F-4158-AF15-113EA1EF1960}
+		{BDA49550-5ED1-4C6B-B648-657B2CACD8E0} = {C4035C32-026F-4158-AF15-113EA1EF1960}
+		{72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F} = {C4035C32-026F-4158-AF15-113EA1EF1960}
+		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {C4035C32-026F-4158-AF15-113EA1EF1960}
+		{68D5EE3B-0C35-4DF1-BD29-6606851A02C1} = {C4035C32-026F-4158-AF15-113EA1EF1960}
+		{068F9531-5D29-49E0-980E-59982A3A0469} = {C4035C32-026F-4158-AF15-113EA1EF1960}
 	EndGlobalSection
 EndGlobal
diff --git a/SharpDevelop.sln b/SharpDevelop.sln
index 69cb288a3a..ca5051d28c 100644
--- a/SharpDevelop.sln
+++ b/SharpDevelop.sln
@@ -1,24 +1,22 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-# SharpDevelop 4.0.0.5201
+# SharpDevelop 4.0.0.5216
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{256F5C28-532C-44C0-8AB8-D8EC5E492E01}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "src\Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Presentation", "src\Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj", "{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "src\Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.WinForms", "src\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj", "{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Widgets", "src\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj", "{8035765F-D51F-4A0C-A746-2FD100E19419}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom", "src\Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj", "{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "src\Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
@@ -28,59 +26,61 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Sd
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "src\Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom", "src\Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj", "{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Widgets", "src\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj", "{8035765F-D51F-4A0C-A746-2FD100E19419}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.WinForms", "src\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj", "{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "src\Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Presentation", "src\Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj", "{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "src\Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{2A232EF1-EB95-41C6-B63A-C106E0C95D3C}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NRefactory", "NRefactory", "{E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}"
-	ProjectSection(SolutionItems) = postProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TreeView", "src\Libraries\SharpTreeView\ICSharpCode.TreeView\ICSharpCode.TreeView.csproj", "{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}"
+	ProjectSection(ProjectDependencies) = postProject
+		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryASTGenerator", "src\Libraries\NRefactory\NRefactoryASTGenerator\NRefactoryASTGenerator.csproj", "{B22522AA-B5BF-4A58-AC6D-D4B45805521F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aga.Controls", "src\Libraries\TreeViewAdv\Aga.Controls\Aga.Controls.csproj", "{E73BB233-D88B-44A7-A98F-D71EE158381D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "src\Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "src\Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Build.Tasks", "src\Libraries\ICSharpCode.Build.Tasks\Project\ICSharpCode.Build.Tasks.csproj", "{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonDock", "src\Libraries\AvalonDock\AvalonDock.csproj", "{2FF700C2-A38A-48BD-A637-8CAFD4FE6237}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit", "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj", "{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Build.Tasks", "src\Libraries\ICSharpCode.Build.Tasks\Project\ICSharpCode.Build.Tasks.csproj", "{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonDock", "src\Libraries\AvalonDock\AvalonDock.csproj", "{2FF700C2-A38A-48BD-A637-8CAFD4FE6237}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NRefactory", "NRefactory", "{E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}"
+	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "src\Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "src\Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aga.Controls", "src\Libraries\TreeViewAdv\Aga.Controls\Aga.Controls.csproj", "{E73BB233-D88B-44A7-A98F-D71EE158381D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TreeView", "src\Libraries\SharpTreeView\ICSharpCode.TreeView\ICSharpCode.TreeView.csproj", "{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryASTGenerator", "src\Libraries\NRefactory\NRefactoryASTGenerator\NRefactoryASTGenerator.csproj", "{B22522AA-B5BF-4A58-AC6D-D4B45805521F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
@@ -89,188 +89,180 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{393278
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Profiler", "Profiler", "{C4035C32-026F-4158-AF15-113EA1EF1960}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.AddIn", "src\AddIns\Misc\Profiler\Frontend\AddIn\Profiler.AddIn.csproj", "{D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
-		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}
-		{68D5EE3B-0C35-4DF1-BD29-6606851A02C1} = {68D5EE3B-0C35-4DF1-BD29-6606851A02C1}
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WpfDesign", "WpfDesign", "{6022AC51-B658-4C54-97EF-79187AC65B47}"
+	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Controls", "src\AddIns\Misc\Profiler\Frontend\Controls\Profiler.Controls.csproj", "{BDA49550-5ED1-4C6B-B648-657B2CACD8E0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.XamlDom", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.XamlDom\Project\WpfDesign.XamlDom.csproj", "{88DA149F-21B2-48AB-82C4-28FB6BDFD783}"
 	ProjectSection(ProjectDependencies) = postProject
-		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Controller", "src\AddIns\Misc\Profiler\Controller\Profiler.Controller.csproj", "{72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Designer", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.Designer\Project\WpfDesign.Designer.csproj", "{78CC29AC-CC79-4355-B1F2-97936DF198AC}"
 	ProjectSection(ProjectDependencies) = postProject
-		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.X64Converter", "src\AddIns\Misc\Profiler\X64Converter\Profiler.X64Converter.csproj", "{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.AddIn", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.AddIn\WpfDesign.AddIn.csproj", "{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{0E96FCFA-9DAC-4534-AC18-01A90C368873}") = "Hook", "src\AddIns\Misc\Profiler\Hook\Hook.vcxproj", "{68D5EE3B-0C35-4DF1-BD29-6606851A02C1}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Language Bindings", "Language Bindings", "{E0646C25-36F2-4524-969F-FA621353AB94}"
-	ProjectSection(SolutionItems) = postProject
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CppBinding", "src\AddIns\BackendBindings\CppBinding\CppBinding\CppBinding.csproj", "{70966F84-74C9-4067-A379-0C674A929233}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign\Project\WpfDesign.csproj", "{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Boo", "Boo", "{97B3B514-AB0E-4FE1-89DE-8A945F5112AE}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IconEditor", "IconEditor", "{0773ED53-08E2-4495-A3BE-CA0B5D413C15}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding", "src\AddIns\BackendBindings\Boo\BooBinding\Project\BooBinding.csproj", "{4AC2D5F1-F671-480C-A075-6BF62B3721B2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditorAddIn", "src\AddIns\DisplayBindings\IconEditor\IconEditorAddIn\IconEditorAddIn.csproj", "{DFB936AD-90EE-4B4F-941E-4F4A636F0D92}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter", "src\AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Project\NRefactoryToBooConverter.csproj", "{DBCF20A1-BA13-4582-BFA9-74DE4D987B73}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditor", "src\AddIns\DisplayBindings\IconEditor\IconEditor\IconEditor.csproj", "{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Python", "Python", "{CA76F702-5B4E-4918-B8D8-7FF8382434FF}"
-	ProjectSection(SolutionItems) = postProject
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks", "src\AddIns\BackendBindings\Python\Python.Build.Tasks\Project\Python.Build.Tasks.csproj", "{D332F2D1-2CF1-43B7-903C-844BD5211A7E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HexEditor", "src\AddIns\DisplayBindings\HexEditor\Project\HexEditor.csproj", "{E618A9CD-A39F-4925-A538-E8A3FEF24E54}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding", "src\AddIns\BackendBindings\Python\PythonBinding\Project\PythonBinding.csproj", "{8D732610-8FC6-43BA-94C9-7126FD7FE361}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingsEditor", "src\AddIns\DisplayBindings\SettingsEditor\Project\SettingsEditor.csproj", "{85226AFB-CE71-4851-9A75-7EEC663A8E8A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILAsmBinding", "src\AddIns\BackendBindings\ILAsmBinding\Project\ILAsmBinding.csproj", "{6E59AF58-F635-459A-9A35-C9AC41C00339}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceEditor", "src\AddIns\DisplayBindings\ResourceEditor\Project\ResourceEditor.csproj", "{CBC6C247-747B-4908-B09A-4D2E0F640B6B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding", "src\AddIns\BackendBindings\WixBinding\Project\WixBinding.csproj", "{E1B288A2-08EE-4318-8BBB-8AB72C69E33E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonEdit.AddIn", "src\AddIns\DisplayBindings\AvalonEdit.AddIn\AvalonEdit.AddIn.csproj", "{0162E499-42D0-409B-AA25-EED21F75336B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "src\AddIns\BackendBindings\CSharpBinding\Project\CSharpBinding.csproj", "{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor", "src\AddIns\DisplayBindings\XmlEditor\Project\XmlEditor.csproj", "{DCA2703D-250A-463E-A68A-07ED105AE6BD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding", "src\AddIns\BackendBindings\VBNetBinding\Project\VBNetBinding.csproj", "{BF38FB72-B380-4196-AF8C-95749D726C61}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormsDesigner", "src\AddIns\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj", "{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlBinding", "src\AddIns\BackendBindings\XamlBinding\XamlBinding\XamlBinding.csproj", "{7C96B65D-28A5-4F28-A35B-8D83CE831EE8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ClassDiagram", "ClassDiagram", "{BFA3BF26-33BD-4A65-B84D-C7F30D131668}"
+	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}"
-	ProjectSection(SolutionItems) = postProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassCanvas", "src\AddIns\DisplayBindings\ClassDiagram\ClassCanvas\ClassCanvas.csproj", "{08F772A1-F0BE-433E-8B37-F6522953DB05}"
+	ProjectSection(ProjectDependencies) = postProject
+		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Core", "src\AddIns\Debugger\Debugger.Core\Debugger.Core.csproj", "{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassDiagramAddin", "src\AddIns\DisplayBindings\ClassDiagram\ClassDiagramAddin\ClassDiagramAddin.csproj", "{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.AddIn", "src\AddIns\Debugger\Debugger.AddIn\Debugger.AddIn.csproj", "{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Diagrams", "src\AddIns\DisplayBindings\ClassDiagram\DiagramRouter\Diagrams.csproj", "{0991423A-DBF6-4C89-B365-A1DF1EB32E42}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{F3662720-9EA2-4591-BBC6-97361DCE50A9}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{C7F29FC2-1B03-4CDD-9E30-400F4765FF04}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace", "src\AddIns\Misc\SearchAndReplace\Project\SearchAndReplace.csproj", "{9196DD8A-B4D4-4780-8742-C5762E547FC2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Addin", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Addin\ICSharpCode.Data.Addin.csproj", "{A9F12710-24E4-46D4-832C-6ECB395B9EAD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReflectorAddIn", "src\AddIns\Misc\ReflectorAddIn\ReflectorAddIn\Project\ReflectorAddIn.csproj", "{8AA421C8-D7AF-4957-9F43-5135328ACB24}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Core", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Core\ICSharpCode.Data.Core.csproj", "{B7823AE9-4B43-4859-8796-2EBDC116FBB8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartPage", "src\AddIns\Misc\StartPage\Project\StartPage.csproj", "{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Core.UI", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Core.UI\ICSharpCode.Data.Core.UI.csproj", "{BAD94D6E-4159-4CB6-B991-486F412D9BB6}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddInManager", "src\AddIns\Misc\AddInManager\Project\AddInManager.csproj", "{F93E52FD-DA66-4CE5-A0CB-BCD902811122}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.EDMDesigner.Core", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.EDMDesigner.Core\ICSharpCode.Data.EDMDesigner.Core.csproj", "{5C70D6AB-0A33-43F9-B8B5-54558C35BBB1}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddinScout", "src\AddIns\Misc\AddinScout\Project\AddinScout.csproj", "{4B8F0F98-8BE1-402B-AA8B-C8D548577B38}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.EDMDesigner.Core.UI", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.EDMDesigner.Core.UI\ICSharpCode.Data.EDMDesigner.Core.UI.csproj", "{EEF5E054-4192-4A57-8FBF-E860D808A51D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FiletypeRegisterer", "src\AddIns\Misc\FiletypeRegisterer\Project\FiletypeRegisterer.csproj", "{D022A6CE-7438-41E8-AC64-F2DE18EC54C6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.SQLServer", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.SQLServer\ICSharpCode.Data.SQLServer.csproj", "{AFE34868-AFA1-4E1C-9450-47AB4BE329D5}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HtmlHelp2", "src\AddIns\Misc\HtmlHelp2\Project\HtmlHelp2.csproj", "{918487B7-2153-4618-BBB3-344DBDDF2A2A}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Analysis", "Analysis", "{F355E45F-F54F-4B42-8916-9A633A392789}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceAnalysis", "src\AddIns\Misc\SourceAnalysis\SourceAnalysis.csproj", "{CE498514-D12D-4B6E-AE0E-FEC29BD43748}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "HtmlHelp2JScriptGlobals", "src\AddIns\Misc\HtmlHelp2\JScriptGlobals\HtmlHelp2JScriptGlobals.vbproj", "{E54A5AD2-418D-4A85-BA5E-CD803DE38715}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage", "src\AddIns\Misc\CodeCoverage\Project\CodeCoverage.csproj", "{08CE9972-283B-44F4-82FA-966F7DFA6B7A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PInvokeAddIn", "src\AddIns\Misc\PInvokeAddIn\Project\PInvokeAddIn.csproj", "{5EEB99CF-EA2B-4733-80A6-CE9192D68170}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysis", "src\AddIns\Misc\CodeAnalysis\CodeAnalysis.csproj", "{3EAA45A9-735C-4AC7-A799-947B93EA449D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegExpTk", "src\AddIns\Misc\RegExpTk\Project\RegExpTk.csproj", "{64A3E5E6-90BF-47F6-94DF-68C94B62C817}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting", "src\AddIns\Misc\UnitTesting\UnitTesting.csproj", "{1F261725-6318-4434-A1B1-6C70CE4CD324}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceToolkit", "src\AddIns\Misc\ResourceToolkit\Project\ResourceToolkit.csproj", "{461606BD-E824-4D0A-8CBA-01810B1F5E02}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ComponentInspector", "ComponentInspector", "{D599885D-E161-4CCE-A66E-7A40C8C4F4CC}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector.AddIn", "src\AddIns\Misc\ComponentInspector\ComponentInspector.AddIn\ComponentInspector.AddIn.csproj", "{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpRefactoring", "src\AddIns\Misc\SharpRefactoring\SharpRefactoring.csproj", "{3CA90546-3B4C-4663-9445-C4E9371750A7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector.Core", "src\AddIns\Misc\ComponentInspector\ComponentInspector.Core\ComponentInspector.Core.csproj", "{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubversionAddIn", "src\AddIns\Misc\SubversionAddIn\Project\SubversionAddIn.csproj", "{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector", "src\AddIns\Misc\ComponentInspector\ComponentInspector\ComponentInspector.csproj", "{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UsageDataCollector", "UsageDataCollector", "{DEFC8584-BEC3-4921-BD0F-40482E450B7B}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{F3662720-9EA2-4591-BBC6-97361DCE50A9}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UsageDataCollector", "src\AddIns\Misc\UsageDataCollector\UsageDataCollector\UsageDataCollector.csproj", "{6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UsageDataCollector", "UsageDataCollector", "{DEFC8584-BEC3-4921-BD0F-40482E450B7B}"
+	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UsageDataCollector.AddIn", "src\AddIns\Misc\UsageDataCollector\UsageDataCollector.AddIn\UsageDataCollector.AddIn.csproj", "{0008FCE9-9EB4-4E2E-979B-553278E5BBA6}"
@@ -278,172 +270,185 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UsageDataCollector.AddIn",
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ComponentInspector", "ComponentInspector", "{D599885D-E161-4CCE-A66E-7A40C8C4F4CC}"
-	ProjectSection(SolutionItems) = postProject
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector", "src\AddIns\Misc\ComponentInspector\ComponentInspector\ComponentInspector.csproj", "{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UsageDataCollector", "src\AddIns\Misc\UsageDataCollector\UsageDataCollector\UsageDataCollector.csproj", "{6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector.Core", "src\AddIns\Misc\ComponentInspector\ComponentInspector.Core\ComponentInspector.Core.csproj", "{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubversionAddIn", "src\AddIns\Misc\SubversionAddIn\Project\SubversionAddIn.csproj", "{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector.AddIn", "src\AddIns\Misc\ComponentInspector\ComponentInspector.AddIn\ComponentInspector.AddIn.csproj", "{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpRefactoring", "src\AddIns\Misc\SharpRefactoring\SharpRefactoring.csproj", "{3CA90546-3B4C-4663-9445-C4E9371750A7}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Analysis", "Analysis", "{F355E45F-F54F-4B42-8916-9A633A392789}"
-	ProjectSection(SolutionItems) = postProject
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting", "src\AddIns\Misc\UnitTesting\UnitTesting.csproj", "{1F261725-6318-4434-A1B1-6C70CE4CD324}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceToolkit", "src\AddIns\Misc\ResourceToolkit\Project\ResourceToolkit.csproj", "{461606BD-E824-4D0A-8CBA-01810B1F5E02}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysis", "src\AddIns\Misc\CodeAnalysis\CodeAnalysis.csproj", "{3EAA45A9-735C-4AC7-A799-947B93EA449D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegExpTk", "src\AddIns\Misc\RegExpTk\Project\RegExpTk.csproj", "{64A3E5E6-90BF-47F6-94DF-68C94B62C817}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage", "src\AddIns\Misc\CodeCoverage\Project\CodeCoverage.csproj", "{08CE9972-283B-44F4-82FA-966F7DFA6B7A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PInvokeAddIn", "src\AddIns\Misc\PInvokeAddIn\Project\PInvokeAddIn.csproj", "{5EEB99CF-EA2B-4733-80A6-CE9192D68170}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceAnalysis", "src\AddIns\Misc\SourceAnalysis\SourceAnalysis.csproj", "{CE498514-D12D-4B6E-AE0E-FEC29BD43748}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "HtmlHelp2JScriptGlobals", "src\AddIns\Misc\HtmlHelp2\JScriptGlobals\HtmlHelp2JScriptGlobals.vbproj", "{E54A5AD2-418D-4A85-BA5E-CD803DE38715}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}"
-	ProjectSection(SolutionItems) = postProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HtmlHelp2", "src\AddIns\Misc\HtmlHelp2\Project\HtmlHelp2.csproj", "{918487B7-2153-4618-BBB3-344DBDDF2A2A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{C7F29FC2-1B03-4CDD-9E30-400F4765FF04}"
-	ProjectSection(SolutionItems) = postProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FiletypeRegisterer", "src\AddIns\Misc\FiletypeRegisterer\Project\FiletypeRegisterer.csproj", "{D022A6CE-7438-41E8-AC64-F2DE18EC54C6}"
+	ProjectSection(ProjectDependencies) = postProject
+		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.SQLServer", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.SQLServer\ICSharpCode.Data.SQLServer.csproj", "{AFE34868-AFA1-4E1C-9450-47AB4BE329D5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddinScout", "src\AddIns\Misc\AddinScout\Project\AddinScout.csproj", "{4B8F0F98-8BE1-402B-AA8B-C8D548577B38}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.EDMDesigner.Core.UI", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.EDMDesigner.Core.UI\ICSharpCode.Data.EDMDesigner.Core.UI.csproj", "{EEF5E054-4192-4A57-8FBF-E860D808A51D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddInManager", "src\AddIns\Misc\AddInManager\Project\AddInManager.csproj", "{F93E52FD-DA66-4CE5-A0CB-BCD902811122}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.EDMDesigner.Core", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.EDMDesigner.Core\ICSharpCode.Data.EDMDesigner.Core.csproj", "{5C70D6AB-0A33-43F9-B8B5-54558C35BBB1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartPage", "src\AddIns\Misc\StartPage\Project\StartPage.csproj", "{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Core.UI", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Core.UI\ICSharpCode.Data.Core.UI.csproj", "{BAD94D6E-4159-4CB6-B991-486F412D9BB6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReflectorAddIn", "src\AddIns\Misc\ReflectorAddIn\ReflectorAddIn\Project\ReflectorAddIn.csproj", "{8AA421C8-D7AF-4957-9F43-5135328ACB24}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Core", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Core\ICSharpCode.Data.Core.csproj", "{B7823AE9-4B43-4859-8796-2EBDC116FBB8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace", "src\AddIns\Misc\SearchAndReplace\Project\SearchAndReplace.csproj", "{9196DD8A-B4D4-4780-8742-C5762E547FC2}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Addin", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Addin\ICSharpCode.Data.Addin.csproj", "{A9F12710-24E4-46D4-832C-6ECB395B9EAD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShortcutsManagement", "src\AddIns\Misc\ShortcutsManagement\ShortcutsManagement\ShortcutsManagement.csproj", "{745869FF-80E9-4589-A366-E775D2103843}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ClassDiagram", "ClassDiagram", "{BFA3BF26-33BD-4A65-B84D-C7F30D131668}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Diagrams", "src\AddIns\DisplayBindings\ClassDiagram\DiagramRouter\Diagrams.csproj", "{0991423A-DBF6-4C89-B365-A1DF1EB32E42}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.AddIn", "src\AddIns\Debugger\Debugger.AddIn\Debugger.AddIn.csproj", "{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassDiagramAddin", "src\AddIns\DisplayBindings\ClassDiagram\ClassDiagramAddin\ClassDiagramAddin.csproj", "{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Core", "src\AddIns\Debugger\Debugger.Core\Debugger.Core.csproj", "{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassCanvas", "src\AddIns\DisplayBindings\ClassDiagram\ClassCanvas\ClassCanvas.csproj", "{08F772A1-F0BE-433E-8B37-F6522953DB05}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Language Bindings", "Language Bindings", "{E0646C25-36F2-4524-969F-FA621353AB94}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlBinding", "src\AddIns\BackendBindings\XamlBinding\XamlBinding\XamlBinding.csproj", "{7C96B65D-28A5-4F28-A35B-8D83CE831EE8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormsDesigner", "src\AddIns\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj", "{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding", "src\AddIns\BackendBindings\VBNetBinding\Project\VBNetBinding.csproj", "{BF38FB72-B380-4196-AF8C-95749D726C61}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor", "src\AddIns\DisplayBindings\XmlEditor\Project\XmlEditor.csproj", "{DCA2703D-250A-463E-A68A-07ED105AE6BD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "src\AddIns\BackendBindings\CSharpBinding\Project\CSharpBinding.csproj", "{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonEdit.AddIn", "src\AddIns\DisplayBindings\AvalonEdit.AddIn\AvalonEdit.AddIn.csproj", "{0162E499-42D0-409B-AA25-EED21F75336B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding", "src\AddIns\BackendBindings\WixBinding\Project\WixBinding.csproj", "{E1B288A2-08EE-4318-8BBB-8AB72C69E33E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceEditor", "src\AddIns\DisplayBindings\ResourceEditor\Project\ResourceEditor.csproj", "{CBC6C247-747B-4908-B09A-4D2E0F640B6B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILAsmBinding", "src\AddIns\BackendBindings\ILAsmBinding\Project\ILAsmBinding.csproj", "{6E59AF58-F635-459A-9A35-C9AC41C00339}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingsEditor", "src\AddIns\DisplayBindings\SettingsEditor\Project\SettingsEditor.csproj", "{85226AFB-CE71-4851-9A75-7EEC663A8E8A}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Python", "Python", "{CA76F702-5B4E-4918-B8D8-7FF8382434FF}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding", "src\AddIns\BackendBindings\Python\PythonBinding\Project\PythonBinding.csproj", "{8D732610-8FC6-43BA-94C9-7126FD7FE361}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HexEditor", "src\AddIns\DisplayBindings\HexEditor\Project\HexEditor.csproj", "{E618A9CD-A39F-4925-A538-E8A3FEF24E54}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks", "src\AddIns\BackendBindings\Python\Python.Build.Tasks\Project\Python.Build.Tasks.csproj", "{D332F2D1-2CF1-43B7-903C-844BD5211A7E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IconEditor", "IconEditor", "{0773ED53-08E2-4495-A3BE-CA0B5D413C15}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Boo", "Boo", "{97B3B514-AB0E-4FE1-89DE-8A945F5112AE}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditor", "src\AddIns\DisplayBindings\IconEditor\IconEditor\IconEditor.csproj", "{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter", "src\AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Project\NRefactoryToBooConverter.csproj", "{DBCF20A1-BA13-4582-BFA9-74DE4D987B73}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditorAddIn", "src\AddIns\DisplayBindings\IconEditor\IconEditorAddIn\IconEditorAddIn.csproj", "{DFB936AD-90EE-4B4F-941E-4F4A636F0D92}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding", "src\AddIns\BackendBindings\Boo\BooBinding\Project\BooBinding.csproj", "{4AC2D5F1-F671-480C-A075-6BF62B3721B2}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WpfDesign", "WpfDesign", "{6022AC51-B658-4C54-97EF-79187AC65B47}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CppBinding", "src\AddIns\BackendBindings\CppBinding\CppBinding\CppBinding.csproj", "{70966F84-74C9-4067-A379-0C674A929233}"
+	ProjectSection(ProjectDependencies) = postProject
+		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Profiler", "Profiler", "{C4035C32-026F-4158-AF15-113EA1EF1960}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign\Project\WpfDesign.csproj", "{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}"
+Project("{0E96FCFA-9DAC-4534-AC18-01A90C368873}") = "Hook", "src\AddIns\Misc\Profiler\Hook\Hook.vcxproj", "{68D5EE3B-0C35-4DF1-BD29-6606851A02C1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.X64Converter", "src\AddIns\Misc\Profiler\X64Converter\Profiler.X64Converter.csproj", "{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.AddIn", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.AddIn\WpfDesign.AddIn.csproj", "{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Controller", "src\AddIns\Misc\Profiler\Controller\Profiler.Controller.csproj", "{72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F}"
 	ProjectSection(ProjectDependencies) = postProject
+		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Designer", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.Designer\Project\WpfDesign.Designer.csproj", "{78CC29AC-CC79-4355-B1F2-97936DF198AC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Controls", "src\AddIns\Misc\Profiler\Frontend\Controls\Profiler.Controls.csproj", "{BDA49550-5ED1-4C6B-B648-657B2CACD8E0}"
 	ProjectSection(ProjectDependencies) = postProject
+		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.XamlDom", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.XamlDom\Project\WpfDesign.XamlDom.csproj", "{88DA149F-21B2-48AB-82C4-28FB6BDFD783}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.AddIn", "src\AddIns\Misc\Profiler\Frontend\AddIn\Profiler.AddIn.csproj", "{D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}
+		{68D5EE3B-0C35-4DF1-BD29-6606851A02C1} = {68D5EE3B-0C35-4DF1-BD29-6606851A02C1}
 	EndProjectSection
 EndProject
 Project("{00000000-0000-0000-0000-000000000000}") = "Tools", "src\Tools\Tools.build", "{3DF4060F-5EE0-41CF-8096-F27355FD5511}"
@@ -768,101 +773,110 @@ Global
 		{68D5EE3B-0C35-4DF1-BD29-6606851A02C1}.Debug|Win32.ActiveCfg = Debug|Win32
 		{68D5EE3B-0C35-4DF1-BD29-6606851A02C1}.Release|Win32.Build.0 = Release|Win32
 		{68D5EE3B-0C35-4DF1-BD29-6606851A02C1}.Release|Win32.ActiveCfg = Release|Win32
+		{745869FF-80E9-4589-A366-E775D2103843}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{745869FF-80E9-4589-A366-E775D2103843}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{745869FF-80E9-4589-A366-E775D2103843}.Debug|Win32.Build.0 = Debug|Any CPU
+		{745869FF-80E9-4589-A366-E775D2103843}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{745869FF-80E9-4589-A366-E775D2103843}.Release|Any CPU.Build.0 = Release|Any CPU
+		{745869FF-80E9-4589-A366-E775D2103843}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{745869FF-80E9-4589-A366-E775D2103843}.Release|Win32.Build.0 = Release|Any CPU
+		{745869FF-80E9-4589-A366-E775D2103843}.Release|Win32.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{1152B71B-3C05-4598-B20D-823B5D40559E} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{8035765F-D51F-4A0C-A746-2FD100E19419} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{2748AD25-9C63-4E12-877B-4DCE96FBED54} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{80318B5F-A25D-45AB-8A95-EF31D2370A4C} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{924EE450-603D-49C1-A8E5-4AFAA31CE6F3} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{DDE2A481-8271-4EAC-A330-8FA6A38D13D1} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
-		{E73BB233-D88B-44A7-A98F-D71EE158381D} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
-		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
-		{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
-		{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
-		{2FF700C2-A38A-48BD-A637-8CAFD4FE6237} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
+		{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{924EE450-603D-49C1-A8E5-4AFAA31CE6F3} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{80318B5F-A25D-45AB-8A95-EF31D2370A4C} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{2748AD25-9C63-4E12-877B-4DCE96FBED54} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{8035765F-D51F-4A0C-A746-2FD100E19419} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{1152B71B-3C05-4598-B20D-823B5D40559E} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
 		{E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
-		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
+		{2FF700C2-A38A-48BD-A637-8CAFD4FE6237} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
+		{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
+		{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
+		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
+		{E73BB233-D88B-44A7-A98F-D71EE158381D} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
+		{DDE2A481-8271-4EAC-A330-8FA6A38D13D1} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
 		{B22522AA-B5BF-4A58-AC6D-D4B45805521F} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
-		{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
-		{F355E45F-F54F-4B42-8916-9A633A392789} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
-		{D599885D-E161-4CCE-A66E-7A40C8C4F4CC} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
-		{F3662720-9EA2-4591-BBC6-97361DCE50A9} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
-		{CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
-		{E0646C25-36F2-4524-969F-FA621353AB94} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
 		{C4035C32-026F-4158-AF15-113EA1EF1960} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
-		{68D5EE3B-0C35-4DF1-BD29-6606851A02C1} = {C4035C32-026F-4158-AF15-113EA1EF1960}
-		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {C4035C32-026F-4158-AF15-113EA1EF1960}
-		{72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F} = {C4035C32-026F-4158-AF15-113EA1EF1960}
-		{BDA49550-5ED1-4C6B-B648-657B2CACD8E0} = {C4035C32-026F-4158-AF15-113EA1EF1960}
-		{D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B} = {C4035C32-026F-4158-AF15-113EA1EF1960}
-		{7C96B65D-28A5-4F28-A35B-8D83CE831EE8} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{BF38FB72-B380-4196-AF8C-95749D726C61} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{E1B288A2-08EE-4318-8BBB-8AB72C69E33E} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{6E59AF58-F635-459A-9A35-C9AC41C00339} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{CA76F702-5B4E-4918-B8D8-7FF8382434FF} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{97B3B514-AB0E-4FE1-89DE-8A945F5112AE} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{70966F84-74C9-4067-A379-0C674A929233} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{DBCF20A1-BA13-4582-BFA9-74DE4D987B73} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE}
-		{4AC2D5F1-F671-480C-A075-6BF62B3721B2} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE}
-		{8D732610-8FC6-43BA-94C9-7126FD7FE361} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF}
-		{D332F2D1-2CF1-43B7-903C-844BD5211A7E} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF}
-		{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C} = {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}
-		{1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}
-		{DEFC8584-BEC3-4921-BD0F-40482E450B7B} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{17F4D7E0-6933-4C2E-8714-FD7E98D625D5} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{3CA90546-3B4C-4663-9445-C4E9371750A7} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{461606BD-E824-4D0A-8CBA-01810B1F5E02} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{64A3E5E6-90BF-47F6-94DF-68C94B62C817} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{5EEB99CF-EA2B-4733-80A6-CE9192D68170} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{E54A5AD2-418D-4A85-BA5E-CD803DE38715} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{918487B7-2153-4618-BBB3-344DBDDF2A2A} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{D022A6CE-7438-41E8-AC64-F2DE18EC54C6} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{4B8F0F98-8BE1-402B-AA8B-C8D548577B38} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{F93E52FD-DA66-4CE5-A0CB-BCD902811122} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{8AA421C8-D7AF-4957-9F43-5135328ACB24} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{9196DD8A-B4D4-4780-8742-C5762E547FC2} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{0008FCE9-9EB4-4E2E-979B-553278E5BBA6} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B}
-		{6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B}
-		{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446} = {D599885D-E161-4CCE-A66E-7A40C8C4F4CC}
-		{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF} = {D599885D-E161-4CCE-A66E-7A40C8C4F4CC}
-		{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD} = {D599885D-E161-4CCE-A66E-7A40C8C4F4CC}
-		{CE498514-D12D-4B6E-AE0E-FEC29BD43748} = {F355E45F-F54F-4B42-8916-9A633A392789}
-		{08CE9972-283B-44F4-82FA-966F7DFA6B7A} = {F355E45F-F54F-4B42-8916-9A633A392789}
-		{3EAA45A9-735C-4AC7-A799-947B93EA449D} = {F355E45F-F54F-4B42-8916-9A633A392789}
-		{1F261725-6318-4434-A1B1-6C70CE4CD324} = {F355E45F-F54F-4B42-8916-9A633A392789}
-		{6022AC51-B658-4C54-97EF-79187AC65B47} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{0773ED53-08E2-4495-A3BE-CA0B5D413C15} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{E618A9CD-A39F-4925-A538-E8A3FEF24E54} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{85226AFB-CE71-4851-9A75-7EEC663A8E8A} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{CBC6C247-747B-4908-B09A-4D2E0F640B6B} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{0162E499-42D0-409B-AA25-EED21F75336B} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{DCA2703D-250A-463E-A68A-07ED105AE6BD} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{BFA3BF26-33BD-4A65-B84D-C7F30D131668} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{E0646C25-36F2-4524-969F-FA621353AB94} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{F3662720-9EA2-4591-BBC6-97361DCE50A9} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{D599885D-E161-4CCE-A66E-7A40C8C4F4CC} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{F355E45F-F54F-4B42-8916-9A633A392789} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
 		{C7F29FC2-1B03-4CDD-9E30-400F4765FF04} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{A9F12710-24E4-46D4-832C-6ECB395B9EAD} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
-		{B7823AE9-4B43-4859-8796-2EBDC116FBB8} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
-		{BAD94D6E-4159-4CB6-B991-486F412D9BB6} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
-		{5C70D6AB-0A33-43F9-B8B5-54558C35BBB1} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
-		{EEF5E054-4192-4A57-8FBF-E860D808A51D} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
-		{AFE34868-AFA1-4E1C-9450-47AB4BE329D5} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
-		{08F772A1-F0BE-433E-8B37-F6522953DB05} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668}
-		{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668}
-		{0991423A-DBF6-4C89-B365-A1DF1EB32E42} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668}
-		{DFB936AD-90EE-4B4F-941E-4F4A636F0D92} = {0773ED53-08E2-4495-A3BE-CA0B5D413C15}
-		{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD} = {0773ED53-08E2-4495-A3BE-CA0B5D413C15}
-		{88DA149F-21B2-48AB-82C4-28FB6BDFD783} = {6022AC51-B658-4C54-97EF-79187AC65B47}
-		{78CC29AC-CC79-4355-B1F2-97936DF198AC} = {6022AC51-B658-4C54-97EF-79187AC65B47}
-		{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865} = {6022AC51-B658-4C54-97EF-79187AC65B47}
+		{BFA3BF26-33BD-4A65-B84D-C7F30D131668} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{DCA2703D-250A-463E-A68A-07ED105AE6BD} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{0162E499-42D0-409B-AA25-EED21F75336B} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{CBC6C247-747B-4908-B09A-4D2E0F640B6B} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{85226AFB-CE71-4851-9A75-7EEC663A8E8A} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{E618A9CD-A39F-4925-A538-E8A3FEF24E54} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{0773ED53-08E2-4495-A3BE-CA0B5D413C15} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{6022AC51-B658-4C54-97EF-79187AC65B47} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
 		{66A378A1-E9F4-4AD5-8946-D0EC06C2902F} = {6022AC51-B658-4C54-97EF-79187AC65B47}
+		{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865} = {6022AC51-B658-4C54-97EF-79187AC65B47}
+		{78CC29AC-CC79-4355-B1F2-97936DF198AC} = {6022AC51-B658-4C54-97EF-79187AC65B47}
+		{88DA149F-21B2-48AB-82C4-28FB6BDFD783} = {6022AC51-B658-4C54-97EF-79187AC65B47}
+		{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD} = {0773ED53-08E2-4495-A3BE-CA0B5D413C15}
+		{DFB936AD-90EE-4B4F-941E-4F4A636F0D92} = {0773ED53-08E2-4495-A3BE-CA0B5D413C15}
+		{0991423A-DBF6-4C89-B365-A1DF1EB32E42} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668}
+		{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668}
+		{08F772A1-F0BE-433E-8B37-F6522953DB05} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668}
+		{AFE34868-AFA1-4E1C-9450-47AB4BE329D5} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
+		{EEF5E054-4192-4A57-8FBF-E860D808A51D} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
+		{5C70D6AB-0A33-43F9-B8B5-54558C35BBB1} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
+		{BAD94D6E-4159-4CB6-B991-486F412D9BB6} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
+		{B7823AE9-4B43-4859-8796-2EBDC116FBB8} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
+		{A9F12710-24E4-46D4-832C-6ECB395B9EAD} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
+		{1F261725-6318-4434-A1B1-6C70CE4CD324} = {F355E45F-F54F-4B42-8916-9A633A392789}
+		{3EAA45A9-735C-4AC7-A799-947B93EA449D} = {F355E45F-F54F-4B42-8916-9A633A392789}
+		{08CE9972-283B-44F4-82FA-966F7DFA6B7A} = {F355E45F-F54F-4B42-8916-9A633A392789}
+		{CE498514-D12D-4B6E-AE0E-FEC29BD43748} = {F355E45F-F54F-4B42-8916-9A633A392789}
+		{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD} = {D599885D-E161-4CCE-A66E-7A40C8C4F4CC}
+		{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF} = {D599885D-E161-4CCE-A66E-7A40C8C4F4CC}
+		{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446} = {D599885D-E161-4CCE-A66E-7A40C8C4F4CC}
+		{745869FF-80E9-4589-A366-E775D2103843} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{9196DD8A-B4D4-4780-8742-C5762E547FC2} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{8AA421C8-D7AF-4957-9F43-5135328ACB24} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{F93E52FD-DA66-4CE5-A0CB-BCD902811122} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{4B8F0F98-8BE1-402B-AA8B-C8D548577B38} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{D022A6CE-7438-41E8-AC64-F2DE18EC54C6} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{918487B7-2153-4618-BBB3-344DBDDF2A2A} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{E54A5AD2-418D-4A85-BA5E-CD803DE38715} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{5EEB99CF-EA2B-4733-80A6-CE9192D68170} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{64A3E5E6-90BF-47F6-94DF-68C94B62C817} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{461606BD-E824-4D0A-8CBA-01810B1F5E02} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{3CA90546-3B4C-4663-9445-C4E9371750A7} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{17F4D7E0-6933-4C2E-8714-FD7E98D625D5} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{DEFC8584-BEC3-4921-BD0F-40482E450B7B} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B}
+		{0008FCE9-9EB4-4E2E-979B-553278E5BBA6} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B}
+		{1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}
+		{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C} = {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}
+		{70966F84-74C9-4067-A379-0C674A929233} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{97B3B514-AB0E-4FE1-89DE-8A945F5112AE} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{CA76F702-5B4E-4918-B8D8-7FF8382434FF} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{6E59AF58-F635-459A-9A35-C9AC41C00339} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{E1B288A2-08EE-4318-8BBB-8AB72C69E33E} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{BF38FB72-B380-4196-AF8C-95749D726C61} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{7C96B65D-28A5-4F28-A35B-8D83CE831EE8} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{D332F2D1-2CF1-43B7-903C-844BD5211A7E} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF}
+		{8D732610-8FC6-43BA-94C9-7126FD7FE361} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF}
+		{4AC2D5F1-F671-480C-A075-6BF62B3721B2} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE}
+		{DBCF20A1-BA13-4582-BFA9-74DE4D987B73} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE}
+		{D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B} = {C4035C32-026F-4158-AF15-113EA1EF1960}
+		{BDA49550-5ED1-4C6B-B648-657B2CACD8E0} = {C4035C32-026F-4158-AF15-113EA1EF1960}
+		{72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F} = {C4035C32-026F-4158-AF15-113EA1EF1960}
+		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {C4035C32-026F-4158-AF15-113EA1EF1960}
+		{68D5EE3B-0C35-4DF1-BD29-6606851A02C1} = {C4035C32-026F-4158-AF15-113EA1EF1960}
 	EndGlobalSection
 EndGlobal
diff --git a/data/schemas/AddIn.xsd b/data/schemas/AddIn.xsd
index d2ba801e4d..95aa534df1 100644
--- a/data/schemas/AddIn.xsd
+++ b/data/schemas/AddIn.xsd
@@ -114,10 +114,10 @@
 			<!-- !!! INSERT DOOZER LIST !!! -->
 			<xs:element ref="Class" />
 			<xs:element ref="CodeCompletionBinding" />
+			<xs:element ref="CommandBinding" />
 			<xs:element ref="CustomProperty" />
 			<xs:element ref="CustomTool" />
 			<xs:element ref="Debugger" />
-			<xs:element ref="DialogPanel" />
 			<xs:element ref="Directory" />
 			<xs:element ref="DisplayBinding" />
 			<xs:element ref="EditAction" />
@@ -125,14 +125,17 @@
 			<xs:element ref="Icon" />
 			<xs:element ref="Include" />
 			<xs:element ref="ProjectBinding" />
+			<xs:element ref="InputBinding" />
 			<xs:element ref="LanguageBinding" />
 			<xs:element ref="MenuItem" />
+			<xs:element ref="OptionPanel" />
 			<xs:element ref="Pad" />
 			<xs:element ref="Parser" />
 			<xs:element ref="ProjectContentRegistry" />
+			<xs:element ref="RoutedUICommand" />
 			<xs:element ref="SchemeExtension" />
-			<xs:element ref="String" />
 			<xs:element ref="SyntaxMode" />
+			<xs:element ref="String" />
 			<xs:element ref="TaskBoundAdditionalLogger" />
 			<xs:element ref="ToolbarItem" />
 		</xs:choice>
@@ -185,10 +188,10 @@
 			<!-- !!! INSERT DOOZER LIST !!! -->
 			<xs:element ref="Class" />
 			<xs:element ref="CodeCompletionBinding" />
+			<xs:element ref="CommandBinding" />
 			<xs:element ref="CustomProperty" />
 			<xs:element ref="CustomTool" />
 			<xs:element ref="Debugger" />
-			<xs:element ref="DialogPanel" />
 			<xs:element ref="Directory" />
 			<xs:element ref="DisplayBinding" />
 			<xs:element ref="EditAction" />
@@ -196,14 +199,17 @@
 			<xs:element ref="Icon" />
 			<xs:element ref="Include" />
 			<xs:element ref="ProjectBinding" />
+			<xs:element ref="InputBinding" />
 			<xs:element ref="LanguageBinding" />
 			<xs:element ref="MenuItem" />
+			<xs:element ref="OptionPanel" />
 			<xs:element ref="Pad" />
 			<xs:element ref="Parser" />
 			<xs:element ref="ProjectContentRegistry" />
+			<xs:element ref="RoutedUICommand" />
 			<xs:element ref="SchemeExtension" />
-			<xs:element ref="String" />
 			<xs:element ref="SyntaxMode" />
+			<xs:element ref="String" />
 			<xs:element ref="TaskBoundAdditionalLogger" />
 			<xs:element ref="ToolbarItem" />
 		</xs:choice>
@@ -309,6 +315,51 @@
 			</xs:documentation>
 		</xs:annotation>
 	</xs:element>
+	<xs:complexType name="CommandBinding">
+		<xs:complexContent>
+			<xs:extension base="AbstractCodon">
+				<xs:attribute name="command" use="required" type="xs:string">
+					<xs:annotation>
+						<xs:documentation>
+			Name of routed UI command which triggers this binding
+			</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="class" use="required" type="xs:string">
+					<xs:annotation>
+						<xs:documentation>
+			Class implementing System.Window.Input.ICommand or 
+			ICSharpCode.Core class. CanExecute and Executed methods
+			are used to handle raised event
+			</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="lazy" use="optional">
+					<xs:annotation>
+						<xs:documentation>
+			Use lazy loading. If addin containing binded command is 
+			not loaded yet load asseblies referenced in add-in
+			</xs:documentation>
+					</xs:annotation>
+					<xs:simpleType>
+						<xs:restriction base="xs:string">
+							<xs:enumeration value="1" />
+							<xs:enumeration value="0" />
+							<xs:enumeration value="true" />
+							<xs:enumeration value="false" />
+						</xs:restriction>
+					</xs:simpleType>
+				</xs:attribute>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:element name="CommandBinding" type="CommandBinding">
+		<xs:annotation>
+			<xs:documentation>
+			Creates descriptor containing information about command binding
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
 	<xs:complexType name="CustomProperty">
 		<xs:complexContent>
 			<xs:extension base="AbstractCodon">
@@ -441,39 +492,6 @@
 			</xs:documentation>
 		</xs:annotation>
 	</xs:element>
-	<xs:complexType name="DialogPanel">
-		<xs:complexContent>
-			<xs:extension base="AbstractCodon">
-				<xs:choice minOccurs="0" maxOccurs="unbounded">
-					<xs:element ref="ComplexCondition" />
-					<xs:element ref="Condition" />
-					<xs:element ref="DialogPanel" />
-					<xs:element ref="Include" />
-				</xs:choice>
-				<xs:attribute name="class" use="optional" type="xs:string">
-					<xs:annotation>
-						<xs:documentation>
-						Name of the IDialogPanel class. Optional if the page has subpages.
-						</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-				<xs:attribute name="label" use="required" type="xs:string">
-					<xs:annotation>
-						<xs:documentation>
-						Caption of the dialog panel.
-						</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:element name="DialogPanel" type="DialogPanel">
-		<xs:annotation>
-			<xs:documentation>
-			Creates DefaultDialogPanelDescriptor objects that are used in option dialogs.
-			</xs:documentation>
-		</xs:annotation>
-	</xs:element>
 	<xs:complexType name="Directory">
 		<xs:complexContent>
 			<xs:extension base="AbstractCodon">
@@ -669,7 +687,35 @@
 			</xs:documentation>
 		</xs:annotation>
 	</xs:element>
-	<xs:complexType name="ProjectBinding">
+
+	<xs:complexType name="InputBinding">
+		<xs:complexContent>
+			<xs:extension base="AbstractCodon">
+				<xs:attribute name="command" use="required" type="xs:string">
+					<xs:annotation>
+						<xs:documentation>
+			Name of routed UI command which is triggered by this binding
+			</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="gesture" use="required" type="xs:string">
+					<xs:annotation>
+						<xs:documentation>
+			Gesture which triggers this binding
+			</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:element name="InputBinding" type="InputBinding">
+		<xs:annotation>
+			<xs:documentation>
+			Creates descriptor containing information about input binding
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+	<xs:complexType name="LanguageBinding">
 		<xs:complexContent>
 			<xs:extension base="AbstractCodon">
 				<xs:attribute name="guid" use="required" type="xs:string">
@@ -796,6 +842,15 @@
 						</xs:documentation>
 					</xs:annotation>
 				</xs:attribute>
+				<xs:attribute name="command" use="optional" type="xs:string">
+					<xs:annotation>
+						<xs:documentation>
+			A WPF routed command that is executed when item is clicked.
+			Currently, this property is supported only for WPF Menus.
+			Only one of the "class" and "command" attributes can be used on a menu entry.
+			</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
 				<xs:attribute name="link" use="optional" type="xs:string">
 					<xs:annotation>
 						<xs:documentation>
@@ -821,6 +876,39 @@
 			</xs:documentation>
 		</xs:annotation>
 	</xs:element>
+	<xs:complexType name="OptionPanel">
+		<xs:complexContent>
+			<xs:extension base="AbstractCodon">
+				<xs:choice minOccurs="0" maxOccurs="unbounded">
+					<xs:element ref="ComplexCondition" />
+					<xs:element ref="Condition" />
+					<xs:element ref="IOptionPanel" />
+					<xs:element ref="Include" />
+				</xs:choice>
+				<xs:attribute name="class" use="optional" type="xs:string">
+					<xs:annotation>
+						<xs:documentation>
+			Name of the IOptionPanel class. Optional if the page has subpages.
+			</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="label" use="required" type="xs:string">
+					<xs:annotation>
+						<xs:documentation>
+			Caption of the dialog panel.
+			</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:element name="OptionPanel" type="OptionPanel">
+		<xs:annotation>
+			<xs:documentation>
+			Creates DefaultOptionPanelDescriptor objects that are used in option dialogs.
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
 	<xs:complexType name="Pad">
 		<xs:complexContent>
 			<xs:extension base="AbstractCodon">
@@ -930,50 +1018,57 @@
 			</xs:documentation>
 		</xs:annotation>
 	</xs:element>
-	<xs:complexType name="SchemeExtension">
+	<xs:complexType name="RoutedUICommand">
 		<xs:complexContent>
 			<xs:extension base="AbstractCodon">
-				<xs:attribute name="scheme" use="required" type="xs:string">
+				<xs:attribute name="name" use="required" type="xs:string">
 					<xs:annotation>
 						<xs:documentation>
-						Specifies the name of the protocol the extension handles. (e.g. 'ms-help' or 'startpage')
+			Routed UI command name
 						</xs:documentation>
 					</xs:annotation>
 				</xs:attribute>
-				<xs:attribute name="class" use="required" type="xs:string">
+				<xs:attribute name="text" use="required" type="xs:string">
 					<xs:annotation>
 						<xs:documentation>
-						Name of the ISchemeExtension class (normally deriving from DefaultSchemeExtension).
+			Routed UI command displayed name
 						</xs:documentation>
 					</xs:annotation>
 				</xs:attribute>
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
-	<xs:element name="SchemeExtension" type="SchemeExtension">
+	<xs:element name="RoutedUICommand" type="RoutedUICommand">
 		<xs:annotation>
 			<xs:documentation>
-			Creates browser scheme extensions that can intercept calls on one protocol.
+			Creates descriptor containing information about routed UI command
 			</xs:documentation>
 		</xs:annotation>
 	</xs:element>
-	<xs:complexType name="String">
+	<xs:complexType name="SchemeExtension">
 		<xs:complexContent>
 			<xs:extension base="AbstractCodon">
-				<xs:attribute name="text" use="required" type="xs:string">
+				<xs:attribute name="scheme" use="required" type="xs:string">
 					<xs:annotation>
 						<xs:documentation>
-						The string to return.
+			Specifies the name of the protocol the extension handles. (e.g. 'ms-help' or 'startpage')
 						</xs:documentation>
 					</xs:annotation>
 				</xs:attribute>
+				<xs:attribute name="class" use="required" type="xs:string">
+					<xs:annotation>
+						<xs:documentation>
+			Name of the ISchemeExtension class (normally deriving from DefaultSchemeExtension).
+			</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
-	<xs:element name="String" type="String">
+	<xs:element name="SchemeExtension" type="SchemeExtension">
 		<xs:annotation>
 			<xs:documentation>
-			Creates a string.
+			Creates browser scheme extensions that can intercept calls on one protocol.
 			</xs:documentation>
 		</xs:annotation>
 	</xs:element>
@@ -1012,6 +1107,26 @@
 			</xs:documentation>
 		</xs:annotation>
 	</xs:element>
+	<xs:complexType name="String">
+		<xs:complexContent>
+			<xs:extension base="AbstractCodon">
+				<xs:attribute name="text" use="required" type="xs:string">
+					<xs:annotation>
+						<xs:documentation>
+			The string to return.
+			</xs:documentation>
+					</xs:annotation>
+				</xs:attribute>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:element name="String" type="String">
+		<xs:annotation>
+			<xs:documentation>
+			Creates a string.
+			</xs:documentation>
+		</xs:annotation>
+	</xs:element>
 	<xs:complexType name="TaskBoundAdditionalLogger">
 		<xs:complexContent>
 			<xs:extension base="AbstractCodon">
diff --git a/doc/technotes/Commands API.doc b/doc/technotes/Commands API.doc
new file mode 100644
index 0000000000..39a63b3e70
Binary files /dev/null and b/doc/technotes/Commands API.doc differ
diff --git a/doc/technotes/ConditionList.html b/doc/technotes/ConditionList.html
index 7db94b07c3..0933d6ca96 100644
--- a/doc/technotes/ConditionList.html
+++ b/doc/technotes/ConditionList.html
@@ -5,7 +5,7 @@
 </head><body>
 <h1>Condition List</h1>
 <p class="notice">This file was generated by the tool 'BuildAddinDocumentation'.
-It is based on SharpDevelop 3.0.0.3062.</p>
+It is based on SharpDevelop 4.0.0.4126.</p>
 <ul>
   <li><a href="#ActiveContentExtension">ActiveContentExtension</a>
   <li><a href="#ActiveViewContentUntitled">ActiveViewContentUntitled</a>
@@ -26,6 +26,8 @@ It is based on SharpDevelop 3.0.0.3062.</p>
   <li><a href="#TextContent">TextContent</a>
   <li><a href="#WindowActive">WindowActive</a>
   <li><a href="#WindowOpen">WindowOpen</a>
+  <li><a href="#WriteableProject">WriteableProject</a>
+  <li><a href="#WriteableSolution">WriteableSolution</a>
 </ul>
 <div>
   <h2><a name="ActiveContentExtension">ActiveContentExtension</a></h2>
@@ -176,7 +178,7 @@ It is based on SharpDevelop 3.0.0.3062.</p>
        <th colspan=2>comparisonType:</td>
        <td>
             The mode of the comparison: a field of the System.StringComparison enumeration. The default is
-            'InvariantCultureIgnoreCase'.
+            'OrdinalIgnoreCase'.
             </td>
     </tr>
   </table>
@@ -213,7 +215,7 @@ It is based on SharpDevelop 3.0.0.3062.</p>
        <th colspan=2>comparisonType:</td>
        <td>
             The mode of the comparison: a field of the System.StringComparison enumeration. The default is
-            'InvariantCultureIgnoreCase'.
+            'OrdinalIgnoreCase'.
             </td>
     </tr>
   </table>
@@ -492,4 +494,29 @@ It is based on SharpDevelop 3.0.0.3062.</p>
   <br><pre>
             &lt;Condition name="WindowOpen" openwindow="*"&gt;</pre></p>
 </div>
+<div>
+  <h2><a name="WriteableProject">WriteableProject</a></h2>
+  <p>
+            Tests if the caller project is writable. If caller is not an IProject it tests
+            Project.CurrentProject.
+            </p>
+  <table>
+    <tr>
+       <th colspan=2>Condition name:</td>
+       <td>ICSharpCode.SharpDevelop.WriteableProjectConditionEvaluator</td>
+    </tr>
+  </table>
+</div>
+<div>
+  <h2><a name="WriteableSolution">WriteableSolution</a></h2>
+  <p>
+            Description of WriteableSolutionEvaluator.
+            </p>
+  <table>
+    <tr>
+       <th colspan=2>Condition name:</td>
+       <td>ICSharpCode.SharpDevelop.WriteableSolutionConditionEvaluator</td>
+    </tr>
+  </table>
+</div>
 </body></html>
diff --git a/doc/technotes/DoozerList.html b/doc/technotes/DoozerList.html
index e60e8ce1a4..a6d34b1dfe 100644
--- a/doc/technotes/DoozerList.html
+++ b/doc/technotes/DoozerList.html
@@ -5,28 +5,31 @@
 </head><body>
 <h1>Doozer List</h1>
 <p class="notice">This file was generated by the tool 'BuildAddinDocumentation'.
-It is based on SharpDevelop 3.0.0.3062.</p>
+It is based on SharpDevelop 4.0.0.4126.</p>
 <ul>
   <li><a href="#Class">Class</a>
   <li><a href="#CodeCompletionBinding">CodeCompletionBinding</a>
+  <li><a href="#CommandBinding">CommandBinding</a>
   <li><a href="#CustomProperty">CustomProperty</a>
   <li><a href="#CustomTool">CustomTool</a>
   <li><a href="#Debugger">Debugger</a>
-  <li><a href="#DialogPanel">DialogPanel</a>
   <li><a href="#Directory">Directory</a>
   <li><a href="#DisplayBinding">DisplayBinding</a>
   <li><a href="#EditAction">EditAction</a>
   <li><a href="#FileFilter">FileFilter</a>
   <li><a href="#Icon">Icon</a>
   <li><a href="#Include">Include</a>
+  <li><a href="#InputBinding">InputBinding</a>
   <li><a href="#LanguageBinding">LanguageBinding</a>
   <li><a href="#MenuItem">MenuItem</a>
+  <li><a href="#OptionPanel">OptionPanel</a>
   <li><a href="#Pad">Pad</a>
   <li><a href="#Parser">Parser</a>
   <li><a href="#ProjectContentRegistry">ProjectContentRegistry</a>
+  <li><a href="#RoutedUICommand">RoutedUICommand</a>
   <li><a href="#SchemeExtension">SchemeExtension</a>
-  <li><a href="#String">String</a>
   <li><a href="#SyntaxMode">SyntaxMode</a>
+  <li><a href="#String">String</a>
   <li><a href="#TaskBoundAdditionalLogger">TaskBoundAdditionalLogger</a>
   <li><a href="#ToolbarItem">ToolbarItem</a>
 </ul>
@@ -70,7 +73,7 @@ It is based on SharpDevelop 3.0.0.3062.</p>
   <table>
     <tr>
        <th colspan=2>Doozer name:</td>
-       <td>ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.CodeCompletionBindingDoozer</td>
+       <td>ICSharpCode.SharpDevelop.Editor.CodeCompletionBindingDoozer</td>
     </tr>
     <tr><td colspan=3><hr><h3>Attributes:</h3></td></tr>
     <tr>
@@ -103,6 +106,54 @@ It is based on SharpDevelop 3.0.0.3062.</p>
     </tr>
   </table>
 </div>
+<div>
+  <h2><a name="CommandBinding">CommandBinding</a></h2>
+  <p>
+            Creates descriptor containing information about command binding
+            </p>
+  <table>
+    <tr>
+       <th colspan=2>Doozer name:</td>
+       <td>ICSharpCode.Core.CommandBindingDoozer</td>
+    </tr>
+    <tr><td colspan=3><hr><h3>Attributes:</h3></td></tr>
+    <tr>
+       <th>command:</td>
+       <td class="userequired">required</td>
+       <td>
+            Name of routed UI command which triggers this binding
+            </td>
+    </tr>
+    <tr>
+       <th>class:</td>
+       <td class="userequired">required</td>
+       <td>
+            Class implementing System.Window.Input.ICommand or 
+            ICSharpCode.Core class. CanExecute and Executed methods
+            are used to handle raised event
+            </td>
+    </tr>
+    <tr>
+       <th>lazy:</td>
+       <td class="userequired">optional</td>
+       <td>
+            Use lazy loading. If addin containing binded command is 
+            not loaded yet load asseblies referenced in add-in
+            </td>
+    </tr>
+    <tr><td colspan=3><hr></td></tr>
+    <tr>
+       <th colspan=2>Usage:</td>
+       <td>Only in /SharpDevelop/Workbench/CommandBindings</td>
+    </tr>
+    <tr>
+       <th colspan=2>Returns:</td>
+       <td>
+            CommandBindingDescriptor object
+            </td>
+    </tr>
+  </table>
+</div>
 <div>
   <h2><a name="CustomProperty">CustomProperty</a></h2>
   <p>
@@ -275,50 +326,6 @@ It is based on SharpDevelop 3.0.0.3062.</p>
     </tr>
   </table>
 </div>
-<div>
-  <h2><a name="DialogPanel">DialogPanel</a></h2>
-  <p>
-            Creates DefaultDialogPanelDescriptor objects that are used in option dialogs.
-            </p>
-  <table>
-    <tr>
-       <th colspan=2>Doozer name:</td>
-       <td>ICSharpCode.SharpDevelop.DialogPanelDoozer</td>
-    </tr>
-    <tr><td colspan=3><hr><h3>Attributes:</h3></td></tr>
-    <tr>
-       <th colspan=2>class:</td>
-       <td>
-            Name of the IDialogPanel class. Optional if the page has subpages.
-            </td>
-    </tr>
-    <tr>
-       <th>label:</td>
-       <td class="userequired">required</td>
-       <td>
-            Caption of the dialog panel.
-            </td>
-    </tr>
-    <tr><td colspan=3><hr></td></tr>
-    <tr>
-       <th colspan=2>Children:</td>
-       <td>
-            In the SharpDevelop options, option pages can have subpages by specifying them
-            as children in the AddInTree.
-            </td>
-    </tr>
-    <tr>
-       <th colspan=2>Usage:</td>
-       <td>In /SharpDevelop/BackendBindings/ProjectOptions/ and /SharpDevelop/Dialogs/OptionsDialog</td>
-    </tr>
-    <tr>
-       <th colspan=2>Returns:</td>
-       <td>
-            A DefaultDialogPanelDescriptor object.
-            </td>
-    </tr>
-  </table>
-</div>
 <div>
   <h2><a name="Directory">Directory</a></h2>
   <p>
@@ -590,6 +597,44 @@ It is based on SharpDevelop 3.0.0.3062.</p>
     </tr>
   </table>
 </div>
+<div>
+  <h2><a name="InputBinding">InputBinding</a></h2>
+  <p>
+            Creates descriptor containing information about input binding
+            </p>
+  <table>
+    <tr>
+       <th colspan=2>Doozer name:</td>
+       <td>ICSharpCode.Core.InputBindingDoozer</td>
+    </tr>
+    <tr><td colspan=3><hr><h3>Attributes:</h3></td></tr>
+    <tr>
+       <th>command:</td>
+       <td class="userequired">required</td>
+       <td>
+            Name of routed UI command which is triggered by this binding
+            </td>
+    </tr>
+    <tr>
+       <th>gesture:</td>
+       <td class="userequired">required</td>
+       <td>
+            Gesture which triggers this binding
+            </td>
+    </tr>
+    <tr><td colspan=3><hr></td></tr>
+    <tr>
+       <th colspan=2>Usage:</td>
+       <td>Only in /SharpDevelop/Workbench/InputBindings</td>
+    </tr>
+    <tr>
+       <th colspan=2>Returns:</td>
+       <td>
+            InputBindingDescriptor object
+            </td>
+    </tr>
+  </table>
+</div>
 <div>
   <h2><a name="LanguageBinding">LanguageBinding</a></h2>
   <p>
@@ -693,6 +738,15 @@ It is based on SharpDevelop 3.0.0.3062.</p>
             Command class that is run when item is clicked.
             </td>
     </tr>
+    <tr>
+       <th>command:</td>
+       <td class="userequired">optional</td>
+       <td>
+            A WPF routed command that is executed when item is clicked.
+            Currently, this property is supported only for WPF Menus.
+            Only one of the "class" and "command" attributes can be used on a menu entry.
+            </td>
+    </tr>
     <tr>
        <th>link:</td>
        <td class="userequired">optional</td>
@@ -722,7 +776,7 @@ It is based on SharpDevelop 3.0.0.3062.</p>
     <tr>
        <th colspan=2>Returns:</td>
        <td>
-            Any ToolStrip* object, depending on the type attribute.
+            A MenuItemDescriptor object.
             </td>
     </tr>
     <tr>
@@ -731,6 +785,50 @@ It is based on SharpDevelop 3.0.0.3062.</p>
     </tr>
   </table>
 </div>
+<div>
+  <h2><a name="OptionPanel">OptionPanel</a></h2>
+  <p>
+            Creates DefaultOptionPanelDescriptor objects that are used in option dialogs.
+            </p>
+  <table>
+    <tr>
+       <th colspan=2>Doozer name:</td>
+       <td>ICSharpCode.SharpDevelop.OptionPanelDoozer</td>
+    </tr>
+    <tr><td colspan=3><hr><h3>Attributes:</h3></td></tr>
+    <tr>
+       <th colspan=2>class:</td>
+       <td>
+            Name of the IOptionPanel class. Optional if the page has subpages.
+            </td>
+    </tr>
+    <tr>
+       <th>label:</td>
+       <td class="userequired">required</td>
+       <td>
+            Caption of the dialog panel.
+            </td>
+    </tr>
+    <tr><td colspan=3><hr></td></tr>
+    <tr>
+       <th colspan=2>Children:</td>
+       <td>
+            In the SharpDevelop options, option pages can have subpages by specifying them
+            as children in the AddInTree.
+            </td>
+    </tr>
+    <tr>
+       <th colspan=2>Usage:</td>
+       <td>In /SharpDevelop/BackendBindings/ProjectOptions/ and /SharpDevelop/Dialogs/OptionsDialog</td>
+    </tr>
+    <tr>
+       <th colspan=2>Returns:</td>
+       <td>
+            A DefaultOptionPanelDescriptor object.
+            </td>
+    </tr>
+  </table>
+</div>
 <div>
   <h2><a name="Pad">Pad</a></h2>
   <p>
@@ -878,66 +976,77 @@ It is based on SharpDevelop 3.0.0.3062.</p>
   </table>
 </div>
 <div>
-  <h2><a name="SchemeExtension">SchemeExtension</a></h2>
+  <h2><a name="RoutedUICommand">RoutedUICommand</a></h2>
   <p>
-            Creates browser scheme extensions that can intercept calls on one protocol.
+            Creates descriptor containing information about routed UI command
             </p>
   <table>
     <tr>
        <th colspan=2>Doozer name:</td>
-       <td>ICSharpCode.SharpDevelop.BrowserDisplayBinding.SchemeExtensionDoozer</td>
+       <td>ICSharpCode.Core.RoutedUICommandDoozer</td>
     </tr>
     <tr><td colspan=3><hr><h3>Attributes:</h3></td></tr>
     <tr>
-       <th>scheme:</td>
+       <th>name:</td>
        <td class="userequired">required</td>
        <td>
-            Specifies the name of the protocol the extension handles. (e.g. 'ms-help' or 'startpage')
+            Routed UI command name
             </td>
     </tr>
     <tr>
-       <th>class:</td>
+       <th>text:</td>
        <td class="userequired">required</td>
        <td>
-            Name of the ISchemeExtension class (normally deriving from DefaultSchemeExtension).
+            Routed UI command displayed name
             </td>
     </tr>
     <tr><td colspan=3><hr></td></tr>
     <tr>
        <th colspan=2>Usage:</td>
-       <td>Only in /SharpDevelop/Views/Browser/SchemeExtensions</td>
+       <td>Only in /SharpDevelop/Workbench/CommandBindings</td>
     </tr>
     <tr>
        <th colspan=2>Returns:</td>
        <td>
-            An SchemeExtensionDescriptor object that exposes the protocol name and ISchemeExtension object (lazy-loading).
+            RoutedUICommandDescriptor object
             </td>
     </tr>
   </table>
 </div>
 <div>
-  <h2><a name="String">String</a></h2>
+  <h2><a name="SchemeExtension">SchemeExtension</a></h2>
   <p>
-            Creates a string.
+            Creates browser scheme extensions that can intercept calls on one protocol.
             </p>
   <table>
     <tr>
        <th colspan=2>Doozer name:</td>
-       <td>ICSharpCode.Core.StringDoozer</td>
+       <td>ICSharpCode.SharpDevelop.BrowserDisplayBinding.SchemeExtensionDoozer</td>
     </tr>
     <tr><td colspan=3><hr><h3>Attributes:</h3></td></tr>
     <tr>
-       <th>text:</td>
+       <th>scheme:</td>
        <td class="userequired">required</td>
        <td>
-            The string to return.
+            Specifies the name of the protocol the extension handles. (e.g. 'ms-help' or 'startpage')
+            </td>
+    </tr>
+    <tr>
+       <th>class:</td>
+       <td class="userequired">required</td>
+       <td>
+            Name of the ISchemeExtension class (normally deriving from DefaultSchemeExtension).
             </td>
     </tr>
     <tr><td colspan=3><hr></td></tr>
+    <tr>
+       <th colspan=2>Usage:</td>
+       <td>Only in /SharpDevelop/Views/Browser/SchemeExtensions</td>
+    </tr>
     <tr>
        <th colspan=2>Returns:</td>
        <td>
-            The string specified by 'text', passed through the StringParser.
+            An SchemeExtensionDescriptor object that exposes the protocol name and ISchemeExtension object (lazy-loading).
             </td>
     </tr>
   </table>
@@ -989,6 +1098,33 @@ It is based on SharpDevelop 3.0.0.3062.</p>
     </tr>
   </table>
 </div>
+<div>
+  <h2><a name="String">String</a></h2>
+  <p>
+            Creates a string.
+            </p>
+  <table>
+    <tr>
+       <th colspan=2>Doozer name:</td>
+       <td>ICSharpCode.Core.StringDoozer</td>
+    </tr>
+    <tr><td colspan=3><hr><h3>Attributes:</h3></td></tr>
+    <tr>
+       <th>text:</td>
+       <td class="userequired">required</td>
+       <td>
+            The string to return.
+            </td>
+    </tr>
+    <tr><td colspan=3><hr></td></tr>
+    <tr>
+       <th colspan=2>Returns:</td>
+       <td>
+            The string specified by 'text', passed through the StringParser.
+            </td>
+    </tr>
+  </table>
+</div>
 <div>
   <h2><a name="TaskBoundAdditionalLogger">TaskBoundAdditionalLogger</a></h2>
   <p>
diff --git a/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin b/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin
index 1bed615e10..b0ada5e597 100644
--- a/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin
+++ b/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin
@@ -175,7 +175,7 @@
 		     category = "Main"
 		     title    = "${res:ICSharpCode.BooInterpreter}"
 		     icon     = "Boo.ProjectIcon"
-		     shortcut = "Control|Shift|B"
+		     shortcut = "Ctrl+Shift+B"
 		     class    = "Grunwald.BooBinding.InteractiveInterpreterPad"
 		     defaultPosition = "Bottom, Hidden" />
 	</Path>
diff --git a/src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/FSharpBinding.addin b/src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/FSharpBinding.addin
index 5b7215928d..75b343f28b 100644
--- a/src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/FSharpBinding.addin
+++ b/src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/FSharpBinding.addin
@@ -109,7 +109,7 @@
 		<Condition name = "ProjectActive" activeproject="F#">
 			<MenuItem id = "SendToFSharpInteractive"
 				  label = "Send To F# Interactive"
-				  shortcut = "Alt|Return"
+				  shortcut = "Alt+Return"
 				  class= "FSharpBinding.SentToFSharpInteractive"/>
 		</Condition>
 	</Path>
diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.addin b/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.addin
index b002f23721..ed85a3968d 100644
--- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.addin
+++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.addin
@@ -62,12 +62,12 @@
 					          icon="Icons.16x16.RunProgramIcon"
 					          class="ICSharpCode.PythonBinding.RunDebugPythonCommand"
 					          label="${res:XML.MainMenu.RunMenu.Run}"
-					          shortcut="Control|Shift|R"/>
+					          shortcut="Ctrl+Shift+R"/>
 					<MenuItem id="RunWithoutDebugger"
 					          icon="Icons.16x16.Debug.StartWithoutDebugging"
 					          class="ICSharpCode.PythonBinding.RunPythonCommand"
 					          label="${res:XML.MainMenu.DebugMenu.RunWithoutDebug}"
-					          shortcut="Control|Shift|W"/>
+					          shortcut="Ctrl+Shift+W"/>
 				</Condition>
 				<Condition name="IsProcessRunning" isdebugging="True" action="Disable">
 					<MenuItem id="Stop"
diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/AddInFileTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/AddInFileTestFixture.cs
index 4e0c100faa..a67f32ad43 100644
--- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/AddInFileTestFixture.cs
+++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/AddInFileTestFixture.cs
@@ -253,7 +253,7 @@ namespace PythonBinding.Tests
 		[Test]
 		public void PythonRunMenuItemShortcut()
 		{
-			Assert.AreEqual("Control|Shift|R", pythonRunMenuItemCodon["shortcut"]);
+			Assert.AreEqual("Ctrl+Shift+R", pythonRunMenuItemCodon["shortcut"]);
 		}
 		
 		[Test]
@@ -712,7 +712,7 @@ namespace PythonBinding.Tests
 		[Test]
 		public void PythonRunWithoutDebuggerMenuItemShortcut()
 		{
-			Assert.AreEqual("Control|Shift|W", pythonWithoutDebuggerRunMenuItemCodon["shortcut"]);
+			Assert.AreEqual("Ctrl+Shift+W", pythonWithoutDebuggerRunMenuItemCodon["shortcut"]);
 		}
 		
 		[Test]
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.addin b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.addin
index a0219c4c68..038dc72a2d 100644
--- a/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.addin
+++ b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.addin
@@ -72,7 +72,7 @@
 		     category = "Debugger"
 		     title    = "${res:MainWindow.Windows.Debug.Breakpoints}"
 		     icon     = "PadIcons.BreakPoints"
-		     shortcut = "Control|Alt|P"
+		     shortcut = "Ctrl+Alt+P"
 		     class = "ICSharpCode.SharpDevelop.Gui.Pads.BreakPointsPad"
 		     defaultPosition = "Bottom, Hidden" />
 		
@@ -80,7 +80,7 @@
 		     category = "Debugger"
 		     title    = "${res:MainWindow.Windows.Debug.CallStack}"
 		     icon     = "PadIcons.CallStack"
-		     shortcut = "Control|Alt|C"
+		     shortcut = "Ctrl+Alt+C"
 		     class = "ICSharpCode.SharpDevelop.Gui.Pads.CallStackPad"
 		     defaultPosition = "Bottom, Hidden" />
 		
@@ -88,7 +88,7 @@
 		     category = "Debugger"
 		     title    = "${res:MainWindow.Windows.Debug.Modules}"
 		     icon     = "PadIcons.LoadedModules"
-		     shortcut = "Control|Alt|U"
+		     shortcut = "Ctrl+Alt+U"
 		     class = "ICSharpCode.SharpDevelop.Gui.Pads.LoadedModulesPad"
 		     defaultPosition = "Bottom, Hidden" />
 		
@@ -96,7 +96,7 @@
 		     category = "Debugger"
 		     title    = "${res:MainWindow.Windows.Debug.Threads}"
 		     icon     = "PadIcons.Threads"
-		     shortcut = "Control|Alt|H"
+		     shortcut = "Ctrl+Alt+H"
 		     class = "ICSharpCode.SharpDevelop.Gui.Pads.RunningThreadsPad"
 		     defaultPosition = "Bottom, Hidden" />
 		
@@ -104,7 +104,7 @@
 		     category = "Debugger"
 		     title    = "${res:MainWindow.Windows.Debug.LocalVariables}"
 		     icon     = "PadIcons.LocalVariables"
-		     shortcut = "Control|Alt|V"
+		     shortcut = "Ctrl+Alt+V"
 		     class = "ICSharpCode.SharpDevelop.Gui.Pads.LocalVarPad"
 		     defaultPosition = "Bottom, Hidden" />
 		
@@ -112,7 +112,7 @@
 		     category = "Debugger"
 		     title    = "${res:MainWindow.Windows.Debug.Console}"
 		     icon     = "PadIcons.Output"
-		     shortcut = "Control|Alt|N"
+		     shortcut = "Ctrl+Alt+N"
 		     class = "ICSharpCode.SharpDevelop.Gui.Pads.ConsolePad"
 		     defaultPosition = "Bottom, Hidden" />
 		
@@ -120,7 +120,7 @@
 		     category = "Debugger"
 		     title    = "${res:MainWindow.Windows.Debug.Watch}"
 		     icon     = "PadIcons.LocalVariables"
-		     shortcut = "Control|Alt|W"
+		     shortcut = "Ctrl+Alt+W"
 		     class = "ICSharpCode.SharpDevelop.Gui.Pads.WatchPad"
 		     defaultPosition = "Bottom, Hidden" />
 	  <!-- Hidden until DebuggerPad.IsVisible bug is fixed
@@ -128,7 +128,7 @@
 		     category = "Debugger"
 		     title    = "${res:MainWindow.Windows.Debug.ObjectGraph}"
 		     icon     = "PadIcons.LocalVariables"
-		     shortcut = "Control|Alt|O"
+		     shortcut = "Ctrl+Alt+O"
 		     class = "ICSharpCode.SharpDevelop.Gui.Pads.ObjectGraphPad"
 		     defaultPosition = "Bottom, Hidden" />
       -->
diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.addin b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.addin
index 14805f9c96..b186b1e18b 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.addin
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.addin
@@ -76,7 +76,7 @@
 			<MenuItem id = "Separator5" type = "Separator" insertbefore = "Separator4" />
 			<MenuItem id = "SurroundWithSnippet"
 			          insertbefore = "Separator4"
-			          shortcut="Ctrl|J"
+			          shortcut="Ctrl+J"
 			          label = "Surround with"
 			          class = "ICSharpCode.AvalonEdit.AddIn.Commands.SurroundWithCommand"/>
 		</Condition>
diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Addin/ICSharpCode.Data.addin b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Addin/ICSharpCode.Data.addin
index ce3dc17915..1ac9a95a26 100644
--- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Addin/ICSharpCode.Data.addin
+++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Addin/ICSharpCode.Data.addin
@@ -30,7 +30,7 @@
           icon="Icons.16x16.SharpQuery.Refresh"
           category="Tools"
           title="DatabaseExplorer"
-          shortcut="Control|Alt|D"
+          shortcut="Ctrl+Alt+D"
 		   defaultPosition = "Right, Hidden"
           class="ICSharpCode.Data.Addin.Pad.DatabasesTreeViewPad" />
   </Path>
diff --git a/src/AddIns/DisplayBindings/HexEditor/Project/HexEditor.addin b/src/AddIns/DisplayBindings/HexEditor/Project/HexEditor.addin
index 90c129988a..53934ae37c 100644
--- a/src/AddIns/DisplayBindings/HexEditor/Project/HexEditor.addin
+++ b/src/AddIns/DisplayBindings/HexEditor/Project/HexEditor.addin
@@ -43,7 +43,7 @@
 		<MenuItem id = "Save"
 		          label = "${res:XML.MainMenu.FileMenu.Save}"
 		          icon = "Icons.16x16.SaveIcon"
-		          shortcut = "Control|S"
+		          shortcut = "Ctrl+S"
 		          class = "ICSharpCode.SharpDevelop.Commands.SaveFile"/>
 		<MenuItem id = "SaveAs"
 		          label = "${res:XML.MainMenu.FileMenu.SaveAs}"
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/WpfDesign.addin b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/WpfDesign.addin
index b0c5cd9091..2a3646a7c9 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/WpfDesign.addin
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/WpfDesign.addin
@@ -31,7 +31,7 @@
 		     category = "Tools"
 		     title    = "${res:ICSharpCode.SharpDevelop.Gui.OutlinePad}"
 		     icon     = "PadIcons.BreakPoints"
-		     shortcut = "Control|Alt|I"
+		     shortcut = "Ctrl+Alt+I"
 		     class = "ICSharpCode.WpfDesign.AddIn.OutlineViewPad"/>
 	</Path>
 	-->
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.addin b/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.addin
index b484cb46c0..f4649c1c3b 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.addin
+++ b/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.addin
@@ -83,7 +83,7 @@
 				<MenuItem id="ValidateXml"
 					label="${res:ICSharpCode.XmlEditor.ValidateXmlMenuLabel}"
 					class="ICSharpCode.XmlEditor.ValidateXmlCommand"
-					shortcut="Control|Shift|V"/>
+					shortcut="Ctrl+Shift+V"/>
 				<MenuItem id="Separator1" type="Separator"/>
 				<ComplexCondition action="Disable">
 					<Not>
@@ -105,7 +105,7 @@
 					<MenuItem id="RunTransform"
 						label="${res:ICSharpCode.XmlEditor.RunXSLT}"
 						class="ICSharpCode.XmlEditor.RunXslTransformCommand"
-						shortcut="Control|Shift|T"/>
+						shortcut="Ctrl+Shift+T"/>
 				</ComplexCondition>
 				<MenuItem id="Separator2" type="Separator"/>
 				<MenuItem id="Format"
@@ -115,60 +115,6 @@
 		</ComplexCondition>
 	</Path>
 	
-	<!-- Right click menu -->
-	<Path name="/SharpDevelop/ViewContent/XmlEditor/ContextMenu">
-		<MenuItem id="Cut"
-      label="${res:XML.TextAreaContextMenu.Cut}"
-      icon="Icons.16x16.CutIcon"
-      shortcut="Control|X"
-      class="ICSharpCode.SharpDevelop.Commands.Cut"/>
-		<MenuItem id="Copy"
-      label="${res:XML.TextAreaContextMenu.Copy}"
-      icon="Icons.16x16.CopyIcon"
-      shortcut="Control|C"
-      class="ICSharpCode.SharpDevelop.Commands.Copy"/>
-		<MenuItem id="Paste"
-      label="${res:XML.TextAreaContextMenu.Paste}"
-      icon="Icons.16x16.PasteIcon"
-      shortcut="Control|V"
-      class="ICSharpCode.SharpDevelop.Commands.Paste"/>
-		<MenuItem id="Delete"
-      label="${res:XML.MainMenu.EditMenu.Delete}"
-      icon="Icons.16x16.DeleteIcon"
-      class="ICSharpCode.SharpDevelop.Commands.Delete"/>
-		<MenuItem id="Separator1" type="Separator"/>
-		<MenuItem id="Save"
-      label="${res:XML.MainMenu.FileMenu.Save}"
-      icon="Icons.16x16.SaveIcon"
-      shortcut="Control|S"
-      class="ICSharpCode.SharpDevelop.Commands.SaveFile"/>
-		<MenuItem id="SaveAs"
-      label="${res:XML.MainMenu.FileMenu.SaveAs}"
-      class="ICSharpCode.SharpDevelop.Commands.SaveFileAs"/>
-		<MenuItem id="File"
-      label="${res:XML.MainMenu.FileMenu.Close}"
-      class="ICSharpCode.SharpDevelop.Commands.CloseFile"/>
-		<MenuItem id="Separator2" type="Separator"/>
-		<MenuItem id="Indent"
-      label="${res:XML.TextAreaContextMenu.Indent}"
-      shortcut="Control|I"
-      class="ICSharpCode.SharpDevelop.DefaultEditor.Commands.IndentSelection"/>
-		<MenuItem id="HideXPathResults"
-      label="${res:ICSharpCode.XmlEditor.HideXPathResults}"
-      class="ICSharpCode.XmlEditor.RemoveXPathHighlightingCommand"/>
-		<MenuItem id="GoToDefinition"
-      label="${res:ICSharpCode.NAntAddIn.GotoDefinitionMenuLabel}"
-      class="ICSharpCode.XmlEditor.GoToSchemaDefinitionCommand"/>
-		<MenuItem id="FileMode" label="${res:XML.TextAreaContextMenu.FileMode}" type="Menu">
-      <MenuItem id="HighlightBuilder" type="Builder" class="ICSharpCode.SharpDevelop.DefaultEditor.Commands.HighlightingTypeBuilder"/>
-		</MenuItem>
-		<MenuItem id="Separator3" type="Separator"/>
-		<MenuItem id="Options"
-      label="${res:XML.TextAreaContextMenu.BufferOptions}"
-      icon="Icons.16x16.PropertiesIcon"
-      class="ICSharpCode.SharpDevelop.DefaultEditor.Commands.ShowBufferOptions"/>
-	</Path>
-	
 	<!-- Options panel -->
 	<Path path="/SharpDevelop/Dialogs/OptionsDialog/TextEditorOptions">
 		<OptionPanel id="XmlSchemasPanel"
@@ -182,10 +128,6 @@
      class="ICSharpCode.XmlEditor.XmlEditorOptionsPanel"/>
 	</Path>
 	
-	<Path path="/AddIns/XmlEditor/EditActions">
-		<EditAction id="XmlCompletionPopup" class="ICSharpCode.XmlEditor.CodeCompletionPopupCommand"  keys="Control|Space"/>
-		<EditAction id="GoToDefinition" class="ICSharpCode.XmlEditor.GoToSchemaDefinitionEditAction" keys="Control|Enter"/>
-	</Path>
 	
 	<!-- XPath Query pad -->
 	<Path name="/SharpDevelop/Workbench/Pads">
diff --git a/src/AddIns/Misc/CodeCoverage/Project/CodeCoverage.addin b/src/AddIns/Misc/CodeCoverage/Project/CodeCoverage.addin
index 0cf47f1249..67a62d0035 100644
--- a/src/AddIns/Misc/CodeCoverage/Project/CodeCoverage.addin
+++ b/src/AddIns/Misc/CodeCoverage/Project/CodeCoverage.addin
@@ -20,7 +20,7 @@
 		     insertafter  = "Bookmarks"
 		     insertbefore = "DefinitionView"
 		     icon         = "CodeCoverage.Icons.16x16.Pad"
-		     shortcut     = "Control|Alt|G"
+		     shortcut     = "Ctrl+Alt+G"
 		     class        = "ICSharpCode.CodeCoverage.CodeCoveragePad"
 		     defaultPosition = "Bottom, Hidden" />
 	</Path>
diff --git a/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.addin b/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.addin
index 9901a37ff7..8b2ebb1989 100644
--- a/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.addin
+++ b/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.addin
@@ -67,24 +67,24 @@
 		          insertafter  = "HtmlHelp2Separator2"
 		          label        = "${res:AddIns.HtmlHelp2.Contents}"
 		          icon         = "HtmlHelp2.16x16.Toc"
-		          shortcut     = "Control|Alt|F1"
+		          shortcut     = "Ctrl+Alt+F1"
 		          class        = "HtmlHelp2.ShowTocMenuCommand"/>
 		<MenuItem id           = "IndexPadCommand"
 		          label        = "${res:AddIns.HtmlHelp2.Index}"
 		          icon         = "HtmlHelp2.16x16.Index"
-		          shortcut     = "Control|Alt|F2"
+		          shortcut     = "Ctrl+Alt+F2"
 		          class        = "HtmlHelp2.ShowIndexMenuCommand"
 		          insertafter  = "TocPadCommand"/>
 		<MenuItem id           = "SearchPadCommand"
 		          label        = "${res:AddIns.HtmlHelp2.SearchCommand}"
 		          icon         = "HtmlHelp2.16x16.Search"
-		          shortcut     = "Control|Alt|F3"
+		          shortcut     = "Ctrl+Alt+F3"
 		          class        = "HtmlHelp2.ShowSearchMenuCommand"
 		          insertafter  = "IndexPadCommand"/>
 		<MenuItem id           = "IndexResultsPadCommand"
 		          label        = "${res:AddIns.HtmlHelp2.IndexResults}"
 		          icon         = "HtmlHelp2.16x16.IndexResults"
-		          shortcut     = "Shift|Alt|F2"
+		          shortcut     = "Shift+Alt+F2"
 		          class        = "HtmlHelp2.ShowIndexResultsMenuCommand"
 		          insertafter  = "SearchPadCommand"
 		          insertbefore = "Separator1"/>
@@ -92,7 +92,7 @@
 		          insertbefore = "TocPadCommand"
 		          label        = "${res:AddIns.HtmlHelp2.DynamicHelp}"
 		          icon         = "HtmlHelp2.16x16.DynamicHelp"
-		          shortcut     = "Control|F1"
+		          shortcut     = "Ctrl+F1"
 		          class        = "HtmlHelp2.ShowDynamicHelpMenuCommand"/>
 	</Path>
 	
diff --git a/src/AddIns/Misc/SearchAndReplace/Project/Gui/SearchAndReplaceDialog.cs b/src/AddIns/Misc/SearchAndReplace/Project/Gui/SearchAndReplaceDialog.cs
index 0e83d92e64..a7b34df66d 100644
--- a/src/AddIns/Misc/SearchAndReplace/Project/Gui/SearchAndReplaceDialog.cs
+++ b/src/AddIns/Misc/SearchAndReplace/Project/Gui/SearchAndReplaceDialog.cs
@@ -8,8 +8,10 @@
 using System;
 using System.Drawing;
 using System.Windows.Forms;
+using System.Windows.Input;
 
 using ICSharpCode.Core;
+using ICSharpCode.Core.Presentation;
 using ICSharpCode.Core.WinForms;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Gui;
@@ -87,8 +89,12 @@ namespace SearchAndReplace
 			SetSearchAndReplaceMode();
 			FormLocationHelper.Apply(this, "ICSharpCode.SharpDevelop.Gui.SearchAndReplaceDialog.Location", false);
 			
-			searchKeyboardShortcut = GetKeyboardShortcut(SearchMenuAddInPath, "Find");
-			replaceKeyboardShortcut = GetKeyboardShortcut(SearchMenuAddInPath, "Replace");
+			// TODO: Check how this realy should work
+			var searchKeys = GetKeyBoardShortcut("SDSearchAndReplace.Find");
+			searchKeyboardShortcut = searchKeys.Length > 0 ? searchKeys[0] : Keys.None;
+			
+			var replaceKeys = GetKeyBoardShortcut("SDSearchAndReplace.Replace");
+			replaceKeyboardShortcut = replaceKeys.Length > 0 ? replaceKeys[0] : Keys.None;
 		}
 		
 		protected override void OnClosing(System.ComponentModel.CancelEventArgs e)
@@ -97,7 +103,7 @@ namespace SearchAndReplace
 			Instance = null;
 		}
 		
-		protected override void OnKeyDown(KeyEventArgs e)
+		protected override void OnKeyDown(System.Windows.Forms.KeyEventArgs e)
 		{
 			if (e.KeyData == Keys.Escape) {
 				Close();
@@ -144,17 +150,73 @@ namespace SearchAndReplace
 		/// Gets the keyboard shortcut for the menu item with the given addin tree
 		/// path and given codon id.
 		/// </summary>
-		Keys GetKeyboardShortcut(string path, string id)
+		Keys[] GetKeyboardShortcut(string path, string id)
 		{
 			AddInTreeNode node = AddInTree.GetTreeNode(path);
 			if (node != null) {
 				foreach (Codon codon in node.Codons) {
 					if (codon.Id == id) {
-						return MenuCommand.ParseShortcut(codon.Properties["shortcut"]);
+						return (Keys[])new KeysCollectionConverter().ConvertFromInvariantString(codon.Properties["shortcut"]);
 					}
 				}
 			}
-			return Keys.None;
+			
+			return new Keys[] { Keys.None };
+		}
+		
+		Keys[] GetKeyBoardShortcut(string routedCommandName)
+		{
+			var template = BindingInfoTemplate.Create(null, null, routedCommandName);
+			var gestureCollection = SDCommandManager.FindInputGestures(template, null);
+			var keyCollection = new Keys[gestureCollection.Count];
+			
+			var i = 0;
+			foreach(InputGesture gesture in gestureCollection) {
+				var keyGesture = gesture as KeyGesture;
+				if(!(keyGesture is MultiKeyGesture)) { // I can't imagine presenting these in WinForms
+					keyCollection[i++] = ConvertInputGestureToKeys(keyGesture);
+				}
+			}
+			
+			return keyCollection;
+		}
+		
+		Keys ConvertInputGestureToKeys(KeyGesture gesture)
+		{
+			var formsKey = Keys.None;
+			
+			var key = Key.None;
+			var modifiers = System.Windows.Input.ModifierKeys.None;
+			var partialGesture = gesture as PartialKeyGesture;
+			var multiKeyGesture = gesture as MultiKeyGesture;
+			
+			if(partialGesture != null) {
+				key = partialGesture.Key;
+				modifiers = partialGesture.Modifiers;
+			} else if(!(gesture is MultiKeyGesture)) {
+				key = gesture.Key;
+				modifiers = gesture.Modifiers;
+			}
+			
+			if(key != Key.None || modifiers != System.Windows.Input.ModifierKeys.None) {
+				formsKey |= (Keys)KeyInterop.VirtualKeyFromKey(key);
+				
+				if((modifiers & System.Windows.Input.ModifierKeys.Alt) == System.Windows.Input.ModifierKeys.Alt) {
+					formsKey |= Keys.Alt;
+				}
+				
+				if((modifiers & System.Windows.Input.ModifierKeys.Control) == System.Windows.Input.ModifierKeys.Control) {
+					formsKey |= Keys.Control;
+				}
+				
+				if((modifiers & System.Windows.Input.ModifierKeys.Shift) == System.Windows.Input.ModifierKeys.Shift) {
+					formsKey |= Keys.Shift;
+				}
+				
+				// What about "Windows" key?
+			}
+			
+			return formsKey;
 		}
 	}
 }
diff --git a/src/AddIns/Misc/SearchAndReplace/Project/SearchAndReplace.addin b/src/AddIns/Misc/SearchAndReplace/Project/SearchAndReplace.addin
index 66ff3dcbbd..f83dd28136 100644
--- a/src/AddIns/Misc/SearchAndReplace/Project/SearchAndReplace.addin
+++ b/src/AddIns/Misc/SearchAndReplace/Project/SearchAndReplace.addin
@@ -15,7 +15,7 @@
 		<MenuItem id = "Find"
 		          label = "${res:XML.MainMenu.SearchMenu.Find}"
 		          icon = "Icons.16x16.FindIcon"
-		          shortcut = "Control|F"
+		          shortcut = "Ctrl+F"
 		          class = "SearchAndReplace.Find"/>
 		<MenuItem id = "FindNext"
 		          insertafter = "Find"
@@ -26,14 +26,14 @@
 		<MenuItem id = "FindNextSelected"
 		          insertafter = "FindNext"
 		          label = "${res:XML.MainMenu.SearchMenu.FindNextSelected}"
-		          shortcut = "Control|F3"
+		          shortcut = "Ctrl+F3"
 		          class = "SearchAndReplace.FindNextSelected"/>
 		<MenuItem id = "Replace"
 		          insertbefore = "SearchIncremental"
 		          insertafter = "FindNextSelected"
 		          label = "${res:XML.MainMenu.SearchMenu.Replace}"
 		          icon = "Icons.16x16.ReplaceIcon"
-		          shortcut = "Control|R"
+		          shortcut = "Ctrl+R"
 		          class = "SearchAndReplace.Replace"/>
 	</Path>
 	
diff --git a/src/AddIns/Misc/SearchAndReplace/Project/SearchAndReplace.csproj b/src/AddIns/Misc/SearchAndReplace/Project/SearchAndReplace.csproj
index e2a7d04027..f13d6b9480 100644
--- a/src/AddIns/Misc/SearchAndReplace/Project/SearchAndReplace.csproj
+++ b/src/AddIns/Misc/SearchAndReplace/Project/SearchAndReplace.csproj
@@ -128,6 +128,10 @@
       <Name>ICSharpCode.Core</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj">
+      <Project>{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}</Project>
+      <Name>ICSharpCode.Core.Presentation</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj">
       <Project>{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}</Project>
       <Name>ICSharpCode.Core.WinForms</Name>
diff --git a/src/AddIns/Misc/ShortcutsManagement/Properties/AssemblyInfo.cs b/src/AddIns/Misc/ShortcutsManagement/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..19844fbd4e
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Properties/AssemblyInfo.cs
@@ -0,0 +1,34 @@
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("ShortcutsManagement")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+    //(used if a resource is not found in the page, 
+    // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+    //(used if a resource is not found in the page, 
+    // app, or any theme specific resource dictionaries)
+)]
+
diff --git a/src/AddIns/Misc/ShortcutsManagement/Properties/Resources.Designer.cs b/src/AddIns/Misc/ShortcutsManagement/Properties/Resources.Designer.cs
new file mode 100644
index 0000000000..04cdec7e18
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Properties/Resources.Designer.cs
@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.3082
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace ICSharpCode.ShortcutsManagement.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ICSharpCode.ShortcutsManagement.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}
diff --git a/src/AddIns/Misc/ShortcutsManagement/Properties/Resources.resx b/src/AddIns/Misc/ShortcutsManagement/Properties/Resources.resx
new file mode 100644
index 0000000000..af7dbebbac
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Properties/Resources.resx
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/src/AddIns/Misc/ShortcutsManagement/Properties/Settings.Designer.cs b/src/AddIns/Misc/ShortcutsManagement/Properties/Settings.Designer.cs
new file mode 100644
index 0000000000..f2395b7165
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Properties/Settings.Designer.cs
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.3082
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace ICSharpCode.ShortcutsManagement.Properties {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+        
+        public static Settings Default {
+            get {
+                return defaultInstance;
+            }
+        }
+    }
+}
diff --git a/src/AddIns/Misc/ShortcutsManagement/Properties/Settings.settings b/src/AddIns/Misc/ShortcutsManagement/Properties/Settings.settings
new file mode 100644
index 0000000000..033d7a5e9e
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Properties/Settings.settings
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>
\ No newline at end of file
diff --git a/src/AddIns/Misc/ShortcutsManagement/Resources/16-square-red-remove.png b/src/AddIns/Misc/ShortcutsManagement/Resources/16-square-red-remove.png
new file mode 100644
index 0000000000..7983d4e732
Binary files /dev/null and b/src/AddIns/Misc/ShortcutsManagement/Resources/16-square-red-remove.png differ
diff --git a/src/AddIns/Misc/ShortcutsManagement/Resources/StringResources.resx b/src/AddIns/Misc/ShortcutsManagement/Resources/StringResources.resx
new file mode 100644
index 0000000000..5161c71aff
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Resources/StringResources.resx
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="ShortcutsManagement.EnterGestureLabel" xml:space="preserve">
+    <value>Add gesture</value>
+  </data>
+  <data name="ShortcutsManagement.ShortcutGesturesLabel" xml:space="preserve">
+    <value>Shortcut gestures</value>
+  </data>
+  <data name="ShortcutsManagement.SimilarShortcutsLabel" xml:space="preserve">
+    <value>Shortcuts with same gestures</value>
+  </data>
+  <data name="Global.CancelButtonText" xml:space="preserve">
+    <value>_Cancel</value>
+    <comment>For testing outside SD</comment>
+  </data>
+  <data name="Global.OKButtonText" xml:space="preserve">
+    <value>_OK</value>
+    <comment>For testing outside SD</comment>
+  </data>
+  <data name="ShortcutsManagement.UnspecifiedAddInName" xml:space="preserve">
+    <value>Unspecified</value>
+  </data>
+  <data name="ShortcutsManagement.UnspecifiedCategoryName" xml:space="preserve">
+    <value>Uncategorized</value>
+  </data>
+  <data name="ShortcutsManagement.GestureTextBox.FirstChordIsIncomplete" xml:space="preserve">
+    <value>First chord must have a modifier</value>
+  </data>
+  <data name="ShortcutsManagement.GestureTextBox.GestureIsValid" xml:space="preserve">
+    <value>Valid gesture</value>
+  </data>
+  <data name="ShortcutsManagement.GestureTextBox.LastChordIsIncomplete" xml:space="preserve">
+    <value>Multi key gesture is not finished</value>
+  </data>
+  <data name="ShortcutsManagement.GestureTextBox.SequenceIsNotCoherent" xml:space="preserve">
+    <value>Invalid gesture. Sequence is not coherent.</value>
+  </data>
+  <data name="ShortcutsManagement.GestureTextBox.TimeExpired" xml:space="preserve">
+    <value>Time given for gesture entry expired</value>
+  </data>
+  <data name="ShortcutsManagement.ModificationWindow.AdditionFailedFirstChordIsIncomplete" xml:space="preserve">
+    <value>Failed to add a gesture. First chord should contain a modifier</value>
+  </data>
+  <data name="ShortcutsManagement.ModificationWindow.AdditionFailedLastChordIsIncompete" xml:space="preserve">
+    <value>Failed to add a gesture. Gesture is unfinished. Last chord should have a key</value>
+  </data>
+  <data name="ShortcutsManagement.ModificationWindow.AdditionFailedNoChords" xml:space="preserve">
+    <value>Failed to add a gesture. Gesture must have atleast one chord</value>
+  </data>
+  <data name="ShortcutsManagement.ModificationWindow.AdditionIsSuccessfull" xml:space="preserve">
+    <value>Gesture added</value>
+  </data>
+  <data name="ShortcutsManagement.ModificationWindow.AddingExistingGesture" xml:space="preserve">
+    <value>Failed to add a gesture. Such gesture already exists in shortcut gestures collections</value>
+  </data>
+  <data name="ShortcutsManagement.CreateNewProfilePrompt.BasedOnLabel" xml:space="preserve">
+    <value>Based on:</value>
+  </data>
+  <data name="ShortcutsManagement.CreateNewProfilePrompt.SpecifyProfileNameLabel" xml:space="preserve">
+    <value>Please specify profile name</value>
+  </data>
+  <data name="ShortcutsManagement.ReadOnly" xml:space="preserve">
+    <value>Read-Only</value>
+  </data>
+  <data name="ShortcutsManagement.ShortcutsManagementOptionsPanel.ConfirmDeleteProfileMessage" xml:space="preserve">
+    <value>Are you sure you want to reset modifications to current profile?</value>
+  </data>
+  <data name="ShortcutsManagement.ShortcutsManagementOptionsPanel.ConfirmDeleteProfileMessageWindowName" xml:space="preserve">
+    <value>Reset modifications to profile</value>
+  </data>
+  <data name="ShortcutsManagement.ShortcutsManagementOptionsPanel.NoProfileSelectedMessage" xml:space="preserve">
+    <value>Please select a profile which you wan't to modify.</value>
+  </data>
+  <data name="ShortcutsManagement.ShortcutsManagementOptionsPanel.ProfileCreateAction" xml:space="preserve">
+    <value>Create</value>
+  </data>
+  <data name="ShortcutsManagement.ShortcutsManagementOptionsPanel.ProfileDeleteAction" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="ShortcutsManagement.ShortcutsManagementOptionsPanel.ProfileLoadAction" xml:space="preserve">
+    <value>Load</value>
+  </data>
+  <data name="ShortcutsManagement.ShortcutsManagementOptionsPanel.ProfileRenameAction" xml:space="preserve">
+    <value>Rename</value>
+  </data>
+  <data name="ShortcutsManagement.ShortcutsManagementOptionsPanel.ProfileResetAction" xml:space="preserve">
+    <value>Reset to defaults</value>
+  </data>
+  <data name="ShortcutsManagement.ShortcutManagementWindow.ResetToDefaults" xml:space="preserve">
+    <value>Reset</value>
+  </data>
+  <data name="ShortcutsManagement.ShortcutsManagementOptionsPanel.ProfilesLabel" xml:space="preserve">
+    <value>Profiles:</value>
+  </data>
+  <data name="ShortcutsManagement.ShortcutsManagementOptionsPanel.SelectedProfileIsReadOnlyMessage" xml:space="preserve">
+    <value>Selected profile is read-only.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/AddIns/Misc/ShortcutsManagement/Resources/Thumbs.db b/src/AddIns/Misc/ShortcutsManagement/Resources/Thumbs.db
new file mode 100644
index 0000000000..c31d17e439
Binary files /dev/null and b/src/AddIns/Misc/ShortcutsManagement/Resources/Thumbs.db differ
diff --git a/src/AddIns/Misc/ShortcutsManagement/Resources/add_correction_16x16.gif b/src/AddIns/Misc/ShortcutsManagement/Resources/add_correction_16x16.gif
new file mode 100644
index 0000000000..252d7ebcb8
Binary files /dev/null and b/src/AddIns/Misc/ShortcutsManagement/Resources/add_correction_16x16.gif differ
diff --git a/src/AddIns/Misc/ShortcutsManagement/Resources/block_small.png b/src/AddIns/Misc/ShortcutsManagement/Resources/block_small.png
new file mode 100644
index 0000000000..cea7cd0f77
Binary files /dev/null and b/src/AddIns/Misc/ShortcutsManagement/Resources/block_small.png differ
diff --git a/src/AddIns/Misc/ShortcutsManagement/Resources/delete_small.png b/src/AddIns/Misc/ShortcutsManagement/Resources/delete_small.png
new file mode 100644
index 0000000000..c3134399ae
Binary files /dev/null and b/src/AddIns/Misc/ShortcutsManagement/Resources/delete_small.png differ
diff --git a/src/AddIns/Misc/ShortcutsManagement/Resources/info_big.png b/src/AddIns/Misc/ShortcutsManagement/Resources/info_big.png
new file mode 100644
index 0000000000..4d166f512c
Binary files /dev/null and b/src/AddIns/Misc/ShortcutsManagement/Resources/info_big.png differ
diff --git a/src/AddIns/Misc/ShortcutsManagement/Resources/info_mid.png b/src/AddIns/Misc/ShortcutsManagement/Resources/info_mid.png
new file mode 100644
index 0000000000..dfc69de586
Binary files /dev/null and b/src/AddIns/Misc/ShortcutsManagement/Resources/info_mid.png differ
diff --git a/src/AddIns/Misc/ShortcutsManagement/Resources/info_small.png b/src/AddIns/Misc/ShortcutsManagement/Resources/info_small.png
new file mode 100644
index 0000000000..2794af30db
Binary files /dev/null and b/src/AddIns/Misc/ShortcutsManagement/Resources/info_small.png differ
diff --git a/src/AddIns/Misc/ShortcutsManagement/Resources/key_enter.png b/src/AddIns/Misc/ShortcutsManagement/Resources/key_enter.png
new file mode 100644
index 0000000000..0182ca646e
Binary files /dev/null and b/src/AddIns/Misc/ShortcutsManagement/Resources/key_enter.png differ
diff --git a/src/AddIns/Misc/ShortcutsManagement/Resources/key_enter_pressed.png b/src/AddIns/Misc/ShortcutsManagement/Resources/key_enter_pressed.png
new file mode 100644
index 0000000000..a3ced2f3eb
Binary files /dev/null and b/src/AddIns/Misc/ShortcutsManagement/Resources/key_enter_pressed.png differ
diff --git a/src/AddIns/Misc/ShortcutsManagement/Resources/plus_small.png b/src/AddIns/Misc/ShortcutsManagement/Resources/plus_small.png
new file mode 100644
index 0000000000..c78afd1d53
Binary files /dev/null and b/src/AddIns/Misc/ShortcutsManagement/Resources/plus_small.png differ
diff --git a/src/AddIns/Misc/ShortcutsManagement/Resources/search_small.png b/src/AddIns/Misc/ShortcutsManagement/Resources/search_small.png
new file mode 100644
index 0000000000..e930b6cad7
Binary files /dev/null and b/src/AddIns/Misc/ShortcutsManagement/Resources/search_small.png differ
diff --git a/src/AddIns/Misc/ShortcutsManagement/Resources/tick_small.png b/src/AddIns/Misc/ShortcutsManagement/Resources/tick_small.png
new file mode 100644
index 0000000000..abc312f186
Binary files /dev/null and b/src/AddIns/Misc/ShortcutsManagement/Resources/tick_small.png differ
diff --git a/src/AddIns/Misc/ShortcutsManagement/Resources/warning_small.png b/src/AddIns/Misc/ShortcutsManagement/Resources/warning_small.png
new file mode 100644
index 0000000000..86668e4e07
Binary files /dev/null and b/src/AddIns/Misc/ShortcutsManagement/Resources/warning_small.png differ
diff --git a/src/AddIns/Misc/ShortcutsManagement/ShortcutsManagement.addin b/src/AddIns/Misc/ShortcutsManagement/ShortcutsManagement.addin
new file mode 100644
index 0000000000..da149b20e0
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/ShortcutsManagement.addin
@@ -0,0 +1,19 @@
+<AddIn name        = "ShortcutsManagement"
+       author      = "Sergej Andrejev"
+       url         = ""
+       description = "Addin allows managing application shortcuts">
+    	
+	<Manifest>
+		<Identity name="ICSharpCode.ShortcutsManagement" version = "@SharpDevelopCoreVersion"/>
+	</Manifest>
+    
+    <Runtime>
+        <Import assembly = "ICSharpCode.ShortcutsManagement.dll"/>
+    </Runtime>
+    
+    <Path name = "/SharpDevelop/Dialogs/OptionsDialog/TextEditorOptions">
+		    <OptionPanel id = "ShortcutsManagement"
+			             label = "Shortcuts management"
+			             class = "ICSharpCode.ShortcutsManagement.Dialogs.ShortcutsManagementOptionsPanel" />
+	  </Path>
+</AddIn>
diff --git a/src/AddIns/Misc/ShortcutsManagement/ShortcutsManagement.csproj b/src/AddIns/Misc/ShortcutsManagement/ShortcutsManagement.csproj
new file mode 100644
index 0000000000..2a456b1c52
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/ShortcutsManagement.csproj
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
+  <PropertyGroup>
+    <ProjectGuid>{745869FF-80E9-4589-A366-E775D2103843}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <OutputType>Library</OutputType>
+    <RootNamespace>ICSharpCode.ShortcutsManagement</RootNamespace>
+    <AssemblyName>ICSharpCode.ShortcutsManagement</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <SignAssembly>True</SignAssembly>
+    <AssemblyOriginatorKeyFile>ShortcutsManagement.snk</AssemblyOriginatorKeyFile>
+    <DelaySign>False</DelaySign>
+    <AssemblyOriginatorKeyMode>File</AssemblyOriginatorKeyMode>
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <NoStdLib>False</NoStdLib>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <OutputPath>..\..\..\..\AddIns\AddIns\Misc\ShortcutsManagement\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>Full</DebugType>
+    <Optimize>False</Optimize>
+    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <StartAction>Program</StartAction>
+    <StartProgram>..\..\..\..\bin\SharpDevelop.exe</StartProgram>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DebugSymbols>False</DebugSymbols>
+    <DebugType>None</DebugType>
+    <Optimize>True</Optimize>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <DefineConstants>TRACE</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
+    <BaseAddress>4194304</BaseAddress>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <FileAlignment>4096</FileAlignment>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="PresentationCore">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="PresentationFramework">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\..\Main\GlobalAssemblyInfo.cs">
+      <Link>Properties\GlobalAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Src\Converters\AdditionConverter.cs" />
+    <Compile Include="Src\Converters\BoolToVisibilityConverter.cs" />
+    <Compile Include="Src\Converters\GesturesCollectionConverter.cs" />
+    <Compile Include="Src\Converters\InputGestureConverter.cs" />
+    <Compile Include="Src\Converters\NotNullOrEmptyConverter.cs" />
+    <Compile Include="Src\Converters\ProfilesComboBoxItemStyleSelector.cs" />
+    <Compile Include="Src\Converters\ProfileToStringConverter.cs" />
+    <Compile Include="Src\Converters\ShortcutCategorySubElementsMergedConverter.cs" />
+    <Compile Include="Src\Converters\TypeNameConverter.cs" />
+    <Compile Include="Src\Data\AddIn.cs" />
+    <Compile Include="Src\Data\IShortcutTreeEntry.cs" />
+    <Compile Include="Src\Data\IShortcutTreeEntryCloner.cs" />
+    <Compile Include="Src\Data\MapTable.cs" />
+    <Compile Include="Src\Data\SeparatorData.cs" />
+    <Compile Include="Src\Data\Shortcut.cs" />
+    <Compile Include="Src\Data\ShortcutCategory.cs" />
+    <Compile Include="Src\Data\ShortcutsFinder.cs" />
+    <Compile Include="Src\Data\UserGestureProfileAction.cs" />
+    <Compile Include="Src\Dialogs\CreateNewProfilePrompt.xaml.cs">
+      <DependentUpon>CreateNewProfilePrompt.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Src\Dialogs\MultiKeyGestureTextBox.xaml.cs">
+      <DependentUpon>MultiKeyGestureTextBox.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Src\Dialogs\ShortcutManagementWindow.xaml.cs">
+      <DependentUpon>ShortcutManagementWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Src\Dialogs\ShortcutsManagementOptionsPanel.xaml.cs">
+      <DependentUpon>ShortcutsManagementOptionsPanel.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Src\Dialogs\ShortcutsTreeView.xaml.cs">
+      <DependentUpon>ShortcutsTreeView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Src\Extensions\TextBlockBehavior.cs" />
+    <Compile Include="Src\Extensions\TreeViewExtensions.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Resources" />
+    <Folder Include="Src" />
+    <Folder Include="Src\Converters" />
+    <Folder Include="Src\Data" />
+    <Folder Include="Src\Dialogs" />
+    <Folder Include="Src\Extensions" />
+    <Folder Include="Themes" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\16-square-red-remove.png" />
+    <Resource Include="Resources\add_correction_16x16.gif" />
+    <Resource Include="Resources\block_small.png" />
+    <Resource Include="Resources\delete_small.png" />
+    <Resource Include="Resources\info_big.png" />
+    <Resource Include="Resources\info_mid.png" />
+    <Resource Include="Resources\info_small.png" />
+    <Resource Include="Resources\key_enter.png" />
+    <Resource Include="Resources\key_enter_pressed.png" />
+    <Resource Include="Resources\plus_small.png" />
+    <Resource Include="Resources\search_small.png" />
+    <Resource Include="Resources\tick_small.png" />
+    <Resource Include="Resources\warning_small.png" />
+    <None Include="ShortcutsManagement.addin">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\StringResources.resx" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="Src\Dialogs\CreateNewProfilePrompt.xaml" />
+    <Page Include="Src\Dialogs\MultiKeyGestureTextBox.xaml" />
+    <Page Include="Src\Dialogs\Resources.xaml" />
+    <Page Include="Src\Dialogs\ShortcutManagementWindow.xaml" />
+    <Page Include="Src\Dialogs\ShortcutsManagementOptionsPanel.xaml" />
+    <Page Include="Src\Dialogs\ShortcutsTreeView.xaml" />
+    <Page Include="Themes\Generic.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
+      <Project>{2748AD25-9C63-4E12-877B-4DCE96FBED54}</Project>
+      <Name>ICSharpCode.SharpDevelop</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Main\Core\Project\ICSharpCode.Core.csproj">
+      <Project>{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}</Project>
+      <Name>ICSharpCode.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj">
+      <Project>{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}</Project>
+      <Name>ICSharpCode.Core.Presentation</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
+</Project>
\ No newline at end of file
diff --git a/src/AddIns/Misc/ShortcutsManagement/ShortcutsManagement.snk b/src/AddIns/Misc/ShortcutsManagement/ShortcutsManagement.snk
new file mode 100644
index 0000000000..e1a8981007
Binary files /dev/null and b/src/AddIns/Misc/ShortcutsManagement/ShortcutsManagement.snk differ
diff --git a/src/AddIns/Misc/ShortcutsManagement/Src/Converters/AdditionConverter.cs b/src/AddIns/Misc/ShortcutsManagement/Src/Converters/AdditionConverter.cs
new file mode 100644
index 0000000000..10fc55f2a7
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Src/Converters/AdditionConverter.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace ICSharpCode.ShortcutsManagement.Converters
+{
+	/// <summary>
+	/// Converts double value to another double value by adding another value provided in converter parameter
+	/// </summary>
+	class AddidionConverter : IValueConverter
+	{
+		/// <summary>
+		/// Convert double value to another double value by adding another value provided in converter parameter
+		/// </summary>
+		/// <param name="value">Original double value</param>
+		/// <param name="targetType">Convertion target type</param>
+		/// <param name="parameter">Another double value to be added to original value</param>
+		/// <param name="culture">Not used</param>
+		/// <returns>New double value</returns>
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			double additionParameter = 0;
+			var additionParameterString = parameter as string;
+			if (additionParameterString != null) {
+				Double.TryParse(additionParameterString, out additionParameter);
+			}
+			
+			if(value is double) {
+				var doubleValue = (double)value;
+				return doubleValue + additionParameter;
+			}
+			
+			return value;
+		}
+		
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			throw new NotSupportedException();
+		}
+	}
+}
diff --git a/src/AddIns/Misc/ShortcutsManagement/Src/Converters/BoolToVisibilityConverter.cs b/src/AddIns/Misc/ShortcutsManagement/Src/Converters/BoolToVisibilityConverter.cs
new file mode 100644
index 0000000000..3f392f1e31
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Src/Converters/BoolToVisibilityConverter.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace ICSharpCode.ShortcutsManagement.Converters
+{
+	/// <summary>
+	/// Converts boolean value to <see cref="Visibility" /> enum
+	/// </summary>
+	public class BoolToVisibilityConverter : IValueConverter
+	{
+		/// <summary>
+		/// Convert forward
+		/// </summary>
+		/// <param name="value">Boolean value</param>
+		/// <param name="targetType">Target type (Only string is supported)</param>
+		/// <param name="parameter">Hide type (Hidden - reserve space but don't show, Collapse - do not reserve space)</param>
+		/// <param name="culture">Culture info (Invariant culture is used always)</param>
+		/// <returns>Visibility value</returns>
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			if(value is bool) {
+				var hidden = parameter ?? "Hidden";
+				return (bool)value ? "Visible" : hidden;
+			}
+			
+			throw new NotSupportedException();
+		}
+		
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			throw new NotSupportedException();
+		}
+	}
+}
diff --git a/src/AddIns/Misc/ShortcutsManagement/Src/Converters/GesturesCollectionConverter.cs b/src/AddIns/Misc/ShortcutsManagement/Src/Converters/GesturesCollectionConverter.cs
new file mode 100644
index 0000000000..e69234fc62
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Src/Converters/GesturesCollectionConverter.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Globalization;
+using System.Windows.Data;
+using System.Windows.Input;
+using ICSharpCode.Core.Presentation;
+
+namespace ICSharpCode.ShortcutsManagement.Converters
+{
+	/// <summary>
+	/// Converts input gestures collection into string
+	/// </summary>
+	public class GesturesListConverter : IValueConverter
+	{
+		/// <summary>
+		/// Convert collection of gestures to a string
+		/// </summary>
+		/// <param name="value">Collection of gestures</param>
+		/// <param name="targetType">Convertion target type (only string is supported)</param>
+		/// <param name="parameter">Not used</param>
+		/// <param name="culture">Not used</param>
+		/// <returns>String representing collection of gestures</returns>
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			string converterValue = "";
+			if (value is InputGestureCollection && (targetType == typeof(string) || targetType.IsSubclassOf(typeof(string)))) {
+				converterValue = new InputGestureCollectionConverter().ConvertToInvariantString(value);
+			}
+			
+			if (value is ObservableCollection<InputGesture> && (targetType == typeof(string) || targetType.IsSubclassOf(typeof(string)))) {
+				var inputGestureCollection = new InputGestureCollection();
+				foreach (var gesture in (ObservableCollection<InputGesture>)value) {
+					inputGestureCollection.Add(gesture);
+				}
+				converterValue = new InputGestureCollectionConverter().ConvertToInvariantString(inputGestureCollection);
+			}
+			
+			return converterValue.Replace("+", " + ").Replace(",", ", ").Replace(";", "; ");
+		}
+		
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			throw new NotSupportedException();
+		}
+	}
+}
diff --git a/src/AddIns/Misc/ShortcutsManagement/Src/Converters/InputGestureConverter.cs b/src/AddIns/Misc/ShortcutsManagement/Src/Converters/InputGestureConverter.cs
new file mode 100644
index 0000000000..4a0a69f728
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Src/Converters/InputGestureConverter.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+using System.Windows.Input;
+using ICSharpCode.Core.Presentation;
+
+namespace ICSharpCode.ShortcutsManagement.Converters
+{
+	/// <summary>
+	/// Converts input gesture to string representation
+	/// </summary>
+	public class InputGestureConverter : IValueConverter
+	{
+		/// <summary>
+		/// Convert input gesture to string
+		/// </summary>
+		/// <param name="value">Input gesture</param>
+		/// <param name="targetType">Convertion target type (Only string is supported)</param>
+		/// <param name="parameter">Not used</param>
+		/// <param name="culture">Not used</param>
+		/// <returns>String representing <see cref="InputGesture" /></returns>
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			if (value is KeyGesture && targetType == typeof(string)) {
+				var gestures = new InputGestureCollection(new[] {value});
+				return new InputGestureCollectionConverter().ConvertToInvariantString(gestures).Replace("+", " + ").Replace(",", ", ");
+			} 
+			
+			if(value is MouseGesture && targetType == typeof(string)) {
+			return new MouseGestureConverter().ConvertToInvariantString(value);
+			}
+			
+			return "";
+		}
+		
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			throw new NotSupportedException();
+		}
+	}
+}
diff --git a/src/AddIns/Misc/ShortcutsManagement/Src/Converters/NotNullOrEmptyConverter.cs b/src/AddIns/Misc/ShortcutsManagement/Src/Converters/NotNullOrEmptyConverter.cs
new file mode 100644
index 0000000000..f862707bd3
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Src/Converters/NotNullOrEmptyConverter.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace ICSharpCode.ShortcutsManagement.Converters
+{
+	/// <summary>
+	/// Converts null and empty string to true and all other values to false
+	/// </summary>
+	class NotNullOrEmptyConverter : IValueConverter
+	{
+		/// <summary>
+		/// Converts null and empty string to true and all other values to false
+		/// </summary>
+		/// <param name="value">String or any other object</param>
+		/// <param name="targetType">Convertion target type</param>
+		/// <param name="parameter">Not used</param>
+		/// <param name="culture">Not used</param>
+		/// <returns>Bool value</returns>
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			if ((value is string && !string.IsNullOrEmpty((string)value)) || (!(value is string) && value != null)) {
+				return true;
+			}
+			
+			return false;
+		}
+		
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			throw new NotSupportedException();
+		}
+	}
+}
diff --git a/src/AddIns/Misc/ShortcutsManagement/Src/Converters/ProfileToStringConverter.cs b/src/AddIns/Misc/ShortcutsManagement/Src/Converters/ProfileToStringConverter.cs
new file mode 100644
index 0000000000..9eeef334e5
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Src/Converters/ProfileToStringConverter.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+using ICSharpCode.Core;
+using ICSharpCode.Core.Presentation;
+
+namespace ICSharpCode.ShortcutsManagement.Converters
+{
+	/// <summary>
+	/// Converts profile to representing string
+	/// </summary>
+	public class ProfileToStringConverter : IValueConverter
+	{
+		/// <summary>
+		/// Converts profile to representing string
+		/// </summary>
+		/// <param name="value">UserGestureProfile instance</param>
+		/// <param name="targetType">Convertion target type (only string is supported)</param>
+		/// <param name="parameter">Not supported</param>
+		/// <param name="culture">Not supported</param>
+		/// <returns>String representing instance of UserGestureProfile</returns>
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			var profile = value as UserGestureProfile;
+			if(profile != null) {
+				var readOnlyString = "";
+				if(profile.ReadOnly) {
+					readOnlyString = string.Format(" ({0})", StringParser.Parse("${res:ShortcutsManagement.ReadOnly}"));
+				}
+				
+				return profile.Text + readOnlyString;
+			}
+			
+			return value;
+		}
+		
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			throw new NotSupportedException();
+		}
+	}
+}
diff --git a/src/AddIns/Misc/ShortcutsManagement/Src/Converters/ProfilesComboBoxItemStyleSelector.cs b/src/AddIns/Misc/ShortcutsManagement/Src/Converters/ProfilesComboBoxItemStyleSelector.cs
new file mode 100644
index 0000000000..c383b038d6
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Src/Converters/ProfilesComboBoxItemStyleSelector.cs
@@ -0,0 +1,31 @@
+using System.Windows;
+using System.Windows.Controls;
+using ICSharpCode.ShortcutsManagement.Data;
+
+namespace ICSharpCode.ShortcutsManagement.Converters
+{
+	/// <summary>
+	/// Selects profilesComboBox item style
+	/// </summary>
+	public class ProfilesComboBoxItemStyleSelector : StyleSelector
+	{
+		/// <summary>
+		/// Selects profilesComboBox item style
+		/// </summary>
+		/// <param name="item">Item contained in ComboBoxItem</param>
+		/// <param name="container">ComboBoxItem container</param>
+		/// <returns>ComboBoxItem style</returns>
+		public override Style SelectStyle(object item, DependencyObject container)
+		{
+			if(item is SeparatorData) {
+				return (Style)((FrameworkElement)container).FindResource("SeparatorStyle");
+			}
+			
+			if(item is UserGestureProfileAction) {
+				return (Style)((FrameworkElement)container).FindResource("ProfileActionStyle");
+			}
+			
+			return null;
+		}
+	}
+}
diff --git a/src/AddIns/Misc/ShortcutsManagement/Src/Converters/ShortcutCategorySubElementsMergedConverter.cs b/src/AddIns/Misc/ShortcutsManagement/Src/Converters/ShortcutCategorySubElementsMergedConverter.cs
new file mode 100644
index 0000000000..faf02d26a6
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Src/Converters/ShortcutCategorySubElementsMergedConverter.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Windows.Data;
+using ICSharpCode.ShortcutsManagement.Data;
+
+namespace ICSharpCode.ShortcutsManagement.Converters
+{
+	/// <summary>
+	/// Merges category's sub-categories and shortcuts into one list
+	/// </summary>
+	public class ShortcutCategorySubElementsMergedConverter : IMultiValueConverter
+	{
+		/// <summary>
+		/// Merge category's sub-categories and shortcuts into one list
+		/// </summary>
+		/// <param name="values">List of sub-categories and list of shortcuts</param>
+		/// <param name="targetType">Not used</param>
+		/// <param name="parameter">Not used</param>
+		/// <param name="culture">Not used</param>
+		/// <returns>List of objects where objects are either a shortcut category or a shortcut</returns>
+		public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+		{
+			var items = new List<object>();
+			items.AddRange(((IEnumerable<ShortcutCategory>)values[0]).Cast<object>());
+			items.AddRange(((IEnumerable<Shortcut>)values[1]).Cast<object>());
+			
+			return items;
+		}
+		
+		public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+		{
+			throw new NotSupportedException();
+		}
+	}
+}
diff --git a/src/AddIns/Misc/ShortcutsManagement/Src/Converters/TypeNameConverter.cs b/src/AddIns/Misc/ShortcutsManagement/Src/Converters/TypeNameConverter.cs
new file mode 100644
index 0000000000..1a3f85e65b
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Src/Converters/TypeNameConverter.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace ICSharpCode.ShortcutsManagement.Converters
+{
+	/// <summary>
+	/// Convert object to its type name
+	/// </summary>
+	class TypeNameConverter : IValueConverter
+	{
+		/// <summary>
+		/// Convert object to type name
+		/// </summary>
+		/// <param name="value">Any object</param>
+		/// <param name="targetType">Convertion target type (Only string is supported)</param>
+		/// <param name="parameter">Not used</param>
+		/// <param name="culture">Not used</param>
+		/// <returns>Passed object type name</returns>
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			return value.GetType().Name;
+		}
+		
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			throw new NotSupportedException();
+		}
+	}
+}
diff --git a/src/AddIns/Misc/ShortcutsManagement/Src/Data/AddIn.cs b/src/AddIns/Misc/ShortcutsManagement/Src/Data/AddIn.cs
new file mode 100644
index 0000000000..a460e10a20
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Src/Data/AddIn.cs
@@ -0,0 +1,125 @@
+using System.Collections.Generic;
+using System.ComponentModel;
+
+namespace ICSharpCode.ShortcutsManagement.Data
+{
+	/// <summary>
+	/// Add-in where shortcuts were registered
+	/// </summary>
+	public class AddIn : INotifyPropertyChanged, IShortcutTreeEntry
+	{
+		private string name;
+		
+		/// <summary>
+		/// Gets or sets add-in name
+		/// </summary>
+		public string Name
+		{
+			get {
+				return name;
+			}
+			set {
+				if (name != value) {
+					name = value;
+					InvokePropertyChanged("Name");
+				}
+			}
+		}
+		
+		private bool isVisible;
+		
+		/// <summary>
+		/// Gets or sets value specifying whether category is visible in shortcuts tree or not
+		/// </summary>
+		public bool IsVisible
+		{
+			get {
+				return isVisible;
+			}
+			set {
+				if (isVisible != value) {
+					isVisible = value;
+					InvokePropertyChanged("IsVisible");
+				}
+			}
+		}
+		
+		/// <summary>
+		/// Gets list of add-in categories
+		/// </summary>
+		public List<ShortcutCategory> Categories
+		{
+			get; 
+			private set;
+		}
+		
+		/// <summary>
+		/// Creates new instance of <see cref="AddIn" />
+		/// </summary>
+		/// <param name="addInName">Add-in name</param>
+		public AddIn(string addInName)
+		{
+			IsVisible = true;
+			Name = addInName;
+			Categories = new List<ShortcutCategory>();
+		}
+		
+		/// <summary>
+		/// Finds shortcut by shortcut Id in add-in categories 
+		/// </summary>
+		/// <param name="shortcutId">Shortcut Id</param>
+		/// <returns>Shortcut with matching Id value</returns>
+		public Shortcut FindShortcut(string shortcutId)
+		{
+			foreach (var c in Categories) {
+				Shortcut foundShortcut;
+				if ((foundShortcut = c.FindShortcut(shortcutId)) != null) {
+					return foundShortcut;
+				}
+			}
+		
+			return null;
+		}
+		
+		/// <summary>
+		/// Sorts add-in sub-categories
+		/// </summary>
+		public void SortSubEntries() 
+		{
+			Categories.Sort((a, b) => a.Name.CompareTo(b.Name));
+			foreach (var category in Categories) {
+				category.SortSubEntries();
+			}
+		}
+		
+		/// <summary>
+		/// Occurs when <see cref="Name" /> or  or <see cref="IsVisible" /> property value changes
+		/// </summary>
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		/// <summary>
+		/// Compares add-in to other instances of type <see cref="IShortcutTreeEntry"/>
+		/// </summary>
+		/// <param name="obj">Compared object</param>
+		/// <returns>Comparison result</returns>
+		public int CompareTo(object obj) 
+		{
+			if (obj is ShortcutCategory) return -1;
+			if (obj is Shortcut) return -1;
+			
+			var addInObj = (AddIn)obj;
+			return Name.CompareTo(addInObj.Name);
+		}
+		
+		/// <summary>
+		/// Invoke dependency property changed event
+		/// </summary>
+		/// <param name="propertyName">Name of dependency property from this classs</param>
+		private void InvokePropertyChanged(string propertyName)
+		{
+			if (PropertyChanged != null) {
+				PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+}
diff --git a/src/AddIns/Misc/ShortcutsManagement/Src/Data/IShortcutTreeEntry.cs b/src/AddIns/Misc/ShortcutsManagement/Src/Data/IShortcutTreeEntry.cs
new file mode 100644
index 0000000000..b2d7c1b963
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Src/Data/IShortcutTreeEntry.cs
@@ -0,0 +1,35 @@
+using System;
+
+namespace ICSharpCode.ShortcutsManagement.Data
+{
+    public interface IShortcutTreeEntry : IComparable
+    {
+		/// <summary>
+		/// Gets or sets shortcut entry name displayed in shortcuts tree
+		/// </summary>
+		string Name
+		{
+		get; set;
+		}
+		
+		/// <summary>
+		/// Specifies whether shortcut tree entry is visible
+		/// </summary>
+		bool IsVisible
+		{
+			get; set;
+		}
+		
+		/// <summary>
+		/// Sort shortcut entry sub elements
+		/// </summary>
+		void SortSubEntries();
+		
+		/// <summary>
+		/// Search for shortcut in this shortcut entry and sub-elements
+		/// </summary>
+		/// <param name="shortcutId"></param>
+		/// <returns></returns>
+		Shortcut FindShortcut(string shortcutId);
+	}
+}
diff --git a/src/AddIns/Misc/ShortcutsManagement/Src/Data/IShortcutTreeEntryCloner.cs b/src/AddIns/Misc/ShortcutsManagement/Src/Data/IShortcutTreeEntryCloner.cs
new file mode 100644
index 0000000000..9125f8385d
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Src/Data/IShortcutTreeEntryCloner.cs
@@ -0,0 +1,119 @@
+using System;
+using System.Collections.Generic;
+using System.Windows.Input;
+
+namespace ICSharpCode.ShortcutsManagement.Data
+{
+	/// <summary>
+	/// Creates deep copy of <see cref="Shortcut" />, <see cref="ShortcutTree" /> or <see cref="AddIn" />
+	/// </summary>
+	public class IShortcutTreeEntryCloner
+	{
+		/// <summary>
+		/// Creates new instance of <see cref="IShortcutTreeEntryCloner" />
+		/// </summary>
+		public IShortcutTreeEntryCloner()
+		{
+		}
+		
+		/// <summary>
+		/// Deep clone collection of <see cref="IShortcutTreeEntry" />
+		/// 
+		/// Re-uses <see cref="Shortcut" /> instances for similar shortcuts in different categories
+		/// </summary>
+		/// <param name="entries">Collection of <see cref="IShortcutTreeEntry" /></param>
+		/// <returns>Cloned entries</returns>
+		public ICollection<IShortcutTreeEntry> CloneShortcutTree(ICollection<IShortcutTreeEntry> entries)
+		{
+			var clonedShortcuts = new Dictionary<string, Shortcut>();
+			var clonedEntries = new List<IShortcutTreeEntry>();
+			
+			// Make a deep copy of all add-ins, categories and shortcuts
+			foreach (var entry in entries) {
+				var shortcut = entry as Shortcut;
+				var category = entry as ShortcutCategory;
+				var addin = entry as AddIn;
+				
+				IShortcutTreeEntry clonedEntry = null;
+				if(shortcut != null) {
+					clonedEntry = CloneShortcut(shortcut, clonedShortcuts);
+				} else if(category != null) {
+					clonedEntry = CloneShortutCategory(category, clonedShortcuts);
+				} else if(addin != null) {
+					clonedEntry = CloneAddin(addin, clonedShortcuts);
+				}
+				
+				clonedEntries.Add(clonedEntry);
+			}
+			
+			return clonedEntries;
+		}
+		
+			
+		/// <summary>
+		/// Creates a deep copy of <see cref="ShortcutCategory" /> instance
+		/// 
+		/// Re-uses <see cref="Shortcut" /> instances for similar shortcuts in different categories
+		/// </summary>
+		/// <param name="category">Cloned shortcut category</param>
+		/// <param name="clonedShortcuts">Dictionary of shortcuts which should be re-used. If cloned shortcut <see cref="Shortcut.Id" /> property value is already preset in this dictionary instance from dictionary is used instead</param>
+		/// <returns>Deep copy of <see cref="ShortcutCategory" /></returns>
+		public ShortcutCategory CloneShortutCategory(ShortcutCategory category, Dictionary<string, Shortcut> clonedShortcuts)
+		{
+			var clonedCategory = new ShortcutCategory(category.Name);
+			
+			foreach (var subCategory in category.SubCategories) {
+				clonedCategory.SubCategories.Add(CloneShortutCategory(subCategory, clonedShortcuts));
+			}
+			
+			foreach (var shortcut in category.Shortcuts) {
+				clonedCategory.Shortcuts.Add(CloneShortcut(shortcut, clonedShortcuts));
+			}
+			
+			return clonedCategory;
+		}
+		
+		 /// <summary>
+		/// Create a deep copy of <see cref="AddIn" /> instance
+		/// 
+		/// Re-uses <see cref="Shortcut" /> instances for similar shortcuts in different categories
+		/// </summary>
+		/// <param name="shortcut">Cloned shortcut</param>
+		/// <param name="clonedShortcuts">Dictionary of shortcuts which should be re-used. If cloned shortcut <see cref="Shortcut.Id" /> property value is already preset in this dictionary instance from dictionary is used instead</param>
+		/// <returns>Deep copy of <see cref="Shortcut" /></returns>
+		public Shortcut CloneShortcut(Shortcut shortcut, Dictionary<string, Shortcut> clonedShortcuts)
+        {
+        	if(clonedShortcuts.ContainsKey(shortcut.Id)) {
+        		return clonedShortcuts[shortcut.Id];
+        	} else {
+				var clonedShortcut = new Shortcut(
+					shortcut.Id,
+					shortcut.Name, 
+					new InputGestureCollection(shortcut.Gestures), 
+					new InputGestureCollection(shortcut.DefaultGestures));
+				
+				clonedShortcuts.Add(clonedShortcut.Id, clonedShortcut);
+				
+				return clonedShortcut;
+        	}
+        }
+
+		/// <summary>
+		/// Creates a deep copy of <see cref="AddIn" /> instance
+		/// 
+		/// Re-uses <see cref="Shortcut" /> instances for similar shortcuts in different categories
+		/// </summary>
+		/// <param name="category">Cloned add-in</param>
+		/// <param name="clonedShortcuts">Dictionary of shortcuts which should be re-used. If cloned shortcut <see cref="Shortcut.Id" /> property value is already preset in this dictionary instance from dictionary is used instead</param>
+		/// <returns>Deep copy of <see cref="AddIn" /> instance</returns>
+		public AddIn CloneAddin(AddIn addin, Dictionary<string, Shortcut> clonedShortcuts)
+		{
+			var clonedAddIn = new AddIn(addin.Name);
+			foreach (var category in addin.Categories) {
+				clonedAddIn.Categories.Add(CloneShortutCategory(category, clonedShortcuts));
+			}
+			
+			return clonedAddIn;
+		}
+	}
+}
diff --git a/src/AddIns/Misc/ShortcutsManagement/Src/Data/MapTable.cs b/src/AddIns/Misc/ShortcutsManagement/Src/Data/MapTable.cs
new file mode 100644
index 0000000000..78dbc41f49
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Src/Data/MapTable.cs
@@ -0,0 +1,87 @@
+using System.Collections;
+using System.Collections.Generic;
+
+namespace ICSharpCode.ShortcutsManagement.Data
+{
+	/// <summary>
+	/// Stores one-to-one relationships beween two objects of type T1 and T2
+	/// </summary>
+	public class MapTable<T1, T2> : IEnumerable<KeyValuePair<T1, T2>> 
+	{
+		private readonly Dictionary<T1, T2> forwardMaping = new Dictionary<T1, T2>();
+		private readonly Dictionary<T2, T1> backwardMaping = new Dictionary<T2, T1>();
+		
+		/// <summary>
+		/// Add new relationship between mapped and mapping object
+		/// </summary>
+		/// <param name="mappingObject">Mapping object</param>
+		/// <param name="mappedObject">Mapping object</param>
+		public void Add(T1 mappingObject, T2 mappedObject)
+		{
+			forwardMaping.Add(mappingObject, mappedObject);
+			backwardMaping.Add(mappedObject, mappingObject);
+		}
+		
+		/// <summary>
+		/// Tries to find object related to mapping object
+		/// </summary>
+		/// <param name="mappingObject">Mapping object</param>
+		/// <param name="mappedObject">Mapped object</param>
+		public void TryMapForward(T1 mappingObject, out T2 mappedObject)
+		{
+			forwardMaping.TryGetValue(mappingObject, out mappedObject);
+		}
+		
+		/// <summary>
+		/// Tries to find object related to mapped object
+		/// </summary>
+		/// <param name="mappingObject">Mapped object</param>
+		/// <param name="mappedObject">Mapping object</param>
+		public void TryMapBackward(T2 mappedObject, out T1 mappingObject)
+		{
+			backwardMaping.TryGetValue(mappedObject, out mappingObject);
+		}
+		
+		
+		/// <summary>
+		/// Finds object related to mapping object
+		/// </summary>
+		/// <param name="mappingObject">Mapping object</param>
+		/// <returns>Mapped object</returns>
+		public T2 MapForward(T1 mappingObject)
+		{
+			return forwardMaping[mappingObject];
+		}
+		
+		/// <summary>
+		/// Finds object related to mapped object
+		/// </summary>
+		/// <param name="mappingObject">Mapped object</param>
+		/// <returns>Mapping object</returns>
+		public T1 MapBackward(T2 mappingObject)
+		{
+			return backwardMaping[mappingObject];
+		}
+		
+		/// <summary>
+		/// Removes all relationships from map
+		/// </summary>
+		public void Clear()
+		{
+			forwardMaping.Clear();
+			backwardMaping.Clear();
+		}
+		
+		/// <inheritdoc />
+		public IEnumerator<KeyValuePair<T1, T2>> GetEnumerator()
+		{
+			return forwardMaping.GetEnumerator();
+		}
+		
+		/// <inheritdoc />
+		IEnumerator IEnumerable.GetEnumerator()
+		{
+			return forwardMaping.GetEnumerator();
+		}
+	}
+}
diff --git a/src/AddIns/Misc/ShortcutsManagement/Src/Data/SeparatorData.cs b/src/AddIns/Misc/ShortcutsManagement/Src/Data/SeparatorData.cs
new file mode 100644
index 0000000000..f5a669bac2
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Src/Data/SeparatorData.cs
@@ -0,0 +1,9 @@
+namespace ICSharpCode.ShortcutsManagement.Data
+{
+	/// <summary>
+	/// Represents a seporator in data binded control
+	/// </summary>
+	class SeparatorData
+	{
+	}
+}
diff --git a/src/AddIns/Misc/ShortcutsManagement/Src/Data/Shortcut.cs b/src/AddIns/Misc/ShortcutsManagement/Src/Data/Shortcut.cs
new file mode 100644
index 0000000000..8281b2d5fd
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Src/Data/Shortcut.cs
@@ -0,0 +1,235 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows.Input;
+using ICSharpCode.Core.Presentation;
+using System.Linq;
+using System.Collections.Specialized;
+
+namespace ICSharpCode.ShortcutsManagement.Data
+{
+	/// <summary>
+	/// Shortcut
+	/// </summary>
+	public class Shortcut : INotifyPropertyChanged, IShortcutTreeEntry
+	{
+		/// <summary>
+		/// Gets collection of input gestures assigned to this <see cref="Shortcut" /> instance
+		/// </summary>
+		public ObservableCollection<InputGesture> Gestures
+		{
+			get;
+			private set;
+		}
+		
+		/// <summary>
+		/// Gets collection of default input suggested assigned by developer
+		/// </summary>
+		public ReadOnlyCollection<InputGesture> DefaultGestures
+		{
+			get;
+			private set;
+		}
+		
+		private bool _doesUseDefault;
+		
+		/// <summary>
+		/// Gets or sets value which specifies whether default gestures should be used or those assigned by user
+		/// </summary>
+		public bool DoesUseDefault
+		{
+			get {
+				return _doesUseDefault;
+			}
+		}
+		
+		private string _name;
+		
+		/// <summary>
+		/// Gets or sets shortcut name (displayed to user)
+		/// </summary>
+		public string Name
+		{
+			get {
+				return _name;
+			}
+			set {
+				if(_name != value) {
+				    _name = value;
+				    InvokePropertyChanged("Name");
+				}
+			}
+		}
+		
+		/// <summary>
+		/// Sorts shortcut sub-elements
+		/// </summary>
+		public void SortSubEntries() 
+		{
+		
+		}
+		
+		/// <summary>
+		/// Gets or sets shortcut id.
+		/// 
+		/// This value is used to identify shortcut clones
+		/// </summary>
+		public string Id
+		{
+			get; set;
+		}
+		
+		private bool isVisible;
+		
+		/// <summary>
+		/// Gets or sets whether category is visible in shortcuts tree
+		/// 
+		/// Dependency property
+		/// </summary>
+		public bool IsVisible
+		{
+			get {
+				return isVisible;
+			}
+			set {
+				if(isVisible != value) {
+				    isVisible = value;
+				    InvokePropertyChanged("IsVisible");
+				}
+			}
+		}
+		
+		/// <summary>
+		/// Notify observers about property changes
+		/// </summary>
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		/// <summary>
+		/// Create new instance of <see cref="Shortcut" />
+		/// </summary>
+		/// <param name="id">Shortcut id. Used to identify shortcut clones</param>
+		/// <param name="gestures">Active gestures</param>
+		/// <param name="defaultGestures">Default gestures suggest by developer</param>
+		public Shortcut(string shortcutText, InputGestureCollection gestures, InputGestureCollection defaultGestures)
+			: this(Guid.NewGuid().ToString(), shortcutText, gestures, defaultGestures)
+		{
+			
+		}
+		
+		/// <summary>
+		/// Create new instance of <see cref="Shortcut" />
+		/// </summary>
+		/// <param name="id">Shortcut id. Used to identify shortcut clones</param>
+		/// <param name="shortcutText">Shortcut action name (displayed to user)</param>
+		/// <param name="gestures">Active gestures</param>
+		/// <param name="defaultGestures">Default gestures suggest by developer</param>
+		public Shortcut(string id, string shortcutText, InputGestureCollection gestures, InputGestureCollection defaultGestures)
+		{
+			IsVisible = true;
+			Id = id;
+			Name = shortcutText;
+			
+			if(defaultGestures != null) {
+				var defaultGesturesArray = new InputGesture[defaultGestures.Count]; 
+				defaultGestures.CopyTo(defaultGesturesArray, 0);
+				DefaultGestures = new ReadOnlyCollection<InputGesture>(defaultGesturesArray);
+			} else {
+				DefaultGestures = new ReadOnlyCollection<InputGesture>(new List<InputGesture>());
+			}
+			
+			Gestures = new ObservableCollection<InputGesture>();
+			if(gestures != null) {
+				foreach (InputGesture gesture in gestures) {
+					Gestures.Add(gesture);
+				}
+			}
+			
+			_doesUseDefault = new InputGestureCollection(Gestures).ContainsTemplateForAny(new InputGestureCollection(DefaultGestures), GestureCompareMode.ExactlyMatches);
+			Gestures.CollectionChanged += Gestures_CollectionChanged;
+		}
+
+		void Gestures_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+		{
+			var newDoesUseDefaultValue = new InputGestureCollection(Gestures).ContainsTemplateForAny(new InputGestureCollection(DefaultGestures), GestureCompareMode.ExactlyMatches);
+			if(_doesUseDefault != newDoesUseDefaultValue) {
+				_doesUseDefault = newDoesUseDefaultValue;
+				InvokePropertyChanged("DoesUseDefault");
+			}
+			
+			InvokePropertyChanged("Gestures");
+		}
+		
+		/// <summary>
+		/// Determines whether provided gesture is already assigned to this action
+		/// </summary>
+		/// <param name="gesture">Input gesture</param>
+		/// <returns>True if provided gesture is assigned to this action. Otherwise false</returns>
+		public bool ContainsGesture(InputGesture gesture)
+		{
+			foreach (var existingGesture in Gestures) {
+				if(existingGesture == gesture) {
+				    return true;
+				}
+				
+				if(existingGesture is KeyGesture && gesture is KeyGesture) {
+					var existingKeyGesture = (KeyGesture) existingGesture;
+					var keyGesture = (KeyGesture) gesture;
+					
+					if(existingKeyGesture.Key == keyGesture.Key && existingKeyGesture.Modifiers == keyGesture.Modifiers) {
+						return true;
+					}
+				}
+			}
+			
+			return false;
+		}
+		
+		/// <summary>
+		/// Compare shortcut to other instances of <see cref="IShortcutTreeEntry"/>
+		/// </summary>
+		/// <param name="obj">Compared object</param>
+		/// <returns>Comparison result</returns>
+		public int CompareTo(object obj)
+		{
+			if (obj is AddIn) return 1;
+			if (obj is ShortcutCategory) return 1;
+			
+			var shortcutObj = (Shortcut)obj;
+			return Name.CompareTo(shortcutObj.Name);
+		}
+		
+		/// <summary>
+		/// Returns this <see cref="Shortcut"/> instance if searched id matches
+		/// </summary>
+		/// <param name="shortcutId">Searched shortcut id</param>
+		/// <returns>Found shortcut instance or null</returns>
+		public Shortcut FindShortcut(string shortcutId) {
+			return Id == shortcutId ? this : null;
+		}
+		
+		/// <summary>
+		/// Invoke dependency property changed event
+		/// </summary>
+		/// <param name="propertyName">Name of dependency property from this classs</param>
+		private void InvokePropertyChanged(string propertyName)
+		{
+			if (PropertyChanged != null) {
+				PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+		
+		/// <summary>
+		/// Resets active gestures assigned to this shortcut to default <see cref="InputGestureCollection" /> suggested by developer
+		/// </summary>
+		public void ResetToDefaults() 
+		{
+			_doesUseDefault = true;
+			
+			Gestures.Clear();
+			foreach(var gesture in DefaultGestures) {
+				Gestures.Add(gesture);
+			}
+		}
+	}
+}
diff --git a/src/AddIns/Misc/ShortcutsManagement/Src/Data/ShortcutCategory.cs b/src/AddIns/Misc/ShortcutsManagement/Src/Data/ShortcutCategory.cs
new file mode 100644
index 0000000000..62e11f91f0
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Src/Data/ShortcutCategory.cs
@@ -0,0 +1,145 @@
+using System.Collections.Generic;
+using System.ComponentModel;
+
+namespace ICSharpCode.ShortcutsManagement.Data
+{
+	/// <summary>
+	/// Stores shortcut category data
+	/// </summary>
+	public class ShortcutCategory : INotifyPropertyChanged, IShortcutTreeEntry
+	{
+		private string name;
+		
+		/// <summary>
+		/// Gets or sets category name
+		/// </summary>
+		public string Name
+		{
+			get {
+				return name;
+			}
+			set {
+				if (name != value) {
+					name = value;
+					InvokePropertyChanged("Name");
+				}
+			}
+		}
+		
+		private bool isVisible;
+		
+		/// <summary>
+		/// Gets or sets whether category is visible in shortcuts tree
+		/// </summary>
+		public bool IsVisible
+		{
+			get {
+				return isVisible;
+			}
+			set {
+				if (isVisible != value) {
+					isVisible = value;
+					InvokePropertyChanged("IsVisible");
+				}
+			}
+		}
+		
+		/// <summary>
+		/// Gets list of sub-cateories 
+		/// </summary>
+		public List<ShortcutCategory> SubCategories
+		{
+			get;
+			private set;
+		}
+		
+		/// <summary>
+		/// Gets shortcuts assigned to this category
+		/// </summary>
+		public List<Shortcut> Shortcuts
+		{
+			get;
+			private set;
+		}
+		
+		/// <summary>
+		/// Occurs when <see cref="Name" /> or <see cref="IsVisible" /> property changes
+		/// </summary>
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		/// <summary>
+		/// Creates new instance of <see cref="ShortcutCategory" />
+		/// </summary>
+		/// <param name="categoryName">Category name</param>
+		public ShortcutCategory(string categoryName)
+		{
+			IsVisible = true;
+			Shortcuts = new List<Shortcut>(); 
+			SubCategories = new List<ShortcutCategory>();
+			Name = categoryName;
+		}
+		
+		/// <summary>
+		/// Sorts category shortcuts
+		/// </summary>
+		public void SortSubEntries()
+		{
+			SubCategories.Sort((a, b) => a.Name.CompareTo(b.Name));
+			Shortcuts.Sort((a, b) => a.Name.CompareTo(b.Name));
+			
+			foreach (var category in SubCategories) {
+				category.SortSubEntries();
+			}
+		}
+		
+		/// <summary>
+		/// In this category and sub-categories finds shortcut by shortcut ID 
+		/// </summary>
+		/// <param name="shortcutId">Shortcut ID</param>
+		/// <returns>Shortcut with ID equal to provided</returns>
+		public Shortcut FindShortcut(string shortcutId)
+		{
+			// Search for shortcut in shortcuts assigned to this category
+			foreach (var s in Shortcuts) {
+				if(s.Id == shortcutId) {
+					return s;
+				}
+			}
+			
+			// Search for shortcut in sub categories
+			foreach (var category in SubCategories) {
+				Shortcut foundShortcut;
+				if ((foundShortcut = category.FindShortcut(shortcutId)) != null) {
+					return foundShortcut;
+				}
+			}
+			
+			return null;
+		}
+		
+		/// <summary>
+		/// Compares <see cref="ShortcutCategory" /> instance to another instance of <see cref="IShortcutTreeEntry"/> type
+		/// </summary>
+		/// <param name="obj">Compared object</param>
+		/// <returns>Comparison result</returns>
+		public int CompareTo(object obj)
+		{
+			if (obj is AddIn) return 1;
+			if (obj is Shortcut) return -1;
+			
+			var categoryObj = (ShortcutCategory)obj;
+			return Name.CompareTo(categoryObj.Name);
+		}
+		
+		/// <summary>
+		/// Invoke dependency property changed event
+		/// </summary>
+		/// <param name="propertyName">Name of dependency property from this classs</param>
+		private void InvokePropertyChanged(string propertyName)
+		{
+			if (PropertyChanged != null) {
+				PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+}
diff --git a/src/AddIns/Misc/ShortcutsManagement/Src/Data/ShortcutsFinder.cs b/src/AddIns/Misc/ShortcutsManagement/Src/Data/ShortcutsFinder.cs
new file mode 100644
index 0000000000..2f63900776
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Src/Data/ShortcutsFinder.cs
@@ -0,0 +1,264 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Windows.Input;
+using ICSharpCode.Core.Presentation;
+using ICSharpCode.ShortcutsManagement.Extensions;
+
+namespace ICSharpCode.ShortcutsManagement.Data
+{
+	/// <summary>
+	/// Filters and hides shortcuts from add-in collection
+	/// </summary>
+	public class ShortcutsFinder
+	{
+		/// <summary>
+		/// Gets and sets collection of add-ins, shortcut categories and shortcuts from shortcuts tree root level
+		/// </summary>
+		public ICollection<IShortcutTreeEntry> RootEntries
+		{
+			get; set;
+		}
+		
+		/// <summary>
+		/// Create new instance of <see cref="ShortcutsFinder"/>
+		/// </summary>
+		/// <param name="rootEntries"></param>
+		public ShortcutsFinder(ICollection<IShortcutTreeEntry> rootEntries) 
+		{
+			RootEntries = rootEntries;
+		}
+		
+		/// <summary>
+		/// Hides shortcut by setting <see cref="Shortcut.IsVisible"/> to false
+		/// 
+		/// This also function hides parent categories and Add-in if it has no sub-elements 
+		/// left
+		/// </summary>
+		/// <param name="shortcut">Shortcut to be hidden</param>
+		public void HideShortcut(Shortcut shortcut)
+		{
+			foreach (var entry in RootEntries) {
+				var subCategoryIsVisible = false;
+				
+				var rootAddIn = entry as AddIn;
+				if (rootAddIn != null) {
+					foreach (var category in rootAddIn.Categories) {
+						if (HideShortcut(category, shortcut)) {
+							subCategoryIsVisible = true;
+						}
+					}
+					
+					// Hide add-in if it doesn't have any visible sub-elements
+					rootAddIn.IsVisible = subCategoryIsVisible;
+				}
+				
+				var rootCategory = entry as ShortcutCategory;
+				if(rootCategory != null) {
+					HideShortcut(rootCategory, shortcut);
+				}
+				
+				var rootShortcut = entry as Shortcut;
+				if (rootShortcut != null) {
+					shortcut.IsVisible = false;
+				}
+			}
+		}
+		
+		private static bool HideShortcut(ShortcutCategory category, Shortcut filteredShortcut)
+		{
+			// Check if this shortcut is in subcategories
+			var isSubElementVisible = false;
+			foreach (var subCategory in category.SubCategories) {
+				if (HideShortcut(subCategory, filteredShortcut)) {
+					isSubElementVisible = true;
+				}
+			}
+			
+			// Determine whether provided shortcut is in provided category and 
+			// hide it if so
+			foreach (var shortcut in category.Shortcuts) {
+				if (shortcut.Id == filteredShortcut.Id) {
+					shortcut.IsVisible = false;
+				}
+				
+				if(shortcut.IsVisible) {
+					isSubElementVisible = true;
+				}
+			}
+			
+			// Hide category if it doesn't have any visible sub-elements
+			category.IsVisible = isSubElementVisible;
+			
+			return category.IsVisible;
+		}
+		
+		/// <summary>
+		/// Filters gestures matching provided key gesture template
+		/// 
+		/// Hides add-ins and sub-categories if there are no sub-elements left
+		/// </summary>
+		/// <param name="inputGestureTemplate">Gesture template which should match shortcut gesture partly to make it visible</param>
+		/// <param name="mode">Filtering mode</param>
+		public void FilterGesture(InputGesture inputGestureTemplate, GestureCompareMode mode)
+		{
+			FilterGesture(new InputGestureCollection(new[] { inputGestureTemplate }), mode);
+		}
+		
+		/// <summary>
+		/// Filter gestures matching one of provided gesture templates
+		/// 
+		/// Hides add-ins and sub-categories if there are no sub-elements left
+		/// </summary>
+		/// <param name="inputGestureTemplateCollection">Collection of gesture templates which (atleast one) should match shortcut gesture partly to make it visible</param>
+		/// <param name="mode">Filtering mode</param>
+		public void FilterGesture(InputGestureCollection inputGestureTemplateCollection, GestureCompareMode mode)
+		{
+			foreach (var entry in RootEntries) {
+				var subCategoryIsVisible = false;
+				
+				// Filter root addin and sub-elements
+				var rootAddIn = entry as AddIn;
+				if (rootAddIn != null) {
+					foreach (var category in rootAddIn.Categories) {
+						if (FilterGesture(category, inputGestureTemplateCollection, mode)) {
+							subCategoryIsVisible = true;
+						}
+					}
+					
+					// Hide add-in if it doesn't have any visible sub-elements
+					rootAddIn.IsVisible = subCategoryIsVisible;
+				}
+				
+				// Filter root category and sub-elements
+				var rootCategory = entry as ShortcutCategory;
+				if (rootCategory != null) {
+					FilterGesture(rootCategory, inputGestureTemplateCollection, mode);
+				}
+				
+				// Filter root shortcut
+				var rootShortcut = entry as Shortcut;
+				if (rootShortcut != null) {
+					rootShortcut.IsVisible = false;
+					foreach (InputGesture template in inputGestureTemplateCollection) {
+						if (template.IsTemplateForAny(new InputGestureCollection(rootShortcut.Gestures), mode)) {
+							rootShortcut.IsVisible = true;
+							break;
+						}
+					}
+				}
+			}
+		}
+		
+		/// <summary>
+		/// Filter gestures matching one of provided gesture templates from templates collection 
+		/// </summary>
+		/// <param name="category">Category to filter</param>
+		/// <param name="inputGestureTemplateCollection">Collection of gesture templates which (atleast one) should match shortcut gesture partly to make it visible</param>
+		/// <param name="mode">Filtering mode</param>
+		/// <returns><code>true</code> if found any gestur matching provided template; otherwise <code>false</code></returns>
+		private static bool FilterGesture(ShortcutCategory category, InputGestureCollection inputGestureTemplateCollection, GestureCompareMode mode)
+		{
+			// Apply filter to sub-categories
+			var isSubElementVisible = false;
+			foreach (var subCategory in category.SubCategories) {
+				if (FilterGesture(subCategory, inputGestureTemplateCollection, mode)) {
+					isSubElementVisible = true;
+				}
+			}
+		
+			// Apply filter to shortcuts
+			foreach (var shortcut in category.Shortcuts) {
+				var gestureMatched = inputGestureTemplateCollection.ContainsTemplateForAny(new InputGestureCollection(shortcut.Gestures), mode);
+				
+				if (gestureMatched) {
+					shortcut.IsVisible = true;
+					isSubElementVisible = true;
+				} else {
+					shortcut.IsVisible = false;
+				}
+			}
+			
+			// Hide category if it doesn't have any visible sub-elements
+			category.IsVisible = isSubElementVisible;
+			return category.IsVisible;
+		}
+		
+		/// <summary>
+		/// Filter addins, child categories and shortcuts where item name
+		/// contains filter string
+		/// 
+		/// Hides add-ins and sub-categories if there are no sub-elements left
+		/// </summary>
+		/// <param name="filterString">Filter string</param>
+		public void Filter(string filterString)
+		{
+			foreach (var entry in RootEntries) {
+				var rootAddIn = entry as AddIn;
+				if (rootAddIn != null) {
+					// If add-in name matches filter string show all sub-elements
+					var addInNameContainsFilterString = !string.IsNullOrEmpty(filterString) && rootAddIn.Name.IndexOf(filterString, StringComparison.InvariantCultureIgnoreCase) >= 0;
+					
+					// Apply filter to categories
+					var subCategoryIsVisible = false;
+					
+					foreach (var category in rootAddIn.Categories) {
+						if (Filter(category, filterString, addInNameContainsFilterString ? (bool?) true : null)) {
+							subCategoryIsVisible = true;
+						}
+					}
+					
+					// If last category in add-in was hidden and addin name does not contain 
+					// part of the filter then hide add-in
+					rootAddIn.IsVisible = addInNameContainsFilterString || subCategoryIsVisible;
+				}
+				
+				var rootCategory = entry as ShortcutCategory;
+				if (rootCategory != null) {
+					Filter(rootCategory, filterString, null);
+				}
+				
+				var rootShortcut = entry as Shortcut;
+				if (rootShortcut != null) {
+					rootShortcut.IsVisible = filterString == null || rootShortcut.Name.IndexOf(filterString, StringComparison.InvariantCultureIgnoreCase) >= 0;
+				}
+			}
+		}
+		
+		/// <summary>
+		/// Filter categorys and child elements where item name contains filter string
+		/// </summary>
+		/// <param name="category">Category to filter</param>
+		/// <param name="filterString">Filter string</param>
+		/// <param name="forseMatch">If set to true all sub-elements are visible</param>
+		/// <returns></returns>
+		private static bool Filter(ShortcutCategory category, string filterString, bool? forseMatch)
+		{
+			// If category name matches filter show all sub-categories and shortcuts
+			if (!string.IsNullOrEmpty(filterString) && category.Name.IndexOf(filterString, StringComparison.InvariantCultureIgnoreCase) >= 0) {
+				forseMatch = true;
+			}
+			
+			// Apply filter to sub-categories
+			var isSubElementVisible = false;
+			foreach (var subCategory in category.SubCategories) {
+				if(Filter(subCategory, filterString, forseMatch)) {
+					isSubElementVisible = true;
+				}
+			}
+			
+			// Filter shortcuts which text match the filter
+			foreach (var shortcut in category.Shortcuts) {
+				if ((forseMatch.HasValue && forseMatch.Value) || filterString == null || shortcut.Name.IndexOf(filterString, StringComparison.InvariantCultureIgnoreCase) >= 0) {
+					shortcut.IsVisible = true;
+					isSubElementVisible = true;
+				} else {
+					shortcut.IsVisible = false;
+				}
+			}
+			
+			// Show category if has sub elements, forced or matches search filter
+			return category.IsVisible = (forseMatch.HasValue && forseMatch.Value && (category.SubCategories.Count > 0 || category.Shortcuts.Count > 0)) || isSubElementVisible;
+		}
+	}
+}
diff --git a/src/AddIns/Misc/ShortcutsManagement/Src/Data/UserGestureProfileAction.cs b/src/AddIns/Misc/ShortcutsManagement/Src/Data/UserGestureProfileAction.cs
new file mode 100644
index 0000000000..da11b9cf00
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Src/Data/UserGestureProfileAction.cs
@@ -0,0 +1,26 @@
+namespace ICSharpCode.ShortcutsManagement.Data
+{
+    /// <summary>
+    /// Represents action <see cref="UserGestureProfile" /> action
+    /// </summary>
+    class UserGestureProfileAction
+    {
+        /// <summary>
+        /// Gets or sets action name
+        /// </summary>
+        public string Name
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Gets or sets action text
+        /// </summary>
+        public object Text
+        {
+            get;
+            set;
+        }
+    }
+}
diff --git a/src/AddIns/Misc/ShortcutsManagement/Src/Dialogs/CreateNewProfilePrompt.xaml b/src/AddIns/Misc/ShortcutsManagement/Src/Dialogs/CreateNewProfilePrompt.xaml
new file mode 100644
index 0000000000..972fc679d0
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Src/Dialogs/CreateNewProfilePrompt.xaml
@@ -0,0 +1,57 @@
+<Window x:Class="ICSharpCode.ShortcutsManagement.Dialogs.CreateNewProfilePrompt"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:core="http://icsharpcode.net/sharpdevelop/core"
+    xmlns:Presentation="clr-namespace:ICSharpCode.Core.Presentation;assembly=ICSharpCode.Core.Presentation"
+    Title="InputMessageBox" 
+    ResizeMode="NoResize"
+    x:Name="_this" 
+    SizeToContent="WidthAndHeight" >
+    <Window.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="Resources.xaml" />
+                <ResourceDictionary>
+                    <DataTemplate DataType="{x:Type Presentation:UserGestureProfile}">
+                        <TextBlock Text="{Binding Path=Text}" />
+                    </DataTemplate>
+                </ResourceDictionary>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Window.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition MinHeight="42" Height="42" />
+            <RowDefinition Height="30" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="30" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" MinWidth="52" />
+            <ColumnDefinition  />
+        </Grid.ColumnDefinitions>
+        
+        <Image Grid.Column="0" Grid.Row="0" Source="../../Resources/info_mid.png" Height="32" Margin="5" />
+
+        <Label Grid.Column="1" Grid.Row="0" VerticalAlignment="Center" Padding="5">
+            <TextBlock Text="{core:Localize ShortcutsManagement.CreateNewProfilePrompt.SpecifyProfileNameLabel}" />
+        </Label>
+        <TextBox Grid.Column="1" Grid.Row="1" x:Name="profileNameTextBox" Text="{Binding Path=Text, ElementName=_this}" HorizontalAlignment="Stretch" Padding="3" Margin="5,5,20,5" />
+        
+        <Grid Grid.Column="1" Grid.Row="2">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="200" />
+            </Grid.ColumnDefinitions>
+            <Label Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="3" Visibility="{Binding Path=BaseProfilesVisibility, ElementName=_this}" >
+                <TextBlock Text="{core:Localize ShortcutsManagement.CreateNewProfilePrompt.BasedOnLabel}" />
+            </Label>
+            <ComboBox Grid.Column="1" Margin="5,5,20,5" ItemsSource="{Binding Path=AvailableBaseProfiles, ElementName=_this}" SelectedItem="{Binding Path=BaseProfile, ElementName=_this}" Visibility="{Binding Path=BaseProfilesVisibility, ElementName=_this}" />
+        </Grid>
+
+        <WrapPanel Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="3" HorizontalAlignment="Center" Margin="5">
+            <Button Content="{core:Localize Global.OKButtonText}" Width="70" Padding="15,0" Margin="5,0" Click="OkButton_Click" IsEnabled="{Binding Text, ElementName=profileNameTextBox, Converter={StaticResource NotNullOrEmptyConverter}}" />
+            <Button Content="{core:Localize Global.CancelButtonText}" Padding="15,0" Margin="5,0" Click="CancelButton_Click" />
+        </WrapPanel>
+    </Grid>
+</Window>
diff --git a/src/AddIns/Misc/ShortcutsManagement/Src/Dialogs/CreateNewProfilePrompt.xaml.cs b/src/AddIns/Misc/ShortcutsManagement/Src/Dialogs/CreateNewProfilePrompt.xaml.cs
new file mode 100644
index 0000000000..bb7dc76a8a
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Src/Dialogs/CreateNewProfilePrompt.xaml.cs
@@ -0,0 +1,131 @@
+using System.Collections.Generic;
+using System.Windows;
+using ICSharpCode.Core.Presentation;
+
+namespace ICSharpCode.ShortcutsManagement.Dialogs
+{
+	/// <summary>
+	/// Window prompting user to enter new or existing profile name
+	/// and base profile
+	/// </summary>
+	public partial class CreateNewProfilePrompt : Window
+	{
+		/// <summary>
+		/// Identifies <see cref="BaseProfile"/> dependency property
+		/// </summary>
+		public static readonly DependencyProperty BaseProfileProperty = DependencyProperty.Register(
+			"BaseProfile",
+			typeof(UserGestureProfile),
+			typeof(CreateNewProfilePrompt),
+			new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.AffectsRender));
+		
+		/// <summary>
+		/// Gets or sets profile which new profile will be based on
+		/// </summary>
+		public UserGestureProfile BaseProfile
+		{
+			get {
+				return (UserGestureProfile)GetValue(BaseProfileProperty);
+			}
+			set {
+				SetValue(BaseProfileProperty, value);
+			}
+		}
+		
+		/// <summary>
+		/// Identifies <see cref="BaseProfilesVisibility"/> dependency property
+		/// </summary>
+		public static readonly DependencyProperty BaseProfilesVisibilityProperty = DependencyProperty.Register(
+			"BaseProfilesVisibility",
+			typeof(Visibility),
+			typeof(CreateNewProfilePrompt),
+			new FrameworkPropertyMetadata(Visibility.Visible, FrameworkPropertyMetadataOptions.AffectsRender));
+		
+		/// <summary>
+		/// Gets or sets base profiles combo box visibility
+		/// </summary>
+		public Visibility BaseProfilesVisibility
+		{
+			get {
+				return (Visibility)GetValue(BaseProfilesVisibilityProperty);
+			}
+			set {
+				SetValue(BaseProfilesVisibilityProperty, value);
+			}
+		}
+		
+		/// <summary>
+		/// Identifies <see cref="AvailableBaseProfiles"/> dependency property
+		/// </summary>
+		public static readonly DependencyProperty AvailableBaseProfilesProperty = DependencyProperty.Register(
+			"AvailableBaseProfiles",
+			typeof(ICollection<UserGestureProfile>),
+			typeof(CreateNewProfilePrompt),
+			new FrameworkPropertyMetadata(new List<UserGestureProfile>(), FrameworkPropertyMetadataOptions.AffectsRender));
+		
+		/// <summary>
+		/// Profiles user can choose from when selecting base profile
+		/// </summary>
+		public ICollection<UserGestureProfile> AvailableBaseProfiles
+		{
+			get {
+				return (ICollection<UserGestureProfile>)GetValue(AvailableBaseProfilesProperty);
+			}
+			set {
+				SetValue(AvailableBaseProfilesProperty, value);
+			}
+		}
+		
+		/// <summary>
+		/// Identifies <see cref="Text"/> dependency property
+		/// </summary>
+		public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
+			"Text",
+			typeof(string),
+			typeof(CreateNewProfilePrompt),
+			new FrameworkPropertyMetadata("", FrameworkPropertyMetadataOptions.AffectsRender));
+		
+		/// <summary>
+		/// Gets or sets text entered in window text box
+		/// </summary>
+		public string Text
+		{
+			get {
+				return (string)GetValue(TextProperty);
+			}
+			set {
+				SetValue(TextProperty, value);
+			}
+		}
+		
+		/// <summary>
+		/// Creates new instance of <see cref="CreateNewProfilePrompt"/>
+		/// </summary>
+		public CreateNewProfilePrompt()
+		{
+			InitializeComponent();
+		}
+		
+		/// <summary>
+		/// Executed when user clicks on OK button
+		/// </summary>
+		/// <param name="sender">Sender object</param>
+		/// <param name="e">Event argument</param>
+		private void OkButton_Click(object sender, RoutedEventArgs e)
+		{
+			DialogResult = true;
+			Close();
+		}
+		
+		/// <summary>
+		/// Executed when user clicks on Cancel buttons
+		/// </summary>
+		/// <param name="sender">Sender obect</param>
+		/// <param name="e">Event argument</param>
+		private void CancelButton_Click(object sender, RoutedEventArgs e)
+		{
+			DialogResult = false;
+			Close();
+		}
+	}
+}
diff --git a/src/AddIns/Misc/ShortcutsManagement/Src/Dialogs/MultiKeyGestureTextBox.xaml b/src/AddIns/Misc/ShortcutsManagement/Src/Dialogs/MultiKeyGestureTextBox.xaml
new file mode 100644
index 0000000000..7bafb67fcd
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Src/Dialogs/MultiKeyGestureTextBox.xaml
@@ -0,0 +1,92 @@
+<UserControl x:Class="ICSharpCode.ShortcutsManagement.Dialogs.MultiKeyGestureTextBox"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:Dialogs="clr-namespace:ICSharpCode.ShortcutsManagement.Dialogs"
+    x:Name="_this" >
+
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="Resources.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
+    
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+
+        <Border Grid.Row="0" BorderThickness="{Binding ElementName=_this, Path=TextBoxBorderThickness}" SnapsToDevicePixels="True" BorderBrush="{x:Static SystemColors.ControlDarkBrush}">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                
+                <TextBox Grid.Column="0" x:Name="shortcutTextBox" PreviewKeyDown="TextBox_PreviewKeyDown" TextChanged="shortcutTextBox_TextChanged" AcceptsTab="True" AcceptsReturn="True" VerticalAlignment="Top" Padding="5" BorderThickness="0" />
+                <Button Grid.Column="1" x:Name="clearTextBox" VerticalAlignment="Center" Margin="5,0" Click="clearTextBox_Click">
+                    <Button.Template>
+                        <ControlTemplate>
+                            <Image Source="../../Resources/delete_small.png" Width="16" />
+                        </ControlTemplate>
+                    </Button.Template>
+                </Button>
+            </Grid>
+        </Border>
+
+        <!-- Notification panel under the textbox -->
+        <StackPanel Grid.Row="1" Orientation="Horizontal" Visibility="{Binding ElementName=_this, Path=NotificationVisibility}" Height="16" Margin="0">
+            <Image Height="16" Margin="5,0,10,0">
+                <Image.Style>
+                    <Style>
+                        <Style.Triggers>
+                            <DataTrigger Value="{x:Static Dialogs:NotificationType.Valid}" Binding="{Binding ElementName=_this, Path=NotificationType}">
+                                <Setter Property="Image.Source" Value="../../Resources/tick_small.png" />
+                            </DataTrigger>
+                            <DataTrigger Value="{x:Static Dialogs:NotificationType.Invalid}" Binding="{Binding ElementName=_this, Path=NotificationType}">
+                                <Setter Property="Image.Source" Value="../../Resources/warning_small.png" />
+                            </DataTrigger>
+                            <DataTrigger Value="{x:Static Dialogs:NotificationType.Added}" Binding="{Binding ElementName=_this, Path=NotificationType}">
+                                <Setter Property="Image.Source" Value="../../Resources/plus_small.png" />
+                            </DataTrigger>
+                            <DataTrigger Value="{x:Static Dialogs:NotificationType.Failed}" Binding="{Binding ElementName=_this, Path=NotificationType}">
+                                <Setter Property="Image.Source" Value="../../Resources/block_small.png"/>
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </Image.Style>
+            </Image>
+            <TextBlock Text="{Binding ElementName=_this, Path=NotificationText}" VerticalAlignment="Center">
+                <TextBlock.Style>
+                    <Style>
+                        <Style.Triggers>
+                            <DataTrigger Value="{x:Static Dialogs:NotificationType.Valid}" Binding="{Binding ElementName=_this, Path=NotificationType}">
+                                <Setter Property="TextBlock.Foreground" Value="Green"/>
+                            </DataTrigger>
+                            <DataTrigger Value="{x:Static Dialogs:NotificationType.Invalid}" Binding="{Binding ElementName=_this, Path=NotificationType}">
+                                <Setter Property="TextBlock.Foreground" Value="Red"/>
+                            </DataTrigger>
+                            <DataTrigger Value="{x:Static Dialogs:NotificationType.Added}" Binding="{Binding ElementName=_this, Path=NotificationType}">
+                                <Setter Property="TextBlock.Foreground" Value="Green"/>
+                            </DataTrigger>
+                            <DataTrigger Value="{x:Static Dialogs:NotificationType.Failed}" Binding="{Binding ElementName=_this, Path=NotificationType}">
+                                <Setter Property="TextBlock.Foreground" Value="Red"/>
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </TextBlock.Style>
+            </TextBlock>
+            <StackPanel.Style>
+                <Style>
+                    <Style.Triggers>
+                        <DataTrigger Value="{x:Static Dialogs:NotificationType.None}" Binding="{Binding ElementName=_this, Path=NotificationType}">
+                            <Setter Property="TextBlock.Visibility" Value="Hidden"/>
+                        </DataTrigger>
+                    </Style.Triggers>
+                </Style>
+            </StackPanel.Style>
+        </StackPanel>
+    </Grid>
+</UserControl>
diff --git a/src/AddIns/Misc/ShortcutsManagement/Src/Dialogs/MultiKeyGestureTextBox.xaml.cs b/src/AddIns/Misc/ShortcutsManagement/Src/Dialogs/MultiKeyGestureTextBox.xaml.cs
new file mode 100644
index 0000000000..dadbf5c376
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Src/Dialogs/MultiKeyGestureTextBox.xaml.cs
@@ -0,0 +1,294 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using ICSharpCode.Core;
+using ICSharpCode.Core.Presentation;
+
+namespace ICSharpCode.ShortcutsManagement.Dialogs
+{
+	/// <summary>
+	/// Notification type enumeration
+	/// </summary>
+	public enum NotificationType
+	{
+		/// <summary>
+		/// A valid gesture is entered so far
+		/// </summary>
+		Valid,
+		
+		/// <summary>
+		/// Gesture is being entered, but is not valid yet
+		/// </summary>
+		Invalid,
+		
+		/// <summary>
+		/// Gesture was successfully added to gestures collection
+		/// </summary>
+		Added,
+		
+		/// <summary>
+		/// Failed to add gesture to gestures collection
+		/// </summary>
+		Failed,
+		
+		/// <summary>
+		/// Notification message is not displayed
+		/// </summary>
+		None
+	}
+	
+	/// <summary>
+	/// Represents a textbox suited for entering key gestures
+	/// </summary>
+	public partial class MultiKeyGestureTextBox : UserControl
+	{
+		/// <summary>
+		/// Identifies <see cref="TextBoxBorderThickness"/> dependency property
+		/// </summary>
+		public static readonly DependencyProperty TextBoxBorderThicknessProperty = DependencyProperty.Register(
+			"TextBoxBorderThickness",
+			typeof(int),
+			typeof(MultiKeyGestureTextBox),
+			new FrameworkPropertyMetadata(1, FrameworkPropertyMetadataOptions.AffectsRender));
+		
+		/// <summary>
+		/// Gets or sets text box border thickness
+		/// </summary>
+		public int TextBoxBorderThickness
+		{
+			get {
+				return (int)GetValue(TextBoxBorderThicknessProperty);
+			}
+			set {
+				SetValue(TextBoxBorderThicknessProperty, value);
+			}
+		}
+		
+		/// <summary>
+		/// Gets <see cref="KeyGesture" /> entered in text box
+		/// </summary>
+		public KeyGesture Gesture
+		{
+			get {
+				if (enteredKeyGestureSequence == null || enteredKeyGestureSequence.Count == 0) {
+					return null;
+				}
+				
+				if (enteredKeyGestureSequence.Count == 1) {
+					return new PartialKeyGesture(enteredKeyGestureSequence.First());
+				}
+				
+				return new MultiKeyGesture(enteredKeyGestureSequence);
+			}
+		}
+		
+		/// <summary>
+		/// Occurs when gesture entered in text box changes
+		/// </summary>
+		public event EventHandler GestureChanged;
+		
+		/// <summary>
+		/// Identifies <see cref="NotificationVisibility"/> dependency property
+		/// </summary>
+		public static readonly DependencyProperty NotificationVisibilityProperty = DependencyProperty.Register(
+			"NotificationVisibility",
+			typeof(Visibility),
+			typeof(MultiKeyGestureTextBox),
+			new FrameworkPropertyMetadata(Visibility.Visible, FrameworkPropertyMetadataOptions.AffectsRender));
+		
+		/// <summary>
+		/// Gets or sets value which specifies whether notifications are displayed under textbox control
+		/// </summary>
+		public Visibility NotificationVisibility
+		{
+			get {
+				return (Visibility)GetValue(NotificationVisibilityProperty);
+			}
+			set {
+				SetValue(NotificationVisibilityProperty, value);
+			}
+		}
+		
+		/// <summary>
+		/// Identifies <see cref="NotificationType"/> dependency property
+		/// </summary>
+		public static readonly DependencyProperty NotificationTypeProperty = DependencyProperty.Register(
+			"NotificationType",
+			typeof(NotificationType),
+			typeof(MultiKeyGestureTextBox),
+			new FrameworkPropertyMetadata(NotificationType.None, FrameworkPropertyMetadataOptions.AffectsRender));
+		
+		/// <summary>
+		/// Gets or sets notification type
+		/// </summary>
+		public NotificationType NotificationType
+		{
+			get {
+				return (NotificationType)GetValue(NotificationTypeProperty);
+			}
+			set {
+				SetValue(NotificationTypeProperty, value);
+			}
+		}
+		
+		/// <summary>
+		/// Identifies <see cref="NotificationText"/> dependency property
+		/// </summary>
+		public static readonly DependencyProperty NotificationTextProperty = DependencyProperty.Register(
+			"NotificationText",
+			typeof(string),
+			typeof(MultiKeyGestureTextBox),
+			new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.AffectsRender));
+		
+		/// <summary>
+		/// Gets or sets displayed notification text
+		/// </summary>
+		public string NotificationText
+		{
+			get {
+				return (string)GetValue(NotificationTextProperty);
+			}
+			set {
+				SetValue(NotificationTextProperty, value);
+			}
+		}
+		
+		/// <summary>
+		/// Last entered chords
+		/// </summary>
+		private List<PartialKeyGesture> enteredKeyGestureSequence = new List<PartialKeyGesture>();
+		
+		/// <summary>
+		/// Time when last successfull chord was entered
+		/// </summary>
+		private DateTime lastEnterTime = DateTime.Now;
+		
+		/// <summary>
+		/// Creates instance of <see cref="MultiKeyGestureTextBox"/>
+		/// </summary>
+		public MultiKeyGestureTextBox()
+		{
+			InitializeComponent();
+		}
+		
+		/// <summary>
+		/// Displays notifications under gesture text box
+		/// </summary>
+		/// <param name="notificationText">Notification text</param>
+		/// <param name="type">Notification type</param>
+		public void DisplayNotification(string notificationText, NotificationType type)
+		{
+			NotificationText = notificationText;
+			NotificationType = type;
+		}
+		
+		/// <summary>
+		/// Clears all text area, chords and hides notification
+		/// </summary>
+		public void Clear()
+		{
+			enteredKeyGestureSequence = new List<PartialKeyGesture>();
+			shortcutTextBox.Text = "";
+			DisplayNotification("", NotificationType.None);
+		}
+		
+		/// <summary>
+		/// Executed when clicked on "Clear" button to the right from gesture text box
+		/// </summary>
+		/// <param name="sender">Sender object</param>
+		/// <param name="e"><see cref="RoutedEvent" /> supporting data</param>
+		private void clearTextBox_Click(object sender, RoutedEventArgs e)
+		{
+			Clear();
+		}
+		
+		/// <summary>
+		/// Executed when text inside textbox changes
+		/// </summary>
+		/// <param name="sender">Sender object</param>
+		/// <param name="e">Event arguments</param>
+		void shortcutTextBox_TextChanged(object sender, TextChangedEventArgs e)
+		{
+			if (GestureChanged != null) {
+				GestureChanged.Invoke(sender, new EventArgs());
+			}
+		}
+		
+		/// <summary>
+		/// Raised before user presses any key inside text box
+		/// </summary>
+		/// <param name="sender">Sender object</param>
+		/// <param name="e">Event argument</param>
+		private void TextBox_PreviewKeyDown(object sender, KeyEventArgs e)
+		{
+			e.Handled = true;
+		
+			// If a key is holded for a longer time key event is raised repeatedly.
+			// We don't want to handle this kind of events
+			if (e.IsRepeat) {
+				return;
+			}
+			
+			// If delete or backspace button is pressed
+			if (e.Key == Key.Back || e.Key == Key.Delete) {
+				Clear();
+				return;
+			}
+			
+			// Check whether time given for chord entry haven't expired yet
+			if (DateTime.Now - lastEnterTime > MultiKeyGesture.DelayBetweenChords) {
+				if (enteredKeyGestureSequence.Count > 0) {
+					DisplayNotification(StringParser.Parse("${res:ShortcutsManagement.GestureTextBox.TimeExpired}"), NotificationType.Invalid);
+				}
+				
+				Clear();
+				lastEnterTime = DateTime.Now;
+			}
+			
+			var partialKeyGesture = new PartialKeyGesture(e);
+			
+			var lastGesture = enteredKeyGestureSequence.Count > 0 ? enteredKeyGestureSequence.LastOrDefault() : null;
+			var isLastGestureSpecialKey = lastGesture != null && (lastGesture.Key >= Key.F1) && (lastGesture.Key <= Key.F24);
+			
+			var isLastGestureComplete = lastGesture != null && (lastGesture.Key != Key.None || isLastGestureSpecialKey);
+			var isContinuedGesture = lastGesture != null && partialKeyGesture.Modifiers - (partialKeyGesture.Modifiers ^ lastGesture.Modifiers) >= 0;
+			
+			// If continuing previous chord
+			if (!isLastGestureComplete && isContinuedGesture) {
+				enteredKeyGestureSequence.RemoveAt(enteredKeyGestureSequence.Count - 1);
+			} else if (!isLastGestureComplete) {
+				// If previous chord is unfinished and second chord is already entered
+				// start from scratch. 
+				DisplayNotification(StringParser.Parse("${res:ShortcutsManagement.GestureTextBox.SequenceIsNotCoherent}"), NotificationType.Invalid);
+				Clear();
+			}
+			
+			// If successfully finished another chord give more time
+			if (partialKeyGesture.Key != Key.None) {
+				lastEnterTime = DateTime.Now;
+			}
+			
+			enteredKeyGestureSequence.Add(partialKeyGesture);
+			
+			// Create a multi key gesture if entered more than one chord
+			if (enteredKeyGestureSequence.Count > 0) {
+				var multiKeyGesture = new MultiKeyGesture(enteredKeyGestureSequence);
+				var multiKeyGestureString = new MultiKeyGestureConverter().ConvertToInvariantString(multiKeyGesture);
+				shortcutTextBox.Text = multiKeyGestureString;
+			} else {
+				Clear();
+			}
+			
+			if (!enteredKeyGestureSequence[0].IsFull) {
+				DisplayNotification(StringParser.Parse("${res:ShortcutsManagement.GestureTextBox.FirstChordIsIncomplete}"), NotificationType.Invalid);
+			} else if (partialKeyGesture.Key == Key.None) {
+				DisplayNotification(StringParser.Parse("${res:ShortcutsManagement.GestureTextBox.LastChordIsIncomplete}"), NotificationType.Invalid);
+			} else {
+				DisplayNotification(StringParser.Parse("${res:ShortcutsManagement.GestureTextBox.GestureIsValid}"), NotificationType.Valid);
+			}
+		}
+	}
+}
diff --git a/src/AddIns/Misc/ShortcutsManagement/Src/Dialogs/Resources.xaml b/src/AddIns/Misc/ShortcutsManagement/Src/Dialogs/Resources.xaml
new file mode 100644
index 0000000000..e39699e357
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Src/Dialogs/Resources.xaml
@@ -0,0 +1,181 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:Converters="clr-namespace:ICSharpCode.ShortcutsManagement.Converters">
+
+    <Converters:GesturesListConverter x:Key="GesturesListConverter" />
+    <Converters:ShortcutCategorySubElementsMergedConverter x:Key="ShortcutsTreeConverter" />
+    <Converters:TypeNameConverter x:Key="TypeNameConverter" />
+    <Converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+    <Converters:NotNullOrEmptyConverter x:Key="NotNullOrEmptyConverter" />
+    <Converters:ProfileToStringConverter x:Key="ProfileToStringConverter" />
+    <Converters:InputGestureConverter x:Key="InputGestureConverter" />
+    <Converters:AddidionConverter x:Key="AddidionConverter" />
+
+    <LinearGradientBrush x:Key="SelectedItemBackground" StartPoint="0,0" EndPoint="0,1">
+        <GradientStop Color="#3194FF" Offset="0" />
+        <GradientStop Color="#3984F7" Offset="1" />
+    </LinearGradientBrush>
+    <SolidColorBrush x:Key="SelectedItemForeground" Color="#FFF" />
+
+    <Style x:Key="RemoveButton" TargetType="Button">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Image Source="..\..\Resources\16-square-red-remove.png" Width="16" SnapsToDevicePixels="True" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="AddButton" TargetType="Button">
+        <Setter Property="ContentTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <Image Source="..\..\Resources\add_correction_16x16.gif" Width="16" />
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+
+    <Style x:Key="GesturesListBox" TargetType="{x:Type ListBoxItem}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ListBoxItem">
+                    <StackPanel>
+                        <Border x:Name="ListBoxItemBorder" CornerRadius="6" Padding="10, 5" Background="{TemplateBinding Background}">
+                            <ContentPresenter />
+                        </Border>
+                    </StackPanel>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="ListBoxItemBorder" Property="Panel.Background" Value="{StaticResource SelectedItemBackground}" />
+                            <Setter TargetName="ListBoxItemBorder" Property="TextElement.Foreground" Value="{StaticResource SelectedItemForeground}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+
+    <Style x:Key="KeyToggleButton" TargetType="ToggleButton">
+        <Setter Property="Focusable" Value="False"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ToggleButton">
+                    <Image x:Name="searchTypeImage" Source="..\..\Resources\key_enter.png" />
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter Property="Source" TargetName="searchTypeImage" Value="..\..\Resources\key_enter_pressed.png"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+
+    
+    <Style x:Key="ExpandCollapseToggleStyle" TargetType="ToggleButton">
+        <Setter Property="Focusable" Value="False"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ToggleButton">
+                    <Grid Width="15" Height="13" Background="Transparent">
+                        <Path x:Name="expandPath" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="1" Fill="#444" Data="M 4 0 L 8 4 L 4 8 Z"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter Property="Data" TargetName="expandPath" Value="M 0 4 L 8 4 L 4 8 Z"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="ShortcutsTreeItem" TargetType="{x:Type TreeViewItem}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="TreeViewItem">
+                    <Border Name="OuterBorder" BorderThickness="2" CornerRadius="8">
+                        <StackPanel>
+                            <Border Name="InnerBorder" Background="White" BorderThickness="0.6" CornerRadius="8" Padding="0,6,6,6" >
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="19" />
+                                        <ColumnDefinition />
+                                    </Grid.ColumnDefinitions>
+                                    <ToggleButton Grid.Column="0" x:Name="treeViewItemToggleButton" Style="{StaticResource ExpandCollapseToggleStyle}" IsChecked="{Binding Path=IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" ClickMode="Press" />
+                                    <ContentPresenter Name="PART_Header" ContentSource="Header" VerticalAlignment="Center"  Grid.Column="1" />
+                                </Grid>
+                            </Border>
+                            <Border Name="ItemsBorder" Margin="20,0,0,0" >
+                                <ItemsPresenter x:Name="ItemsHost" />
+                            </Border>
+                        </StackPanel>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsExpanded" Value="false">
+                            <Setter TargetName="ItemsHost" Property="Visibility" Value="Collapsed"/>
+                        </Trigger>
+                        <Trigger Property="HasItems" Value="false">
+                            <Setter TargetName="treeViewItemToggleButton" Property="Visibility" Value="Hidden"/>
+                        </Trigger>
+                        <DataTrigger Binding="{Binding Converter={StaticResource TypeNameConverter}}" Value="ShortcutCategory">
+                            <Setter TargetName="InnerBorder" Property="Panel.Background" Value="#DEDE00" />
+                            <Setter TargetName="InnerBorder" Property="TextElement.Foreground" Value="#FFFFFF" />
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding Converter={StaticResource TypeNameConverter}}" Value="AddIn">
+                            <Setter TargetName="InnerBorder" Property="Panel.Background" Value="#AEFFA8" />
+                            <Setter TargetName="InnerBorder" Property="TextElement.Foreground" Value="#000000" />
+                            <Setter TargetName="OuterBorder" Property="Margin" Value="0" />
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding Path=IsVisible}" Value="false">
+                            <Setter Property="Visibility" Value="Collapsed" />
+                            <Setter Property="IsEnabled" Value="False" />
+                        </DataTrigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="InnerBorder" Property="Panel.Background" Value="{StaticResource SelectedItemBackground}" />
+                            <Setter TargetName="InnerBorder" Property="TextElement.Foreground" Value="{StaticResource SelectedItemForeground}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+
+    <Style TargetType="{x:Type ListBoxItem}" x:Key="SeparatorStyle">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ListBoxItem}">
+                    <Separator HorizontalAlignment="Stretch" IsEnabled="false" Margin="5"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="{x:Type ListBoxItem}" x:Key="ProfileActionStyle">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ListBoxItem}">
+                    <TextBlock x:Name="textBlock" TextDecorations="Underline" Foreground="Blue" Margin="5" HorizontalAlignment="Left" TextAlignment="Left" >
+                                        <TextBlock.Style>
+                                            <Style>
+                                                <Style.Triggers>
+                                                    <Trigger Property="TextBlock.IsMouseOver" Value="True">
+                                                        <Setter Property="TextBlock.Background" Value="{StaticResource SelectedItemBackground}" />
+                                                    </Trigger>
+                                                </Style.Triggers>
+                                            </Style>
+                                        </TextBlock.Style>
+                                        <ContentPresenter />
+                    </TextBlock>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/AddIns/Misc/ShortcutsManagement/Src/Dialogs/ShortcutManagementWindow.xaml b/src/AddIns/Misc/ShortcutsManagement/Src/Dialogs/ShortcutManagementWindow.xaml
new file mode 100644
index 0000000000..033e378f15
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Src/Dialogs/ShortcutManagementWindow.xaml
@@ -0,0 +1,104 @@
+<Window x:Class="ICSharpCode.ShortcutsManagement.Dialogs.ShortcutManagementWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:core="http://icsharpcode.net/sharpdevelop/core"
+        xmlns:Dialogs="clr-namespace:ICSharpCode.ShortcutsManagement.Dialogs"
+        Title="{Binding Text}" 
+        MinHeight="400" 
+        MinWidth="400" 
+        x:Name="_this">
+	
+	<Window.Resources>
+		<ResourceDictionary>
+			<ResourceDictionary.MergedDictionaries>
+				<ResourceDictionary Source="Resources.xaml" />
+				<ResourceDictionary>
+					<Style x:Key="ValidationTextBox" TargetType="TextBlock"></Style>
+				</ResourceDictionary>
+			</ResourceDictionary.MergedDictionaries>
+		</ResourceDictionary>
+	</Window.Resources>
+	
+	<Grid Margin="8">
+		<Grid.ColumnDefinitions>
+			<ColumnDefinition Width="100" />
+			<ColumnDefinition />
+		</Grid.ColumnDefinitions>
+		<Grid.RowDefinitions>
+			<RowDefinition Height="50" />
+			<RowDefinition />
+			<RowDefinition Height="2" />
+			<RowDefinition />
+			<RowDefinition Height="30" />
+		</Grid.RowDefinitions>
+		
+		<!-- Field for entering a gesture -->
+		<Label x:Name="shortcutLabel" Grid.Column="0" Grid.Row="0" Target="{Binding ElementName=gestureTextBox}" HorizontalAlignment="Right" VerticalAlignment="Top">
+			<TextBlock TextWrapping="Wrap" Text="{core:Localize ShortcutsManagement.EnterGestureLabel}" />
+		</Label>
+		<Grid Grid.Column="2" Grid.Row="0">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition />
+				<ColumnDefinition Width="40" />
+			</Grid.ColumnDefinitions>
+			
+			<Dialogs:MultiKeyGestureTextBox x:Name="gestureTextBox" Grid.Column="0" Margin="3" TextBoxBorderThickness="1" />
+			<Button x:Name="addGestureButton" Grid.Column="1" Style="{StaticResource AddButton}" Height="25" VerticalAlignment="Top" Margin="3" Click="addGestureButton_Click"  />
+		</Grid>
+		
+		<!-- List of gestures assigned to modified shortcut -->
+		<Label x:Name="otherShortcutsLabel" Grid.Column="0" Grid.Row="1" Target="{Binding ElementName=otherShortcutsListBox}" HorizontalAlignment="Right" VerticalAlignment="Top">
+			<TextBlock TextWrapping="Wrap" Text="{core:Localize ShortcutsManagement.ShortcutGesturesLabel}" />
+		</Label>
+		<ListBox x:Name="otherShortcutsListBox" Grid.Column="1" Grid.Row="1" ItemContainerStyle="{StaticResource GesturesListBox}" ItemsSource="{Binding Path=Gestures}" Margin="3" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+			<ListBox.ItemTemplate>
+				<DataTemplate DataType="{x:Type InputGesture}">
+					<Grid>
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition />
+							<ColumnDefinition Width="20" />
+						</Grid.ColumnDefinitions>
+						
+						<TextBlock Text="{Binding Converter={StaticResource InputGestureConverter}}" Grid.Column="0" />
+						<Button x:Name="removeGestureButton" Style="{StaticResource RemoveButton}" Grid.Column="1" Visibility="Hidden" Click="removeGestureButton_Click" Tag="{Binding}" />
+					</Grid>
+					<DataTemplate.Triggers>
+						<DataTrigger Binding="{Binding IsMouseOver, RelativeSource={RelativeSource TemplatedParent}}" Value="True">
+							<Setter Property="Visibility" TargetName="removeGestureButton" Value="Visible" />
+						</DataTrigger>
+					</DataTemplate.Triggers>
+				</DataTemplate>
+			</ListBox.ItemTemplate>
+		</ListBox>
+		
+		<GridSplitter Grid.Row="2" Grid.Column="2" ResizeDirection="Rows" 
+		              Width="Auto" 
+		              Height="2" 
+		              HorizontalAlignment="Stretch" 
+		              VerticalAlignment="Stretch" 
+		              Background="White"
+		              Margin="0"/>
+		
+		<!-- List of shortcuts which have same gestures assigned to them -->
+		<Label x:Name="otherCommandsLabel" Grid.Row="3" Grid.Column="0" Target="{Binding ElementName=shortcutsManagementOptionsPanel}" HorizontalAlignment="Right" VerticalAlignment="Top">
+			<TextBlock TextWrapping="Wrap" Text="{core:Localize ShortcutsManagement.SimilarShortcutsLabel}" />
+		</Label>
+		<Dialogs:ShortcutsTreeView Grid.Row="3" Grid.Column="1" x:Name="shortcutsManagementOptionsPanel" IsSearchable="False" Padding="3" RemoveShortcutClick="shortcutsManagementOptionsPanel_RemoveShortcutClick" IsRemovableShortcutsEnabled="True" />
+		
+		<!-- Defaults/Ok/Cancel buttons -->
+
+		<!-- Reset/Ok/Cancel buttons -->
+		<Grid Grid.Column="2" Grid.Row="4">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="Auto" />
+				<ColumnDefinition />
+				<ColumnDefinition Width="Auto" />
+				<ColumnDefinition Width="Auto" />
+			</Grid.ColumnDefinitions>
+		
+			<Button Grid.Column="0" Click="DefaultButton_Click" x:Name="defaultButton" Margin="3" Width="80" Content="{core:Localize ShortcutsManagement.ShortcutManagementWindow.ResetToDefaults}" />
+			<Button Grid.Column="2" Click="saveButton_Click" x:Name="saveButton" Margin="3" Width="80" Content="{core:Localize Global.OKButtonText}" />
+			<Button Grid.Column="3" Click="resetButton_Click" x:Name="resetButton" Margin="3" Width="80" Content="{core:Localize Global.CancelButtonText}" />
+		</Grid>
+	</Grid>
+</Window>
\ No newline at end of file
diff --git a/src/AddIns/Misc/ShortcutsManagement/Src/Dialogs/ShortcutManagementWindow.xaml.cs b/src/AddIns/Misc/ShortcutsManagement/Src/Dialogs/ShortcutManagementWindow.xaml.cs
new file mode 100644
index 0000000000..a30d57702e
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Src/Dialogs/ShortcutManagementWindow.xaml.cs
@@ -0,0 +1,225 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using ICSharpCode.Core;
+using ICSharpCode.Core.Presentation;
+using ICSharpCode.ShortcutsManagement.Data;
+
+namespace ICSharpCode.ShortcutsManagement.Dialogs
+{
+	/// <summary>
+	/// This window allows user to modify shortcuts registered in application
+	/// </summary>
+	public partial class ShortcutManagementWindow : Window
+	{
+		private HashSet<Shortcut> modifiedShortcuts = new HashSet<Shortcut>();
+		
+		/// <summary>
+		/// Gets modified shortcut copy
+		/// </summary>
+		public Shortcut Shortcut
+		{
+			get; private set;
+		}
+		
+		/// <summary>
+		/// Gets deep copy of addins list (including copies of categories and shortcuts)
+		/// </summary>
+		public ICollection<IShortcutTreeEntry> RootEntries
+		{
+			get; private set;
+		}
+		
+		/// <summary>
+		/// Gets list of modified shortcuts. 
+		/// 
+		/// This list is used to optimize performance. Shortcuts not in this list are not saved.
+		/// Allways add modified shortcut to this list.
+		/// </summary>
+		public ICollection<Shortcut> ModifiedShortcuts
+		{
+			get {
+				return modifiedShortcuts;
+			}
+		}
+		
+		/// <summary>
+		/// Initializes new <see cref="ShortcutManagementWindow" /> class
+		/// </summary>
+		/// <param name="shortcut">Shortcut</param>
+		/// <param name="rootEntries">List of all other add-ins containing shortcuts and categories. This list is used to find dupliate shortcuts</param>
+		public ShortcutManagementWindow(Shortcut shortcut, ICollection<IShortcutTreeEntry> rootEntries)
+		{
+			Shortcut = shortcut;
+			RootEntries = rootEntries;
+			
+			shortcut.Gestures.CollectionChanged += Gestures_CollectionChanged;
+			ModifiedShortcuts.Add(shortcut);
+			DataContext = shortcut;
+			
+			InitializeComponent();
+			
+			// Display similar shortcuts (Shortcuts with the same input gestures assigned to them)
+			shortcutsManagementOptionsPanel.DataContext = rootEntries;
+			shortcutsManagementOptionsPanel.Loaded += delegate { FilterSimilarShortcuts(); };
+		}
+		
+		/// <summary>
+		/// Filter shortcuts using same gestures as modified shortcut
+		/// </summary>
+		private void FilterSimilarShortcuts()
+		{
+			var templates = new InputGestureCollection(Shortcut.Gestures);
+			
+			// Find shortcuts with same gesture and hide them.
+			// Also hide modified shortcut from this list
+			var finder = new ShortcutsFinder(RootEntries);
+			finder.FilterGesture(templates, GestureCompareMode.Conflicting);
+			finder.HideShortcut(Shortcut);
+			
+			shortcutsManagementOptionsPanel.ExpandAll();
+			shortcutsManagementOptionsPanel.SelectFirstVisibleShortcut(false);
+		}
+		
+		/// <summary>
+		/// Executed when adding or removing gestures used to call modified shortcut
+		/// </summary>
+		/// <param name="sender">Sender object</param>
+		/// <param name="e">Event arguments</param>
+		void Gestures_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+		{
+			FilterSimilarShortcuts();
+		}
+		
+		/// <summary>
+		/// Executed when "Remove" button next to gesture is pressed
+		/// </summary>
+		/// <param name="sender">Object sender</param>
+		/// <param name="e">Event arguments</param>
+		private void removeGestureButton_Click(object sender, RoutedEventArgs e)
+		{
+			var tag = ((Button) sender).Tag as InputGesture;
+			Shortcut.Gestures.Remove(tag);
+		}
+		
+		/// <summary>
+		/// Executed when "Add Gesture" button is clicked
+		/// </summary>
+		/// <param name="sender">Object sender</param>
+		/// <param name="e">Event arguments</param>
+		private void addGestureButton_Click(object sender, RoutedEventArgs e)
+		{
+			// Check if any chords are entered
+			if (gestureTextBox.Gesture == null) {
+				DisplayNotification(StringParser.Parse("${res:ShortcutsManagement.ModificationWindow.AdditionFailedNoChords}"), NotificationType.Failed);
+				return;
+			}
+			
+			// Check whether first chord is unfinished
+			var partialKeyGesture = gestureTextBox.Gesture as PartialKeyGesture;
+			if (partialKeyGesture != null && !partialKeyGesture.IsFull) {
+				DisplayNotification(StringParser.Parse("${res:ShortcutsManagement.ModificationWindow.AdditionFailedFirstChordIsIncomplete}"), NotificationType.Failed);
+				return;
+			}
+			
+			// Check whether last chord is finished
+			var multiKeyGesture = gestureTextBox.Gesture as MultiKeyGesture;
+			if (multiKeyGesture != null && multiKeyGesture.Chords.Last().Key == Key.None) {
+				DisplayNotification(StringParser.Parse("${res:ShortcutsManagement.ModificationWindow.AdditionFailedLastChordIsIncompete}"), NotificationType.Failed);
+				return;
+			}
+			
+			// Check whether gesture exist in shortcut gestures collection
+			foreach (var existingGesture in Shortcut.Gestures) {
+				if (gestureTextBox.Gesture.IsTemplateFor(existingGesture, GestureCompareMode.ExactlyMatches)) {
+					DisplayNotification(StringParser.Parse("${res:ShortcutsManagement.ModificationWindow.AddingExistingGesture}"), NotificationType.Failed);
+					return;
+				}
+			}
+			
+			// Add gesture
+			if (partialKeyGesture != null) {
+				try {
+					var keyGesture = new KeyGesture(partialKeyGesture.Key, partialKeyGesture.Modifiers);
+					Shortcut.Gestures.Add(keyGesture);
+				} catch (NotSupportedException) {
+					Shortcut.Gestures.Add(partialKeyGesture);
+				}
+			} else {
+				Shortcut.Gestures.Add(gestureTextBox.Gesture);
+			}
+			
+			DisplayNotification(StringParser.Parse("${res:ShortcutsManagement.ModificationWindow.AdditionIsSuccessfull}"), NotificationType.Added);
+		}
+		
+		/// <summary>
+		/// Executed when "Remove" button next to similar shortcut is pressed
+		/// </summary>
+		/// <param name="sender">Sender object</param>
+		/// <param name="e">Event argument</param>
+		private void shortcutsManagementOptionsPanel_RemoveShortcutClick(object sender, RoutedRemoveShortcutEventArgs e)
+		{
+			e.Handled = true;
+			
+			// Remove gestures registered in modified shortcut from deleted shortcut
+			var removedShortcutGestures = e.RemovedShortcut.Gestures;
+			
+			for (int i = removedShortcutGestures.Count - 1; i >= 0; i--) {
+				foreach (var modifiedInputGesture in Shortcut.Gestures) {
+					if (removedShortcutGestures[i].IsTemplateFor(modifiedInputGesture, GestureCompareMode.StartsWith)) {
+						removedShortcutGestures.RemoveAt(i);
+						
+						modifiedShortcuts.Add(e.RemovedShortcut);
+						
+						break;
+					}
+				}
+			}
+			
+			FilterSimilarShortcuts();
+		}
+		
+		/// <summary>
+		/// Save changes to shortcuts
+		/// </summary>
+		/// <param name="sender">Sender object</param>
+		/// <param name="e">Event arguments</param>
+		private void saveButton_Click(object sender, RoutedEventArgs e)
+		{
+			DialogResult = true;
+			
+			Close();
+		}
+		
+		/// <summary>
+		/// Display message describing shortcut addition result
+		/// </summary>
+		/// <param name="notificationText">Displayed message text</param>
+		/// <param name="type">Message type</param>
+		public void DisplayNotification(string notificationText, NotificationType type)
+		{
+			gestureTextBox.NotificationText = notificationText;
+			gestureTextBox.NotificationType = type;
+		}
+		
+		/// <summary>
+		/// Execute this method when Reset button is clicked. 
+		/// 
+		/// Modifications are not saved
+		/// </summary>
+		/// <param name="sender">Sender object</param>
+		/// <param name="e">Event arguments</param>
+		private void resetButton_Click(object sender, RoutedEventArgs e)
+		{
+			Close();
+		}
+		
+		void DefaultButton_Click(object sender, RoutedEventArgs e)
+		{
+			Shortcut.ResetToDefaults();
+		}
+	}
+}
diff --git a/src/AddIns/Misc/ShortcutsManagement/Src/Dialogs/ShortcutsManagementOptionsPanel.xaml b/src/AddIns/Misc/ShortcutsManagement/Src/Dialogs/ShortcutsManagementOptionsPanel.xaml
new file mode 100644
index 0000000000..fcde946a8e
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Src/Dialogs/ShortcutsManagementOptionsPanel.xaml
@@ -0,0 +1,52 @@
+<UserControl x:Class="ICSharpCode.ShortcutsManagement.Dialogs.ShortcutsManagementOptionsPanel"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:core="http://icsharpcode.net/sharpdevelop/core"
+    xmlns:Dialogs="clr-namespace:ICSharpCode.ShortcutsManagement.Dialogs"
+    xmlns:Converters="clr-namespace:ICSharpCode.ShortcutsManagement.Converters"
+    xmlns:Presentation="clr-namespace:ICSharpCode.Core.Presentation;assembly=ICSharpCode.Core.Presentation"
+    xmlns:Data="clr-namespace:ICSharpCode.ShortcutsManagement.Data"
+    x:Name="_this">
+    
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="Resources.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+    	     <Converters:ProfilesComboBoxItemStyleSelector x:Key="ProfilesComboBoxItemStyleSelector" />
+
+	        <DataTemplate DataType="{x:Type Presentation:UserGestureProfile}">
+	            <TextBlock Text="{Binding Converter={StaticResource ProfileToStringConverter}}" Margin="5" />
+	        </DataTemplate>
+	
+	        <DataTemplate DataType="{x:Type Data:UserGestureProfileAction}">
+	            <TextBlock Text="{Binding Path=Text}" />
+	        </DataTemplate>
+       </ResourceDictionary>
+    </UserControl.Resources>
+    
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+    
+        <WrapPanel HorizontalAlignment="Right" Grid.Row="0" Margin="0,3">
+            <Label Content="{core:Localize ShortcutsManagement.ShortcutsManagementOptionsPanel.ProfilesLabel}" />
+            <ComboBox 
+                ItemContainerStyleSelector="{StaticResource ProfilesComboBoxItemStyleSelector}"      
+                x:Name="profilesTextBox" 
+                Width="150" 
+                Height="30" 
+                ItemsSource="{Binding}" 
+                SelectionChanged="profilesTextBox_SelectionChanged" 
+            />
+        </WrapPanel>
+
+        <Dialogs:ShortcutsTreeView Grid.Row="1"
+            x:Name="shortcutsManagementOptionsPanel" 
+            IsSearchable="True" 
+            ShortcutModified="shortcutsManagementOptionsPanel_ShortcutModified" 
+            Height="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ContentPresenter}}, Path=ActualHeight, Converter={StaticResource AddidionConverter}, ConverterParameter=-40}" />
+    </Grid>
+</UserControl>
diff --git a/src/AddIns/Misc/ShortcutsManagement/Src/Dialogs/ShortcutsManagementOptionsPanel.xaml.cs b/src/AddIns/Misc/ShortcutsManagement/Src/Dialogs/ShortcutsManagementOptionsPanel.xaml.cs
new file mode 100644
index 0000000000..49870e1a79
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Src/Dialogs/ShortcutsManagementOptionsPanel.xaml.cs
@@ -0,0 +1,384 @@
+using System;
+using System.Collections.Generic;
+using System.Collections;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Text.RegularExpressions;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using ICSharpCode.Core;
+using ICSharpCode.Core.Presentation;
+using ICSharpCode.SharpDevelop;
+using ICSharpCode.ShortcutsManagement.Data;
+using Microsoft.Win32;
+using ShortcutManagement=ICSharpCode.ShortcutsManagement.Data;
+using MessageBox=System.Windows.MessageBox;
+using Shortcut=ICSharpCode.ShortcutsManagement.Data.Shortcut;
+using UserControl=System.Windows.Controls.UserControl;
+
+namespace ICSharpCode.ShortcutsManagement.Dialogs
+{
+	/// <summary>
+	/// Interaction logic for ShortcutsManagementOptionsPanel.xaml
+	/// </summary>
+	public partial class ShortcutsManagementOptionsPanel : UserControl, IOptionPanel
+	{
+		/// <summary>
+		/// Identifies <see cref="SelectedProfile"/> dependency property
+		/// </summary>
+		public static readonly DependencyProperty SelectedProfileProperty = DependencyProperty.Register(
+			"SelectedProfile",
+			typeof(UserGestureProfile),
+			typeof(ShortcutsManagementOptionsPanel),
+			new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.AffectsRender));
+		
+		/// <summary>
+		/// Specifies text box border thickness
+		/// </summary>
+		public UserGestureProfile SelectedProfile
+		{
+			get {
+				return (UserGestureProfile)GetValue(SelectedProfileProperty);
+			}
+			set {
+				SetValue(SelectedProfileProperty, value);
+			}
+		}
+		
+		/// <summary>
+		/// Stores shortcut entry to input binding convertion map
+		/// </summary>
+		private readonly MapTable<Shortcut, InputBindingInfo> shortcutsMap = new MapTable<Shortcut, InputBindingInfo>();
+		
+		private List<IShortcutTreeEntry> rootEntries;
+		
+		private readonly List<UserGestureProfile> profiles = new List<UserGestureProfile>();
+		
+		private readonly List<UserGestureProfile> removedProfiles = new List<UserGestureProfile>();
+		
+		public ShortcutsManagementOptionsPanel()
+		{
+			ResourceService.RegisterStrings("ICSharpCode.ShortcutsManagement.Resources.StringResources", GetType().Assembly);
+			
+			InitializeComponent();
+		}
+		
+		public void LoadOptions()
+		{
+			shortcutsManagementOptionsPanel.searchTextBox.Focus();
+			
+			if (Directory.Exists(UserGestureProfileManager.UserGestureProfilesDirectory)) {
+				var dirInfo = new DirectoryInfo(UserGestureProfileManager.UserGestureProfilesDirectory);
+				var xmlFiles = dirInfo.GetFiles("*.xml");
+				
+				foreach (var fileInfo in xmlFiles) {
+					var path = Path.Combine(UserGestureProfileManager.UserGestureProfilesDirectory, fileInfo.Name);
+					var profile = new UserGestureProfile(path);
+					profile.Load();
+					profiles.Add(profile);
+					
+					if (UserGestureProfileManager.CurrentProfile != null && profile.Name == UserGestureProfileManager.CurrentProfile.Name) {
+						SelectedProfile = profile;
+					}
+				}
+			}
+			
+			BindProfiles();
+			BindShortcuts();
+		}
+		
+		private void BindProfiles()
+		{
+			var profilesTextBoxItemsSource = new ArrayList(profiles);
+			
+			profilesTextBoxItemsSource.Add(new SeparatorData());
+			
+			var deleteItem = new UserGestureProfileAction();
+			deleteItem.Name = "Delete";
+			deleteItem.Text = StringParser.Parse("${res:ShortcutsManagement.ShortcutsManagementOptionsPanel.ProfileDeleteAction}");
+			profilesTextBoxItemsSource.Add(deleteItem);
+			
+			var loadItem = new UserGestureProfileAction();
+			loadItem.Name = "Load";
+			loadItem.Text = StringParser.Parse("${res:ShortcutsManagement.ShortcutsManagementOptionsPanel.ProfileLoadAction}");
+			profilesTextBoxItemsSource.Add(loadItem);
+			
+			var createItem = new UserGestureProfileAction();
+			createItem.Name = "Create";
+			createItem.Text = StringParser.Parse("${res:ShortcutsManagement.ShortcutsManagementOptionsPanel.ProfileCreateAction}");
+			profilesTextBoxItemsSource.Add(createItem);
+			
+			var renameItem = new UserGestureProfileAction();
+			renameItem.Name = "Rename";
+			renameItem.Text = StringParser.Parse("${res:ShortcutsManagement.ShortcutsManagementOptionsPanel.ProfileRenameAction}");
+			profilesTextBoxItemsSource.Add(renameItem);
+			
+			var resetItem = new UserGestureProfileAction();
+			resetItem.Name = "Reset";
+			resetItem.Text = StringParser.Parse("${res:ShortcutsManagement.ShortcutsManagementOptionsPanel.ProfileResetAction}");
+			profilesTextBoxItemsSource.Add(resetItem);
+			
+			profilesTextBox.DataContext = profilesTextBoxItemsSource;
+			
+			if (SelectedProfile != null) {
+				if(profilesTextBox.SelectedItem != SelectedProfile) {
+					profilesTextBox.Text = SelectedProfile.Text;
+					profilesTextBox.SelectedItem = SelectedProfile;
+				}
+			} else {
+				profilesTextBox.SelectedIndex = -1;
+				profilesTextBox.Text = "";
+			}
+		}
+		
+		private void BindShortcuts()
+		{
+			shortcutsMap.Clear();
+			
+			// Root shortcut tree entries
+			rootEntries = new List<IShortcutTreeEntry>();
+			
+			// Stores SD input binding category to category section convertion map
+			var categoriesMap = new MapTable<InputBindingCategory, ShortcutCategory>();
+			
+			var unspecifiedCategory = new ShortcutCategory(StringParser.Parse("${res:ShortcutsManagement.UnspecifiedCategoryName}"));
+			rootEntries.Add(unspecifiedCategory);
+			
+			SDCommandManager.InputBindingCategories.Sort((c1, c2) => c1.Path.CompareTo(c2.Path));
+			var parentCategories = new LinkedList<ShortcutCategory>();
+			var previousDepth = 0;
+			foreach(var bindingCategory in SDCommandManager.InputBindingCategories) {
+				var categoryName = Regex.Replace(StringParser.Parse(bindingCategory.Text), @"&([^\s])", @"$1");
+				var shortcutCategory = new ShortcutCategory(categoryName);
+				categoriesMap.Add(bindingCategory, shortcutCategory);
+				
+			AddCategory:
+				var currentDepth = bindingCategory.Path.Split('/').Length - 1;
+				if (currentDepth > previousDepth) {
+					previousDepth++;
+					
+					if (previousDepth > 1) {
+						parentCategories.Last.Value.SubCategories.Add(shortcutCategory);
+					} else {
+						rootEntries.Add(shortcutCategory);
+					}
+					
+					parentCategories.AddLast(shortcutCategory);
+				} else {
+					while (previousDepth >= currentDepth) {
+						parentCategories.RemoveLast();
+						previousDepth--;   
+					}
+					
+					goto AddCategory;
+				}
+			}
+			
+			var inputBindingInfos = SDCommandManager.FindInputBindingInfos(new BindingInfoTemplate(), null);
+			foreach (var inputBindingInfo in inputBindingInfos) {
+				// Get shortcut entry text. Normaly shortcut entry text is equal to routed command text
+				// but this value can be overriden through InputBindingInfo.RoutedCommandText value
+				var shortcutText = inputBindingInfo.RoutedCommand.Text;
+				if (!string.IsNullOrEmpty(inputBindingInfo.RoutedCommandText)) {
+					shortcutText = inputBindingInfo.RoutedCommandText;
+				}
+				
+				shortcutText = StringParser.Parse(shortcutText);
+				
+				// Some commands have "&" sign to mark alternative key used to call this command from menu
+				// Strip this sign from shortcut entry text
+				shortcutText = Regex.Replace(shortcutText, @"&([^\s])", @"$1");
+				
+				var shortcut = new Shortcut(shortcutText, inputBindingInfo.ActiveGestures, inputBindingInfo.DefaultGestures.InputGesturesCollection);
+				shortcutsMap.Add(shortcut, inputBindingInfo);
+				 
+				// Assign shortcut to all categories it is registered in
+				var isAnyCategoriesResolved = true;
+				if (inputBindingInfo.Categories != null && inputBindingInfo.Categories.Count > 0) {
+					foreach (var bindingCategory in inputBindingInfo.Categories) {
+						ShortcutCategory shortcutCategory;
+						categoriesMap.TryMapForward(bindingCategory, out shortcutCategory);
+						if(shortcutCategory != null) {
+							shortcutCategory.Shortcuts.Add(shortcut);
+							isAnyCategoriesResolved = true;
+						}
+					}
+				} else {
+					isAnyCategoriesResolved = false;
+				}
+				
+				if(!isAnyCategoriesResolved) {
+					rootEntries.Add(shortcut);
+				}
+			}
+			
+			rootEntries.Sort();
+			
+			foreach (var entry in rootEntries) {
+				entry.SortSubEntries();
+			}
+			
+			new ShortcutsFinder(rootEntries).Filter("");
+			shortcutsManagementOptionsPanel.DataContext = rootEntries;
+		}
+		
+		public bool SaveOptions() 
+		{
+			foreach (var profile in removedProfiles) {
+				if(File.Exists(profile.Path)) {
+					File.Delete(profile.Path);
+				}
+			}
+			
+			UserGestureProfileManager.CurrentProfile = SelectedProfile;
+			
+			profiles.ForEach(p => p.Save());
+			
+			return true;
+		}
+		
+		public object Owner 
+		{
+			get; set;
+		}
+		
+		public object Control 
+		{
+			get { 
+				return this; 
+			}
+		}
+		
+		private void profilesTextBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+		{
+			if (e.AddedItems == null || e.AddedItems.Count == 0) {
+				return;
+			}
+			
+			var userGestureProfileAction = e.AddedItems[0] as UserGestureProfileAction;
+			if (userGestureProfileAction != null) {
+				if (userGestureProfileAction.Name == "Delete" && SelectedProfile != null) {
+					var result = MessageBox.Show(
+						StringParser.Parse("${res:ShortcutsManagement.ShortcutsManagementOptionsPanel.ConfirmDeleteProfileMessage}"),
+						StringParser.Parse("${res:ShortcutsManagement.ShortcutsManagementOptionsPanel.ConfirmDeleteProfileMessageWindowName}"),
+						MessageBoxButton.YesNo);
+					
+					if(MessageBoxResult.Yes == result) {
+						profiles.Remove(SelectedProfile);
+						removedProfiles.Add(SelectedProfile);
+						SelectedProfile = null;
+					}
+				}
+				
+				if (userGestureProfileAction.Name == "Rename" && SelectedProfile != null) {
+					var promptWindow = new CreateNewProfilePrompt();
+					promptWindow.BaseProfilesVisibility = Visibility.Collapsed;
+					promptWindow.Text = SelectedProfile.Text;
+					promptWindow.ShowDialog();
+					
+					SelectedProfile.Text = promptWindow.Text;
+				} 
+				
+				if(userGestureProfileAction.Name == "Load") {
+					var openDialog = new OpenFileDialog();
+					openDialog.Filter = "Xml files (*.xml)|*.xml";
+					openDialog.FilterIndex = 1;
+					openDialog.RestoreDirectory = false;
+					if(true == openDialog.ShowDialog()) {
+						var loadedProfilePath = Path.Combine(UserGestureProfileManager.UserGestureProfilesDirectory, Guid.NewGuid().ToString());
+						File.Copy(openDialog.FileName, loadedProfilePath);
+						var loadedProfile = new UserGestureProfile(loadedProfilePath);
+						loadedProfile.Load();
+						
+						profiles.Add(loadedProfile);
+						SelectedProfile = loadedProfile;
+					}
+				}
+			
+				if (userGestureProfileAction.Name == "Reset") {
+					SelectedProfile = null;
+				}
+				
+				if(userGestureProfileAction.Name == "Create") {
+					var promptWindow = new CreateNewProfilePrompt();
+					promptWindow.AvailableBaseProfiles = profiles;
+					promptWindow.ShowDialog();
+					
+					if (promptWindow.DialogResult == true) {
+						UserGestureProfile newProfile;
+						
+						var newProfileName = Guid.NewGuid().ToString();
+						newProfile = new UserGestureProfile(
+							Path.Combine(UserGestureProfileManager.UserGestureProfilesDirectory, newProfileName + ".xml"),
+							newProfileName,
+							promptWindow.Text,
+							false);
+						
+						if (promptWindow.BaseProfile != null) {
+							foreach(var pair in promptWindow.BaseProfile) {
+								newProfile[pair.Key] = pair.Value;
+							}
+						}
+					
+						profiles.Add(newProfile);
+						
+						SelectedProfile = newProfile;
+					}
+				}
+			}
+			
+			var userGestureProfile = e.AddedItems[0] as UserGestureProfile;
+			if (userGestureProfile != null && userGestureProfile != SelectedProfile) {
+				SelectedProfile = userGestureProfile;
+			}
+			
+			BindProfiles(); 
+			BindShortcuts();
+		}
+		
+		private void shortcutsManagementOptionsPanel_ShortcutModified(object sender, EventArgs e)
+		{
+			var selectedShortcut = (Shortcut)shortcutsManagementOptionsPanel.shortcutsTreeView.SelectedItem;
+			
+			if(SelectedProfile == null) {
+				MessageBox.Show(StringParser.Parse("${res:ShortcutsManagement.ShortcutsManagementOptionsPanel.NoProfileSelectedMessage}"));
+				return;
+			}
+			
+			if(SelectedProfile.ReadOnly) {
+				MessageBox.Show(StringParser.Parse("${res:ShortcutsManagement.ShortcutsManagementOptionsPanel.SelectedProfileIsReadOnlyMessage}"));
+				return;
+			}
+			
+			Shortcut shortcutCopy = null;            
+			
+			var cloner = new IShortcutTreeEntryCloner();
+			var rootEntriesCopy = cloner.CloneShortcutTree(rootEntries);
+			foreach(var clonedEntry in rootEntriesCopy) {
+				if (shortcutCopy == null) {
+					shortcutCopy = clonedEntry.FindShortcut(selectedShortcut.Id);
+				}
+			}
+			
+			var shortcutManagementWindow = new ShortcutManagementWindow(shortcutCopy, rootEntriesCopy);
+			shortcutManagementWindow.ShowDialog();
+			
+			if (SelectedProfile != null && shortcutManagementWindow.DialogResult.HasValue && shortcutManagementWindow.DialogResult.Value) {
+				// Move modifications from shortcut copies to original shortcut objects
+				foreach (var relatedShortcutCopy in shortcutManagementWindow.ModifiedShortcuts) {
+					foreach (var rootEntry in rootEntries) {
+						var originalRelatedShortcut = rootEntry.FindShortcut(relatedShortcutCopy.Id);
+						if (originalRelatedShortcut != null) {
+							originalRelatedShortcut.Gestures.Clear();
+							originalRelatedShortcut.Gestures.AddRange(relatedShortcutCopy.Gestures);
+							
+							var id = BindingInfoTemplate.CreateFromIBindingInfo(shortcutsMap.MapForward(originalRelatedShortcut));
+							SelectedProfile[id] = relatedShortcutCopy.DoesUseDefault ? null : new InputGestureCollection(relatedShortcutCopy.Gestures);
+						}
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/src/AddIns/Misc/ShortcutsManagement/Src/Dialogs/ShortcutsTreeView.xaml b/src/AddIns/Misc/ShortcutsManagement/Src/Dialogs/ShortcutsTreeView.xaml
new file mode 100644
index 0000000000..b83f25f42d
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Src/Dialogs/ShortcutsTreeView.xaml
@@ -0,0 +1,93 @@
+<UserControl x:Class="ICSharpCode.ShortcutsManagement.Dialogs.ShortcutsTreeView"
+             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" 
+             xmlns:Data="clr-namespace:ICSharpCode.ShortcutsManagement.Data" 
+             xmlns:Dialogs="clr-namespace:ICSharpCode.ShortcutsManagement.Dialogs" 
+             xmlns:Extensions="clr-namespace:ICSharpCode.ShortcutsManagement.Extensions"
+             mc:Ignorable="d" 
+             x:Name="_this"
+             d:DesignHeight="300" d:DesignWidth="300" >
+    
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="Resources.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
+
+    
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition Height="Auto"  />
+        </Grid.RowDefinitions>
+
+        <!-- Tree view -->
+        <TreeView x:Name="shortcutsTreeView" ItemsSource="{Binding}" ItemContainerStyle="{StaticResource ShortcutsTreeItem}" Grid.Column="0" Grid.Row="0" FocusManager.FocusedElement="{Binding ElementName=searchTextBox}" PreviewKeyDown="shortcutsTreeView_PreviewKeyDown">
+            <TreeView.Resources>
+                <!-- Tree view add-in data template -->
+                <HierarchicalDataTemplate DataType="{x:Type Data:AddIn}" ItemsSource="{Binding Path=Categories}" >
+                    <TextBlock Text="{Binding Path=Name}" Extensions:TextBlockBehavior.SearchedText="{Binding ElementName=searchTextBox, Path=Text}" />
+                </HierarchicalDataTemplate>
+
+                <!-- Tree view category data template -->
+                <HierarchicalDataTemplate DataType="{x:Type Data:ShortcutCategory}" >
+                    <HierarchicalDataTemplate.ItemsSource>
+                        <MultiBinding Converter="{StaticResource ShortcutsTreeConverter}">
+                            <Binding Path="SubCategories" />
+                            <Binding Path="Shortcuts" />
+                        </MultiBinding>
+                    </HierarchicalDataTemplate.ItemsSource>
+                    
+                    <TextBlock Text="{Binding Path=Name}" Extensions:TextBlockBehavior.SearchedText="{Binding ElementName=searchTextBox, Path=Text}" />
+                </HierarchicalDataTemplate>
+
+                <!-- Tree view shortcut data template -->
+                <HierarchicalDataTemplate DataType="{x:Type Data:Shortcut}" >
+                    <Grid x:Name="shortcutEntry" MouseDown="shortcutEntry_MouseDown" Panel.Background="{Binding Panel.Background, RelativeSource={RelativeSource TemplatedParent}}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        
+                        <TextBlock Text="{Binding Name}" Extensions:TextBlockBehavior.SearchedText="{Binding ElementName=searchTextBox, Path=Text}" Grid.Column="0" />
+                        <TextBlock Text="{Binding Gestures, Converter={StaticResource GesturesListConverter}}" Grid.Column="1" TextAlignment="Right" Padding="20,0,0,0" />
+                        <Button x:Name="removeShortcutButton" Style="{StaticResource RemoveButton}" Visibility="Hidden" Grid.Column="2" Tag="{Binding}" Click="removeShortcutButton_Click" SnapsToDevicePixels="True" />
+                    </Grid>
+                    <HierarchicalDataTemplate.Triggers>
+                        <DataTrigger Binding="{Binding ElementName=_this, Path=IsRemovableShortcutsEnabled}" Value="True">
+                            <Setter Property="Margin" TargetName="removeShortcutButton" Value="10,0,0,0" />
+                        </DataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding ElementName=_this, Path=IsRemovableShortcutsEnabled}" Value="True" />
+                                <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource TemplatedParent}}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Visibility" TargetName="removeShortcutButton" Value="Visible" />
+                        </MultiDataTrigger>
+                    </HierarchicalDataTemplate.Triggers>
+                </HierarchicalDataTemplate>
+            </TreeView.Resources>
+        </TreeView>
+
+        <!-- Search box -->
+        <Border x:Name="searchSection" CornerRadius="0,0,8,8" Padding="2" Background="#FFF" BorderBrush="#888" BorderThickness="1,0,1,1" Grid.Column="0" Grid.Row="1" Visibility="{Binding ElementName=_this, Path=IsSearchable, Converter={StaticResource BoolToVisibilityConverter}, ConverterParameter=Collapsed}">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition Width="20" />
+                </Grid.ColumnDefinitions>
+
+                <TextBox Grid.Column="0" x:Name="searchTextBox" TextChanged="searchTextBox_TextChanged" BorderThickness="0" PreviewKeyDown="searchTextBox_PreviewKeyDown" />
+                <Dialogs:MultiKeyGestureTextBox Grid.Column="0" x:Name="gestureTextBox" NotificationVisibility="Collapsed" TextBoxBorderThickness="0" Visibility="{Binding ElementName=searchTypeToggleButton, Path=IsChecked, Converter={StaticResource BoolToVisibilityConverter}, ConverterParameter=Hidden}" GestureChanged="gestureTextBox_GestureChanged" PreviewKeyDown="searchTextBox_PreviewKeyDown" />
+
+                <ToggleButton x:Name="searchTypeToggleButton" Grid.Column="1" Style="{StaticResource KeyToggleButton}" ClickMode="Press" Click="searchTypeToggleButton_Click" />
+            </Grid>
+        </Border>
+    </Grid>
+</UserControl>
diff --git a/src/AddIns/Misc/ShortcutsManagement/Src/Dialogs/ShortcutsTreeView.xaml.cs b/src/AddIns/Misc/ShortcutsManagement/Src/Dialogs/ShortcutsTreeView.xaml.cs
new file mode 100644
index 0000000000..161d0fbaf9
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Src/Dialogs/ShortcutsTreeView.xaml.cs
@@ -0,0 +1,320 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using ICSharpCode.Core.Presentation;
+using ICSharpCode.ShortcutsManagement.Data;
+using ICSharpCode.ShortcutsManagement.Extensions;
+
+namespace ICSharpCode.ShortcutsManagement.Dialogs
+{
+	/// <summary>
+	/// This panel is used in SharpDevelop options window to manage shortcuts
+	/// </summary>
+	public partial class ShortcutsTreeView : UserControl
+	{
+		/// <summary>
+		/// Identifies <see cref="IsSearchable"/> dependency property
+		/// </summary>
+		public static readonly DependencyProperty IsSearchableProperty = DependencyProperty.Register(
+			"IsSearchable",
+			typeof(Boolean),
+			typeof(ShortcutsTreeView),
+			new FrameworkPropertyMetadata(false, FrameworkPropertyMetadataOptions.AffectsRender));
+		
+		/// <summary>
+		/// Gets or sets property specifying whether shortcuts tree can be searched using part of the shortcut's name or
+		/// gesture
+		/// </summary>
+		public Boolean IsSearchable
+		{
+			get {
+				return (Boolean)GetValue(IsSearchableProperty);
+			}
+			set {
+				SetValue(IsSearchableProperty, value);
+			}
+		}
+		
+		/// <summary>
+		/// Identifies <see cref="IsRemovableShortcutsEnabled" /> dependency property
+		/// </summary>
+		public static readonly DependencyProperty IsRemovableShortcutsEnabledProperty = DependencyProperty.Register(
+			"IsRemovableShortcutsEnabled",
+			typeof(Boolean),
+			typeof(ShortcutsTreeView),
+			new FrameworkPropertyMetadata(false, FrameworkPropertyMetadataOptions.AffectsRender));
+		
+		/// <summary>
+		/// Specify whether shortcuts can be removed from the tree.
+		/// 
+		/// If this value set to true <see cref="RemoveShortcutClick"/> will be Executed when
+		/// shortcut is deleted
+		/// </summary>
+		public Boolean IsRemovableShortcutsEnabled
+		{
+			get {
+				return (Boolean)GetValue(IsSearchableProperty);
+			}
+			set {
+				SetValue(IsSearchableProperty, value);
+			}
+		}
+		
+		/// <summary>
+		/// Occurs when user tries to remove shortcut from shortcuts tree
+		/// </summary>
+		public event RemoveShortcutRoutedHandler RemoveShortcutClick;
+		
+		/// <summary>
+		/// List of add-ins containing shortcut categories and shortcuts
+		/// </summary>
+		private ICollection<IShortcutTreeEntry> RootEntries
+		{
+			get {
+				return (ICollection<IShortcutTreeEntry>)DataContext;
+			}
+		}
+		
+		/// <summary>
+		/// Creates new instance of <see cref="ShortcutsTreeView" />
+		/// </summary>
+		public ShortcutsTreeView()
+		{
+			InitializeComponent();
+		}
+		
+		/// <summary>
+		/// Selects first enabled shortcut in shortcut tree
+		/// </summary>
+		/// <param name="setFocus">Set focus to this shortcut entry</param>
+		public void SelectFirstVisibleShortcut(bool setFocus)
+		{
+			var path = new List<IShortcutTreeEntry>();
+			foreach (var entry in RootEntries) {
+				if (entry != null && entry.IsVisible) {
+					path.Add(entry);
+					FindFirstVisibleItemPath(entry, path);
+					shortcutsTreeView.SelectItem(path.Cast<object>().ToList(), setFocus);
+					
+					return;
+				}
+			}
+		}
+		
+		/// <summary>
+		/// Find path to first <see cref="IShortcutTreeEntry"/> with <see cref="IShortcutTreeEntry.IsVisible"/> true
+		/// </summary>
+		/// <param name="parent">Starting node</param>
+		/// <param name="path">Accumulated path</param>
+		private void FindFirstVisibleItemPath(IShortcutTreeEntry parent, List<IShortcutTreeEntry> path) 
+		{
+			// Find first visible add-in
+			var addIn = parent as AddIn;
+			if(addIn != null) {
+				var selectedCategory = addIn.Categories.FirstOrDefault(a => a.IsVisible);
+				if (selectedCategory != null) {
+					path.Add(selectedCategory);
+					FindFirstVisibleItemPath(selectedCategory, path);
+					return;
+				}
+			}
+			
+			// Find first visible category
+			var category = parent as ShortcutCategory;
+			if (category != null) {
+				var selectedCategory = category.SubCategories.FirstOrDefault(a => a.IsVisible);
+				if (selectedCategory != null) {
+					path.Add(selectedCategory);
+					FindFirstVisibleItemPath(selectedCategory, path);
+					return;
+				}
+				
+				// Find first visible shortcut
+				var selectedShortcut = category.Shortcuts.FirstOrDefault(a => a.IsVisible);
+				if (selectedShortcut != null) {
+					path.Add(selectedShortcut);
+					FindFirstVisibleItemPath(selectedShortcut, path);
+					return;
+				}
+			}
+		}
+		
+		/// <summary>
+		/// Expands all elements of the tree
+		/// </summary>
+		public void ExpandAll()
+		{
+			shortcutsTreeView.SetExpandAll(true);
+		}
+		
+		/// <summary>
+		/// Executed when user starts to type inside shortcuts tree
+		/// </summary>
+		/// <param name="sender">Sender object</param>
+		/// <param name="e">Event arguments</param>
+		private void shortcutsTreeView_PreviewKeyDown(object sender, KeyEventArgs e)
+		{
+			// If not navigating tree set focus to search text box
+			var keyboardDevice = (KeyboardDevice)e.Device;
+			if (keyboardDevice.Modifiers != ModifierKeys.None || Array.IndexOf(new[] { Key.Up, Key.Right, Key.Down, Key.Left }, e.Key) < 0) {
+				searchTextBox.Text = "";
+				Keyboard.Focus(searchTextBox);
+				return;
+			}
+		}
+		
+		/// <summary>
+		/// Executed when user tries to remove a shortcut from shortcut tree
+		/// </summary>
+		/// <param name="sender">Sender object</param>
+		/// <param name="e">Event arguments</param>
+		private void removeShortcutButton_Click(object sender, RoutedEventArgs e)
+		{
+			if(RemoveShortcutClick != null) {
+				var removeButton = (Button) sender;
+				var routedRemoveShortcutEventArgs = new RoutedRemoveShortcutEventArgs(e.RoutedEvent, e.OriginalSource, (Shortcut)removeButton.Tag);
+				
+				// Forward event
+				RemoveShortcutClick.Invoke(sender, routedRemoveShortcutEventArgs);
+			}
+		}
+		
+		
+		/// <summary>
+		/// Executed when user changes text in search textbox
+		/// </summary>
+		/// <param name="sender">Object sender</param>
+		/// <param name="e">Event arguments</param>
+		private void searchTextBox_TextChanged(object sender, TextChangedEventArgs e)
+		{
+			if (!searchTypeToggleButton.IsChecked.HasValue || searchTypeToggleButton.IsChecked.Value) return;
+			
+			new ShortcutsFinder(RootEntries).Filter(searchTextBox.Text);
+			
+			if (!string.IsNullOrEmpty(searchTextBox.Text)) {
+				SelectFirstVisibleShortcut(false);
+			} else {
+				shortcutsTreeView.SetExpandAll(false);
+			}
+		}
+		
+		/// <summary>
+		/// Executed when changing search type
+		/// </summary>
+		/// <param name="sender">Sender object</param>
+		/// <param name="e">Event arguments</param>
+		private void searchTypeToggleButton_Click(object sender, RoutedEventArgs e)
+		{
+			searchTextBox.Text = "";
+			gestureTextBox.shortcutTextBox.Text = "";
+			
+			new ShortcutsFinder(RootEntries).Filter("");
+			shortcutsTreeView.SetExpandAll(false);
+			
+			if(!searchTypeToggleButton.IsChecked.HasValue || !searchTypeToggleButton.IsChecked.Value) {
+				Keyboard.Focus(searchTextBox);
+			} else {
+				Keyboard.Focus(gestureTextBox.shortcutTextBox);
+			}
+		}
+		
+		/// <summary>
+		/// Occurs when shortcut is modified
+		/// </summary>
+		public event EventHandler ShortcutModified;
+		
+		/// <summary>
+		/// Executed when user presses a key inside search box
+		/// </summary>
+		/// <param name="sender">Sender object </param>
+		/// <param name="e">Event arguments</param>
+		private void searchTextBox_PreviewKeyDown(object sender, KeyEventArgs e)
+		{
+			var keyboardDevice = (KeyboardDevice)e.Device;
+			
+			// If Up/Down is pressed switch focus to shortcuts tree
+			if (keyboardDevice.Modifiers == ModifierKeys.None && Array.IndexOf(new[] { Key.Up, Key.Down }, e.Key) >= 0) {
+				SelectFirstVisibleShortcut(true);
+				return;
+			}
+		
+			// If enter is pressed open shortcut configuration
+			if (keyboardDevice.Modifiers == ModifierKeys.None && e.Key == Key.Enter && shortcutsTreeView.SelectedItem is Shortcut) {
+				e.Handled = true;
+				if(ShortcutModified != null) {
+					ShortcutModified.Invoke(sender, null);
+				}
+				
+				return;
+			}
+		}
+		
+		/// <summary>
+		/// Raised if gestures entered in gesture text box change
+		/// </summary>
+		/// <param name="sender">Senrer object</param>
+		/// <param name="e">Event arguments</param>
+		private void gestureTextBox_GestureChanged(object sender, EventArgs e)
+		{
+			// Exit if filtering by text (Handled in searchTextBox_TextChanged)
+			if (searchTypeToggleButton.IsChecked.HasValue && !searchTypeToggleButton.IsChecked.Value) {
+				return;
+			}
+			
+			if (gestureTextBox.Gesture != null) {
+				new ShortcutsFinder(RootEntries).FilterGesture(gestureTextBox.Gesture, GestureCompareMode.PartlyMatches);
+				SelectFirstVisibleShortcut(false);
+			} else {
+				new ShortcutsFinder(RootEntries).Filter("");
+			}
+		}
+		
+		/// <summary>
+		/// Executed when user double click on shortcut tree item
+		/// </summary>
+		/// <param name="sender">Sender object</param>
+		/// <param name="e">Event arguments</param>
+		private void shortcutEntry_MouseDown(object sender, MouseButtonEventArgs e)
+		{
+			if (e.ChangedButton == MouseButton.Left && e.ClickCount == 2) {
+				if (shortcutsTreeView.SelectedItem is Shortcut) {
+					if(ShortcutModified != null) {
+					    ShortcutModified.Invoke(sender, null);
+					}
+				}
+			}
+		}
+	}
+		
+	public delegate void RemoveShortcutRoutedHandler(object sender, RoutedRemoveShortcutEventArgs args);
+	
+	/// <summary>
+	/// Contains state information and event data associated with <see cref="RemoveShortcutRoutedHandler"/>
+	/// </summary>
+	public class RoutedRemoveShortcutEventArgs : RoutedEventArgs
+	{
+		/// <summary>
+		/// Reference to shortcut being removed
+		/// </summary>
+		public Shortcut RemovedShortcut
+		{
+			get; 
+			private set;
+		}
+		
+		/// <summary>
+		/// Creates new isntance of <see cref="RoutedRemoveShortcutEventArgs" />
+		/// </summary>
+		/// <param name="routedEvent">Associated routed event</param>
+		/// <param name="source">Source which will be reported when event is handled</param>
+		/// <param name="removedShortcut">Shortcut being removed</param>
+		public RoutedRemoveShortcutEventArgs(RoutedEvent routedEvent, object source, Shortcut removedShortcut)
+			: base(routedEvent, source)
+		{
+			RemovedShortcut = removedShortcut;
+		}
+	}
+}
diff --git a/src/AddIns/Misc/ShortcutsManagement/Src/Extensions/TextBlockBehavior.cs b/src/AddIns/Misc/ShortcutsManagement/Src/Extensions/TextBlockBehavior.cs
new file mode 100644
index 0000000000..59285d9fd9
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Src/Extensions/TextBlockBehavior.cs
@@ -0,0 +1,90 @@
+using System.Text.RegularExpressions;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Media;
+
+namespace ICSharpCode.ShortcutsManagement.Extensions
+{
+	/// <summary>
+	/// Contains <see cref="TextBlock"/> attached properties
+	/// </summary>
+	public static class TextBlockBehavior
+	{
+		/// <summary>
+		/// Gets "TextBlockBehavior.SearchedText" attached property value
+		/// </summary>
+		/// <param name="textBlock">Attached property host</param>
+		/// <returns>Attached property value</returns>
+		public static string GetSearchedText(TextBlock textBlock)
+		{
+			return (string)textBlock.GetValue(SearchedTextProperty);
+		}
+		
+		/// <summary>
+		/// Set "TextBlockBehavior.SearchedText" attached property value
+		/// </summary>
+		/// <param name="textBlock">Attached property host</param>
+		/// <param name="value">New attached property value</param>
+		public static void SetSearchedText(TextBlock textBlock, string value)
+		{
+			textBlock.SetValue(SearchedTextProperty, value);
+		}
+		
+		/// <summary>
+		/// Identifies SearchedText dependency property
+		/// </summary>
+		public static readonly DependencyProperty SearchedTextProperty =
+			DependencyProperty.RegisterAttached(
+			"SearchedText",
+			typeof(string),
+			typeof(TextBlockBehavior),
+			new UIPropertyMetadata(null, OnSearchedTextChanged));
+		
+		/// <summary>
+		/// On SearchedText changed highlight text in TextBlock which matches 
+		/// attached property value
+		/// </summary>
+		/// <param name="depObj"></param>
+		/// <param name="e"></param>
+		private static void OnSearchedTextChanged(DependencyObject depObj, DependencyPropertyChangedEventArgs e)
+		{
+			var textBlock = (TextBlock) depObj;
+			var textBlockText = textBlock.Text;
+			
+			// Remove all text from text block
+			textBlock.Inlines.Clear();
+			
+			// Split text contained in text block to three parts: before the match, the match and after the match
+			var matches = Regex.Matches(textBlockText, @"(.*)(" + Regex.Escape((string)e.NewValue) + @")(.*)", RegexOptions.IgnoreCase);
+			if (matches.Count > 0) {
+				foreach (Match match in matches) {
+					// Add what is found before match back to the block without modifications
+					var matchedTextPrefix = match.Groups[1].Value;
+					if (!string.IsNullOrEmpty(matchedTextPrefix)) {
+						textBlock.Inlines.Add(new Run(matchedTextPrefix));
+					}
+					
+					// Higlight the match and add back to textblock
+					var matchedText = match.Groups[2].Value;
+					if (!string.IsNullOrEmpty(matchedText)) {
+						var matchedRun = new Run(matchedText);
+						
+						matchedRun.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#CEDEF7"));
+						matchedRun.Foreground = new SolidColorBrush((Color) ColorConverter.ConvertFromString("#000000"));
+						textBlock.Inlines.Add(matchedRun);
+					}
+					
+					// Add what is found after match back to the block without modifications
+					var matchedTextSuffix = match.Groups[3].Value;
+					if (!string.IsNullOrEmpty(matchedTextSuffix)) {
+						textBlock.Inlines.Add(new Run(matchedTextSuffix));
+					}
+				}
+			} else {
+				// If filter string is not found put the original text back without modifications
+				textBlock.Inlines.Add(new Run(textBlockText));
+			}
+		}
+	}
+}
diff --git a/src/AddIns/Misc/ShortcutsManagement/Src/Extensions/TreeViewExtensions.cs b/src/AddIns/Misc/ShortcutsManagement/Src/Extensions/TreeViewExtensions.cs
new file mode 100644
index 0000000000..9a73df2e3b
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Src/Extensions/TreeViewExtensions.cs
@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Input;
+
+namespace ICSharpCode.ShortcutsManagement.Extensions
+{
+	/// <summary>
+	/// <see cref="TreeView"/> extention methods
+	/// </summary>
+	public static class TreeViewExtensions
+	{
+		/// <summary>
+		/// Expand TreeView items according to provided path and select element 
+		/// on the lowest level 
+		/// </summary>
+		/// <param name="parentContainer">TreeView instance</param>
+		/// <param name="path">Path to the selected item</param>
+		/// <param name="setFocus"></param>
+		public static void SelectItem(this ItemsControl parentContainer, List<object> path, bool setFocus)
+		{
+			if(path == null || path.Count == 0) {
+				return;
+			}
+			
+			var head = path.First();
+			var tail = path.GetRange(1, path.Count - 1);
+			
+			// Get TreeViewItem which wraps first element from path
+			var itemContainer = parentContainer.ItemContainerGenerator.ContainerFromItem(head) as TreeViewItem;
+			
+			if (itemContainer != null && itemContainer.Items.Count == 0) {
+				// If item container doesn't have any sub-elements select it
+				itemContainer.IsSelected = true;
+				
+				if(setFocus) {
+					Keyboard.Focus(itemContainer);
+				}
+				
+				var selectMethod = typeof(TreeViewItem).GetMethod("Select", BindingFlags.NonPublic | BindingFlags.Instance);
+				selectMethod.Invoke(itemContainer, new object[] { true });
+			} else if (itemContainer != null) { 
+				// If item container have sub-elements expand it and select item from this container
+				itemContainer.IsExpanded = true;
+				
+				if (itemContainer.ItemContainerGenerator.Status != GeneratorStatus.ContainersGenerated) {
+					// If item container is not generated yet register a delegate which would be called when container is generated
+					itemContainer.ItemContainerGenerator.StatusChanged += delegate {
+						SelectItem(itemContainer, tail, setFocus);
+					};
+				} else {
+					// If item container already generated select sub-element from this container
+					SelectItem(itemContainer, tail, setFocus);
+				}
+			}
+		}
+		
+		/// <summary>
+		/// Expand/Collapse all tree view items
+		/// </summary>
+		/// <param name="parentContainer">TreeView or TreeViewItem</param>
+		/// <param name="value">True - expand, False - collapse</param>
+		public static void SetExpandAll(this ItemsControl parentContainer, bool value)
+		{
+			foreach (Object item in parentContainer.Items) {
+				var currentContainer = parentContainer.ItemContainerGenerator.ContainerFromItem(item) as TreeViewItem;
+				if (currentContainer != null && currentContainer.Items.Count > 0) {
+					currentContainer.IsExpanded = value;
+					if (currentContainer.ItemContainerGenerator.Status != GeneratorStatus.ContainersGenerated) {
+						currentContainer.ItemContainerGenerator.StatusChanged += delegate { SetExpandAll(currentContainer, value); };
+					} else {
+						SetExpandAll(currentContainer, value);
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/src/AddIns/Misc/ShortcutsManagement/Themes/Generic.xaml b/src/AddIns/Misc/ShortcutsManagement/Themes/Generic.xaml
new file mode 100644
index 0000000000..8e69621a35
--- /dev/null
+++ b/src/AddIns/Misc/ShortcutsManagement/Themes/Generic.xaml
@@ -0,0 +1,5 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+</ResourceDictionary>
diff --git a/src/AddIns/Misc/StartPage/Project/Src/StartPageControl.xaml b/src/AddIns/Misc/StartPage/Project/Src/StartPageControl.xaml
index 54c7c75f0f..bf0e946a5e 100644
--- a/src/AddIns/Misc/StartPage/Project/Src/StartPageControl.xaml
+++ b/src/AddIns/Misc/StartPage/Project/Src/StartPageControl.xaml
@@ -32,6 +32,7 @@
 					Source="../Resources/balken_mitte.gif" />
 			</DockPanel>
 			<ItemsControl
+				Focusable="False"
 				Name="startPageItems"
 				Grid.Row="1">
 				<ItemsControl.ItemsPanel>
diff --git a/src/AddIns/Misc/UnitTesting/UnitTesting.addin b/src/AddIns/Misc/UnitTesting/UnitTesting.addin
index 9596e8d66f..a602b7f554 100644
--- a/src/AddIns/Misc/UnitTesting/UnitTesting.addin
+++ b/src/AddIns/Misc/UnitTesting/UnitTesting.addin
@@ -21,7 +21,7 @@
 		     category = "Tools"
 		     title    = "${res:ICSharpCode.NUnitPad.NUnitPadContent.PadName}"
 		     icon     = "PadIcons.NUnitTest"
-		     shortcut = "Control|Alt|T"
+		     shortcut = "Ctrl+Alt+T"
 		     class    = "ICSharpCode.UnitTesting.UnitTestsPad"
 		     defaultPosition = "Right, Hidden" />
 	</Path>
diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
index aec649fbfa..f60b1959bd 100644
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
@@ -26,6 +26,7 @@
     <WarningLevel>4</WarningLevel>
     <OutputPath>..\..\..\..\bin\</OutputPath>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <SourceAnalysisOverrideSettingsFile>C:\Documents and Settings\Administrator\Application Data\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <DebugType>Full</DebugType>
diff --git a/src/Main/Base/Project/Src/Commands/AutostartCommands.cs b/src/Main/Base/Project/Src/Commands/AutostartCommands.cs
index d0f60b34a7..8d71620fc0 100644
--- a/src/Main/Base/Project/Src/Commands/AutostartCommands.cs
+++ b/src/Main/Base/Project/Src/Commands/AutostartCommands.cs
@@ -125,14 +125,15 @@ namespace ICSharpCode.SharpDevelop.Commands
 			//WorkbenchSingleton.MainForm.Focus(); // windows.forms focus workaround
 			
 			ParserService.StartParserThread();
-			
+						
 			// finally run the workbench window ...
 			//Application.AddMessageFilter(new FormKeyHandler());
 			//Application.Run(WorkbenchSingleton.MainForm);
+			
 			App application = new App();
 			System.Windows.Forms.Integration.WindowsFormsHost.EnableWindowsFormsInterop();
 			application.Run(WorkbenchSingleton.MainWindow);
-			
+
 			// save the workbench memento in the ide properties
 			try {
 				PropertyService.Set(workbenchMemento, WorkbenchSingleton.Workbench.CreateMemento());
diff --git a/src/Main/Base/Project/Src/Commands/MenuItemBuilders.cs b/src/Main/Base/Project/Src/Commands/MenuItemBuilders.cs
index 2668e842f2..d4dea0404c 100644
--- a/src/Main/Base/Project/Src/Commands/MenuItemBuilders.cs
+++ b/src/Main/Base/Project/Src/Commands/MenuItemBuilders.cs
@@ -6,11 +6,13 @@
 // </file>
 
 using System;
+using System.Linq;
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading;
 using System.Windows;
+using System.Windows.Input;
 using System.Windows.Controls;
 
 using ICSharpCode.Core;
@@ -198,16 +200,58 @@ namespace ICSharpCode.SharpDevelop.Commands
 	
 	public class ToolMenuBuilder : IMenuItemBuilder
 	{
+		private static InputBindingCategory externalToolsCategory;
+		
+		static ToolMenuBuilder()
+		{
+			var categoryName = StringParser.Parse("External tools");
+			externalToolsCategory = new InputBindingCategory("/MainMenu/Tools/ExternalTools", categoryName);
+			ICSharpCode.Core.Presentation.SDCommandManager.RegisterInputBindingCategory(externalToolsCategory);
+		}
+		
+		private bool bindingsAssigned = false;
+		
 		public ICollection BuildItems(Codon codon, object owner)
 		{
 			var items = new System.Windows.Controls.MenuItem[ToolLoader.Tool.Count];
 			for (int i = 0; i < ToolLoader.Tool.Count; ++i) {
 				ExternalTool tool = ToolLoader.Tool[i];
-				items[i] = new System.Windows.Controls.MenuItem {
-					Header = tool.ToString()
-				};
-				items[i].Click += delegate { RunTool(tool); };
+				items[i] = new System.Windows.Controls.MenuItem();
+				
+				var routedCommandName = "SDToolsCommands.RunExternalTool_" + tool.ToString();
+				var routedCommandText = MenuService.ConvertLabel(StringParser.Parse(tool.ToString()));
+				
+				if(!bindingsAssigned) {
+					var addIn = AddInTree.AddIns.FirstOrDefault(a => a.Name == "SharpDevelop");
+					
+					// Dynamicaly create routed UI command to loaded pad and bindings for it
+					SDCommandManager.RegisterRoutedUICommand(routedCommandName, routedCommandText);
+					
+					var commandBindingInfo = new CommandBindingInfo();
+					commandBindingInfo.OwnerTypeName = SDCommandManager.DefaultOwnerTypeName;
+					commandBindingInfo.RoutedCommandName = routedCommandName;
+					commandBindingInfo.CanExecuteEventHandler = delegate(object sender, CanExecuteRoutedEventArgs e) { e.CanExecute = true; };
+					commandBindingInfo.ExecutedEventHandler = delegate { RunTool(tool); };
+					SDCommandManager.RegisterCommandBindingInfo(commandBindingInfo);
+					
+					var inputBindingInfo = new InputBindingInfo();
+					inputBindingInfo.OwnerTypeName = SDCommandManager.DefaultOwnerTypeName;
+					inputBindingInfo.RoutedCommandName = routedCommandName;
+					inputBindingInfo.Categories.Add(externalToolsCategory);
+					SDCommandManager.RegisterInputBindingInfo(inputBindingInfo);
+				}		
+				
+				var gesturesTemplate = BindingInfoTemplate.Create(null, SDCommandManager.DefaultOwnerTypeName, routedCommandName);
+				var updatedGestures = SDCommandManager.FindInputGestures(gesturesTemplate, null);
+				var updatedGesturesText = (string)new InputGestureCollectionConverter().ConvertToInvariantString(updatedGestures);
+				
+				items[i].InputGestureText = updatedGesturesText;					
+				items[i].Command = SDCommandManager.GetRoutedUICommand(routedCommandName);
+				items[i].Header = StringParser.Parse(tool.ToString());
 			}
+								
+			bindingsAssigned = true;
+			
 			return items;
 		}
 		
@@ -455,6 +499,8 @@ namespace ICSharpCode.SharpDevelop.Commands
 			get;
 		}
 		
+		public List<string> bindingsAssigned = new List<string>();
+		
 		public ICollection BuildItems(Codon codon, object owner)
 		{
 			ArrayList list = new ArrayList();
@@ -465,14 +511,52 @@ namespace ICSharpCode.SharpDevelop.Commands
 					if (!string.IsNullOrEmpty(padContent.Icon)) {
 						item.Icon = PresentationResourceService.GetImage(padContent.Icon);
 					}
-					item.Command = new BringPadToFrontCommand(padContent);
-					if (!string.IsNullOrEmpty(padContent.Shortcut)) {
-						var kg = Core.Presentation.MenuService.ParseShortcut(padContent.Shortcut);
-						WorkbenchSingleton.MainWindow.InputBindings.Add(
-							new System.Windows.Input.InputBinding(item.Command, kg)
-						);
-						item.InputGestureText = kg.GetDisplayStringForCulture(Thread.CurrentThread.CurrentUICulture);
-					}
+					
+					var routedCommandName = "SDViewCommands.ShowView_" + padContent.Class;
+					var routedCommandText = MenuService.ConvertLabel(StringParser.Parse(padContent.Title));
+					
+					// TODO: fix this hack
+					if(!bindingsAssigned.Contains(routedCommandName)) {
+						var addIn = AddInTree.AddIns.FirstOrDefault(a => a.Name == "SharpDevelop");
+						
+						// Dynamicaly create routed UI command to loaded pad and bindings for it
+						SDCommandManager.RegisterRoutedUICommand(routedCommandName, routedCommandText);
+						SDCommandManager.LoadCommand(routedCommandName, new BringPadToFrontCommand(padContent));
+						
+						var commandBindingInfo = new CommandBindingInfo();
+						commandBindingInfo.CommandTypeName = routedCommandName;
+						commandBindingInfo.OwnerTypeName = SDCommandManager.DefaultOwnerTypeName;
+						commandBindingInfo.RoutedCommandName = routedCommandName;
+						commandBindingInfo.AddIn = addIn;
+						SDCommandManager.RegisterCommandBindingInfo(commandBindingInfo);
+						
+						var gestures = InputGestureCollectionConverter.Parse(padContent.Shortcut, padContent.Class);
+						
+						var inputBindingInfo = new InputBindingInfo();
+						inputBindingInfo.OwnerTypeName = SDCommandManager.DefaultOwnerTypeName;
+						inputBindingInfo.RoutedCommandName = routedCommandName;
+						inputBindingInfo.DefaultGestures.AddRange(gestures);
+						
+						var categoryPath = "/MainMenu/View" + (Category == padContent.Category && padContent.Category != "Main" ? "/" + padContent.Category : "");
+						var category = ICSharpCode.Core.Presentation.SDCommandManager.GetInputBindingCategory(categoryPath, false);
+						if(category == null) {
+							category = new InputBindingCategory(categoryPath, padContent.Category);
+							ICSharpCode.Core.Presentation.SDCommandManager.RegisterInputBindingCategory(category);
+						}
+						
+						inputBindingInfo.Categories.Add(category);
+						inputBindingInfo.AddIn = addIn;
+						SDCommandManager.RegisterInputBindingInfo(inputBindingInfo);
+						
+						bindingsAssigned.Add(routedCommandName);
+					}		
+					
+					item.Command = SDCommandManager.GetRoutedUICommand(routedCommandName);
+					
+					var gesturesTemplate = BindingInfoTemplate.Create(null, SDCommandManager.DefaultOwnerTypeName, routedCommandName);
+					var updatedGestures = SDCommandManager.FindInputGestures(gesturesTemplate, null);
+					var updatedGesturesText = (string)new InputGestureCollectionConverter().ConvertToInvariantString(updatedGestures);
+					item.InputGestureText = updatedGesturesText;
 					
 					list.Add(item);
 				}
diff --git a/src/Main/Base/Project/Src/Commands/ToolsCommands.cs b/src/Main/Base/Project/Src/Commands/ToolsCommands.cs
index 885f5acb76..9088188613 100644
--- a/src/Main/Base/Project/Src/Commands/ToolsCommands.cs
+++ b/src/Main/Base/Project/Src/Commands/ToolsCommands.cs
@@ -8,10 +8,33 @@
 using System;
 using System.Windows.Forms;
 using ICSharpCode.Core;
+using ICSharpCode.Core.Presentation;
 using ICSharpCode.SharpDevelop.Gui;
+using System.Windows.Input;
 
 namespace ICSharpCode.SharpDevelop.Commands
 {
+	public class TestCommand : System.Windows.Input.ICommand
+	{
+		public event EventHandler CanExecuteChanged
+		{ 
+			add {} 
+			remove {}
+		}
+		
+		public void Execute(object parameter)
+		{
+			SDCommandManager.GetRoutedUICommand("SDBuildCommands.BuildSolution").Execute(parameter, WorkbenchSingleton.MainWindow);
+			
+			System.Windows.MessageBox.Show("test");
+		}
+		
+		public bool CanExecute(object parameter)
+		{
+			return true;
+		}
+	}
+	
 	public class OptionsCommand : AbstractMenuCommand
 	{
 		public static bool? ShowTabbedOptions(string dialogTitle, AddInTreeNode node)
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/TreeViewOptionsDialog.xaml b/src/Main/Base/Project/Src/Gui/Dialogs/TreeViewOptionsDialog.xaml
index d96c8c8dc8..907f20344f 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/TreeViewOptionsDialog.xaml
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/TreeViewOptionsDialog.xaml
@@ -38,31 +38,31 @@
 				</TreeView.ItemTemplate>
 			</TreeView>
 			<GridSplitter Width="2" />
-			<ScrollViewer Name="optionPanelScrollViewer"
-			              Grid.Column="1"
-			              HorizontalScrollBarVisibility="Disabled"
-			              VerticalScrollBarVisibility="Auto">
-				<DockPanel>
-					<TextBlock
-						DockPanel.Dock="Top"
-						Name="optionPanelTitle"
-						FontFamily="Tahoma" FontSize="14pt" FontWeight="Bold"
-						Padding="8"
-					>
-						<TextBlock.Background>
-							<LinearGradientBrush StartPoint="0, 0" EndPoint="0, 1">
-								<LinearGradientBrush.GradientStops>
-									<GradientStop Offset="0.0"
-									              Color="{DynamicResource {x:Static SystemColors.WindowColorKey}}" />
-									<GradientStop Offset="1.0"
-									              Color="{DynamicResource {x:Static SystemColors.ControlColorKey}}" />
-								</LinearGradientBrush.GradientStops>
-							</LinearGradientBrush>
-						</TextBlock.Background>
-					</TextBlock>
+			<DockPanel Grid.Column="1">
+				<TextBlock
+					DockPanel.Dock="Top"
+					Name="optionPanelTitle"
+					FontFamily="Tahoma" FontSize="14pt" FontWeight="Bold"
+					Padding="8"
+				>
+					<TextBlock.Background>
+						<LinearGradientBrush StartPoint="0, 0" EndPoint="0, 1">
+							<LinearGradientBrush.GradientStops>
+								<GradientStop Offset="0.0"
+								              Color="{DynamicResource {x:Static SystemColors.WindowColorKey}}" />
+								<GradientStop Offset="1.0"
+								              Color="{DynamicResource {x:Static SystemColors.ControlColorKey}}" />
+							</LinearGradientBrush.GradientStops>
+						</LinearGradientBrush>
+					</TextBlock.Background>
+				</TextBlock>
+				<ScrollViewer Name="optionPanelScrollViewer"
+				              HorizontalScrollBarVisibility="Disabled"
+				              VerticalScrollBarVisibility="Auto">
+					
 					<ContentPresenter Name="optionPanelContent" />
-				</DockPanel>
-			</ScrollViewer>
+				</ScrollViewer>
+			</DockPanel>
 		</Grid>
 		<Button
 			Content="{core:Localize Global.OKButtonText}"
diff --git a/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonPadContent.cs b/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonPadContent.cs
index 859e895920..b158bab43b 100644
--- a/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonPadContent.cs
+++ b/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonPadContent.cs
@@ -84,6 +84,9 @@ namespace ICSharpCode.SharpDevelop.Gui
 				if (padInstance != null) {
 					this.SetContent(padInstance.Control, padInstance);
 					placeholder = null;
+					
+					var contextName = padInstance.GetType().FullName;
+					SDCommandManager.RegisterNamedUIElement(contextName, (UIElement)Content);
 				}
 			}
 		}
diff --git a/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonWorkbenchWindow.cs b/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonWorkbenchWindow.cs
index 06be17afa9..4f314c74ca 100644
--- a/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonWorkbenchWindow.cs
+++ b/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonWorkbenchWindow.cs
@@ -118,6 +118,11 @@ namespace ICSharpCode.SharpDevelop.Gui
 			}
 			oldActiveViewContent = newActiveViewContent;
 			CommandManager.InvalidateRequerySuggested();
+			
+			if (newActiveViewContent != null) {
+				string ownerName = SDCommandManager.GetShortAssemblyQualifiedName(newActiveViewContent.GetType());
+				SDCommandManager.RegisterNamedUIElement(ownerName, (UIElement)Content);
+			}
 		}
 		
 		sealed class ViewContentCollection : Collection<IViewContent>
@@ -294,7 +299,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		void OnIsDirtyChanged(object sender, EventArgs e)
 		{
 			UpdateTitle();
-			CommandManager.InvalidateRequerySuggested();
+			System.Windows.Input.CommandManager.InvalidateRequerySuggested();
 		}
 		
 		void UpdateTitle()
@@ -399,7 +404,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		{
 			base.OnClosed();
 			Dispose();
-			CommandManager.InvalidateRequerySuggested();
+			System.Windows.Input.CommandManager.InvalidateRequerySuggested();
 		}
 		
 		void RefreshTabPageTexts()
diff --git a/src/Main/Base/Project/Src/Gui/Workbench/WpfWorkbench.cs b/src/Main/Base/Project/Src/Gui/Workbench/WpfWorkbench.cs
index e0a2f31896..85577376b8 100644
--- a/src/Main/Base/Project/Src/Gui/Workbench/WpfWorkbench.cs
+++ b/src/Main/Base/Project/Src/Gui/Workbench/WpfWorkbench.cs
@@ -76,7 +76,25 @@ namespace ICSharpCode.SharpDevelop.Gui
 		}
 		
 		public void Initialize()
-		{
+		{	
+			// Use shortened assembly qualified name to not lose user defined gestures
+			// when sharp develop is updated
+			SDCommandManager.DefaultOwnerTypeName =  SDCommandManager.GetShortAssemblyQualifiedName(GetType());
+			SDCommandManager.RegisterNamedUIType(SDCommandManager.DefaultOwnerTypeName, GetType());
+			
+			CommandsService.RegisterBuiltInRoutedUICommands();
+			CommandsService.RegisterRoutedCommands(typeof(ICSharpCode.AvalonEdit.AvalonEditCommands));
+			
+			// Load all commands and and key bindings from addin tree
+			CommandsService.RegisterInputBindingCategories(this, "/SharpDevelop/CommandManager/InputBindingCategories");
+			CommandsService.RegisterRoutedUICommands(this, "/SharpDevelop/CommandManager/RoutedUICommands");
+			CommandsService.RegisterMenuBindings(this, "/SharpDevelop/CommandManager/MenuLocations");
+			CommandsService.RegisterCommandBindings(this, "/SharpDevelop/CommandManager/CommandBindings");
+			CommandsService.RegisterInputBindings(this, "/SharpDevelop/CommandManager/InputBindings");
+				
+			// Register context and load all commands from addin
+			SDCommandManager.LoadAddinCommands(AddInTree.AddIns.FirstOrDefault(a => a.Name == "SharpDevelop"));
+
 			foreach (PadDescriptor content in AddInTree.BuildItems<PadDescriptor>(viewContentPath, this, false)) {
 				if (content != null) {
 					ShowPad(content);
@@ -106,7 +124,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			FileService.FileRenamed += FileService.RecentOpen.FileRenamed;
 			
 			requerySuggestedEventHandler = new EventHandler(CommandManager_RequerySuggested);
-			CommandManager.RequerySuggested += requerySuggestedEventHandler;
+			System.Windows.Input.CommandManager.RequerySuggested += requerySuggestedEventHandler;
 			ResourceService.LanguageChanged += OnLanguageChanged;
 			
 			StatusBarService.SetMessage("${res:MainWindow.StatusBar.ReadyMessage}");
diff --git a/src/Main/Base/Project/Src/Internal/Doozers/PadDoozer.cs b/src/Main/Base/Project/Src/Internal/Doozers/PadDoozer.cs
index 28bdb80af3..1b864a2509 100644
--- a/src/Main/Base/Project/Src/Internal/Doozers/PadDoozer.cs
+++ b/src/Main/Base/Project/Src/Internal/Doozers/PadDoozer.cs
@@ -34,7 +34,7 @@ namespace ICSharpCode.SharpDevelop
 	/// "View -&gt; Debugger" menu.
 	/// </attribute>
 	/// <attribute name="shortcut" use="optional">
-	/// Shortcut that activates the 'Show pad' command (e.g. "Control|Alt|T").
+	/// Shortcut that activates the 'Show pad' command (e.g. "Ctrl+Alt+T").
 	/// </attribute>
 	/// <usage>Only in /Workspace/Parser</usage>
 	/// <returns>
diff --git a/src/Main/Base/Project/Src/TextEditor/Codons/EditActionDoozer.cs b/src/Main/Base/Project/Src/TextEditor/Codons/EditActionDoozer.cs
index 380c2c271b..3356629000 100644
--- a/src/Main/Base/Project/Src/TextEditor/Codons/EditActionDoozer.cs
+++ b/src/Main/Base/Project/Src/TextEditor/Codons/EditActionDoozer.cs
@@ -9,6 +9,7 @@ using System;
 using System.Collections;
 using System.Reflection;
 using System.Windows.Forms;
+using ICSharpCode.Core.WinForms;
 
 using ICSharpCode.Core;
 using ICSharpCode.TextEditor.Actions;
@@ -19,8 +20,8 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Codons
 	/// Creates IEditAction objects for the text editor.
 	/// </summary>
 	/// <attribute name="keys" use="required">
-	/// Comma-separated list of keyboard shortcuts that activate the edit action.
-	/// E.g. "Control|C,Control|Insert"
+	/// semicolon-separated list of keyboard shortcuts that activate the edit action.
+	/// E.g. "Ctrl+C;Ctrl+Insert"
 	/// </attribute>
 	/// <attribute name="class" use="required">
 	/// Name of the IEditAction class.
@@ -44,17 +45,8 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Codons
 		public object BuildItem(object caller, Codon codon, ArrayList subItems)
 		{
 			IEditAction editAction = (IEditAction)codon.AddIn.CreateObject(codon.Properties["class"]);
-			string[] keys = codon.Properties["keys"].Split(',');
-			
-			Keys[] actionKeys = new Keys[keys.Length];
-			for (int j = 0; j < keys.Length; ++j) {
-				string[] keydescr = keys[j].Split('|');
-				Keys key = (Keys)((System.Windows.Forms.Keys.Space.GetType()).InvokeMember(keydescr[0], BindingFlags.GetField, null, System.Windows.Forms.Keys.Space, new object[0]));
-				for (int k = 1; k < keydescr.Length; ++k) {
-					key |= (Keys)((System.Windows.Forms.Keys.Space.GetType()).InvokeMember(keydescr[k], BindingFlags.GetField, null, System.Windows.Forms.Keys.Space, new object[0]));
-				}
-				actionKeys[j] = key;
-			}
+
+			var actionKeys = (Keys[])new KeysCollectionConverter().ConvertFrom(codon.Properties["keys"]);
 			editAction.Keys = actionKeys;
 			
 			return editAction;
diff --git a/src/Main/Core/Project/ICSharpCode.Core.csproj b/src/Main/Core/Project/ICSharpCode.Core.csproj
index a856555368..e338e6ec4a 100644
--- a/src/Main/Core/Project/ICSharpCode.Core.csproj
+++ b/src/Main/Core/Project/ICSharpCode.Core.csproj
@@ -60,6 +60,16 @@
     <Compile Include="Src\AddInTree\AddIn\Codon.cs" />
     <Compile Include="Src\AddInTree\AddIn\ComplexCondition.cs" />
     <Compile Include="Src\AddInTree\AddIn\Condition.cs" />
+    <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\Command\CommandBindingInfoDescriptor.cs" />
+    <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\Command\CommandBindingInfoDoozer.cs" />
+    <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\Command\InputBindingCategoryDescriptor.cs" />
+    <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\Command\InputBindingInfoDescriptor.cs" />
+    <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\Command\InputBindingInfoDoozer.cs" />
+    <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\Command\InputBindingCategoryDoozer.cs" />
+    <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\Command\RoutedUICommandDescriptor.cs" />
+    <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\Command\RoutedUICommandDoozer.cs" />
+    <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\MenuItem\MenuLocationDescriptor.cs" />
+    <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\MenuItem\MenuLocationDoozer.cs" />
     <Compile Include="Src\AddInTree\AddIn\ExtensionPath.cs" />
     <Compile Include="Src\AddInTree\AddIn\IConditionEvaluator.cs" />
     <Compile Include="Src\AddInTree\AddIn\ICondition.cs" />
@@ -110,6 +120,7 @@
     <Compile Include="Src\Util\AbstractCommand.cs" />
     <Compile Include="Src\Util\CallbackOnDispose.cs" />
     <Compile Include="Src\Util\DebugTextWriter.cs" />
+    <Compile Include="Src\Util\ExtensionMethods.cs" />
     <Compile Include="Src\Util\ICommand.cs" />
     <Compile Include="Src\AddInTree\AddIn\IBuildItemsModifier.cs" />
     <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\IncludeDoozer.cs" />
@@ -126,6 +137,7 @@
     <Compile Include="Src\AddInTree\AddIn\DefaultDoozers\ToolBarItem\ITextBoxCommand.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Folder Include="Src\AddInTree\AddIn\DefaultDoozers\Command" />
     <Folder Include="Src\Services\LoggingService" />
     <Folder Include="Src\Services\AnalyticsMonitor" />
     <Folder Include="Src\Services\ResourceService" />
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/AddIn.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/AddIn.cs
index 13d945b49a..e238b587cb 100644
--- a/src/Main/Core/Project/Src/AddInTree/AddIn/AddIn.cs
+++ b/src/Main/Core/Project/Src/AddInTree/AddIn/AddIn.cs
@@ -63,6 +63,13 @@ namespace ICSharpCode.Core
 		}
 		
 		bool dependenciesLoaded;
+
+		/// <summary>
+		/// Specifies whether all add-in dependencies and referenced assemblies are loaded
+		/// </summary>
+		public bool DependenciesLoaded {
+			get { return dependenciesLoaded; }
+		}
 		
 		void LoadDependencies()
 		{
@@ -245,6 +252,7 @@ namespace ICSharpCode.Core
 								throw new AddInLoadException("Import node requires ONE attribute.");
 							}
 							string pathName = reader.GetAttribute(0);
+							
 							ExtensionPath extensionPath = addIn.GetExtensionPath(pathName);
 							if (!reader.IsEmptyElement) {
 								ExtensionPath.SetUp(extensionPath, reader, "Path");
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/Command/CommandBindingInfoDescriptor.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/Command/CommandBindingInfoDescriptor.cs
new file mode 100644
index 0000000000..a6e3ea4e10
--- /dev/null
+++ b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/Command/CommandBindingInfoDescriptor.cs
@@ -0,0 +1,110 @@
+using System;
+
+namespace ICSharpCode.Core
+{
+	/// <summary>
+	/// Describes <see cref="ICSharpCode.Core.Presentation.CommandBindingInfo" /> 
+	/// </summary>
+	public class CommandBindingInfoDescriptor
+	{		
+		/// <summary>
+		/// Gets codon used to create this descriptor
+		/// </summary>
+		public Codon Codon {
+			get; private set;
+		}
+		
+		/// <summary>
+		/// Gets full name of the command class (should implement ICSharpCode.Core.ICommand or System.Window.Input.ICommand) containing user instructions associated with
+		/// <see cref="System.Windows.Input.CommandBinding" />
+		/// </summary>
+		public string Class {
+			get; private set;
+		}
+		
+		/// <summary>
+		/// Gets name of <see cref="System.Window.Input.RoutedUICommand" /> associated with descriptor
+		/// A name should be associated to a command in code using <see cref="ICSharpCode.Core.Presentation.CommandManager" />
+		/// </summary>
+		public string Command {
+			get; private set;
+		}
+		
+		/// <summary>
+		/// Gets overriden routed command text (string visible to user)
+		/// 
+		/// If not provided <see cref="System.Window.Input.RoutedUICommand.Text" /> property value is used
+		/// </summary>
+		public string CommandText {
+			get; private set;
+		}
+		
+		/// <summary>
+		/// Gets name of binding owner type name. 
+		/// 
+		/// A name can be assigned to type in code using <see cref="ICSharpCode.Core.Presentation.CommandManager" />.
+		/// If this property is set then <see cref="OwnerTypeName" /> property can be ignored
+		/// If neither owner type nor owner instance is specified default owner type is applied
+		/// </summary>
+		public string OwnerInstanceName {
+			get; private set;
+		}
+		
+		/// <summary>
+		/// Name of binding owner instance name. 
+		/// 
+		/// A name can be assigned to instance in code using <see cref="ICSharpCode.Core.Presentation.CommandManager" />.
+		/// If this property is set then <see cref="OwnerInstanceName" /> property can be ignored
+		/// If neither owner type nor owner instance is specified default owner type is applied
+		/// </summary>
+		public string OwnerTypeName {
+			get; private set;
+		}
+		
+		/// <summary>
+		/// Gets gestures associated with created <see cref="ICSharpCode.Core.Presentation.InputBindingInfo" /> 
+		/// 
+		/// Optional, if provided input binding info with the same owner will be created
+		/// </summary>
+		public string Gestures {
+			get; private set;
+		}
+		
+		/// <summary>
+		/// Gets list of paths to input binding categories associated with created <see cref="ICSharpCode.Core.Presentation.InputBindingInfo" /> (separated by comma) 
+		/// 
+		/// Can only be used together with <see cref="Gestures" /> property
+		/// </summary>
+		public string Categories {
+			get; private set;
+		}
+		
+		/// <summary>
+		/// Lazy loading
+		/// 
+		/// If true add-in referenced assemblies are loaded when command is invoked.
+		/// Otherwise command can't be invoked until addin is loaded
+		/// </summary>
+		public bool Lazy {
+			get {
+				return Codon.Properties["lazy"] == "1" || Codon.Properties["lazy"] == "true";
+			}
+		}
+		
+		/// <summary>
+		/// Creates new instance of <see cref="CommandBindingInfoDescriptor" />
+		/// </summary>
+		/// <param name="codon">Reference to codon used to create this descriptor</param>
+		public CommandBindingInfoDescriptor(Codon codon)
+		{
+			Codon = codon;
+			Class = Codon.Properties["class"];
+			Command = Codon.Properties["command"];
+			CommandText = Codon.Properties["commandtext"];
+			OwnerInstanceName = Codon.Properties["ownerinstance"];
+			OwnerTypeName = Codon.Properties["ownertype"];
+			Gestures = Codon.Properties["gestures"];
+			Categories = Codon.Properties["categories"];
+		}
+	}
+}
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/Command/CommandBindingInfoDoozer.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/Command/CommandBindingInfoDoozer.cs
new file mode 100644
index 0000000000..204b9afcb4
--- /dev/null
+++ b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/Command/CommandBindingInfoDoozer.cs
@@ -0,0 +1,76 @@
+using System;
+
+namespace ICSharpCode.Core
+{
+	/// <attribute name="command" use="required">
+	/// Name of System.Window.Input.RoutedUICommand associated with built CommandBindingInfoDescriptor
+	/// The name should be first registered in code using ICSharpCode.Core.Presentation.CommandManager
+	/// or in addin file using RoutedUICommand node
+	/// </attribute>
+	/// <attribute name="class" use="required">
+	/// Full name of the command class (should implement ICSharpCode.Core.ICommand or System.Window.Input.ICommand) containing user instructions associated with
+	/// System.Windows.Input.CommandBinding
+	/// </attribute>
+	/// <attribute name="ownertype" use="optional">
+	/// Name of binding owner type. 
+	/// 
+	/// A name can be assigned to type in code using ICSharpCode.Core.Presentation.CommandManager.
+	/// If this attribute is used "ownerinstance" attribute cannot be used
+	/// If neither owner type nor owner instance is specified default owner type is applied
+	/// </attribute>
+	/// <attribute name="ownertype" use="optional">
+	/// Name of binding owner instance. 
+	/// 
+	/// A name can be assigned to instance in code using ICSharpCode.Core.Presentation.CommandManager.
+	/// If this attribute is used "ownertype" attribute cannot be used
+	/// If neither owner type nor owner instance is specified default owner type is applied
+	/// </attribute>
+	/// <attribute name="lazy" use="optional" enum="1;0;true;false">
+	/// Use lazy loading. 
+	/// </attribute>
+	/// <attribute name="gestures" use="optional">
+	/// Create input bindings assigned to the same owner type or owner instance and associated 
+	/// with the same System.Window.Input.RoutedUICommand
+	/// </attribute>
+	/// <attribute name="commandtext" use="optional">
+	/// Text displayed to user when managing input bindings (shortcuts)
+	/// 
+	/// If this attribute is not used System.Window.Input.RoutedUICommand.Text property is used
+	/// This attribute can only be used together with "gestures" attribute
+	/// </attribute>
+	/// <attribute name="categories" use="optional">
+	/// List of paths to input binding categories associated with created input binding info (separated by comma) 
+	/// 
+	/// Input binding categories can be created in code using ICSharpCode.Core.Presentation.CommandManager or by using InputBindingCategory node in addin file
+	/// Input binding categories are used to group shortcuts into separate sections when displaying to user.
+	/// This attribute can only be used together with "gestures" attribute
+	/// </attribute>	
+	/// <usage>Only in /SharpDevelop/Workbench/CommandBindings</usage>
+	/// <returns>
+	/// CommandBindingInfoDescriptor object
+	/// </returns>
+	/// <summary>
+	/// Registers ICSharpCode.Core.Presentation.CommandBindingInfo with specified pa
+	/// </summary>
+	public class CommandBindingInfoDoozer : IDoozer
+	{
+		/// <inheritdoc />
+		public bool HandleConditions {
+			get {
+				return false;
+			}
+		}
+		
+		/// <summary>
+		/// Builds instance of <see cref="CommandBindingInfoDescriptor" /> from codon
+		/// </summary>
+		/// <param name="caller">Caller object</param>
+		/// <param name="codon">Codon</param>
+		/// <param name="subItems">Codon sub-items</param>
+		/// <returns>Instance of <see cref="CommandBindingInfoDescriptor" /></returns>
+		public object BuildItem(object caller, Codon codon, System.Collections.ArrayList subItems)
+		{
+			return new CommandBindingInfoDescriptor(codon);
+		}
+	}
+}
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/Command/InputBindingCategoryDescriptor.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/Command/InputBindingCategoryDescriptor.cs
new file mode 100644
index 0000000000..a51a336925
--- /dev/null
+++ b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/Command/InputBindingCategoryDescriptor.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Linq;
+using System.Collections.Generic;
+
+namespace ICSharpCode.Core
+{
+	/// <summary>
+	/// Describes <see cref="ICSharpCode.Core.Presentation.CommandBindingInfo" /> 
+	/// </summary>
+	public class InputBindingCategoryDescriptor
+	{
+		/// <summary>
+		/// Gets category Id used to create category path
+		/// </summary>
+		public string Id {
+			get; private set;
+		}
+		
+		/// <summary>
+		/// Gets category name displayed to user
+		/// </summary>
+		public string Text {
+			get; private set;
+		}
+		
+		/// <summary>
+		/// Gets children category descriptors
+		/// </summary>
+		public List<InputBindingCategoryDescriptor> Children {
+			get; private set;
+		}
+		
+		/// <summary>
+		/// Creates instance of <see cref="InputBindingCategoryDescriptor" />
+		/// </summary>
+		/// <param name="codon">Reference to codon used to create this descriptor</param>
+		/// <param name="subItems">List of sub-category descriptors</param>
+		public InputBindingCategoryDescriptor(Codon codon, System.Collections.ArrayList subItems) 
+		{
+			Id = codon.Properties["id"]; 
+			Text = codon.Properties["text"];
+			Children = subItems != null ? subItems.Cast<InputBindingCategoryDescriptor>().ToList() : new List<InputBindingCategoryDescriptor>();
+		}
+	}
+}
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/Command/InputBindingCategoryDoozer.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/Command/InputBindingCategoryDoozer.cs
new file mode 100644
index 0000000000..7d62292b5b
--- /dev/null
+++ b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/Command/InputBindingCategoryDoozer.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ICSharpCode.Core
+{
+	/// <attribute name="id" use="required">
+	/// Category Id used in category path
+	/// </attribute>
+	/// <attribute name="name" use="required">
+	/// Category name displayed to user
+	/// </attribute>
+	/// <usage>Only in /SharpDevelop/CommandManager/InputBindingCategories</usage>
+	/// <returns>
+	/// InputBindingCategory object
+	/// </returns>
+	/// <summary>
+	/// Associates ICSharpCode.Core.Presentation.InputBindingCategory with path which can later be used to reference created ICSharpCode.Core.Presentation.InputBindingCategory
+	/// </summary>
+	public class InputBindingCategoryDoozer : IDoozer
+	{
+		/// <inheritdoc />
+		public bool HandleConditions {
+			get {
+				return true;
+			}
+		}
+		
+		/// <summary>
+		/// Builds instance of <see cref="InputBindingCategoryDescriptor" /> from codon
+		/// </summary>
+		/// <param name="caller">Caller object</param>
+		/// <param name="codon">Codon</param>
+		/// <param name="subItems">Codon sub-items</param>
+		/// <returns>Instance of <see cref="InputBindingCategoryDescriptor" /></returns>
+		public object BuildItem(object caller, Codon codon, System.Collections.ArrayList subItems)
+		{
+			return new InputBindingCategoryDescriptor(codon, subItems);
+		}
+	}
+	
+
+}
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/Command/InputBindingInfoDescriptor.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/Command/InputBindingInfoDescriptor.cs
new file mode 100644
index 0000000000..09873a1618
--- /dev/null
+++ b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/Command/InputBindingInfoDescriptor.cs
@@ -0,0 +1,90 @@
+using System;
+
+namespace ICSharpCode.Core
+{
+	/// <summary>
+	/// Describes <see cref="ICSharpCode.Core.Presentation.InputBindingInfo" /> 
+	/// </summary>
+	public class InputBindingInfoDescriptor
+	{
+		/// <summary>
+		/// Codon used to create this descriptor
+		/// </summary>
+		public Codon Codon 
+		{
+			get; private set;
+		}
+		
+		/// <summary>
+		/// Gets name of <see cref="System.Window.Input.RoutedUICommand" /> associated with descriptor
+		/// The name should be associated to a command in code using <see cref="ICSharpCode.Core.Presentation.CommandManager" />
+		/// </summary>
+		public string Command 
+		{
+			get; private set;
+		}
+		
+		
+		/// <summary>
+		/// Gets overriden routed command text (string visible to user)
+		/// 
+		/// If not provided <see cref="System.Window.Input.RoutedUICommand.Text" /> property value is used
+		/// </summary>
+		public string CommandText 
+		{
+			get; private set;
+		}
+		
+		/// <summary>
+		/// Gets name of binding owner type name. 
+		/// 
+		/// A name can be assigned to type in code using <see cref="ICSharpCode.Core.Presentation.CommandManager" />.
+		/// If this property is set then <see cref="OwnerTypeName" /> property can be ignored
+		/// If neither owner type nor owner instance is specified default owner type is applied
+		/// </summary>
+		public string OwnerInstanceName {
+			get; private set;
+		}
+
+		/// <summary>
+		/// Name of binding owner instance name. 
+		/// 
+		/// A name can be assigned to instance in code using <see cref="ICSharpCode.Core.Presentation.CommandManager" />.
+		/// If this property is set then <see cref="OwnerInstanceName" /> property can be ignored
+		/// If neither owner type nor owner instance is specified default owner type is applied
+		/// </summary>
+		public string OwnerTypeName {
+			get; private set;
+		}
+
+		/// <summary>
+		/// Gets gestures associated with created <see cref="ICSharpCode.Core.Presentation.InputBindingInfo" /> 
+		/// </summary>
+		public string Gestures {
+			get; private set;
+		}
+		
+		
+		/// <summary>
+		/// List of paths to input binding categories associated with created <see cref="ICSharpCode.Core.Presentation.InputBindingInfo" /> (separated by comma) 
+		/// </summary>
+		public string Categories {
+			get; private set;
+		}
+		
+		/// <summary>
+		/// Creates new instance of <see cref="InputBindingInfoDescriptor" />
+		/// </summary>
+		/// <param name="codon">Reference to codon used to create this descriptor</param>
+		public InputBindingInfoDescriptor(Codon codon)
+		{
+			Codon = codon;
+			Command = codon.Properties["command"];
+			CommandText = codon.Properties["commandtext"];
+			OwnerInstanceName = codon.Properties["ownerinstance"];
+			OwnerTypeName = codon.Properties["ownertype"];
+			Gestures = codon.Properties["gestures"];
+			Categories = codon.Properties["categories"];
+		}
+	}
+}
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/Command/InputBindingInfoDoozer.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/Command/InputBindingInfoDoozer.cs
new file mode 100644
index 0000000000..2f04ae6aac
--- /dev/null
+++ b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/Command/InputBindingInfoDoozer.cs
@@ -0,0 +1,69 @@
+using System;
+
+namespace ICSharpCode.Core
+{
+	/// <attribute name="command" use="required">
+	/// Name of System.Window.Input.RoutedUICommand associated with built InputBindingInfoDescriptor
+	/// The name should be first registered in code using ICSharpCode.Core.Presentation.CommandManager
+	/// or in addin file using RoutedUICommand node
+	/// </attribute>
+	/// <attribute name="ownertype" use="optional">
+	/// Name of binding owner type. 
+	/// 
+	/// A name can be assigned to type in code using ICSharpCode.Core.Presentation.CommandManager.
+	/// If this attribute is used "ownerinstance" attribute cannot be used
+	/// If neither owner type nor owner instance is specified default owner type is applied
+	/// </attribute>
+	/// <attribute name="ownertype" use="optional">
+	/// Name of binding owner instance. 
+	/// 
+	/// A name can be assigned to instance in code using ICSharpCode.Core.Presentation.CommandManager.
+	/// If this attribute is used "ownertype" attribute cannot be used
+	/// If neither owner type nor owner instance is specified default owner type is applied
+	/// </attribute>
+	/// <attribute name="gestures" use="optional">
+	/// Gestures associated with created System.Windows.Input.InputBinding instances
+	/// </attribute>
+	/// <attribute name="commandtext" use="optional">
+	/// Text displayed to user when managing input bindings (shortcuts)
+	/// 
+	/// If this attribute is not used System.Window.Input.RoutedUICommand.Text property is used
+	/// This attribute can only be used together with "gestures" attribute
+	/// </attribute>
+	/// <attribute name="categories" use="optional">
+	/// List of input binding category paths (separated using comma) associated with
+	/// created input binding infos
+	/// 
+	/// Input binding categories can be created in code using ICSharpCode.Core.Presentation.CommandManager or by using InputBindingCategory node in addin file
+	/// Input binding categories are used to group shortcuts into separate sections when displaying to user.
+	/// </attribute>
+	/// <usage>Only in /SharpDevelop/Workbench/InputBindings</usage>
+	/// <returns>
+	/// CommandBindingInfoDescriptor object
+	/// </returns>
+	/// <summary>
+	/// Registers ICSharpCode.Core.Presentation.InputBindingInfo with specified parameters
+	/// </summary>
+	public class InputBindingInfoDoozer : IDoozer
+	{
+		/// <inheritdoc />
+		public bool HandleConditions 
+		{
+			get {
+				return true;
+			}
+		}
+		
+		/// <summary>
+		/// Builds instance of <see cref="InputBindingInfoDescriptor" /> from codon
+		/// </summary>
+		/// <param name="caller">Caller object</param>
+		/// <param name="codon">Codon</param>
+		/// <param name="subItems">Codon sub-items</param>
+		/// <returns>Instance of <see cref="InputBindingInfoDescriptor" /></returns>
+		public object BuildItem(object caller, Codon codon, System.Collections.ArrayList subItems)
+		{
+			return new InputBindingInfoDescriptor(codon);
+		}
+	}
+}
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/Command/RoutedUICommandDescriptor.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/Command/RoutedUICommandDescriptor.cs
new file mode 100644
index 0000000000..b0845e07e3
--- /dev/null
+++ b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/Command/RoutedUICommandDescriptor.cs
@@ -0,0 +1,41 @@
+using System;
+
+namespace ICSharpCode.Core
+{
+	/// <summary>
+	/// Describes <see cref="System.Windows.Input.RoutedUICommand" /> 
+	/// </summary>
+	public class RoutedUICommandDescriptor
+	{
+		private Codon codon;
+		
+		/// <summary>
+		/// Gets text with routed command purpose description
+		/// </summary>
+		public string Text 
+		{
+			get {
+				return codon.Properties["text"];
+			}
+		}
+		
+		/// <summary>
+		/// Get routed command name
+		/// </summary>
+		public string Name 
+		{
+			get {
+				return codon.Properties["name"];
+			}
+		}
+		
+		/// <summary>
+		/// Creates instance of <see cref="RoutedUICommandDescriptor" />
+		/// </summary>
+		/// <param name="codon">Reference to codon used to create this descriptor</param>
+		public RoutedUICommandDescriptor(Codon codon)
+		{
+			this.codon = codon;
+		}
+	}
+}
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/Command/RoutedUICommandDoozer.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/Command/RoutedUICommandDoozer.cs
new file mode 100644
index 0000000000..b161805ab1
--- /dev/null
+++ b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/Command/RoutedUICommandDoozer.cs
@@ -0,0 +1,39 @@
+using System;
+
+namespace ICSharpCode.Core
+{
+	/// <attribute name="name" use="required">
+	/// System.Window.Input.RoutedUICommand unique name
+	/// </attribute>
+	/// <attribute name="text" use="required">
+	/// Displayed text associated with created System.Window.Input.RoutedUICommand 
+	/// </attribute>
+	/// <usage>Only in /SharpDevelop/CommandManager/RoutedUICommands</usage>
+	/// <returns>
+	/// RoutedUICommandDescriptor object
+	/// </returns>
+	/// <summary>
+	/// Creates new System.Window.Input.RoutedUICommand and associates it with a unique name which can be used later to reference routed command
+	/// </summary>
+	public class RoutedUICommandDoozer : IDoozer
+	{
+		/// <inheritdoc />
+		public bool HandleConditions {
+			get {
+				return false;
+			}
+		}
+		
+		/// <summary>
+		/// Builds instance of <see cref="RoutedUICommandDescriptor" /> from codon
+		/// </summary>
+		/// <param name="caller">Caller object</param>
+		/// <param name="codon">Codon</param>
+		/// <param name="subItems">Codon sub-items</param>
+		/// <returns>Instance of <see cref="RoutedUICommandDescriptor" /></returns>
+		public object BuildItem(object caller, Codon codon, System.Collections.ArrayList subItems)
+		{
+			return new RoutedUICommandDescriptor(codon);
+		}
+	}
+}
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/MenuItemDoozer.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/MenuItemDoozer.cs
index 0516393e40..577db80770 100644
--- a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/MenuItemDoozer.cs
+++ b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/MenuItemDoozer.cs
@@ -43,7 +43,7 @@ namespace ICSharpCode.Core
 	/// clicking the item.
 	/// </attribute>
 	/// <attribute name="shortcut" use="optional">
-	/// Shortcut that activates the command (e.g. "Control|S").
+	/// Shortcut that activates the command (e.g. "Ctrl+S").
 	/// </attribute>
 	/// <children childTypes="MenuItem">
 	/// If "type" is "Menu", the item can have sub-menuitems.
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/MenuLocationDescriptor.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/MenuLocationDescriptor.cs
new file mode 100644
index 0000000000..6285021cb7
--- /dev/null
+++ b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/MenuLocationDescriptor.cs
@@ -0,0 +1,44 @@
+using System;
+
+namespace ICSharpCode.Core
+{	
+	/// <summary>
+	/// Describes shortcuts in menu affiliation to input binding category
+	/// 
+	/// Root-level ICSharpCode.Core.Presentation.InputBindingInfo are associated with provided categories. For ICSharpCode.Core.Presentation.InputBindingInfo 
+	/// in sub-menus new ICSharpCode.Core.Presentation.InputBindingCategory is created from sub-menu id and title
+	/// </summary>
+	public class MenuLocationDescriptor
+	{
+		/// <summary>
+		/// Gets paths to categories associated with menu
+		/// </summary>
+		public string CategoryPaths
+		{
+			get; private set;
+		}
+	
+		/// <summary>
+		/// Gets path to menu root
+		/// </summary>
+		public string MenuPath
+		{
+			get; private set;
+		}
+	
+		/// <summary>
+		/// Creates new instance of <see cref="MenuLocationDescriptor" />
+		/// </summary>
+		/// <param name="caller">Caller object</param>
+		/// <param name="codon">Reference to codon used to create this descriptor</param>
+		public MenuLocationDescriptor(object caller, Codon codon)
+		{
+			if(!codon.Properties.Contains("menupath") || !codon.Properties.Contains("categorypaths")){
+				throw new ArgumentException("Menu location should have both menu path and category paths assigned");
+			}
+			
+			MenuPath = codon.Properties["menupath"];
+			CategoryPaths = codon.Properties["categorypaths"];
+		}
+	}
+}
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/MenuLocationDoozer.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/MenuLocationDoozer.cs
new file mode 100644
index 0000000000..04685c24aa
--- /dev/null
+++ b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/MenuLocationDoozer.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Collections;
+
+namespace ICSharpCode.Core
+{
+	/// <attribute name="menupath" use="required">
+	/// Path to menu root category
+	/// </attribute>
+	/// <attribute name="name" use="required">
+	/// Category name displayed to user
+	/// </attribute>
+	/// <usage>Only in /SharpDevelop/CommandManager/MenuLocations</usage>
+	/// <returns>
+	/// MenuLocationDoozer object
+	/// </returns>
+	/// <summary>
+	/// Describes shortcuts in menu affiliation to input binding categories
+	/// 
+	/// Root-level ICSharpCode.Core.Presentation.InputBindingInfo are associated with provided category. For ICSharpCode.Core.Presentation.InputBindingInfo 
+	/// in sub-menus new ICSharpCode.Core.Presentation.InputBindingCategory is created from sub-menu id and title
+	/// </summary>
+	public class MenuLocationDoozer : IDoozer
+	{
+		/// <inheritdoc />
+		public bool HandleConditions {
+			get {
+				return true;
+			}
+		}
+		
+		/// <summary>
+		/// Builds instance of <see cref="MenuLocationDescriptor" /> from codon
+		/// </summary>
+		/// <param name="caller">Caller object</param>
+		/// <param name="codon">Codon</param>
+		/// <param name="subItems">Codon sub-items</param>
+		/// <returns>Instance of <see cref="MenuLocationDescriptor" /></returns>
+		public object BuildItem(object caller, Codon codon, ArrayList subItems)
+		{
+			return new MenuLocationDescriptor(caller, codon);
+		}
+	}
+}
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/Runtime.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/Runtime.cs
index 0ef5a9a862..8c42a5c97e 100644
--- a/src/Main/Core/Project/Src/AddInTree/AddIn/Runtime.cs
+++ b/src/Main/Core/Project/Src/AddInTree/AddIn/Runtime.cs
@@ -84,6 +84,10 @@ namespace ICSharpCode.Core
 					// preload assembly to provoke FileLoadException if dependencies are missing
 					loadedAssembly.GetExportedTypes();
 					#endif
+					
+					if(Loaded != null) {
+						Loaded(this, null);
+					}
 				} catch (FileNotFoundException ex) {
 					MessageService.ShowError("The addin '" + assembly + "' could not be loaded:\n" + ex.ToString());
 				} catch (FileLoadException ex) {
@@ -92,6 +96,8 @@ namespace ICSharpCode.Core
 			}
 		}
 		
+		public event EventHandler Loaded;
+		
 		public Assembly LoadedAssembly {
 			get {
 				Load(); // load the assembly, if not already done
diff --git a/src/Main/Core/Project/Src/AddInTree/AddInTree.cs b/src/Main/Core/Project/Src/AddInTree/AddInTree.cs
index 92dfe51e36..2707575951 100644
--- a/src/Main/Core/Project/Src/AddInTree/AddInTree.cs
+++ b/src/Main/Core/Project/Src/AddInTree/AddInTree.cs
@@ -34,6 +34,13 @@ namespace ICSharpCode.Core
 			doozers.Add("ToolbarItem", new ToolbarItemDoozer());
 			doozers.Add("Include", new IncludeDoozer());
 			
+			// Command manager doozers
+			doozers.Add("InputBindingInfo", new InputBindingInfoDoozer());
+			doozers.Add("InputBindingCategory", new InputBindingCategoryDoozer());
+			doozers.Add("CommandBindingInfo", new CommandBindingInfoDoozer());
+			doozers.Add("RoutedUICommand", new RoutedUICommandDoozer());
+			doozers.Add("MenuLocation", new MenuLocationDoozer());
+			
 			conditionEvaluators.Add("Compare", new CompareConditionEvaluator());
 			conditionEvaluators.Add("Ownerstate", new OwnerStateConditionEvaluator());
 			
diff --git a/src/Main/Core/Project/Src/Services/PropertyService/PropertyService.cs b/src/Main/Core/Project/Src/Services/PropertyService/PropertyService.cs
index af34de6bd8..c75677b253 100644
--- a/src/Main/Core/Project/Src/Services/PropertyService/PropertyService.cs
+++ b/src/Main/Core/Project/Src/Services/PropertyService/PropertyService.cs
@@ -72,6 +72,11 @@ namespace ICSharpCode.Core
 			properties.Set(property, value);
 		}
 		
+		public static void Remove(string property)
+		{
+			properties.Remove(property);
+		}
+		
 		public static void Load()
 		{
 			if (properties == null)
diff --git a/src/Main/Core/Project/Src/Util/ExtensionMethods.cs b/src/Main/Core/Project/Src/Util/ExtensionMethods.cs
new file mode 100644
index 0000000000..ccc39c0656
--- /dev/null
+++ b/src/Main/Core/Project/Src/Util/ExtensionMethods.cs
@@ -0,0 +1,35 @@
+/*
+ * Created by SharpDevelop.
+ * User: Sergej Andrejev
+ * Date: 7/14/2009
+ * Time: 2:30 PM
+ */
+using System;
+using System.Collections.Generic;
+
+namespace ICSharpCode.Core
+{
+    public static class ExtensionMethods
+    {
+    	/// <summary>
+    	/// Determines whether collection contains any elements from other collection
+    	/// </summary>
+    	/// <param name="thisCollection">This collection</param>
+    	/// <param name="otherCollection">Collection of objects to locate in other collection</param>
+    	/// <returns><code>true</code> if item is found; otherwise false</returns>
+    	public static bool ContainsAnyFromCollection<T>(this ICollection<T> thisCollection, ICollection<T> otherCollection) 
+    	{
+    		if(otherCollection == null) {
+    			throw new ArgumentNullException("otherCollection");
+    		}
+    		
+			foreach(var thisCollectionItem in thisCollection) {
+    			if(otherCollection.Contains(thisCollectionItem)) {
+    				return true;
+    			}
+			}
+			
+			return false;
+    	}
+    }
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/CommandsService/AtomicBindingInfoTemplateDictionary.cs b/src/Main/ICSharpCode.Core.Presentation/CommandsService/AtomicBindingInfoTemplateDictionary.cs
new file mode 100644
index 0000000000..75cfa4f157
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/CommandsService/AtomicBindingInfoTemplateDictionary.cs
@@ -0,0 +1,92 @@
+/*
+ * Created by SharpDevelop.
+ * User: Sergej Andrejev
+ * Date: 7/24/2009
+ * Time: 3:35 PM
+ */
+using System;
+
+namespace ICSharpCode.Core.Presentation
+{
+    /// <summary>
+    /// Description of AtomicBindingInfoTemplateDictionary.
+    /// </summary>
+    public class BindingInfoTemplateDictionary<T>
+    {
+		private Dictionary<AtomicBindingInfoTemplate, HashSet<T>> superSetDictionary = new Dictionary<AtomicBindingInfoTemplate, HashSet<T>>();
+	
+		private Dictionary<AtomicBindingInfoTemplate, HashSet<T>> subSetDictionary = new Dictionary<AtomicBindingInfoTemplate, HashSet<T>>();
+	
+		public void Add(BindingInfoTemplate template, T handler)
+		{
+			template.Normalize();
+			
+			foreach(var atomicTemplate in template.GetAtomicTemplates()) {
+				if(!superSetDictionary.ContainsKey(atomicTemplate)) {
+					superSetDictionary.Add(atomicTemplate, new HashSet<T>());
+				}
+				
+				superSetDictionary[atomicTemplate].Add(handler);
+				
+				foreach(var wildCardTemplate in atomicTemplate.GetWildCardTemplates()) {
+					if(!subSetDictionary.ContainsKey(wildCardTemplate)) {
+						subSetDictionary.Add(wildCardTemplate, new HashSet<T>());
+					}
+					
+					subSetDictionary[wildCardTemplate].Add(handler);
+				}
+			}
+		}
+		
+		public IEnumerable InvokeHandlers(BindingInfoTemplate template, BindingInfoMatchType matchType) 
+		{
+			var handlersToInvoke = new HashSet<BindingsUpdatedHandler>();
+			
+			template.Normalize();
+			var atomicTemplates = template.GetAtomicTemplates().ToList();
+			
+			if((matchType & BindingInfoMatchType.SubSet) == BindingInfoMatchType.SubSet) {
+				foreach(var atomicTemplate in atomicTemplates) {
+					foreach(var wildCardTemplate in atomicTemplate.GetWildCardTemplates()) {
+						HashSet<BindingsUpdatedHandler> handlers;
+						superSetUpdatedsHandler.TryGetValue(wildCardTemplate, out handlers);
+						
+						if(handlers != null) {
+							foreach(var handler in handlers) {
+								if(handler != null) {
+									handlersToInvoke.Add(handler);
+								}
+							}
+						}
+					}
+				}
+			}
+			
+			if((matchType & BindingInfoMatchType.SuperSet) == BindingInfoMatchType.SuperSet) {
+				foreach(var atomicTemplate in atomicTemplates) {
+					HashSet<BindingsUpdatedHandler> handlers;
+					subSetUpdatedsHandler.TryGetValue(atomicTemplate, out handlers);
+					
+					if(handlers != null) {
+						foreach(var handler in handlers) {
+							if(handler != null) {
+								handlersToInvoke.Add(handler);
+							}
+						}
+					}
+				}
+			}
+			
+			foreach(var handler in handlersToInvoke) {
+				handler.Invoke();
+			}
+		}
+
+   
+	    
+	    public void Clear() 
+	    {
+	    	superSetUpdatedsHandler.Clear();
+	    }
+    }
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/CommandsService/BindingGroup.cs b/src/Main/ICSharpCode.Core.Presentation/CommandsService/BindingGroup.cs
new file mode 100644
index 0000000000..0448563dc4
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/CommandsService/BindingGroup.cs
@@ -0,0 +1,249 @@
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Input;
+using SDCommandManager=ICSharpCode.Core.Presentation.SDCommandManager;
+
+
+namespace ICSharpCode.Core.Presentation
+{
+	/// <summary>
+	/// <see cref="BindingGroup" /> manages collection of instances which accept
+	/// bindings generated by <see cref="CommandBindingInfo" /> or <see cref="InputBindingInfo" />
+	/// 
+	/// For <see cref="BindingGroup" /> to take effect it must be added to <see cref="InputBindingInfo.Groups" />
+	/// or <see cref="CommandBindingInfo.Groups" /> collection
+	/// </summary>
+	public class BindingGroup
+	{
+		private string _name;
+		private bool _isEnabled = true;
+		private HashSet<WeakReference> _attachedInstances = new HashSet<WeakReference>(new WeakReferenceTargetEqualirtyComparer());
+		private BindingGroupCollection _nestedGroups = new BindingGroupCollection();
+		
+		/// <summary>
+		/// Creates new instance of <see cref="BindingGroup" />
+		/// </summary>
+		/// <param name="name">Group name</param>
+		public BindingGroup(string name)
+		{
+			_name = name;
+			_nestedGroups.CollectionChanged += _nestedGroups_CollectionChanged;
+		}
+		
+		/// <summary>
+		/// Gets <see cref="BindingGroup" /> name
+		/// </summary>
+		public string Name
+		{
+			get {
+				return _name;
+			}
+		}
+		
+		/// <summary>
+		/// Gets read-only collection of attached instances
+		/// </summary>
+		public ICollection<UIElement> RegisteredInstances
+		{
+			get {
+				return new ReadOnlyCollection<UIElement>((from wr in _attachedInstances where wr.Target != null select (UIElement)wr.Target).ToList());
+			}
+		}
+		
+		/// <summary>
+		/// Determines whether <see cref="UIElement" /> instance is handled by this group
+		/// </summary>
+		/// <param name="instance">Examined instance</param>
+		/// <returns><code>true</code> if registered; otherwise <code>false</code></returns>
+		public bool IsInstanceRegistered(UIElement instance) 
+		{
+			return _attachedInstances.Contains(new WeakReference(instance));
+		}
+		
+		/// <summary>
+		/// Register <see cref="UIElement" /> instance handled by this group
+		/// </summary>
+		/// <param name="instance">Registered instance</param>
+		public void RegisterHandledInstance(UIElement instance)
+		{
+			RegisterHandledInstanceWithoutInvoke(instance);
+			InvokeBindingUpdateHandlers(GetFlatNestedGroups(true), GetInstancesRegisteredInNestedGroups(true));
+		}
+		
+		private void RegisterHandledInstanceWithoutInvoke(UIElement instance)
+		{
+			_attachedInstances.Add(new WeakReference(instance));
+			
+			foreach(var nestedGroup in _nestedGroups) {
+				nestedGroup.RegisterHandledInstanceWithoutInvoke(instance);
+			}
+		}
+		
+		/// <summary>
+		/// Gets single-level collection containing instances registered in this or any nested groups
+		/// </summary>
+		/// <param name="includeDisabledNestedGroups">Specifies whether binding groups with <see cref="BindingGroup.IsEnabled" /> attribute should be taken into account</param>
+		public ICollection<UIElement> GetInstancesRegisteredInNestedGroups(bool includeDisabledNestedGroups)
+		{
+			var attachments = new HashSet<UIElement>();
+			foreach(var group in GetFlatNestedGroups(includeDisabledNestedGroups)) {
+				foreach(var groupAttachment in group.RegisteredInstances) {
+					attachments.Add(groupAttachment);
+				}
+			}
+			
+			return new ReadOnlyCollection<UIElement>(attachments.ToArray());
+		}
+		
+		/// <summary>
+		/// Register <see cref="UIElement" /> instance handled by this group
+		/// </summary>
+		/// <param name="instance">Registered instance</param>
+		public void UnregisterHandledInstance(UIElement instance)
+		{
+			var modifiedGroups = GetFlatNestedGroups(true);
+			var modifiedInstances = GetInstancesRegisteredInNestedGroups(true);
+			
+			UnregisterHandledInstanceWithoutInvoke(instance);
+			InvokeBindingUpdateHandlers(modifiedGroups, modifiedInstances);
+		}
+		
+		
+		/// <summary>
+		/// Make <see cref="UIElement" /> instance no longer handled by this group
+		/// </summary>
+		/// <param name="instance">Unregistered instance</param>
+		public void UnregisterHandledInstanceWithoutInvoke(UIElement instance)
+		{
+			_attachedInstances.Remove(new WeakReference(instance));
+			
+			foreach(var nestedGroup in _nestedGroups) {
+				nestedGroup.UnregisterHandledInstance(instance);
+			}
+		}
+		
+		private void InvokeBindingUpdateHandlers(BindingGroupCollection modifiedGroups, ICollection<UIElement> modifiedInstances)
+		{
+			SDCommandManager.InvokeBindingsChanged(
+				this, 
+				new NotifyBindingsChangedEventArgs(
+					NotifyBindingsChangedAction.GroupAttachmendsModified, 
+					modifiedGroups,
+					modifiedInstances));
+		}
+		
+		/// <summary>
+		/// From provided <see cref="ICollection{Type}" /> collection generate <see cref="ICollection{UIElement}" /> collection containing 
+		/// instances created from one of the provided types and registered in this or any nested group
+		/// </summary>
+		/// <param name="instances">Collection of examined types</param>
+		/// <param name="includeDisabledNestedGroups">Specifies whether binding groups with <see cref="BindingGroup.IsEnabled" /> attribute should be taken into account</param>
+		/// <returns>Generated instances</returns>
+		public ICollection<UIElement> FilterRegisteredInstances(ICollection<Type> types, bool includeDisabledNestedGroups)
+		{
+			var attachedInstances = new HashSet<UIElement>();
+			foreach(var nestedGroup in GetFlatNestedGroups(includeDisabledNestedGroups)) {
+				foreach(var wr in nestedGroup._attachedInstances) {
+					var wrTarget = (UIElement)wr.Target;
+					if(wrTarget != null && types.Any(t => t.IsInstanceOfType(wrTarget))) {
+						attachedInstances.Add(wrTarget);
+					}
+				}
+			}
+			
+			return attachedInstances;
+		}
+		
+		/// <summary>
+		/// From provided <see cref="ICollection{UIElement}" /> collection filter <see cref="ICollection{UIElement}" /> collection containing 
+		/// only instances registered in this or one of the nested groups
+		/// </summary>
+		/// <param name="instances">Collection of examined instances</param>
+		/// <param name="includeDisabledNestedGroups">Specifies whether binding groups with <see cref="BindingGroup.IsEnabled" /> attribute should be taken into account</param>
+		/// <returns>Filtered instances</returns>
+		public ICollection<UIElement> FilterRegisteredInstances(ICollection<UIElement> instances, bool includeDisabledNestedGroups)
+		{
+			var attachedInstances = new HashSet<UIElement>();
+			foreach(var nestedGroup in GetFlatNestedGroups(includeDisabledNestedGroups)) {
+				foreach(var wr in nestedGroup._attachedInstances) {
+					var wrTarget = (UIElement)wr.Target;
+					if(wrTarget != null && instances.Contains(wrTarget)) {
+						attachedInstances.Add(wrTarget);
+					}
+				}
+			}
+			
+			return attachedInstances;
+		}
+		
+		/// <summary>
+		/// Gets or sets value indicating whether whole group is enabled
+		/// </summary>
+		public bool IsEnabled {
+			get {
+				return _isEnabled;
+			}
+			set {
+				_isEnabled = value;
+				
+				InvokeBindingUpdateHandlers(new BindingGroupCollection(true, new [] { this }), GetInstancesRegisteredInNestedGroups(true));
+			}
+		}
+		
+		/// <summary>
+		/// Gets direct sub-groups of this groups
+		/// </summary>
+		public BindingGroupCollection NestedGroups
+		{
+			get {
+				return _nestedGroups;
+			}
+		}
+		
+		/// <summary>
+		/// Gets single-level collection containing this group and all sub-groups of this group
+		/// </summary>
+		/// <param name="includeDisabledNestedGroups">Specifies whether binding groups with <see cref="BindingGroup.IsEnabled" /> attribute should be taken into account</param>
+		public BindingGroupCollection GetFlatNestedGroups(bool includeDisabledNestedGroups)
+		{
+			var foundNestedGroups = new HashSet<BindingGroup>();
+			FlattenNestedGroups(this, true, foundNestedGroups);
+			
+			return new BindingGroupCollection(true, foundNestedGroups);
+		}
+		
+		private void FlattenNestedGroups(BindingGroup rootGroup, bool includeDisabledNestedGroups, HashSet<BindingGroup> foundGroups)
+		{
+			if(!includeDisabledNestedGroups && !IsEnabled) {
+				return;
+			}
+			
+			foundGroups.Add(rootGroup);
+			
+			foreach(var nestedGroup in NestedGroups) {
+				if(foundGroups.Add(nestedGroup)) {
+					FlattenNestedGroups(nestedGroup, includeDisabledNestedGroups, foundGroups);
+				}
+			}
+		}
+		
+		private void _nestedGroups_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+		{
+			var modifiedGroups = new BindingGroupCollection();
+			modifiedGroups.AddRange(GetFlatNestedGroups(true));
+			
+			if(e.OldItems != null) {
+				modifiedGroups.AddRange(e.OldItems.Cast<BindingGroup>());
+			}
+			
+			var modifiedInstances = modifiedGroups.GetInstancesRegisteredInNestedGroups(true);
+			
+			InvokeBindingUpdateHandlers(modifiedGroups, modifiedInstances);
+		}
+    }
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/CommandsService/BindingInfoBase.cs b/src/Main/ICSharpCode.Core.Presentation/CommandsService/BindingInfoBase.cs
new file mode 100644
index 0000000000..81c9369b4c
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/CommandsService/BindingInfoBase.cs
@@ -0,0 +1,314 @@
+using System;
+using System.Linq;
+using System.Windows;
+using System.Windows.Input;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Collections.ObjectModel;
+using ICSharpCode.Core.Presentation;
+
+namespace ICSharpCode.Core.Presentation
+{
+    /// <summary>
+    /// Base class for <see cref="CommandBindingInfo" /> and <see cref="InputBindingInfo" />
+    /// </summary>
+    abstract public class BindingInfoBase
+    {
+		private BindingGroupCollection _groups;
+		private string _ownerInstanceName;
+		private string _ownerTypeName;
+		private string routedCommandName;
+		private AddIn _addIn;
+		
+		/// <summary>
+		/// Creates instance of <see cref="BindingInfoBase" />
+		/// </summary>
+		public BindingInfoBase() 
+		{
+			Groups = new BindingGroupCollection();
+		}
+			 
+		/// <summary>
+		/// Get or sets binding groups
+		/// 
+		/// If <see cref="BindingInfoBase" /> instance has a group assigned 
+		/// then <see cref="InputBindingCollection" /> or <see cref="CommandBindingCollection" />
+		/// is applied only for instances attached to the same group
+		/// </summary>
+		public BindingGroupCollection Groups
+		{
+			get {
+				return _groups;
+			}
+			set {
+				if(value == null) {
+					throw new ArgumentNullException("value");
+				}
+
+				var oldGroups = _groups;
+				_groups = value;
+				
+				SetCollectionChanged<BindingGroup>(oldGroups, value, Groups_CollectionChanged);
+			}
+		}
+		
+		private void Groups_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e) {  
+			if(IsRegistered) {
+				var modifiedGroups = new BindingGroupCollection();
+				if(e.NewItems != null) {						
+					modifiedGroups.AddRange(e.NewItems.Cast<BindingGroup>());
+				}
+				
+				if(e.OldItems != null) {
+					modifiedGroups.AddRange(e.OldItems.Cast<BindingGroup>());
+				}
+				
+				ICollection<UIElement> attachedInstances = null;
+				if(OwnerInstanceName != null) {
+					attachedInstances = modifiedGroups.FilterInstancesRegisteredInNestedGroups(OwnerInstances, true);
+				} else {
+					attachedInstances = modifiedGroups.FilterInstancesRegisteredInNestedGroups(OwnerTypes, true);
+				}
+				
+				SDCommandManager.InvokeBindingsChanged(this, new NotifyBindingsChangedEventArgs(NotifyBindingsChangedAction.GroupAttachmendsModified, modifiedGroups, attachedInstances));
+			}
+		}
+		
+		/// <summary>
+		/// Gets name of named owner instance as registered using <see cref="ICSharpCode.Core.Presentation.CommandManager.RegisterNamedUIElement" />
+		///
+		/// If this attribute is used <see cref="OwnerTypeName" /> can not be set
+		/// 
+		/// This attribute can't be set while <see cref="InputBindingInfo" /> or <see cref="CommandBindingInfo" />
+		/// is registered in <see cref="ICSharpCode.Core.Presentation.CommandManager" />
+		/// </summary>
+		public virtual string OwnerInstanceName {
+			get {
+				return _ownerInstanceName;
+			}
+			set {
+				if(_ownerTypeName != null) {
+					throw new ArgumentException("This binding info already has an owner");
+				}
+				
+				if(IsRegistered) {
+					throw new ArgumentException("Can not change owner while binding info is registered");
+				}
+				
+				_ownerInstanceName = value;
+			}
+		}
+		
+		/// <summary>
+		/// Gets collection of instances registered in <see cref="ICSharpCode.Core.Presentation.CommandManager" /> by name found in <see cref="OwnerInstanceName" /> property
+		/// </summary>
+		public ICollection<UIElement> OwnerInstances {
+			get {
+				if(_ownerInstanceName != null) {
+					return SDCommandManager.GetNamedUIElementCollection(_ownerInstanceName);
+				}
+				
+				return null;
+			}
+		}
+					
+		/// <summary>
+		/// Gets name of named owner type as registered using <see cref="ICSharpCode.Core.Presentation.CommandManager.RegisterNamedUIType" />
+		///
+		/// If this attribute is used <see cref="OwnerInstanceName" /> can not be set
+		/// 
+		/// This attribute can't be set while <see cref="InputBindingInfo" /> or <see cref="CommandBindingInfo" />
+		/// is registered in <see cref="ICSharpCode.Core.Presentation.CommandManager" />
+		/// </summary>
+		public virtual string OwnerTypeName 
+		{
+			get {
+				return _ownerTypeName;
+			}
+			set {
+				if(_ownerTypeName != null) {
+					throw new ArgumentException("This binding info already has an owner");
+				}
+				
+				if(IsRegistered) {
+					throw new ArgumentException("Can not change owner while binding info is registered");
+				}
+				
+				_ownerTypeName = value;
+			}
+		}
+		
+		/// <summary>
+		/// Gets collection of types registered in <see cref="ICSharpCode.Core.Presentation.CommandManager" /> by name found in <see cref="OwnerInstanceName" /> property
+		/// </summary>
+		public ICollection<Type> OwnerTypes { 
+			get {
+				if(_ownerTypeName != null) {
+					return SDCommandManager.GetNamedUITypeCollection(_ownerTypeName);
+				}
+				
+				return null;
+			}
+		}
+		
+		/// <summary>
+		/// Gets name of <see cref="RoutedUICommand" /> associated with binding info as registered using 
+		/// <see cref="ICSharpCode.Core.Presentation.CommandManager.RegisterRoutedUICommand" />
+		/// 
+		/// This attribute can't be set while <see cref="InputBindingInfo" /> or <see cref="CommandBindingInfo" />
+		/// is registered in <see cref="ICSharpCode.Core.Presentation.CommandManager" />
+		/// </summary>
+		public virtual string RoutedCommandName { 
+			get {
+				return routedCommandName;
+			}
+			set {
+				if(IsRegistered) {
+					throw new ArgumentException("Can not change routed command while binding info is registered");
+				}
+				
+				routedCommandName = value;
+			}
+		}
+		
+		/// <summary>
+		/// Gets <see cref="RoutedUICommand" /> instance registered in <see cref="ICSharpCode.Core.Presentation.CommandManager" /> by name found in <see cref="RoutedCommandName" /> property
+		/// </summary>
+		public RoutedUICommand RoutedCommand { 
+			get { 
+				return SDCommandManager.GetRoutedUICommand(RoutedCommandName);
+			}
+		}
+		
+		/// <summary>
+		/// Gets whether <see cref="CommandBindingInfo" /> or <see cref="InputBindingInfo" /> is registered in 
+		/// <see cref="ICSharpCode.Core.Presentation.CommandManager" /> 
+		/// </summary>
+		public bool IsRegistered
+		{
+			get; internal set;
+		}
+		
+		/// <summary>
+		/// Gets or sets add-in which created this <see cref="CommandBindingInfo" /> or <see cref="InputBindingInfo" />
+		/// 
+		/// In case of <see cref="CommandBindingInfo" /> this reference is used to create an instance of
+		/// associated command when doing lazy loading
+		/// 
+		/// This attribute can't be set while <see cref="InputBindingInfo" /> or <see cref="CommandBindingInfo" />
+		/// is registered in <see cref="ICSharpCode.Core.Presentation.CommandManager" />
+		/// </summary>
+		public AddIn AddIn {
+			get {
+				return _addIn;
+			} 
+			set {
+				if(IsRegistered) {
+					throw new ArgumentException("Can not change add-in while binding info is registered");
+				}
+				
+				_addIn = value;
+			}
+		}
+		
+		protected void SetCollectionChanged<T>(IObservableCollection<T> oldObservableCollection, IObservableCollection<T> newObservableCollection, NotifyCollectionChangedEventHandler handler) 
+		{
+			newObservableCollection.CollectionChanged += handler;
+			
+			if(oldObservableCollection != null) {
+				oldObservableCollection.CollectionChanged -= handler;
+			
+				var oldItems = new System.Collections.ArrayList();
+				foreach(var oldItem in oldObservableCollection) {
+					oldItems.Add(oldItem);
+				}
+				
+				var newItems = new System.Collections.ArrayList();
+				foreach(var newItem in newObservableCollection) {
+					newItems.Add(newItem);
+				}
+				
+				handler.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Replace, newItems, oldItems, 0));
+			}
+		}
+		
+		/// <summary>
+		/// Handles <see cref="ICSharpCode.Core.Presentation.CommandManager.BindingsChanged" /> event
+		/// </summary>
+		/// <param name="sender">Sender object</param>
+		/// <param name="args">Event data</param>
+		public void BindingsChangedHandler(object sender, NotifyBindingsChangedEventArgs args)
+		{
+			if(!IsRegistered || RoutedCommand == null || (OwnerTypes == null && OwnerInstances == null)) {
+				return;
+			}
+			
+			if( (args.Action == NotifyBindingsChangedAction.BindingInfoModified && args.ModifiedBindingInfoTemplates.Contains(BindingInfoTemplate.CreateFromIBindingInfo(this)))
+			 || (args.Action == NotifyBindingsChangedAction.NamedInstanceModified && OwnerInstanceName == args.UIElementName)
+			 || (args.Action == NotifyBindingsChangedAction.RoutedUICommandModified && routedCommandName == args.RoutedCommandName)
+			 || (args.Action == NotifyBindingsChangedAction.NamedTypeModified && OwnerTypeName == args.TypeName)
+			 || (args.Action == NotifyBindingsChangedAction.GroupAttachmendsModified && ((OwnerTypeName != null && OwnerTypes.Any(t1 => args.GroupHandledInstances.Any(t2 => t1 == t2.GetType())))
+			 	 || (OwnerInstanceName != null && OwnerInstances.Any(t1 => args.GroupHandledInstances.Any(t2 => t1 == t2)))))
+			 ) {
+				GenerateBindings();
+				
+				if(OwnerInstanceName != null) {
+					PopulateOwnerInstancesWithBindings(Groups.Count == 0 ? OwnerInstances : Groups.FilterInstancesRegisteredInNestedGroups(OwnerInstances, false));
+				} else {
+					if(Groups.Count == 0) {
+						PopulateOwnerInstancesWithBindings(null);
+						PopulateOwnerTypesWithBindings(OwnerTypes);
+					} else {
+						PopulateOwnerTypesWithBindings(null);
+						PopulateOwnerInstancesWithBindings(Groups.FilterInstancesRegisteredInNestedGroups(OwnerTypes, false));
+					}
+				}
+			}
+		}
+		
+		/// <summary>
+		/// Remove bindings currently assigned to <see cref="UIElement" /> or <see cref="Type" />
+		/// collection described in this binding info
+		/// </summary>
+		public void RemoveActiveBindings()
+		{
+			PopulateOwnerInstancesWithBindings(null);
+			PopulateOwnerTypesWithBindings(null);
+		}
+		
+		/// <summary>
+		/// Represents instance of <see cref="BindingInfoBase" /> as string
+		/// </summary>
+		/// <returns></returns>
+		public override string ToString()
+		{
+			return string.Format(
+				"[{0}={1}, RoutedCommandName={2}, Hash={3}",
+				OwnerInstanceName != null ? "OwnerInstanceName" : "OwnerTypeName",
+				OwnerInstanceName != null ? OwnerInstanceName : OwnerTypeName,
+				RoutedCommandName,
+				GetHashCode());
+		}
+		
+		/// <summary>
+		/// Generate up to date <see cref="InputBindings" /> collection in case of <see cref="InputBindingInfo" />
+		/// or <see cref="CommandBindings" /> collection in case of <see cref="CommandBindingInfo" />
+		/// </summary>
+		protected abstract void GenerateBindings();
+		
+		/// <summary>
+		/// Fills <see cref="UIElement.CommandBindings" /> or <see cref="UIElement.InputBindings" /> collections 
+		/// with generated <see cref="CommandBinding" /> or <see cref="InputBinding" /> collections
+		/// </summary>
+		/// <param name="newInstances">Collection of <see cref="UIElement" /></param>
+		protected abstract void PopulateOwnerInstancesWithBindings(ICollection<UIElement> newInstances);
+		
+		/// <summary>
+		/// Using <see cref="System.Windows.Input.CommandManager.RegisterClassCommandBinding" /> or <see cref="System.Windows.Input.CommandManager.RegisterClassCommandBinding" /> methods
+		/// registers generated <see cref="CommandBinding" /> or <see cref="InputBinding" /> collections to collection of provided types
+		/// </summary>
+		/// <param name="newInstances">Collection of <see cref="Type" /></param>
+		protected abstract void PopulateOwnerTypesWithBindings(ICollection<Type> newtTypes);
+    }
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/CommandsService/BindingInfoTemplate.cs b/src/Main/ICSharpCode.Core.Presentation/CommandsService/BindingInfoTemplate.cs
new file mode 100644
index 0000000000..7c4f6e8216
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/CommandsService/BindingInfoTemplate.cs
@@ -0,0 +1,84 @@
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Input;
+using System.Reflection;
+
+namespace ICSharpCode.Core.Presentation
+{
+	/// <summary>
+	/// Contains data enough to uniquely identify <see cref="CommandBindingInfo" /> 
+	/// or <see cref="InputBindingInfo" /> in <see cref="ICSharpCode.Core.Presentation.CommandManager" />
+	/// 
+	/// When property value set to null it is counted as wildcard when searching for matching binding infos
+	/// </summary>
+	public struct BindingInfoTemplate
+	{
+		private string _ownerInstanceName;
+		private string _ownerTypeName;
+		private string _routedCommandName;
+		
+		/// <summary>
+		/// Gets name of named owner instance as registered using <see cref="ICSharpCode.Core.Presentation.CommandManager.RegisterNamedUIElement()" />
+		/// </summary>
+		public string OwnerInstanceName
+		{
+			get {
+				return _ownerInstanceName;
+			}
+		}
+		
+		/// <summary>
+		/// Gets name of named owner type as registered using <see cref="ICSharpCode.Core.Presentation.CommandManager.RegisterNamedUIType()" />
+		/// </summary>
+		public string OwnerTypeName
+		{
+			get {
+				return _ownerTypeName;
+			}
+		}
+		
+		/// <summary>
+		/// Gets name of registered named <see cref="RoutedUICommand" />
+		/// </summary>
+		public string RoutedCommandName
+		{
+			get {
+				return _routedCommandName;
+			}
+		}
+		
+		/// <summary>
+		/// Creates <see cref="BndingInfoTemplate" /> instance from provided property values
+		/// </summary>
+		/// <param name="ownerInstanceName">Gets name of named owner instance as registered using <see cref="ICSharpCode.Core.Presentation.CommandManager.RegisterNamedUIElement()" /></param>
+		/// <param name="ownerTypeName">Gets name of named owner type as registered using <see cref="ICSharpCode.Core.Presentation.CommandManager.RegisterNamedUIType()" /></param>
+		/// <param name="routedCommandName">Gets name of registered named <see cref="RoutedUICommand" /></param>
+		/// <returns>Created <see cref="BndingInfoTemplate" /> instance</returns>
+		public static BindingInfoTemplate Create(string ownerInstanceName, string ownerTypeName, string routedCommandName)
+		{
+			var tpl = new BindingInfoTemplate();
+			tpl._ownerInstanceName = ownerInstanceName;
+			tpl._ownerTypeName = ownerTypeName;
+			tpl._routedCommandName = routedCommandName;
+			
+			return tpl;
+		}
+		
+		/// <summary>
+		/// Create <see cref="BindingInfoTemplate" /> instance which can identify provided <see cref="BindingInfoBase" />
+		/// </summary>
+		/// <param name="bindingInfo">Provided binding info</param>
+		/// <returns>Created <see cref="BndingInfoTemplate" /> instance</returns>
+		public static BindingInfoTemplate CreateFromIBindingInfo(BindingInfoBase bindingInfo)
+		{
+			var tpl = new BindingInfoTemplate();
+			tpl._ownerInstanceName = bindingInfo.OwnerInstanceName;
+			tpl._ownerTypeName = bindingInfo.OwnerTypeName;
+			tpl._routedCommandName = bindingInfo.RoutedCommandName;
+			
+			return tpl;
+		}
+	}
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/CommandsService/Collections/BindingGroupCollection.cs b/src/Main/ICSharpCode.Core.Presentation/CommandsService/Collections/BindingGroupCollection.cs
new file mode 100644
index 0000000000..3233cb331f
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/CommandsService/Collections/BindingGroupCollection.cs
@@ -0,0 +1,302 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Data;
+using System.Linq;
+using System.Windows;
+
+using ICSharpCode.Core;
+
+namespace ICSharpCode.Core.Presentation
+{
+	/// <summary>
+	/// Observable collection of <see cref="BindingGroup" />
+	/// </summary>
+	public class BindingGroupCollection : IObservableCollection<BindingGroup>
+	{
+		private bool forwardEvents = true;
+		
+		private ObservableCollection<BindingGroup> _bindingGroups;
+		private event NotifyCollectionChangedEventHandler _bindingGroupsCollectionChanged;
+		private bool _isReadOnly;
+		
+		/// <summary>
+		/// Creates instance of read-write <see cref="BindingGroupCollection" />
+		/// </summary>
+		public BindingGroupCollection() : this(false, null)
+		{
+		}
+		
+		/// <summary>
+		/// Creates instance of <see cref="BindingGroupCollection" />
+		/// </summary>
+		/// <param name="isReadOnly">Specifies whether collection is read-only or not</param>
+		/// <param name="groups">Prefilled groups</param>
+		public BindingGroupCollection(bool isReadOnly, ICollection<BindingGroup> groups)
+		{
+			_isReadOnly = isReadOnly;
+			
+			var observableBindingGroups = new ObservableCollection<BindingGroup>(groups == null ? new List<BindingGroup>() : groups.ToList());
+			observableBindingGroups.CollectionChanged += delegate(object sender, NotifyCollectionChangedEventArgs e) {  
+				if(_bindingGroupsCollectionChanged != null && forwardEvents) {
+					_bindingGroupsCollectionChanged.Invoke(this, e);
+				}
+			};
+			
+			_bindingGroups = observableBindingGroups;
+		}
+		
+		/// <summary>
+		/// Gets single-level collection containing attached instances from this group and all nested groups
+		/// </summary>
+		/// <param name="includeDisabledNestedGroups">Specifies whether binding groups with <see cref="BindingGroup.IsEnabled" /> attribute should be taken into account</param>
+		public ICollection<UIElement> GetInstancesRegisteredInNestedGroups(bool includeDisabledNestedGroups)
+		{
+			var attachments = new HashSet<UIElement>();
+			foreach(var group in GetFlatNesteGroups(includeDisabledNestedGroups)) {
+				foreach(var groupAttachment in group.RegisteredInstances) {
+					attachments.Add(groupAttachment);
+				}
+			}
+			
+			return new ReadOnlyCollection<UIElement>(attachments.ToArray());
+		}
+		
+		/// <inheritdoc />
+		public event NotifyCollectionChangedEventHandler CollectionChanged
+		{
+			add {
+				if(_isReadOnly) {
+					throw new ReadOnlyException("This BindingGroupCollection is read-only");
+				}
+				
+				_bindingGroupsCollectionChanged += value;
+			}
+			remove {
+				if(_isReadOnly) {
+					throw new ReadOnlyException("This BindingGroupCollection is read-only");
+				}
+				
+				_bindingGroupsCollectionChanged -= value;
+			}
+		}
+		
+		/// <summary>
+		/// Gets <see cref="BindingGroupCollection" /> containing all nested binding groups
+		/// </summary>
+		/// <param name="includeDisabledNestedGroups">Specifies whether binding groups with <see cref="BindingGroup.IsEnabled" /> attribute should be taken into account</param>
+		public BindingGroupCollection GetFlatNesteGroups(bool includeDisabledNestedGroups)
+		{
+			var flatGroups = new BindingGroupCollection();
+			foreach(var bindingGroup in this) {
+				if(!includeDisabledNestedGroups && !bindingGroup.IsEnabled) continue;
+				
+				flatGroups.AddRange(bindingGroup.GetFlatNestedGroups(includeDisabledNestedGroups));
+			}
+			
+			return new BindingGroupCollection(true, flatGroups);
+		}
+		
+		/// <summary>
+		/// Determines whether <see cref="UIElement" /> instance is handled by any group or any nested group in this collection
+		/// </summary>
+		/// <param name="instance">Examined instance</param>
+		/// <param name="includeDisabledNestedGroups">Specifies whether binding groups with <see cref="BindingGroup.IsEnabled" /> attribute should be taken into account</param>
+		/// <returns><code>true</code> if registered; otherwise <code>false</code></returns>
+		public bool IsInstanceRegistered(UIElement instance, bool includeDisabledNestedGroups)
+		{
+			return GetInstancesRegisteredInNestedGroups(includeDisabledNestedGroups).Contains(instance);
+		}
+		
+		/// <summary>
+		/// Determines whether any <see cref="UIElement" /> instance from provided collection
+		/// is handled by any group in this collection or any nested group
+		/// </summary>
+		/// <param name="instance">Examined instance</param>
+		/// <param name="includeDisabledNestedGroups">Specifies whether binding groups with <see cref="BindingGroup.IsEnabled" /> attribute should be taken into account</param>
+		/// <returns><code>true</code> if registered; otherwise <code>false</code></returns>
+		public bool IsAnyInstanceRegistered(ICollection<UIElement> instances, bool includeDisabledNestedGroups)
+		{
+			if(instances != null && instances.Count > 0) {
+				foreach(var instance in instances) {
+					if(IsInstanceRegistered(instance, includeDisabledNestedGroups)) {
+						return true;
+					}
+				}
+			}
+			
+			return false;
+		}
+		
+		/// <summary>
+		/// From provided <see cref="ICollection{Type}" /> collection generate <see cref="ICollection{UIElement}" /> collection containing 
+		/// instances created from one of the provided types and registered in any group included in this <see cref="BindingGroupCollection" />
+		/// or any nested groups
+		/// </summary>
+		/// <param name="instances">Collection of examined types</param>
+		/// <param name="includeDisabledNestedGroups">Specifies whether binding groups with <see cref="BindingGroup.IsEnabled" /> attribute should be taken into account</param>
+		/// <returns>Generated instances</returns>
+		public ICollection<UIElement> FilterInstancesRegisteredInNestedGroups(ICollection<Type> types, bool includeDisabledNestedGroups)
+		{
+			var instances = new HashSet<UIElement>();
+			foreach(var group in GetFlatNesteGroups(includeDisabledNestedGroups)) {
+				foreach(var instance in group.FilterRegisteredInstances(types, includeDisabledNestedGroups)) {
+					instances.Add(instance);
+				}
+			}
+			
+			return instances;
+		}
+		
+		/// <summary>
+		/// From provided <see cref="ICollection{UIElement}" /> collection filter <see cref="ICollection{UIElement}" /> collection containing 
+		/// only instances registered in any group included in this <see cref="BindingGroupCollection" /> or any nested group
+		/// </summary>
+		/// <param name="instances">Collection of examined instances</param>
+		/// <param name="includeDisabledNestedGroups">Specifies whether binding groups with <see cref="BindingGroup.IsEnabled" /> attribute should be taken into account</param>
+		/// <returns>Filtered instances</returns>
+		public ICollection<UIElement> FilterInstancesRegisteredInNestedGroups(ICollection<UIElement> instances, bool includeDisabledNestedGroups)
+		{
+			var attachedInstances = new HashSet<UIElement>();
+			foreach(var group in GetFlatNesteGroups(includeDisabledNestedGroups)) {
+				foreach(var instance in group.FilterRegisteredInstances(instances, includeDisabledNestedGroups)) {
+					attachedInstances.Add(instance);
+				}
+			}
+			
+			return attachedInstances;
+		}
+		
+		/// <summary>
+		/// Number of <see cref="BindingGroup" /> instances in this collection
+		/// </summary>
+		public int Count {
+			get {
+				return _bindingGroups.Count;
+			}
+		}
+		
+		/// <summary>
+		/// Returns returns read-only copy of <see cref="BindingGroupCollection" />
+		/// </summary>
+		/// <returns>Read-only <see cref="BindingGroupCollection" /></returns>
+		public BindingGroupCollection AsReadOnly()
+		{
+			return new BindingGroupCollection(true, this);
+		}
+		
+		/// <inheritdoc />
+		public bool IsReadOnly {
+			get {
+				return _isReadOnly;
+			}
+		}
+		
+		/// <summary>
+		/// Add <see cref="BindingGroup" /> to this collection
+		/// </summary>
+		/// <param name="bindingGroup"></param>
+		public void Add(BindingGroup bindingGroup)
+		{
+			if(_isReadOnly) {
+				throw new ReadOnlyException("This BindingGroupCollection is read-only");
+			}
+			
+			if(bindingGroup == null) {
+				throw new ArgumentNullException("bindingGroup");
+			}
+			
+			if(!_bindingGroups.Contains(bindingGroup)) {
+				_bindingGroups.Add(bindingGroup);
+			}
+		}
+		
+		/// <summary>
+		/// Remove all instances of <see cref="BindingGroup" /> from this collection
+		/// </summary>
+		public void Clear()
+		{
+			if(_isReadOnly) {
+				throw new ReadOnlyException("This BindingGroupCollection is read-only");
+			}
+
+			var groupsBackup = GetFlatNesteGroups(true).ToArray();
+			forwardEvents = false;
+			_bindingGroups.Clear();
+			forwardEvents = true;
+			
+			InvokeCollectionChanged(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, groupsBackup));
+		}
+		
+		/// <summary>
+		/// Add many instances of <see cref="BindingGroup" /> to this collection
+		/// </summary>
+		/// <param name="bindingGroups"></param>
+		public void AddRange(IEnumerable<BindingGroup> bindingGroups)
+		{
+			if(_isReadOnly) {
+				throw new ReadOnlyException("This BindingGroupCollection is read-only");
+			}
+			
+			foreach(var bindingGroup in bindingGroups) {
+				Add(bindingGroup);
+			}
+		}
+		
+		/// <summary>
+		/// Determines whether this <see cref="BindingGroupCollection" /> contains
+		/// provided instance of <see cref="BindingGroup" />
+		/// </summary>
+		/// <param name="bindingGroup">Instance of <see cref="BindingGroup" /></param>
+		/// <returns>Returns <code>true</code> if binding group is present in collection; otherwise returns <code>false</code></returns>
+		public bool Contains(BindingGroup bindingGroup)
+		{
+			return _bindingGroups.Contains(bindingGroup);
+		}
+		
+		/// <summary>
+		/// Copy this collection to array
+		/// </summary>
+		/// <param name="array">Array of <see cref="BindingGroup" /> instances</param>
+		/// <param name="arrayIndex">Copy start index</param>
+		public void CopyTo(BindingGroup[] array, int arrayIndex)
+		{
+			_bindingGroups.CopyTo(array, arrayIndex);
+		}
+		
+		/// <summary>
+		/// Remove instance of <see cref="BindingGroup" />
+		/// </summary>
+		/// <param name="bindingGroup">Added instance of <see cref="BindingGroup" /></param>
+		/// <returns><code>True</code> if item was added; otherwise <code>false</code></returns>
+		public bool Remove(BindingGroup bindingGroup)
+		{
+			if(_isReadOnly) {
+				throw new ReadOnlyException("This BindingGroupCollection is read-only");
+			}
+			
+			return _bindingGroups.Remove(bindingGroup);
+		}
+		
+		/// <inheritdoc />
+		public IEnumerator<BindingGroup> GetEnumerator()
+		{
+			return _bindingGroups.GetEnumerator();
+		}
+		
+		/// <inheritdoc />
+		System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+		{
+			return _bindingGroups.GetEnumerator();
+		}
+		
+		private void InvokeCollectionChanged(object sender, NotifyCollectionChangedEventArgs e) 
+		{
+			if(_bindingGroupsCollectionChanged != null && forwardEvents) {
+				_bindingGroupsCollectionChanged.Invoke(this, e);
+			}
+		}
+		
+	}
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/CommandsService/Collections/BindingInfoTemplateDictionary.cs b/src/Main/ICSharpCode.Core.Presentation/CommandsService/Collections/BindingInfoTemplateDictionary.cs
new file mode 100644
index 0000000000..06e6ac5e49
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/CommandsService/Collections/BindingInfoTemplateDictionary.cs
@@ -0,0 +1,142 @@
+using System;
+using System.Linq;
+using System.Windows;
+using System.Text;
+using System.IO;
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace ICSharpCode.Core.Presentation
+{
+	/// <summary>
+	/// Holds objects of type T which can be searched by <see cref="BindingInfoTemplate" />
+	/// </summary>
+    public class BindingInfoTemplateDictionary<T>
+    {
+		static List<PropertyInfo> properties;
+		static PropertyInfo OwnerInstanceNameProperty;
+		static PropertyInfo OwnerTypeNameProperty;
+		static PropertyInfo RoutedCommandNameProperty;
+
+    	private Dictionary<BindingInfoTemplate, HashSet<T>> dictionary = new Dictionary<BindingInfoTemplate, HashSet<T>>();
+		
+		/// <summary>
+		/// Creates new instance of <see cref="BindingInfoTemplateDictionary{T}" />
+		/// </summary>
+		static BindingInfoTemplateDictionary()
+		{
+			var t = typeof(BindingInfoTemplate);
+			properties = new List<PropertyInfo>(4);
+			properties.Add(OwnerInstanceNameProperty = t.GetProperty("OwnerInstanceName"));
+			properties.Add(OwnerTypeNameProperty = t.GetProperty("OwnerTypeName"));
+			properties.Add(RoutedCommandNameProperty = t.GetProperty("RoutedCommandName"));
+		}
+		
+		/// <summary>
+		/// Add new item of type T to the dictionary
+		/// </summary>
+		/// <param name="template">Template which can be used to search for an item</param>
+		/// <param name="item">Added item</param>
+		public void Add(BindingInfoTemplate template, T item)
+		{
+			foreach(var wildCardTemplate in GetWildCardTemplates(template)) {
+				if(!dictionary.ContainsKey(wildCardTemplate)) {
+					dictionary.Add(wildCardTemplate, new HashSet<T>());
+				}
+				
+				dictionary[wildCardTemplate].Add(item);
+			}
+		}
+		
+		/// <summary>
+		/// Find items using <see cref="BindingInfoTemplate" />
+		/// 
+		/// <code>null</code> values in the template will act as wildcards
+		/// </summary>
+		/// <param name="template">Template</param>
+		/// <returns>Collection of found items identified by provided <see cref="BindingInfoTemplate" /></returns>
+		public ICollection<T> FindItems(BindingInfoTemplate template) 
+		{
+			var bucket = FindBucket(template);
+			if(bucket != null) {
+				var items = new T[bucket.Count];
+				bucket.CopyTo(items, 0);
+				return items;
+			}
+			
+			return null;
+		}
+		
+		private HashSet<T> FindBucket(BindingInfoTemplate template) 
+		{				
+			HashSet<T> bucket;
+			dictionary.TryGetValue(template, out bucket);
+			if(bucket == null) {
+				bucket = new HashSet<T>();
+			}
+			
+			return bucket;
+		}
+		
+		/// <summary>
+		/// Remove item from template
+		/// </summary>
+		/// <param name="item"></param>
+		public void Remove(T item) 
+		{
+			foreach(var pair in dictionary) {
+				pair.Value.Remove(item);
+			}
+		}
+
+		/// <summary>
+		/// Remove all registered items from dictionary
+		/// </summary>
+	    public void Clear() 
+	    {
+	    	dictionary.Clear();
+	    }
+	    
+		private List<BindingInfoTemplate> GetWildCardTemplates(BindingInfoTemplate template)
+		{
+			var notNullProperties = GetNotNullProperties(template);
+			var notNullPropertiesCopy = new List<PropertyInfo>(notNullProperties);
+			var generatedTemplates = new List<BindingInfoTemplate>((int)Math.Pow(2, notNullProperties.Count));
+			generatedTemplates.Add(template);
+			
+			GetWildCardTemplatesRecursive(notNullPropertiesCopy, template, generatedTemplates);
+			
+			return generatedTemplates;
+		}
+		
+		private void GetWildCardTemplatesRecursive(List<PropertyInfo> notNullPropertiesCollection, BindingInfoTemplate rootTemplate, List<BindingInfoTemplate> generatedTemplates)
+		{
+			foreach(var property in notNullPropertiesCollection) {
+				var nestedNotNullPropertiesCollection = new List<PropertyInfo>(notNullPropertiesCollection);
+				nestedNotNullPropertiesCollection.Remove(property);
+				
+				var template = BindingInfoTemplate.Create(
+					property != OwnerInstanceNameProperty ? rootTemplate.OwnerInstanceName : null, 
+					property != OwnerTypeNameProperty ? rootTemplate.OwnerTypeName : null, 
+					property != RoutedCommandNameProperty ? rootTemplate.RoutedCommandName : null);
+				
+				generatedTemplates.Add(template);
+				
+				GetWildCardTemplatesRecursive(nestedNotNullPropertiesCollection, template, generatedTemplates);
+				GetWildCardTemplatesRecursive(nestedNotNullPropertiesCollection, rootTemplate, generatedTemplates);
+			}
+		}
+		
+		private List<PropertyInfo> GetNotNullProperties(BindingInfoTemplate template)
+		{
+			var notNullProperties = new List<PropertyInfo>();
+			foreach(var property in properties) {
+				if(property.GetValue(template, null) != null) {
+					notNullProperties.Add(property);
+				}
+			}
+			
+			return notNullProperties;
+		}
+    }
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/CommandsService/Collections/InputBindingCategoryCollection.cs b/src/Main/ICSharpCode.Core.Presentation/CommandsService/Collections/InputBindingCategoryCollection.cs
new file mode 100644
index 0000000000..db26b193b7
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/CommandsService/Collections/InputBindingCategoryCollection.cs
@@ -0,0 +1,131 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Collections.ObjectModel;
+
+namespace ICSharpCode.Core.Presentation
+{
+	/// <summary>
+	/// Observable collection containing instances of <see cref="InputBindingCategory" />
+	/// </summary>
+	public class InputBindingCategoryCollection : IObservableCollection<InputBindingCategory>
+	{
+		private ObservableCollection<InputBindingCategory> categories = new ObservableCollection<InputBindingCategory>();
+		
+		/// <summary>
+		/// Gets number of elements in this <see cref="InputBindingCategoryCollection" />
+		/// </summary>
+		public int Count {
+			get {
+				return categories.Count;
+			}
+		}
+		
+		/// <inheritdoc />
+		public bool IsReadOnly {
+			get {
+				return false;
+			}
+		}
+		
+		private event NotifyCollectionChangedEventHandler categoriesCollectionChanged;
+		
+		/// <inheritdoc />
+		public event NotifyCollectionChangedEventHandler CollectionChanged
+		{
+			add {
+				categoriesCollectionChanged += value;
+				categories.CollectionChanged += value;
+			}
+			remove {
+				categoriesCollectionChanged -= value;
+				categories.CollectionChanged -= value;
+			}
+		}
+		
+		/// <summary>
+		/// Add <see cref="InputBindingCategory" /> to this <see cref="InputBindingCategoryCollection" />
+		/// </summary>
+		/// <param name="category"></param>
+		public void Add(InputBindingCategory category)
+		{
+			if(category == null) {
+				throw new ArgumentException("InputBindingCategory can not be null");
+			}
+			
+			if(!categories.Contains(category)) {
+				categories.Add(category);
+			}
+		}
+		
+		/// <summary>
+		/// Removes all categories from this collection
+		/// </summary>
+		public void Clear()
+		{
+			var categoriesBackup = categories;
+			
+			categories =new ObservableCollection<InputBindingCategory>();
+			foreach(NotifyCollectionChangedEventHandler handler in categoriesCollectionChanged.GetInvocationList()) {
+				categories.CollectionChanged += handler;
+			}
+			
+			if(categoriesCollectionChanged != null) {
+				categoriesCollectionChanged.Invoke(
+					this,
+					new NotifyCollectionChangedEventArgs(
+						NotifyCollectionChangedAction.Remove,
+						categoriesBackup));
+			}
+		}
+		
+		/// <summary>
+		/// Determines whether this collection contains instance of <see cref="InputBindingCategory" />
+		/// </summary>
+		/// <param name="category">Category to be examined</param>
+		/// <returns>Returns <code>true</code> if collection contains provided category; otherwise <code>false</code></returns>
+		public bool Contains(InputBindingCategory category)
+		{
+			return categories.Contains(category);
+		}
+		
+		/// <summary>
+		/// Add multiple categories to <see cref="InputBindingCategory" />
+		/// </summary>
+		/// <param name="categories">Categories to add</param>
+		public void AddRange(IEnumerable<InputBindingCategory> categories)
+		{
+			foreach(var category in categories) {
+				Add(category);
+			}
+		}
+		
+		/// <inheritdoc /> 
+		public void CopyTo(InputBindingCategory[] array, int arrayIndex)
+		{
+			categories.CopyTo(array, arrayIndex);
+		}
+		
+		/// <summary>
+		/// Remove <see cref="InputBindingCategory" /> instance from collection
+		/// </summary>
+		/// <param name="category">Category to remove</param>
+		/// <returns>Returns <code>true</code> if item was removed; otherwise <code>false</code></returns>
+		public bool Remove(InputBindingCategory category)
+		{
+			return categories.Remove(category);
+		}
+		
+		/// <inheritdoc />
+		public IEnumerator<InputBindingCategory> GetEnumerator()
+		{
+			return categories.GetEnumerator();
+		}
+		
+		/// <inheritdoc />
+		System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+		{
+			return categories.GetEnumerator();
+		}
+	}
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/CommandsService/Collections/RelationshipMap.cs b/src/Main/ICSharpCode.Core.Presentation/CommandsService/Collections/RelationshipMap.cs
new file mode 100644
index 0000000000..63db68bb79
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/CommandsService/Collections/RelationshipMap.cs
@@ -0,0 +1,146 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Collections.ObjectModel;
+
+namespace ICSharpCode.Core.Presentation
+{
+	/// <summary>
+	/// Handles many-to-many relationship between instances of T1 and T2 type
+	/// </summary>
+	public class RelationshipMap<T1, T2>
+	{
+		private static Dictionary<T1, HashSet<T2>> forwardMap;
+		private static Dictionary<T2, HashSet<T1>> backwardMap;
+		
+		private IEqualityComparer<T1> t1Comparer;
+		private IEqualityComparer<T2> t2Comparer;
+		
+		/// <summary>
+		/// Creates new instance of <see cref="RelationshipMap" />
+		/// </summary>
+		public RelationshipMap()
+		{
+			forwardMap = new Dictionary<T1, HashSet<T2>>();
+			backwardMap = new Dictionary<T2, HashSet<T1>>();
+		}
+		
+		/// <summary>
+		/// Gets a thread-safe dictionary of forward conversions
+		/// </summary>
+		public IDictionary<T1, ICollection<T2>> ForwardMap 
+		{
+			get {
+				var dict = new Dictionary<T1, ICollection<T2>>();
+				foreach(var pair in forwardMap) {
+					dict.Add(pair.Key, new List<T2>(pair.Value));
+				}
+				
+				return dict;
+			}
+		}
+		
+		/// <summary>
+		/// Gets a thread-safe dictionary of backward conversions
+		/// </summary>
+		public IDictionary<T2, ICollection<T1>> BackwardMap 
+		{
+			get {
+				var dict = new Dictionary<T2, ICollection<T1>>();
+				foreach(var pair in backwardMap) {
+					dict.Add(pair.Key, new List<T1>(pair.Value));
+				}
+				
+				return dict;
+			}
+		}
+		
+		/// <summary>
+		/// Creates new instance of <see cref="RelationshipMap" />
+		/// </summary>
+		/// <param name="t1Comparer">T1 comparer</param>
+		/// <param name="t2Comparer">T2 comparer</param>
+		public RelationshipMap(IEqualityComparer<T1> t1Comparer, IEqualityComparer<T2> t2Comparer)
+		{
+			this.t1Comparer = t1Comparer;
+			this.t2Comparer = t2Comparer;
+			
+			forwardMap = new Dictionary<T1, HashSet<T2>>(t1Comparer);
+			backwardMap = new Dictionary<T2, HashSet<T1>>(t2Comparer);
+		}
+		
+		/// <summary>
+		/// Add new two-way association between item of type T1 and item of type T2
+		/// </summary>
+		/// <param name="item1">Item of type T1</param>
+		/// <param name="item2">Item of type T2</param>
+		/// <returns>Returns <code>true</code> in case relationship was successfully created; otherwise returns <code>false</code></returns>
+		public bool Add(T1 item1, T2 item2) 
+		{
+			if(!forwardMap.ContainsKey(item1)){
+				forwardMap.Add(item1, new HashSet<T2>(t2Comparer));
+			}
+			
+			if(!backwardMap.ContainsKey(item2)) {
+				backwardMap.Add(item2, new HashSet<T1>(t1Comparer));
+			}
+			
+			var forwardRemoveResult = forwardMap[item1].Add(item2);
+			var backwardRemoveResult = backwardMap[item2].Add(item1);
+			
+			return forwardRemoveResult || backwardRemoveResult;
+			//return forwardRemoveResult;
+		}
+		
+		/// <summary>
+		/// Selects all items mapped to provided item
+		/// </summary>
+		/// <param name="item">Mapping item</param>
+		/// <returns>All items mapped to provided item</returns>
+		public ICollection<T2> MapForward(T1 item) {
+			HashSet<T2> mappedValues;
+			forwardMap.TryGetValue(item, out mappedValues);
+			
+			return mappedValues ?? new HashSet<T2>();
+		}
+		
+		/// <summary>
+		/// Select all items mapped backward to provided item
+		/// </summary>
+		/// <param name="item">Mapping item</param>
+		/// <returns>All items mapped to provided item</returns>
+		public ICollection<T1> MapBackward(T2 item) {
+			HashSet<T1> mappedValues;
+			backwardMap.TryGetValue(item, out mappedValues);
+			
+			return mappedValues ?? new HashSet<T1>();
+		}
+		
+		/// <summary>
+		/// Removes association between item of type T1 and item of type T2
+		/// </summary>
+		/// <param name="item1">Item of type T1</param>
+		/// <param name="item2">Item of type T2</param>
+		/// <returns>Returns <code>true</code> if association was successfully removed; otherwise <code>false</code></returns>
+		public bool Remove(T1 item1, T2 item2) 
+		{
+			var forwardBucket = MapForward(item1);
+			var forwardRemoveResult = forwardBucket.Remove(item2);
+			
+			var backwardBucket = MapBackward(item2);
+			var backwardRemoveResult = backwardBucket.Remove(item1);
+			
+			return forwardRemoveResult || backwardRemoveResult;
+		}
+		
+		/// <summary>
+		/// Remove all associations from collection
+		/// </summary>
+		public void Clear()
+		{
+			forwardMap.Clear();
+			backwardMap.Clear();
+		}
+		
+	}
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/CommandsService/CommandBindingInfo.cs b/src/Main/ICSharpCode.Core.Presentation/CommandsService/CommandBindingInfo.cs
new file mode 100644
index 0000000000..a2a30f7ffb
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/CommandsService/CommandBindingInfo.cs
@@ -0,0 +1,292 @@
+using System;
+using System.Linq;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Input;
+using SDCommandManager=ICSharpCode.Core.Presentation.SDCommandManager;
+using CommandManager=System.Windows.Input.CommandManager;
+	
+namespace ICSharpCode.Core.Presentation
+{
+	/// <summary>
+	/// Stores details about <see cref="CommandBinding" />
+	/// </summary>
+	public class CommandBindingInfo : BindingInfoBase
+	{	
+		// Command associated with command binding info
+		private string commandTypeName;
+		private System.Windows.Input.ICommand commandInstance;
+		private ExecutedRoutedEventHandler executedEventHandler;
+		private CanExecuteRoutedEventHandler canExecuteEventHandler;
+		
+		// Owners which where set earlier
+		private List<UIElement> oldOwnerInstances;
+		private List<Type> oldOwnerTypes;
+		
+		// Command bindings which where set earlier
+		private CommandBindingCollection oldCommandBindingCollection = new CommandBindingCollection();
+		
+		/// <summary>
+		/// Creates new instance of <see cref="CommandBindingInfo" />
+		/// </summary>
+		public CommandBindingInfo()
+		{
+			ActiveCommandBindings = new CommandBindingCollection();
+		}
+		
+		/// <summary>
+		/// Gets or sets full name (returned by <see cref="Type.FullName" />) of <see cref="System.Windows.Input.ICommand" /> type associated with this <see cref="CommandBindingInfo" /> 
+		/// 
+		/// Instance of this class is created as soon as user executes the command. See <see cref="IsLazy" /> for details
+		/// 
+		/// If this attribute is provided <see cref="CommandInstance" />, <see cref="ExecutedEventHandler" />
+		/// and <see cref="CanExecuteEventHandler" /> can not be used
+		/// </summary>
+		public string CommandTypeName {
+			get {
+				return commandTypeName;
+			}
+			set {
+				if(canExecuteEventHandler != null || executedEventHandler != null || (commandTypeName == null && commandInstance != null)) {
+					throw new ArgumentException("Executed, CanExecute or CommandInstance property has already been set");   	
+				}
+				
+				if(IsRegistered) {
+					throw new ArgumentException("Can not change command type name while binding info is registered");
+				}
+				
+				commandTypeName = value;
+			}
+		}
+		
+		/// <summary>
+		/// Gets or sets <see cref="System.Windows.Input.ICommand" /> associated with this <see cref="CommandBindingInfo" />
+		/// 
+		/// If this attribute is provided <see cref="CommandInstanceName" />, <see cref="ExecutedEventHandler" />
+		/// and <see cref="CanExecuteEventHandler" /> can not be used
+		/// </summary>
+		public System.Windows.Input.ICommand CommandInstance { 
+			get {
+				if(commandInstance != null) {
+					return commandInstance;
+				}
+				
+				if(ExecutedEventHandler != null || CanExecuteEventHandler != null) {
+					return null;
+				}
+				
+				if(AddIn != null && (AddIn.DependenciesLoaded || IsLazy)) {
+					SDCommandManager.LoadAddinCommands(AddIn);
+				}
+				
+				System.Windows.Input.ICommand command;
+				SDCommandManager.commands.TryGetValue(CommandTypeName, out command);
+				commandInstance = command;
+
+				return command;
+			}
+			set {
+				if(canExecuteEventHandler != null || executedEventHandler != null || commandTypeName != null) {
+					throw new ArgumentException("Executed, CanExecute or CommandTypeName property has already been set");   	
+				}
+				
+				if(IsRegistered) {
+					throw new ArgumentException("Can not change command instance while binding info is registered");
+				}
+				
+				commandInstance = value;
+			}
+		}
+		
+		/// <summary>
+		/// Gets or sets <see cref="CommandBinding" /> "Executed" event handler
+		/// 
+		/// If this attribute is provided <see cref="CommandInstanceName" /> and <see cref="CommandInstance" />
+		/// can not be used
+		/// </summary>
+		public ExecutedRoutedEventHandler ExecutedEventHandler
+		{
+			get {
+				return executedEventHandler;
+			}
+			set {
+				if(commandTypeName != null || commandInstance != null) {
+					throw new ArgumentException("CommandTypeName or CommandInstance property has already been set");   	
+				}
+				
+				if(IsRegistered) {
+					throw new ArgumentException("Can not change \"Executed\" event handler while binding info is registered");
+				}
+				
+				if(commandInstance != null || commandTypeName != null) {
+					throw new ArgumentException("Command class is already provided");
+				}
+				
+				executedEventHandler = value;
+			}
+		}
+		
+		/// <summary>
+		/// Gets or sets <see cref="CommandBinding" /> "CanExecute" event handler
+		/// 
+		/// If this attribute is provided <see cref="CommandInstanceName" /> and <see cref="CommandInstance" />
+		/// can not be used
+		/// </summary>
+		public CanExecuteRoutedEventHandler CanExecuteEventHandler
+		{
+			get {
+				return canExecuteEventHandler;
+			}
+			set {
+				if(commandTypeName != null || commandInstance != null) {
+					throw new ArgumentException("CommandTypeName or CommandInstance property has already been set");   	
+				}
+				
+				if(IsRegistered) {
+					throw new ArgumentException("Can not change \"CanExecute\" event handler while binding info is registered");
+				}
+				
+				canExecuteEventHandler = value;
+			}
+		}
+		
+		/// <summary>
+		/// Apply <see cref="ActiveCommandBindings" /> to new <see cref="System.Windows.UIElement" /> collection
+		/// </summary>
+		/// <param name="newInstances">Collection of modified owner instances</param>
+		protected override void PopulateOwnerInstancesWithBindings(ICollection<UIElement> newInstances)
+		{				
+			if(oldOwnerInstances != null) {
+				foreach(var ownerInstance in oldOwnerInstances) {
+					foreach(CommandBinding binding in oldCommandBindingCollection) {
+						ownerInstance.CommandBindings.Remove(binding);
+					}
+				}
+			}
+			
+			oldOwnerInstances = new List<UIElement>();
+			
+			if(newInstances != null) {
+				foreach(var ownerInstance in newInstances) {
+					ownerInstance.CommandBindings.AddRange(ActiveCommandBindings);
+					oldOwnerInstances.Add(ownerInstance);
+				}
+			}
+		}
+		
+		
+		/// <summary>
+		/// Apply <see cref="ActiveCommandBindings" /> to new <see cref="System.Type" /> collection
+		/// </summary>
+		/// <param name="newInstances">Collection of modified owner types</param>
+		protected override void PopulateOwnerTypesWithBindings(ICollection<Type> newTypes)
+		{
+			if(oldOwnerTypes != null) {
+				foreach(var ownerType in oldOwnerTypes) {
+					foreach(CommandBinding binding in oldCommandBindingCollection) {
+						SDCommandManager.RemoveClassCommandBinding(ownerType, binding);
+					}
+				}
+			}
+			
+			oldOwnerTypes = new List<Type>();
+			
+			if(newTypes != null) {
+				foreach(var ownerType in newTypes) {
+					foreach(CommandBinding binding in ActiveCommandBindings) {
+						System.Windows.Input.CommandManager.RegisterClassCommandBinding(ownerType, binding);
+						oldOwnerTypes.Add(ownerType);
+					}
+				}
+			}
+		}
+
+		/// <summary>
+		/// Lazy load
+		/// 
+		/// If lazy load is enabled then all add-in references are loaded when this 
+		/// command is invoked. Otherwice if add-in is not loaded and IsLazy is set
+		/// to false then this binding can't be triggered until it is loaded manualy is loaded
+		/// using <see cref="CommandsRegistry.LoadCommand" /> or <see cref="CommandsRegistry.LoadAddInCommands" />.
+		/// </summary>
+		public bool IsLazy {
+			get; set;
+		}
+		
+		/// <summary>
+		/// Re-generate <see cref="ActiveCommandBindings" /> using <see cref="CommandBindingInfo" /> data
+		/// </summary>
+		protected override void GenerateBindings() 
+		{			
+			oldCommandBindingCollection = ActiveCommandBindings;
+			
+			ActiveCommandBindings = new CommandBindingCollection();
+			
+			var commandBinding = new CommandBinding(RoutedCommand);
+			commandBinding.CanExecute += GenerateCanExecuteEventHandler;					
+			commandBinding.Executed += ForwardExecutedEventHandler;
+			ActiveCommandBindings.Add(commandBinding);
+		}
+		
+		/// <summary>
+		/// Gets <see cref="InputBindingCollection" /> generated by this <see cref="InputBindingInfo" />
+		/// </summary>
+		public CommandBindingCollection ActiveCommandBindings
+		{
+			get; private set;
+		}
+
+		/// <summary>
+		/// Forwards <see cref="CommandBinding.Executed" /> event to event handler provided provided by developer
+		/// through one of the available means
+		/// </summary>
+		/// <param name="sender">Event sender</param>
+		/// <param name="e">Event arguments</param>
+		internal void ForwardExecutedEventHandler(object sender, ExecutedRoutedEventArgs e) {
+			if(ExecutedEventHandler != null) {
+				ExecutedEventHandler.Invoke(sender, e);
+			} else {
+				if(IsLazy && CommandInstance == null) {
+					AddIn.LoadRuntimeAssemblies();
+					
+					var command = (ICommand)AddIn.CreateObject(CommandTypeName);
+					SDCommandManager.LoadCommand(CommandTypeName, command);
+				}
+				
+				if(CommandInstance != null) {
+					CommandInstance.Execute(e.Parameter);
+				}
+			}
+		}
+		
+
+		/// <summary>
+		/// Forwards <see cref="CommandBinding.CanExecute" /> event to event handler provided provided by developer
+		/// through one of the available means
+		/// </summary>
+		/// <param name="sender">Event sender</param>
+		/// <param name="e">Event arguments</param>
+		internal void GenerateCanExecuteEventHandler(object sender, CanExecuteRoutedEventArgs e) {
+			if(this.CommandTypeName == "ShortcutsAPIDemo.WordCountCommand" || this.CommandTypeName == "ShortcutsAPIDemo.LineCountCommand")
+			{
+				
+			}
+			
+			if(CanExecuteEventHandler == null && ExecutedEventHandler != null) {
+				e.CanExecute = true;
+			} else if(CanExecuteEventHandler != null) {
+				CanExecuteEventHandler.Invoke(sender, e);
+			} else {
+				if(IsLazy && CommandInstance == null) {
+					e.CanExecute = true;
+				} else if(CommandInstance == null) {
+					e.CanExecute = false;
+				} else {
+					e.CanExecute = CommandInstance.CanExecute(e.Parameter); 						
+				}				
+			}
+		}
+	}
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/CommandsService/CommandsService.cs b/src/Main/ICSharpCode.Core.Presentation/CommandsService/CommandsService.cs
new file mode 100644
index 0000000000..8542592c6a
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/CommandsService/CommandsService.cs
@@ -0,0 +1,293 @@
+using System;
+using System.Reflection;
+using System.Windows.Input;
+using System.Windows.Documents;
+using System.Text;
+using System.Collections.Generic;
+using System.Collections;
+using ICSharpCode.Core;
+using ICSharpCode.Core.Presentation;
+
+namespace ICSharpCode.Core.Presentation
+{
+	/// <summary>
+	/// Utility class to help manage commands and bindings
+	/// </summary>
+	public static class CommandsService
+	{
+		/// <summary>
+		/// Register <see cref="InputBindingInfo" /> and <see cref="CommandBindingInfo" /> 
+		/// for all MenuItem codons under provided path
+		/// </summary>
+		/// <param name="caller">Caller object</param>
+		/// <param name="menuRootsLocationPath">Path to codons</param>
+		public static void RegisterMenuBindings(object caller, string menuRootsLocationPath)
+		{
+			var menuRoots = AddInTree.BuildItems<MenuLocationDescriptor>(menuRootsLocationPath, caller);
+			foreach(var menuRoot in menuRoots) {
+				CommandsService.RegisterSingleMenuBindings(menuRoot.MenuPath, caller, menuRoot.CategoryPaths);
+			}
+		}
+		
+		/// <summary>
+		/// Register <see cref="InputBindingInfo" /> and <see cref="CommandBindingInfo" /> using data in MenuItem codon
+		/// and nested codons
+		/// </summary>
+		/// <param name="menuPath">Path to MenuItem codon</param>
+		/// <param name="caller">Caller object</param>
+		/// <param name="categoryPath"><see cref="InputBindingCategory" /> path</param>
+		public static void RegisterSingleMenuBindings(string menuPath, object caller, string categoryPath)
+		{
+			var menuItemNode = AddInTree.GetTreeNode(menuPath);
+			var menuItems = menuItemNode.BuildChildItems<MenuItemDescriptor>(caller);
+			
+			RegisterSingleMenuBindings(menuItems, caller, categoryPath);
+		}
+			
+		private static void RegisterSingleMenuBindings(IList menuItems, object caller, string categoryPath) {
+			foreach(MenuItemDescriptor item in menuItems) {
+				var codon = item.Codon;
+					
+				if(codon.Properties["type"] == "" || codon.Properties["type"] == "command") {
+					string routedCommandName = null;
+					string routedCommandText = null;
+					
+					if(codon.Properties.Contains("command")) {			
+						routedCommandName = codon.Properties["command"];				
+						routedCommandText = codon.Properties["command"];
+					} else if(codon.Properties.Contains("link") || codon.Properties.Contains("class")) {
+						routedCommandName = string.IsNullOrEmpty(codon.Properties["link"]) ? codon.Properties["class"] : codon.Properties["link"];
+						routedCommandText = codon.Properties["label"];
+					}
+					
+					var routedCommand = SDCommandManager.GetRoutedUICommand(routedCommandName);
+					if(routedCommand == null) {
+						routedCommand = SDCommandManager.RegisterRoutedUICommand(routedCommandName, routedCommandText);
+					}
+
+					if(!codon.Properties.Contains("command") && (codon.Properties.Contains("link") || codon.Properties.Contains("class"))) {
+						var commandBindingInfo = new CommandBindingInfo();
+						commandBindingInfo.AddIn = codon.AddIn;
+						if(codon.Properties.Contains("ownerinstance")) {
+							commandBindingInfo.OwnerInstanceName = codon.Properties["ownerinstance"];
+						} else {
+							commandBindingInfo.OwnerTypeName = codon.Properties.Contains("ownertype") ? codon.Properties["ownertype"] : SDCommandManager.DefaultOwnerTypeName;
+						}
+						commandBindingInfo.CommandInstance = CommandWrapper.GetCommand(codon, null, codon.Properties["loadclasslazy"] == "true");
+						commandBindingInfo.RoutedCommandName = routedCommandName;
+						commandBindingInfo.IsLazy = true;
+						SDCommandManager.RegisterCommandBindingInfo(commandBindingInfo);
+					}
+					
+					// Register input bindings
+					var inputBindingInfo = new InputBindingInfo();
+					inputBindingInfo.AddIn = codon.AddIn;
+					if(codon.Properties.Contains("ownerinstance")) {
+						inputBindingInfo.OwnerInstanceName = codon.Properties["ownerinstance"];
+					} else {
+						inputBindingInfo.OwnerTypeName = codon.Properties.Contains("ownertype") ? codon.Properties["ownertype"] : SDCommandManager.DefaultOwnerTypeName;
+					}
+					inputBindingInfo.RoutedCommandName = routedCommandName;
+					
+					var defaultGesture = InputGestureCollectionConverter.Parse(codon.Properties["shortcut"], codon);
+					inputBindingInfo.DefaultGestures.AddRange(defaultGesture);
+					
+					// Menu category
+					var menuCategory = SDCommandManager.GetInputBindingCategory(categoryPath, true);
+					inputBindingInfo.Categories.Add(menuCategory);
+					
+					// User defined categories
+					if(codon.Properties.Contains("inputbindingcategories")) {
+						var additionalCategories = SDCommandManager.GetInputBindingCategoryCollection(codon.Properties["inputbindingcategories"], true);
+						inputBindingInfo.Categories.AddRange(additionalCategories);
+					}
+					
+					SDCommandManager.RegisterInputBindingInfo(inputBindingInfo);
+				}
+				
+				if(item.SubItems != null) {
+					var subMenuCategory = new InputBindingCategory(categoryPath + "/" + item.Codon.Id, codon.Properties["label"]);
+					SDCommandManager.RegisterInputBindingCategory(subMenuCategory);
+					
+					RegisterSingleMenuBindings(item.SubItems, caller, categoryPath + "/" + item.Codon.Id);
+				}
+			}
+		}
+		
+		/// <summary>
+		/// Register all <see cref="RoutedUICommand" /> static propertiess in provided class
+		/// </summary>
+		/// <param name="type">Class with static properties returning <see cref="RoutedUICommand" /></param>
+		public static void RegisterRoutedCommands(Type type) {
+			var typeMembers = type.GetMembers(BindingFlags.Static | BindingFlags.Public | BindingFlags.GetField | BindingFlags.GetProperty);
+			foreach(var member in typeMembers) {
+				RoutedUICommand command = null;
+				
+				var property = member as PropertyInfo;
+				var field = member as FieldInfo;
+				if(property != null) {
+					command = property.GetValue(null, null) as RoutedUICommand;
+				} else if(field != null) {
+					command = field.GetValue(null) as RoutedUICommand;
+				}
+				
+				if(command != null) {
+					SDCommandManager.RegisterRoutedUICommand(command);
+				}
+			}
+		}
+		
+		/// <summary>
+		/// Register default .Net routed commands
+		/// </summary>
+		public static void RegisterBuiltInRoutedUICommands() {
+			RegisterRoutedCommands(typeof(ApplicationCommands));
+			RegisterRoutedCommands(typeof(ComponentCommands));
+			RegisterRoutedCommands(typeof(MediaCommands));
+			RegisterRoutedCommands(typeof(NavigationCommands));
+			RegisterRoutedCommands(typeof(EditingCommands));
+		}
+		
+		/// <summary>
+		/// Register <see cref="InputBindingCategory">InputBindingCategories</see> described by codons with provided path
+		/// </summary>
+		/// <param name="caller">Caller object</param>
+		/// <param name="path">Path to codons</param>
+		public static void RegisterInputBindingCategories(object caller, string path) {
+			var descriptors = AddInTree.BuildItems<InputBindingCategoryDescriptor>(path, caller, false);
+			
+			foreach(var desc in descriptors) 
+			{
+				RegisterInputBindingCategories(desc, "");
+			}
+		}
+		
+		private static void RegisterInputBindingCategories(InputBindingCategoryDescriptor descriptor, string categoryPath)
+		{
+			categoryPath = categoryPath + "/" + descriptor.Id;
+			var category = new InputBindingCategory(categoryPath, descriptor.Text);
+			SDCommandManager.RegisterInputBindingCategory(category);
+			
+			foreach(var desc in descriptor.Children)
+			{
+				RegisterInputBindingCategories(desc, categoryPath);
+			}
+		}
+		
+		/// <summary>
+		/// Register <see cref="RoutedUICommand" />s described by codons with provided path
+		/// </summary>
+		/// <param name="caller">Caller object</param>
+		/// <param name="path">Path to codons</param>
+		public static void RegisterRoutedUICommands(object caller, string path) 
+		{
+			var descriptors = AddInTree.BuildItems<RoutedUICommandDescriptor>(path, caller, false);
+			foreach(var desc in descriptors) {
+				SDCommandManager.RegisterRoutedUICommand(desc.Name, desc.Text);                                                                    	
+			}
+		}
+		
+		/// <summary>
+		/// Register command and input binding infos described by codons with provided path
+		/// </summary>
+		/// <param name="caller">Caller object</param>
+		/// <param name="path">Path to codons</param>
+		public static void RegisterCommandBindings(object caller, string path) 
+		{
+			var descriptors = AddInTree.BuildItems<CommandBindingInfoDescriptor>(path, caller, false);
+			foreach(var desc in descriptors) {
+				var commandBindingInfoName = new StringBuilder();
+				
+				// If routed with such name is not registered register routed command with text same as name
+				if(SDCommandManager.GetRoutedUICommand(desc.Command) == null) {
+					var commandText = string.IsNullOrEmpty(desc.CommandText) ? desc.Command : desc.CommandText;
+					SDCommandManager.RegisterRoutedUICommand(desc.Command, commandText);
+				}
+				
+				var commandBindingInfo = new CommandBindingInfo();
+				
+				if(!string.IsNullOrEmpty(desc.OwnerInstanceName)) {
+					commandBindingInfo.OwnerInstanceName = desc.OwnerInstanceName;
+				} else if(!string.IsNullOrEmpty(desc.OwnerTypeName)) {
+					commandBindingInfo.OwnerTypeName = desc.OwnerTypeName;
+				} else {
+					commandBindingInfo.OwnerTypeName = SDCommandManager.DefaultOwnerTypeName;
+				}
+				
+				commandBindingInfo.RoutedCommandName = desc.Command;
+				commandBindingInfo.CommandTypeName = desc.Class;
+				commandBindingInfo.AddIn = desc.Codon.AddIn;
+				commandBindingInfo.IsLazy = desc.Lazy;
+				SDCommandManager.RegisterCommandBindingInfo(commandBindingInfo);
+				
+				// If gestures are provided register input binding in the same context
+				if(!string.IsNullOrEmpty(desc.Gestures)) {
+					var gestures = (InputGestureCollection)new InputGestureCollectionConverter().ConvertFromString(desc.Gestures);
+					
+					var inputBindingInfo = new InputBindingInfo();
+					
+					if(!string.IsNullOrEmpty(desc.OwnerInstanceName)) {
+						inputBindingInfo.OwnerInstanceName = desc.OwnerInstanceName;
+					} else if(!string.IsNullOrEmpty(desc.OwnerTypeName)) {
+						inputBindingInfo.OwnerTypeName = desc.OwnerTypeName;
+					} else {
+						inputBindingInfo.OwnerTypeName = SDCommandManager.DefaultOwnerTypeName;
+					}
+					
+					inputBindingInfo.AddIn = desc.Codon.AddIn;
+					inputBindingInfo.RoutedCommandName = desc.Command;
+					inputBindingInfo.DefaultGestures.AddRange(gestures);
+					
+					if(!string.IsNullOrEmpty(desc.CommandText)) {
+						inputBindingInfo.RoutedCommandText = desc.CommandText;
+					}
+					
+					if(!string.IsNullOrEmpty(desc.Categories)) {
+						var categories = SDCommandManager.GetInputBindingCategoryCollection(desc.Categories, true);
+						inputBindingInfo.Categories.AddRange(categories);
+					}
+					
+					SDCommandManager.RegisterInputBindingInfo(inputBindingInfo);
+				}
+			}
+		}
+		
+		/// <summary>
+		/// Register input binding infos described by codons with provided path
+		/// </summary>
+		/// <param name="caller">Caller object</param>
+		/// <param name="path">Path to codons</param>
+		public static void RegisterInputBindings(object caller, string path) 
+		{
+			var descriptors = AddInTree.BuildItems<InputBindingInfoDescriptor>(path, caller, false);
+			foreach(var desc in descriptors) {
+				var gestures = (InputGestureCollection)new InputGestureCollectionConverter().ConvertFromString(desc.Gestures);
+				
+				var inputBindingInfo = new InputBindingInfo();
+				
+				if(!string.IsNullOrEmpty(desc.OwnerInstanceName)) {
+					inputBindingInfo.OwnerInstanceName = desc.OwnerInstanceName;
+				} else if(!string.IsNullOrEmpty(desc.OwnerTypeName)) {
+					inputBindingInfo.OwnerTypeName = desc.OwnerTypeName;
+				} else {
+					inputBindingInfo.OwnerTypeName = SDCommandManager.DefaultOwnerTypeName;
+				}	
+				
+				inputBindingInfo.AddIn = desc.Codon.AddIn;
+				inputBindingInfo.RoutedCommandName = desc.Command;
+				inputBindingInfo.DefaultGestures.AddRange(gestures);
+				
+				if(!string.IsNullOrEmpty(desc.CommandText)) {
+					inputBindingInfo.RoutedCommandText = desc.CommandText;
+				}
+				
+				if(!string.IsNullOrEmpty(desc.Categories)) {
+					var categories = SDCommandManager.GetInputBindingCategoryCollection(desc.Categories, true);
+					inputBindingInfo.Categories.AddRange(categories);
+				}
+				
+				SDCommandManager.RegisterInputBindingInfo(inputBindingInfo);
+			}
+		}
+	}
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/CommandsService/Events/NotifyBindingsChangedEvent.cs b/src/Main/ICSharpCode.Core.Presentation/CommandsService/Events/NotifyBindingsChangedEvent.cs
new file mode 100644
index 0000000000..e6a330c5f0
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/CommandsService/Events/NotifyBindingsChangedEvent.cs
@@ -0,0 +1,382 @@
+using System;
+using System.Windows;
+using System.Windows.Input;
+using System.Collections.Generic;
+using ICSharpCode.Core;
+using ICSharpCode.Core.Presentation;
+
+namespace ICSharpCode.Core.Presentation
+{
+	/// <summary>
+	/// Represent a method that will handle <see cref="ICSharpCode.Core.Presentation.CommandManager.BindingsChanged" /> event
+	/// </summary>
+	public delegate void NotifyBindingsChangedEventHandler(object sender, NotifyBindingsChangedEventArgs args);
+	
+	/// <summary>
+	/// Provides data for <see cref="ICSharpCode.Core.Presentation.CommandManager.BindingsChanged" /> event
+	/// </summary>
+	public class NotifyBindingsChangedEventArgs : EventArgs
+	{	
+		private ICollection<BindingInfoTemplate> _modifiedBindingInfoTemplates;
+		private string _routedCommandName;
+		private string _typeName;
+		private ICollection<Type> _oldNamedTypes;
+		private ICollection<Type> _newNamedTypes;
+		private string _uiElementName;
+		private ICollection<UIElement> _oldNamedUIElements;
+		private ICollection<UIElement> _newNamedUIElements;
+		private ICollection<UIElement> _attachedInstances;
+		private BindingGroupCollection _modifiedGroups;
+		private NotifyBindingsChangedAction _action;
+		
+		/// <summary>
+		/// Gets collection of templates which can identify changed 
+		/// <see cref="CommandBindingInfo" /> and <see cref="InputBindingInfo" /> objects
+		/// 
+		/// Provided only when <see cref="NotifyBindingsChangedEventArgs.Action" /> is equal to <see cref="NotifyBindingsChangedAction.BindingInfoModified" />
+		/// </summary>
+		public ICollection<BindingInfoTemplate> ModifiedBindingInfoTemplates
+		{
+			get {
+				return _modifiedBindingInfoTemplates;
+			}
+		}
+		
+		/// <summary>
+		/// Gets name of changed named <see cref="System.Windows.Input.RoutedUICommand" /> as registered using
+		/// <see cref="CommandManager.RegisterRoutedUICommand" /> 
+		/// 
+		/// Provided only when <see cref="NotifyBindingsChangedEventArgs.Action" /> is equal to <see cref="NotifyBindingsChangedAction.RoutedUICommandModified" />
+		/// </summary>
+		public string RoutedCommandName
+		{
+			get {
+				return _routedCommandName;
+			}
+		}
+		
+		/// <summary>
+		/// Gets name of modified named <see cref="Type" /> as registered using <see cref="CommandManager.RegisterNamedUIType" /> 
+		/// 
+		/// Provided only when <see cref="NotifyBindingsChangedEventArgs.Action" /> is equal to <see cref="NotifyBindingsChangedAction.NamedTypeModified" />
+		/// </summary>
+		public string TypeName
+		{
+			get {
+				return _typeName;
+			}
+		}
+		
+		/// <summary>
+		/// Gets collection of types associated with name provided in <see cref="NotifyBindingsChangedEventArgs.TypeName" />
+		/// before the modification event
+		/// 
+		/// Provided only when <see cref="NotifyBindingsChangedEventArgs.Action" /> is equal to <see cref="NotifyBindingsChangedAction.NamedTypeModified" />
+		/// </summary>
+		public ICollection<Type> OldNamedTypes
+		{
+			get {
+				return _oldNamedTypes;
+			}
+		}
+		
+		
+		/// <summary>
+		/// Gets collection of types associated with name provided in <see cref="NotifyBindingsChangedEventArgs.TypeName" /> 
+		/// after the modification event
+		/// 
+		/// Provided only when <see cref="NotifyBindingsChangedEventArgs.Action" /> is equal to <see cref="NotifyBindingsChangedAction.NamedTypeModified" />
+		/// </summary>
+		public ICollection<Type> NewNamedTypes
+		{
+			get {
+				return _newNamedTypes;
+			}
+		}
+		
+		
+		/// <summary>
+		/// Gets name of modified named <see cref="UIElement" /> instance as registered using <see cref="CommandManager.RegisterNamedUIElement" /> 
+		/// 
+		/// Provided only when <see cref="NotifyBindingsChangedEventArgs.Action" /> is equal to <see cref="NotifyBindingsChangedAction.NamedInstanceModified" />
+		/// </summary>
+		public string UIElementName
+		{
+			get {
+				return _uiElementName;
+			}
+		}
+	
+		/// <summary>
+		/// Gets collection of <see cref="UIElement" /> instances associated with name provided in <see cref="NotifyBindingsChangedEventArgs.UIElementName" /> property 
+		/// before the modification event
+		/// 
+		/// Provided only when <see cref="NotifyBindingsChangedEventArgs.Action" /> is equal to <see cref="NotifyBindingsChangedAction.NamedInstanceModified" />
+		/// </summary>
+		public ICollection<UIElement> OldNamedUIElements
+		{
+			get {
+				return _oldNamedUIElements;
+			}
+		}
+	
+		/// <summary>
+		/// Gets collection of <see cref="UIElement" /> instances associated with name provided in <see cref="NotifyBindingsChangedEventArgs.UIElementName" /> property 
+		/// after the modification event
+		/// 
+		/// Provided only when <see cref="NotifyBindingsChangedEventArgs.Action" /> is equal to <see cref="NotifyBindingsChangedAction.NamedInstanceModified" />
+		/// </summary>	
+		public ICollection<UIElement> NewNamedUIElements
+		{
+			get {
+				return _newNamedUIElements;
+			}
+		}
+		
+		/// <summary>
+		/// Gets collection of collection of modified <see cref="BindingInfoGroup" />
+		/// 
+		/// Provided only when <see cref="NotifyBindingsChangedEventArgs.Action" /> is equal to <see cref="NotifyBindingsChangedAction.GroupAttachmendsModified" />
+		/// </summary>
+		public BindingGroupCollection ModifiedGroups
+		{
+			get {
+				return _modifiedGroups;
+			}
+		}
+		
+		/// <summary>
+		/// Gets collection of instances whose <see cref="UIElement.CommandBindings" />
+		/// and <see cref="UIElement.InputBindings" /> collections are controled by
+		/// groups provided in <see cref="NotifyBindingsChangedEventArgs.ModifiedGroups" /> property 
+		/// 
+		/// Provided only when <see cref="NotifyBindingsChangedEventArgs.Action" /> is equal to <see cref="NotifyBindingsChangedAction.GroupAttachmendsModified" />
+		/// </summary>
+		public ICollection<UIElement> GroupHandledInstances
+		{
+			get {
+				return _attachedInstances;
+			}
+		}
+		
+		/// <summary>
+		/// Gets action that caused an event
+		/// </summary>
+		public NotifyBindingsChangedAction Action
+		{
+			get {
+				return _action;
+			}
+		}
+		
+		/// <summary>
+		/// Initializes new instance of <see cref="NotifyBindingsChangedEventArgs" /> that describes
+		/// <see cref="NotifyBindingsChangedAction.EnforceUpdates" /> event
+		/// </summary>
+		/// <param name="action">The action that caused this event. This can only be set to <see cref="NotifyBindingsChangedAction.EnforceUpdates" /></param>
+		public NotifyBindingsChangedEventArgs(NotifyBindingsChangedAction action)
+		{
+			ValidateAction(NotifyBindingsChangedAction.EnforceUpdates, action);
+			
+			_action = action;
+		}
+		
+		/// <summary>
+		/// Initializes new instance of <see cref="NotifyBindingsChangedEventArgs" /> that describes
+		/// <see cref="NotifyBindingsChangedAction.NamedTypeModified" /> event
+		/// </summary>
+		/// <param name="action">The action that caused this event. This can only be set to <see cref="NotifyBindingsChangedAction.NamedTypeModified" /></param>
+		/// <param name="elementName">Registered <see cref="Type" /> name (Can be different from <see cref="System.Type.Name")</param>
+		/// <param name="oldElements">Collection of <see cref="Type" />s associated with provided name before modification</param>
+		/// <param name="newElements">Collection of <see cref="Type" />s associated with provided name after modification</param>
+		public NotifyBindingsChangedEventArgs(NotifyBindingsChangedAction action, string typeName, ICollection<Type> oldTypes, ICollection<Type> newTypes)
+		{
+			ValidateAction(NotifyBindingsChangedAction.NamedTypeModified, action);
+			
+			if(typeName == null) {
+				throw new ArgumentNullException("typeName");
+			}
+
+			if(oldTypes == null) {
+				throw new ArgumentNullException("oldTypes");
+			}
+
+			if(newTypes == null) {
+				throw new ArgumentNullException("newTypes");
+			}
+
+			var oldTypesArray = new Type[0];
+			if(oldTypes != null) {
+				oldTypesArray = new Type[oldTypes.Count];
+				oldTypes.CopyTo(oldTypesArray, 0);
+			}
+			
+			var newTypesArray = new Type[0];
+			if(newTypes != null) {
+				newTypesArray = new Type[newTypes.Count];
+				newTypes.CopyTo(newTypesArray, 0);
+			}
+			
+			_action = action;
+			_typeName = typeName;
+			_oldNamedTypes = oldTypesArray;
+			_newNamedTypes = newTypesArray;
+		}
+		
+		
+		
+		/// <summary>
+		/// Initializes new instance of <see cref="NotifyBindingsChangedEventArgs" /> that describes
+		/// <see cref="NotifyBindingsChangedAction.NamedInstanceModified" /> event
+		/// </summary>
+		/// <param name="action">The action that caused this event. This can only be set to <see cref="NotifyBindingsChangedAction.NamedInstanceModified" /></param>
+		/// <param name="elementName"><see cref="UIElement" /> instance name</param>
+		/// <param name="oldElements">Collection of <see cref="UIElement" /> instances associated with provided name before modification</param>
+		/// <param name="newElements">Collection of <see cref="UIElement" /> instances associated with provided name after modification</param>
+		public NotifyBindingsChangedEventArgs(NotifyBindingsChangedAction action, string elementName, ICollection<UIElement> oldElements, ICollection<UIElement> newElements)
+		{
+			ValidateAction(NotifyBindingsChangedAction.NamedInstanceModified, action);
+			
+			if(elementName == null) {
+				throw new ArgumentNullException("elementName");
+			}
+			
+			if(oldElements == null) {
+				throw new ArgumentNullException("oldElements");
+			}
+			
+			if(newElements == null) {
+				throw new ArgumentNullException("newElements");
+			}
+			
+			var oldElementsArray = new UIElement[0];
+			if(oldElements != null) {
+				oldElementsArray = new UIElement[oldElements.Count];
+				oldElements.CopyTo(oldElementsArray, 0);
+			}
+			
+			var newElementsArray = new UIElement[0];
+			if(newElements != null) {
+				newElementsArray = new UIElement[newElements.Count];
+				newElements.CopyTo(newElementsArray, 0);
+			}
+			
+			_action = action;
+			_uiElementName = elementName;
+			_oldNamedUIElements = oldElementsArray;
+			_newNamedUIElements = newElementsArray;
+		}
+		
+		
+		/// <summary>
+		/// Initializes new instance of <see cref="NotifyBindingsChangedEventArgs" /> that describes
+		/// <see cref="NotifyBindingsChangedAction.RoutedUICommandModified" /> event
+		/// </summary>
+		/// <param name="action">The action that caused this event. This can only be set to <see cref="NotifyBindingsChangedAction.RoutedUICommandModified" /></param>
+		/// <param name="routedCommandName">Registered or unregistered <see cref="RoutedUICommand" /> name</param>
+		public NotifyBindingsChangedEventArgs(NotifyBindingsChangedAction action, string routedCommandName)
+		{
+			ValidateAction(NotifyBindingsChangedAction.RoutedUICommandModified, action);
+			
+			if(routedCommandName == null) {
+				throw new ArgumentNullException("routedCommandName");
+			}
+			
+			_action = action;
+			_routedCommandName = routedCommandName;
+		}
+		
+		/// <summary>
+		/// Initializes new instance of <see cref="NotifyBindingsChangedEventArgs" /> that describes
+		/// <see cref="NotifyBindingsChangedAction.BindingInfoModified" /> event
+		/// </summary>
+		/// <param name="action">The action that caused this event. This can only be set to <see cref="NotifyBindingsChangedAction.BindingInfoModified" /></param>
+		/// <param name="templates">Collection of <see cref="BindingInfoTemplate" />s describing modified <see cref="CommandBindingInfo" />s or <see cref="InputBindingInfo" />s</param>
+		public NotifyBindingsChangedEventArgs(NotifyBindingsChangedAction action, IEnumerable<BindingInfoTemplate> templates)
+		{
+			ValidateAction(NotifyBindingsChangedAction.BindingInfoModified, action);
+			
+			if(templates == null) {
+				throw new ArgumentNullException("templates");
+			}
+			
+			_action = action;
+			_modifiedBindingInfoTemplates = new HashSet<BindingInfoTemplate>(templates);
+		}
+		
+		
+		/// <summary>
+		/// Initializes new instance of <see cref="NotifyBindingsChangedEventArgs" /> that describes
+		/// <see cref="NotifyBindingsChangedAction.GroupAttachmendsModified" /> change event
+		/// </summary>
+		/// <param name="action">The action that caused this event. This can only be set to <see cref="NotifyBindingsChangedAction.GroupAttachmendsModified" /></param>
+		/// <param name="groups">Modified groups</param>
+		/// <param name="attachedInstances">Collection instances (un)registered in <see cref="BindingGroup" /></param>
+		public NotifyBindingsChangedEventArgs(NotifyBindingsChangedAction action, BindingGroupCollection groups, ICollection<UIElement> attachedInstances)
+		{
+			ValidateAction(NotifyBindingsChangedAction.GroupAttachmendsModified, action);
+			
+			if(groups == null) {
+				throw new ArgumentNullException("groups");
+			}
+			
+			if(attachedInstances == null) {
+				throw new ArgumentNullException("attachedInstances");
+			}
+			
+			_action = action;
+			_modifiedGroups = new BindingGroupCollection();
+			_modifiedGroups.AddRange(groups);
+			_attachedInstances = new HashSet<UIElement>(attachedInstances);
+		}
+		
+		private void ValidateAction(NotifyBindingsChangedAction expectedAction, NotifyBindingsChangedAction receivedAction)
+		{
+			if(receivedAction != expectedAction) {
+				throw new ArgumentException(
+					string.Format(
+						"This constructor only supports '{0}' action (got '{1}')",
+					    Enum.GetName(typeof(NotifyBindingsChangedAction), expectedAction),
+					    Enum.GetName(typeof(NotifyBindingsChangedAction), receivedAction)
+					   ));
+			}
+		}
+	}
+	
+	/// <summary>
+	/// Describes the action that caused a <see cref="ICSharpCode.Core.Presentation.CommandManager.BindingsChanged" /> event.
+	/// </summary>
+	public enum NotifyBindingsChangedAction
+	{
+		/// <summary>
+		/// Implicitly enforce executing all handlers
+		/// </summary>
+		EnforceUpdates,
+		
+		/// <summary>
+		/// Binding info modified
+		/// </summary>
+		BindingInfoModified,
+		
+		/// <summary>
+		/// Named instance modfied (new <see cref="UIElement" /> added/removed)
+		/// </summary>
+		NamedInstanceModified,
+		
+		/// <summary>
+		/// Named type modfied (new <see cref="Type" /> added/removed)
+		/// </summary>
+		NamedTypeModified,
+		
+		/// <summary>
+		/// <see cref="RoutedUICommand" /> registered/unregistered
+		/// </summary>
+		RoutedUICommandModified,
+		
+		/// <summary>
+		/// Groups modified (group attached/detached to binding info or new <see cref="UIElement" />
+		/// is registered to be handled by <see cref="BindingGroup" />
+		/// </summary>
+		GroupAttachmendsModified
+	}
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/CommandsService/Events/NotifyGesturesChangedEvent.cs b/src/Main/ICSharpCode.Core.Presentation/CommandsService/Events/NotifyGesturesChangedEvent.cs
new file mode 100644
index 0000000000..6ba12bf514
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/CommandsService/Events/NotifyGesturesChangedEvent.cs
@@ -0,0 +1,131 @@
+using System;
+using System.Collections.Generic;
+using System.Windows.Input;
+
+namespace ICSharpCode.Core.Presentation
+{
+	/// <summary>
+	/// Represent a method that will handle <see cref="ICSharpCode.Core.Presentation.CommandManager.GesturesChanged" /> 
+	/// or <see cref="ICSharpCode.Core.Presentation.UserGestureProfile.GesturesChanged" /> event
+	/// </summary>
+	public delegate void NotifyGesturesChangedEventHandler(object sender, NotifyGesturesChangedEventArgs args);
+	
+	/// <summary>
+	/// Provides data for <see cref="ICSharpCode.Core.Presentation.CommandManager.GesturesChanged" /> 
+	/// or <see cref="ICSharpCode.Core.Presentation.UserGestureProfile.GesturesChanged" /> event
+	/// </summary>
+    public class NotifyGesturesChangedEventArgs : EventArgs
+    {
+    	private bool _enforceUpdates;
+    	private List<GesturesModificationDescription> _modificationDescriptions = new List<GesturesModificationDescription>();
+    	
+    	/// <summary>
+    	/// When this property is set to <code>true</code> all handlers code should be executed
+    	/// </summary>
+    	public bool EnforceUpdates
+    	{
+    		get {
+    			return _enforceUpdates;
+    		}
+    	}
+    	
+    	/// <summary>
+    	/// Gets list of modification descriptions
+    	/// </summary>
+		public ICollection<GesturesModificationDescription> ModificationDescriptions
+		{
+			get
+			{
+				return _modificationDescriptions.AsReadOnly();
+			}
+		}
+		
+		/// <summary>
+		/// Initializes new instance of <see cref="NotifyGesturesChangedEventArgs" /> that describes
+		/// <see cref="NotifyGesturesChangedEventArgs.EnforceUpdates" /> event
+		/// </summary>
+		public NotifyGesturesChangedEventArgs()
+		{
+			_enforceUpdates = true;
+		}
+		
+		/// <summary>
+		/// Initializes new instance of <see cref="NotifyGesturesChangedEventArgs" /> containing a collection modification descriptions
+		/// </summary>
+		/// <param name="descriptions">Collection of modification descriptions</param>
+		public NotifyGesturesChangedEventArgs(IEnumerable<GesturesModificationDescription> descriptions)
+		{
+			if(descriptions == null) {
+				throw new ArgumentNullException("descriptions");
+			}
+			
+			_modificationDescriptions.AddRange(descriptions);
+		}
+		
+		/// <summary>
+		/// Initializes new instance of <see cref="NotifyGesturesChangedEventArgs" /> containing one modification description
+		/// </summary>
+		/// <param name="descriptions">Modification description</param>
+		public NotifyGesturesChangedEventArgs(GesturesModificationDescription description)
+		{
+			if(description == null) {
+				throw new ArgumentNullException("description");
+			}
+			
+			_modificationDescriptions.Add(description);
+		}
+    }
+    
+    /// <summary>
+    /// Class describing single gestures modification in <see cref="InputBindingInfo" /> instance 
+    /// </summary>
+    public class GesturesModificationDescription
+    {
+    	private BindingInfoTemplate _inputBindingIdentifier;
+    	private InputGestureCollection _oldGestures;
+    	private InputGestureCollection _newGestures;
+    	
+    	/// <summary>
+    	/// Creates new instance of <see cref="GesturesModificationDescription" />
+    	/// </summary>
+    	/// <param name="inputBindingInfoTemplate"><see cref="BindingInfoTemplate" /> which identify modified <see cref="InputBindingInfo" /></param>
+    	/// <param name="oldGestures">Active <see cref="InputGestureCollection" /> before modification</param>
+    	/// <param name="newGestures">Active <see cref="InputGestureCollection" /> after modification</param>
+    	public GesturesModificationDescription(BindingInfoTemplate inputBindingInfoTemplate, InputGestureCollection oldGestures, InputGestureCollection newGestures)
+    	{
+    		_inputBindingIdentifier = inputBindingInfoTemplate;
+    		_oldGestures = oldGestures;
+    		_newGestures = newGestures;
+    	}
+    	
+    	/// <summary>
+    	/// <see cref="BindingInfoTemplate" /> which identifies modified <see cref="InputBindingInfo" />
+    	/// </summary>
+    	public BindingInfoTemplate InputBindingIdentifier
+    	{
+    		get {
+    			return _inputBindingIdentifier;
+    		}
+    	}
+    	
+    	/// <summary>
+    	/// Active <see cref="InputGestureCollection" /> before modification
+    	/// </summary>
+    	public InputGestureCollection OldGestures
+    	{
+    		get {
+    			return _oldGestures;
+    		}
+    	}
+    	
+    	/// <summary>
+    	/// Active <see cref="InputGestureCollection" /> after modification
+    	/// </summary>
+    	public InputGestureCollection NewGestures
+    	{
+    		get {
+    			return _newGestures;
+    		}
+    	}
+    }
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/CommandsService/Events/NotifyUserGestureProfileChangedEvent.cs b/src/Main/ICSharpCode.Core.Presentation/CommandsService/Events/NotifyUserGestureProfileChangedEvent.cs
new file mode 100644
index 0000000000..bfaf4b55f9
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/CommandsService/Events/NotifyUserGestureProfileChangedEvent.cs
@@ -0,0 +1,49 @@
+using System;
+
+namespace ICSharpCode.Core.Presentation
+{
+	/// <summary>
+	/// Represent a method that will handle <see cref="ICSharpCode.Core.Presentation.UserGestureProfileManager.CurrentProfileChanged" /> event
+	/// </summary>
+	public delegate void NotifyUserGestureProfileChangedEventHandler(object sender, NotifyUserGestureProfileChangedEventArgs args);
+	
+	/// <summary>
+	/// Provides data for <see cref="ICSharpCode.Core.Presentation.UserGestureProfileManager.CurrentProfileChanged" /> event
+	/// </summary>
+	public class NotifyUserGestureProfileChangedEventArgs : EventArgs
+	{
+		private UserGestureProfile _newProfile;
+		private UserGestureProfile _oldProfile;
+		
+		/// <summary>
+		/// Gets current <see cref="UserGestureProfile" /> before modification
+		/// </summary>
+		public UserGestureProfile OldProfile
+		{
+			get {
+				return _oldProfile;
+			}
+		}
+		
+		/// <summary>
+		/// Gets current <see cref="UserGestureProfile" /> after modification
+		/// </summary>
+		public UserGestureProfile NewProfile
+		{
+			get {
+				return _newProfile;
+			}
+		}
+		
+		/// <summary>
+		/// Create new instance of <see cref="NotifyUserGestureProfileChangedEventArgs" />
+		/// </summary>
+		/// <param name="oldProfile">Current <see cref="UserGestureProfile" /> before modification</param>
+		/// <param name="newProfile">Current <see cref="UserGestureProfile" /> after modification</param>
+		public NotifyUserGestureProfileChangedEventArgs(UserGestureProfile oldProfile, UserGestureProfile newProfile) 
+		{
+			_oldProfile = oldProfile;
+			_newProfile = newProfile;
+		}
+	}
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/CommandsService/InputBindingCategory.cs b/src/Main/ICSharpCode.Core.Presentation/CommandsService/InputBindingCategory.cs
new file mode 100644
index 0000000000..043dc2496f
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/CommandsService/InputBindingCategory.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Linq;
+using System.Collections.Generic;
+
+namespace ICSharpCode.Core.Presentation
+{
+	/// <summary>
+	/// Stores input binding category description
+	/// </summary>
+	public class InputBindingCategory
+	{		
+		/// <summary>
+		/// Creates new instance of <see cref="InputBindingCategory" />
+		/// </summary>
+		/// <param name="name">Category name</param>
+		/// <param name="parentCategory">Parent category (null - root level category)</param>
+		public InputBindingCategory(string path, string text)
+		{
+			Path = path;
+			Text = text;
+		}
+		
+		public string Path
+		{
+			get; set;
+		}
+		
+		/// <summary>
+		/// Category name
+		/// </summary>
+		public string Text
+		{
+			get; set;
+		}
+		
+		public override string ToString() {
+			return Path;
+		}
+	}
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/CommandsService/InputBindingInfo.cs b/src/Main/ICSharpCode.Core.Presentation/CommandsService/InputBindingInfo.cs
new file mode 100644
index 0000000000..b2b543511a
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/CommandsService/InputBindingInfo.cs
@@ -0,0 +1,238 @@
+using System;
+using System.Linq;
+using System.Windows;
+using System.Windows.Input;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Collections.ObjectModel;
+using System.Reflection;
+using ICSharpCode.Core.Presentation;
+
+namespace ICSharpCode.Core.Presentation
+{
+	/// <summary>
+	/// Stores details about input binding
+	/// </summary>
+	public class InputBindingInfo : BindingInfoBase
+	{
+		private InputBindingCollection oldBindingCollection = new InputBindingCollection();
+		private List<UIElement> oldInstances;
+		private List<Type> oldTypes;
+		private InputBindingCategoryCollection _categories;
+		
+		private ObservableInputGestureCollection _defaultGestures;
+		
+		/// <summary>
+		/// Creates new instance of <see cref="InputBindingInfo"/>
+		/// </summary>
+		public InputBindingInfo() 
+		{
+			ActiveInputBindings = new InputBindingCollection();
+			DefaultGestures = new ObservableInputGestureCollection();
+			Categories = new InputBindingCategoryCollection();
+		}
+		
+		/// <summary>
+		/// Gets or sets routed command text
+		/// 
+		/// This overriden text can be used to display to user different command names
+		/// depending on <see cref="InputBindingInfo" />
+		/// </summary>
+		public string RoutedCommandText { 
+			get; set;
+		}
+		
+		/// <summary>
+		/// Gets or sets default gestures associated with bindings generated by 
+		/// this <see cref="InputBindingInfo" />
+		/// </summary>
+		public ObservableInputGestureCollection DefaultGestures { 
+			get {
+				return _defaultGestures;
+			}
+			set {
+				if(_defaultGestures != null) {
+					_defaultGestures.CollectionChanged -= DefaultGestures_CollectionChanged;
+				}
+				
+				if(value != null) {
+					value.CollectionChanged += DefaultGestures_CollectionChanged;
+				}
+				
+				var oldGestures = _defaultGestures;
+				_defaultGestures = value;
+				
+				if(IsRegistered && (UserGestureProfileManager.CurrentProfile == null || UserGestureProfileManager.CurrentProfile[BindingInfoTemplate.CreateFromIBindingInfo(this)] == null)) {
+					var description = new GesturesModificationDescription(
+						BindingInfoTemplate.CreateFromIBindingInfo(this), 
+						oldGestures != null ? oldGestures.InputGesturesCollection : new InputGestureCollection(),
+						value != null ? value.InputGesturesCollection : new InputGestureCollection());
+					
+					SDCommandManager.InvokeGesturesChanged(this, new NotifyGesturesChangedEventArgs(description));
+				}
+			}
+		}
+		
+		private void DefaultGestures_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e) 
+		{
+			if(IsRegistered && (UserGestureProfileManager.CurrentProfile == null || UserGestureProfileManager.CurrentProfile[BindingInfoTemplate.CreateFromIBindingInfo(this)] == null)) {
+				var newGestures = DefaultGestures.InputGesturesCollection;
+				var oldGestures = new InputGestureCollection();
+				oldGestures.AddRange(newGestures);
+				
+				if(e.Action == NotifyCollectionChangedAction.Add) {
+					if(e.NewItems != null) {
+						foreach(InputGesture ng in e.NewItems) { 
+							oldGestures.Remove(ng); 
+						}
+					}
+				} else if(e.Action == NotifyCollectionChangedAction.Remove) {
+					if(e.OldItems != null) {
+						foreach(InputGesture og in e.OldItems) { 
+							oldGestures.Add(og); 
+						}
+					}
+				}
+				
+				// When default gestures are active notify handlers about changes in gestures collection
+				var description = new GesturesModificationDescription(BindingInfoTemplate.CreateFromIBindingInfo(this), oldGestures, newGestures);
+				SDCommandManager.InvokeGesturesChanged(this, new NotifyGesturesChangedEventArgs(description));
+			}
+		}
+		
+		/// <summary>
+		/// Gets <see cref="InputGestureCollection" /> used in generated input bindings
+		/// </summary>
+		public InputGestureCollection ActiveGestures { 
+			get {
+				if(UserGestureProfileManager.CurrentProfile == null 
+				   || UserGestureProfileManager.CurrentProfile[BindingInfoTemplate.CreateFromIBindingInfo(this)] == null) {
+					return DefaultGestures.InputGesturesCollection;
+				} 
+				
+				return UserGestureProfileManager.CurrentProfile[BindingInfoTemplate.CreateFromIBindingInfo(this)];
+			}
+		}
+		
+		/// <summary>
+		/// Categories associated with <see cref="InputBindingInfo" />
+		/// </summary>
+		public InputBindingCategoryCollection Categories
+		{
+			get {
+				return _categories;
+			}
+			set {
+				if(value == null) {
+					throw new ArgumentException("Categories collection can not be null");
+				}
+				
+				var oldValue = _categories;
+				_categories = value;
+				
+				SetCollectionChanged<InputBindingCategory>(oldValue, value, Categories_CollectionChanged);
+			}
+		}
+		
+		/// <summary>
+		/// Gets <see cref="InputBindingCollection" /> generated by this <see cref="InputBindingInfo" />
+		/// </summary>
+		public InputBindingCollection ActiveInputBindings
+		{
+			get; private set;
+		}
+		
+		/// <summary>
+		/// Apply <see cref="ActiveInputBindings" /> to new <see cref="System.Windows.UIElement" /> collection
+		/// </summary>
+		/// <param name="newInstances">Collection of modified owner instances</param>
+		protected override void PopulateOwnerInstancesWithBindings(ICollection<UIElement> newInstances)
+		{
+			// remove old bindings
+			if(oldInstances != null) {
+				foreach(var ownerInstance in oldInstances) {
+					foreach(InputBinding binding in oldBindingCollection) {
+						ownerInstance.InputBindings.Remove(binding);
+					}
+				}
+			}
+			
+			oldInstances = new List<UIElement>();
+	
+			// appply new bindings
+			if(newInstances != null) {
+				foreach(var ownerInstance in newInstances) {
+					ownerInstance.InputBindings.AddRange(ActiveInputBindings);
+					oldInstances.Add(ownerInstance);
+					
+					// Sorting input bindings. This may be slow
+					if(ownerInstance.InputBindings != null) {
+						ownerInstance.InputBindings.SortByChords();
+					}
+				}
+			}
+		}
+		
+		/// <summary>
+		/// Apply <see cref="ActiveInputBindings" /> to new <see cref="System.Type" /> collection
+		/// </summary>
+		/// <param name="newInstances">Collection of modified owner types</param>
+		protected override void PopulateOwnerTypesWithBindings(ICollection<Type> newTypes)
+		{
+			// Remove old bindings
+			if(oldTypes != null) {
+				foreach(var ownerType in oldTypes) {
+					foreach(InputBinding binding in oldBindingCollection) {
+						SDCommandManager.RemoveClassInputBinding(ownerType, binding);
+					}
+				}
+			}
+			
+			oldTypes = new List<Type>();
+			
+			// Apply new bindings
+			if(newTypes != null) {
+				foreach(var ownerType in newTypes) {
+					foreach(InputBinding binding in ActiveInputBindings) {
+						System.Windows.Input.CommandManager.RegisterClassInputBinding(ownerType, binding);
+						oldTypes.Add(ownerType);
+					}
+					
+					var fieldInfo = typeof(System.Windows.Input.CommandManager).GetField("_classInputBindings", BindingFlags.Static | BindingFlags.NonPublic);
+					var fieldData = (HybridDictionary)fieldInfo.GetValue(null);
+					var classInputBindings = (InputBindingCollection)fieldData[ownerType];
+				
+					// Sorting input bindings. This may be slow
+					if(classInputBindings != null) {
+						classInputBindings.SortByChords();
+					}
+				}
+			}
+		}
+		
+		private void Categories_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e) 
+		{
+			if(e.NewItems != null) {
+				foreach(InputBindingCategory addedCategory in e.NewItems) {
+					if(!SDCommandManager.InputBindingCategories.Contains(addedCategory)) {
+						throw new ArgumentException("InputBindingCategory is not registered in CommandManager");
+					}
+				}
+			}
+		}
+		
+		/// <summary>
+		/// Re-generate <see cref="ActiveInputBindings" /> using <see cref="InputBindingInfo" /> data 
+		/// </summary>
+		protected override void GenerateBindings() 
+		{			
+			oldBindingCollection = ActiveInputBindings;
+			
+			ActiveInputBindings = new InputBindingCollection();
+			foreach(InputGesture gesture in ActiveGestures) {
+				var inputBinding = new InputBinding(RoutedCommand, gesture);
+				ActiveInputBindings.Add(inputBinding);
+			}
+		}
+	}
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/CommandsService/Profile/UserGestureManager.cs b/src/Main/ICSharpCode.Core.Presentation/CommandsService/Profile/UserGestureManager.cs
new file mode 100644
index 0000000000..a5206f346b
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/CommandsService/Profile/UserGestureManager.cs
@@ -0,0 +1,76 @@
+using System;
+using System.Collections.Generic;
+using System.Xml;
+using System.Windows.Input;
+using System.IO;
+using SDCommandManager=ICSharpCode.Core.Presentation.CommandManager;
+
+namespace ICSharpCode.Core.Presentation  
+{
+	/// <summary>
+	/// Manages user defined gestures
+	/// </summary>
+	public static class UserGestureProfileManager
+	{
+		private static string _userGestureProfilesDirectory;
+		
+		static UserGestureProfileManager()
+		{
+			if(PropertyService.ConfigDirectory != null) {
+				_userGestureProfilesDirectory = Path.Combine(PropertyService.ConfigDirectory, "UserGestureProfiles");
+				if(!Directory.Exists(_userGestureProfilesDirectory)) {
+					Directory.CreateDirectory(_userGestureProfilesDirectory);
+				}
+			}
+		}
+		
+		/// <summary>
+		/// Path to file where current user defined gestures are set
+		/// </summary>
+		public static string UserGestureProfilesDirectory
+		{
+			get {
+				return _userGestureProfilesDirectory;
+			}
+		}
+		
+		private static UserGestureProfile _currentProfile;
+	
+		public static UserGestureProfile CurrentProfile
+		{
+			get {
+				return _currentProfile;
+			}
+			set {
+				var oldProfile = _currentProfile;
+				_currentProfile = value;
+				
+				var currentProfilePath = value != null ? value.Path : null;
+				if(currentProfilePath != null) {
+					PropertyService.Set("ICSharpCode.Core.Presentation.UserDefinedGesturesManager.UserGestureProfilesDirectory", currentProfilePath);
+				} else {
+					PropertyService.Remove("ICSharpCode.Core.Presentation.UserDefinedGesturesManager.UserGestureProfilesDirectory");
+				}
+				
+				if(_currentProfile != oldProfile) {
+					InvokeCurrentProfileChanged(typeof(UserGestureProfileManager), new NotifyUserGestureProfileChangedEventArgs(oldProfile, _currentProfile));
+				}
+			} 
+		}
+		
+		public static event NotifyUserGestureProfileChangedEventHandler CurrentProfileChanged;
+	
+		public static void InvokeCurrentProfileChanged(object sender, NotifyUserGestureProfileChangedEventArgs args)
+		{
+			if(CurrentProfileChanged != null) {
+				CurrentProfileChanged.Invoke(sender, args);
+			}
+		}
+		
+		public static void Reset()
+		{
+			CurrentProfile = null;
+			CurrentProfileChanged = null;
+		}
+	}
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/CommandsService/Profile/UserGestureProfile.cs b/src/Main/ICSharpCode.Core.Presentation/CommandsService/Profile/UserGestureProfile.cs
new file mode 100644
index 0000000000..5183b71095
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/CommandsService/Profile/UserGestureProfile.cs
@@ -0,0 +1,242 @@
+using System;
+using System.Xml;
+using System.Windows.Input;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using ICSharpCode.Core.Presentation;
+
+namespace ICSharpCode.Core.Presentation
+{
+	/// <summary>
+	/// Stores user defined gestures for different actions
+	/// </summary>
+	public class UserGestureProfile : IEnumerable<KeyValuePair<BindingInfoTemplate, InputGestureCollection>>
+	{
+		private Dictionary<BindingInfoTemplate, InputGestureCollection> userDefinedGestures = new Dictionary<BindingInfoTemplate, InputGestureCollection>();
+		private string _path;
+		
+		/// <summary>
+		/// Gets path to the file on disk where this profile is stored
+		/// </summary>
+		public string Path
+		{
+			get {
+				return _path;
+			}
+		}
+		
+		public bool ReadOnly
+		{
+			get; set;
+		}
+		
+		public string Name
+		{
+			get; set;
+		}
+
+		public string Text
+		{
+			get; set;
+		}
+		
+		/// <summary>
+		/// Creates new instance of <see cref="UserGestureProfile" />
+		/// </summary>
+		/// <param name="filePath">Path to a file where this profile will be stored</param>
+		public UserGestureProfile(string filePath)
+		{
+			_path = filePath;
+		}
+		
+		/// <summary>
+		/// Creates new instance of <see cref="UserGestureProfile" />
+		/// </summary>
+		/// <param name="filePath">Path to a file where this profile will be stored</param>
+		/// <param name="name">Name of the profile</param>
+		/// <param name="text">Text presented to user when describing this profile</param>
+		/// <param name="readOnly">Determines whether profile is read-only</param>
+		public UserGestureProfile(string filePath, string name, string text, bool readOnly)
+		{
+			_path = filePath;
+			Name = name;
+			Text = text;
+			ReadOnly = readOnly;
+		}
+		
+		/// <summary>
+		/// Load user defined gestures from file described in <see cref="UserGestureProfile.Path" />
+		/// </summary>
+		public void Load()
+		{
+			var xmlDocument = new XmlDocument();
+			xmlDocument.Load(Path);
+			
+			var rootNode = xmlDocument.SelectSingleNode("//UserGesturesProfile");
+			
+			Name = rootNode.Attributes["name"].Value;
+			Text = rootNode.Attributes["text"].Value;
+			ReadOnly = Convert.ToBoolean(rootNode.Attributes["readonly"].Value);
+
+			foreach(XmlElement bindingInfoNode in xmlDocument.SelectNodes("//InputBinding")) {
+				string identifierInstanceName = null;
+				string identifierTypeName = null;
+				var ownerInstanceAttribute = bindingInfoNode.Attributes["ownerinstance"];
+				if(ownerInstanceAttribute != null) {
+					identifierInstanceName = ownerInstanceAttribute.Value;
+				} else {
+					var ownerTypeAttribute = bindingInfoNode.Attributes["ownertype"];
+					identifierTypeName = ownerTypeAttribute.Value;
+				}
+				
+				var identifier = BindingInfoTemplate.Create(identifierInstanceName, identifierTypeName, bindingInfoNode.Attributes["routedcommand"].Value);
+				var gestures = (InputGestureCollection)new InputGestureCollectionConverter().ConvertFromInvariantString(bindingInfoNode.Attributes["gestures"].Value);
+				this[identifier] = gestures;
+			}
+		}
+		
+		/// <summary>
+		/// Save user defined gestures to file described in <see cref="UserGestureProfile.Path" />
+		/// </summary>
+		public void Save()
+		{
+			var xmlDocument = new XmlDocument();
+			var rootNode = xmlDocument.CreateElement("UserGesturesProfile");
+			
+			var nameAttribute = xmlDocument.CreateAttribute("name");
+			nameAttribute.Value = Name;
+			rootNode.Attributes.Append(nameAttribute);
+			
+			var textAttribute = xmlDocument.CreateAttribute("text");
+			textAttribute.Value = Text;
+			rootNode.Attributes.Append(textAttribute);
+			
+			var readOnlyAttribute = xmlDocument.CreateAttribute("readonly");
+			readOnlyAttribute.Value = Convert.ToString(ReadOnly);
+			rootNode.Attributes.Append(readOnlyAttribute);
+			
+			foreach(var definedGestures in this) {
+				var bindingInfoNode = xmlDocument.CreateElement("InputBinding");
+				
+				if(definedGestures.Key.RoutedCommandName != null) {
+					var routedCommandAttribute = xmlDocument.CreateAttribute("routedcommand");
+					routedCommandAttribute.Value = definedGestures.Key.RoutedCommandName;
+					bindingInfoNode.Attributes.Append(routedCommandAttribute);
+				} else {
+					throw new ApplicationException("InputBindingIdentifier should have routed command name assigned to it");
+				}
+				
+				if(definedGestures.Key.OwnerInstanceName != null) {
+					var ownerInstanceAttribute = xmlDocument.CreateAttribute("ownerinstance");
+					ownerInstanceAttribute.Value = definedGestures.Key.OwnerInstanceName;
+					bindingInfoNode.Attributes.Append(ownerInstanceAttribute);
+				} else if(definedGestures.Key.OwnerTypeName != null) {
+					var ownerTypeAttribute = xmlDocument.CreateAttribute("ownertype");
+					ownerTypeAttribute.Value = definedGestures.Key.OwnerTypeName;
+					bindingInfoNode.Attributes.Append(ownerTypeAttribute);
+				} else {
+					throw new ApplicationException("InputBindingIdentifier should have owner instance name or type name assigned");
+				}
+				
+				var gesturesAttribute = xmlDocument.CreateAttribute("gestures");
+				gesturesAttribute.Value = new InputGestureCollectionConverter().ConvertToInvariantString(definedGestures.Value);
+				bindingInfoNode.Attributes.Append(gesturesAttribute);
+			
+				rootNode.AppendChild(bindingInfoNode);
+			}
+			
+			xmlDocument.AppendChild(rootNode);
+			xmlDocument.Save(Path);
+		}
+		
+		/// <summary>
+		/// Clear all defined gestures
+		/// </summary>
+		public void Clear()
+		{
+			var descriptions = new List<GesturesModificationDescription>();
+			var args = new NotifyGesturesChangedEventArgs();
+			
+			foreach(var pair in this) {
+				var template = pair.Key;
+				var newGestures = SDCommandManager.FindInputGestures(template, null);
+				
+				descriptions.Add(
+					new GesturesModificationDescription(
+						pair.Key, 
+						userDefinedGestures[pair.Key], 
+						newGestures));
+			}
+			
+			userDefinedGestures.Clear();
+			
+			SDCommandManager.InvokeGesturesChanged(this, args);
+		}
+		
+		/// <summary>
+		/// Assigns <see cref="InputGestureCollection" /> to <see cref="BindingInfoTemplate" />
+		/// representing <see cref="InputBindingInfo" />
+		/// </summary>
+		public InputGestureCollection this[BindingInfoTemplate identifier]
+		{
+			get { return GetInputBindingGesture(identifier); }
+			set { SetInputBindingGestures(identifier, value); }
+		}
+
+		private InputGestureCollection GetInputBindingGesture(BindingInfoTemplate identifier) 
+		{
+			InputGestureCollection gestures;
+			userDefinedGestures.TryGetValue(identifier, out gestures);
+			
+			return gestures;
+		}
+		
+		private void SetInputBindingGestures(BindingInfoTemplate identifier, InputGestureCollection inputGestureCollection) 
+		{
+			var oldGestures = GetInputBindingGesture(identifier);
+			var newGestures = inputGestureCollection;
+			
+			if(oldGestures == null || newGestures == null) {
+				var defaultGestures = SDCommandManager.FindInputGestures(identifier, null);
+				
+				oldGestures = oldGestures ?? defaultGestures;
+				newGestures = newGestures ?? defaultGestures;
+			}
+			
+			var args = new NotifyGesturesChangedEventArgs(
+				new GesturesModificationDescription(identifier, oldGestures, newGestures));
+			
+			if(inputGestureCollection != null) {
+				userDefinedGestures[identifier] = inputGestureCollection;
+			} else {
+				userDefinedGestures.Remove(identifier);
+			}
+			
+			InvokeGesturesChanged(this, args);
+		}
+		
+		/// <inheritdoc />
+		public IEnumerator<KeyValuePair<BindingInfoTemplate, InputGestureCollection>> GetEnumerator()
+		{
+			return userDefinedGestures.GetEnumerator();
+		}
+		
+		/// <inheritdoc />
+		System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+		{
+			return userDefinedGestures.GetEnumerator();
+		}
+		
+		/// <summary>
+		/// Occurs when any gestures defined in this profile are changed, removed or added
+		/// </summary>
+		public event NotifyGesturesChangedEventHandler GesturesChanged;
+		
+		private void InvokeGesturesChanged(object sender, NotifyGesturesChangedEventArgs args)
+		{
+			if(GesturesChanged != null) {
+				GesturesChanged.Invoke(sender, args);
+			}
+		}
+	}
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/CommandsService/Profile/UserGestureProfileManager.cs b/src/Main/ICSharpCode.Core.Presentation/CommandsService/Profile/UserGestureProfileManager.cs
new file mode 100644
index 0000000000..b88f3edf07
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/CommandsService/Profile/UserGestureProfileManager.cs
@@ -0,0 +1,88 @@
+using System;
+using System.Collections.Generic;
+using System.Xml;
+using System.Windows.Input;
+using System.IO;
+using ICSharpCode.Core.Presentation;
+
+namespace ICSharpCode.Core.Presentation  
+{
+	/// <summary>
+	/// Manages active <see cref="UserGestureProfile" /> 
+	/// </summary>
+	public static class UserGestureProfileManager
+	{
+		private static UserGestureProfile _currentProfile;
+		private static string _userGestureProfilesDirectory;
+		
+		static UserGestureProfileManager()
+		{
+			if(PropertyService.ConfigDirectory != null) {
+				_userGestureProfilesDirectory = Path.Combine(PropertyService.ConfigDirectory, "UserGestureProfiles");
+				if(!Directory.Exists(_userGestureProfilesDirectory)) {
+					Directory.CreateDirectory(_userGestureProfilesDirectory);
+				}
+			}
+		}
+		
+		/// <summary>
+		/// Gets path to directory where user gesture profiles are stored as XML files
+		/// </summary>
+		public static string UserGestureProfilesDirectory
+		{
+			get {
+				return _userGestureProfilesDirectory;
+			}
+		}
+		
+		/// <summary>
+		/// Gets or sets current profile. 
+		/// 
+		/// Current profile can change <see cref="InputBindingInfo.ActiveGestures" />
+		/// </summary>
+		public static UserGestureProfile CurrentProfile
+		{
+			get {
+				return _currentProfile;
+			}
+			set {
+				var oldProfile = _currentProfile;
+				_currentProfile = value;
+				
+				var currentProfilePath = value != null ? value.Path : null;
+				if(currentProfilePath != null) {
+					PropertyService.Set("ICSharpCode.Core.Presentation.UserDefinedGesturesManager.UserGestureProfilesDirectory", currentProfilePath);
+				} else {
+					PropertyService.Remove("ICSharpCode.Core.Presentation.UserDefinedGesturesManager.UserGestureProfilesDirectory");
+				}
+				
+				if(_currentProfile != oldProfile) {
+					InvokeCurrentProfileChanged(typeof(UserGestureProfileManager), new NotifyUserGestureProfileChangedEventArgs(oldProfile, _currentProfile));
+				}
+			} 
+		}
+		
+		/// <summary>
+		/// Occurs when <see cref="CurrentProfile" /> is changes
+		/// </summary>
+		public static event NotifyUserGestureProfileChangedEventHandler CurrentProfileChanged;
+	
+		private static void InvokeCurrentProfileChanged(object sender, NotifyUserGestureProfileChangedEventArgs args)
+		{
+			if(CurrentProfileChanged != null) {
+				CurrentProfileChanged.Invoke(sender, args);
+			}
+		}
+		
+		/// <summary>
+		/// Reset <see cref="UserGestureProfileManager" />
+		/// 
+		/// Intended to use for unit tests only
+		/// </summary>
+		public static void Reset()
+		{
+			CurrentProfile = null;
+			CurrentProfileChanged = null;
+		}
+	}
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/CommandsService/SDCommandManager.cs b/src/Main/ICSharpCode.Core.Presentation/CommandsService/SDCommandManager.cs
new file mode 100644
index 0000000000..0a34c27479
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/CommandsService/SDCommandManager.cs
@@ -0,0 +1,829 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Windows;
+using System.Windows.Input;
+using System.Xml.Serialization;
+using ICSharpCode.Core;
+
+namespace ICSharpCode.Core.Presentation
+{	
+	/// <summary>
+	/// Provides methods to describe <see cref="CommandBinding" /> and <see cref="InputBinding" /> 
+	/// objects assigned to owners and methods to keep aware of user changes to default gestures
+	/// </summary>
+	public static class SDCommandManager
+	{
+		/// <summary>
+		/// Name of the type which should be used as owner if no other 
+		/// owner type or element was provided
+		/// </summary>
+		public static string DefaultOwnerTypeName {
+			get; set;
+		}
+		
+		/// <summary>
+		/// Suspend <see cref="BindingsChanged" /> and <see cref="GesturesChanged" />
+		/// event handlers from being notified about new events
+		/// 
+		/// This property is usefull when lots of updates hapen. To improve performance
+		/// event notifications can be turned off until all updates are finished and after
+		/// that all handlers should be notified about the changes by calling method 
+		/// <see cref="InvokeBindingsChanged" /> or <see cref="InvokeGesturesChanged" />
+		/// with appropriate arguments
+		public static bool SuspendEvents {
+			get; set;
+		}
+		
+		// Registered binding infos
+		private static BindingInfoTemplateDictionary<BindingInfoBase> commandBindings = new BindingInfoTemplateDictionary<BindingInfoBase>();
+		private static BindingInfoTemplateDictionary<BindingInfoBase> inputBidnings = new BindingInfoTemplateDictionary<BindingInfoBase>();
+		
+		// Registered commands
+		private static Dictionary<string, RoutedUICommand> routedCommands = new Dictionary<string, RoutedUICommand>();
+		internal static Dictionary<string, System.Windows.Input.ICommand> commands = new Dictionary<string, System.Windows.Input.ICommand>();
+		
+		// Named UI instances and types
+		private static RelationshipMap<string, WeakReference> namedUIInstances = new RelationshipMap<string, WeakReference>(null, new WeakReferenceTargetEqualirtyComparer());
+		private static RelationshipMap<string, Type> namedUITypes = new RelationshipMap<string, Type>();
+		
+		// Registered input binding categories
+		public static List<InputBindingCategory> InputBindingCategories = new List<InputBindingCategory>();
+		
+		static SDCommandManager()
+		{
+			// Load gesture profile first
+			var path = PropertyService.Get("ICSharpCode.Core.Presentation.UserDefinedGesturesManager.UserGestureProfilesDirectory");
+			if(path != null && File.Exists(path)) {
+				var profile = new UserGestureProfile(path);
+				profile.Load();
+				
+				UserGestureProfileManager.CurrentProfile = profile;
+			}
+			
+			UserGestureProfileManager.CurrentProfileChanged += UserDefinedGesturesManager_CurrentProfileChanged;
+		}
+
+		static void UserDefinedGesturesManager_CurrentProfileChanged(object sender, NotifyUserGestureProfileChangedEventArgs args)
+		{
+			// Collect information about changed gestures and bindings from ProfileChanged event
+			var changedGestures = new Dictionary<BindingInfoTemplate, Tuple<InputGestureCollection, InputGestureCollection>>();
+			
+			if(args.OldProfile != null) {
+				args.OldProfile.GesturesChanged -= Profile_GesturesChanged;
+				
+				foreach(var pair in args.OldProfile) {
+					changedGestures.Add(pair.Key, new Tuple<InputGestureCollection, InputGestureCollection>(pair.Value, null));
+				}
+			}
+			
+			if(args.NewProfile != null) {
+				args.NewProfile.GesturesChanged += Profile_GesturesChanged;
+				
+				foreach(var pair in args.NewProfile) {
+					if(!changedGestures.ContainsKey(pair.Key)) {
+						changedGestures.Add(pair.Key, new Tuple<InputGestureCollection, InputGestureCollection>(null, pair.Value));
+					} else {
+						changedGestures[pair.Key] = new Tuple<InputGestureCollection, InputGestureCollection>(changedGestures[pair.Key].Item1, pair.Value);
+					}
+				}
+			}
+			
+			var modifiedBindingTemplates = new HashSet<BindingInfoTemplate>();
+			var descriptions = new List<GesturesModificationDescription>(changedGestures.Count);
+			foreach(var changedGesture in changedGestures) {
+				var bindingInfoTemplate = changedGesture.Key;
+				InputGestureCollection defaultUserGesture = null;
+				if(changedGesture.Value.Item1 == null || changedGesture.Value.Item2 == null) {
+					defaultUserGesture = FindInputGestures(bindingInfoTemplate, null);
+				}
+				
+				var oldGestures = changedGesture.Value.Item1 ?? defaultUserGesture;
+				var newGestures = changedGesture.Value.Item2 ?? defaultUserGesture;
+				descriptions.Add(new GesturesModificationDescription(changedGesture.Key, oldGestures, newGestures));
+						
+				modifiedBindingTemplates.Add(bindingInfoTemplate);
+			}
+			
+			// Notify GesturesChanged and BindingsChanged events handlers about changes
+			InvokeBindingsChanged(typeof(SDCommandManager), new NotifyBindingsChangedEventArgs(NotifyBindingsChangedAction.BindingInfoModified, modifiedBindingTemplates));
+			InvokeGesturesChanged(typeof(SDCommandManager), new NotifyGesturesChangedEventArgs(descriptions));
+		}
+
+		static void Profile_GesturesChanged(object sender, NotifyGesturesChangedEventArgs args)
+		{
+			// Collect information about changed gestures and bindings from GesturesChanded event in profile
+			var modifiedBindingTemplates = new HashSet<BindingInfoTemplate>();
+			foreach(var description in args.ModificationDescriptions) {
+				modifiedBindingTemplates.Add(description.InputBindingIdentifier);
+			}
+			
+			// Notify GesturesChanged and BindingsChanged events handlers about changes
+			InvokeBindingsChanged(typeof(SDCommandManager), new NotifyBindingsChangedEventArgs(NotifyBindingsChangedAction.BindingInfoModified, modifiedBindingTemplates));
+			InvokeGesturesChanged(typeof(SDCommandManager), args);
+		}
+		
+		/// <summary>
+		/// Get fully qualified assembly name without version and locale
+		/// </summary>
+		/// <param name="type"></param>
+		/// <returns></returns>
+		public static string GetShortAssemblyQualifiedName(Type type)
+		{
+			return string.Format("{0}, {1}", type.FullName, type.Assembly.GetName().Name);
+		}
+		
+		/// <summary>
+		/// Register <see cref="UIlement" /> instance accessible by unique name
+		/// </summary>
+		/// <param name="instanceName">Instance name</param>
+		/// <param name="instance">Instance</param>
+		public static void RegisterNamedUIElement(string instanceName, UIElement instance)
+		{	
+			if(instanceName == null) {
+				throw new ArgumentNullException("instanceName");
+			}
+			if(instance == null) {
+				throw new ArgumentNullException("instance");
+			}
+			
+			var oldInstances = GetNamedUIElementCollection(instanceName).ToArray();
+			
+			var container = new WeakReference(instance);
+			if(namedUIInstances.Add(instanceName, container)) {
+				InvokeBindingsChanged(
+					null, 
+					new NotifyBindingsChangedEventArgs(
+						NotifyBindingsChangedAction.NamedInstanceModified,
+						instanceName,
+						oldInstances,
+						GetNamedUIElementCollection(instanceName)));
+			}	
+		}
+		
+		/// <summary>
+		/// Make <see cref="UIlement" /> instance no longer accessible by provided name
+		/// </summary>
+		/// <param name="instanceName">Instance name</param>
+		/// <param name="instance">Instance</param>
+		public static void UnregisterNamedUIElement(string instanceName, UIElement instance)
+		{	
+			if(instanceName == null) {
+				throw new ArgumentNullException("instanceName");
+			}
+			if(instance == null) {
+				throw new ArgumentNullException("element");
+			}
+			
+			var oldInstances = GetNamedUIElementCollection(instanceName).ToArray();
+			
+			var container = new WeakReference(instance);
+			if(namedUIInstances.Remove(instanceName, container)) {
+				InvokeBindingsChanged(
+					null, 
+					new NotifyBindingsChangedEventArgs(
+						NotifyBindingsChangedAction.NamedInstanceModified,
+						instanceName,
+						oldInstances,
+						GetNamedUIElementCollection(instanceName)));
+			}
+		}
+		
+		/// <summary>
+		/// Get collection of <see cref="UIElement" /> instances associated with provided instance name
+		/// </summary>
+		/// <param name="instanceName">Instance name</param>
+		/// <returns>Instances collection</returns>
+		public static ICollection<UIElement> GetNamedUIElementCollection(string instanceName)
+		{
+			if(instanceName == null) {
+				throw new ArgumentNullException("instanceName");
+			}
+			
+			return namedUIInstances.MapForward(instanceName).Where(reference => reference.Target != null).Select(reference => (UIElement)reference.Target).ToList();
+		}
+		
+		/// <summary>
+		/// Gets all name-to-instance relationships
+		/// </summary>
+		public static IDictionary<string, ICollection<UIElement>> RegisteredNamedUIElements
+		{
+			get {
+				var dict = new Dictionary<string, ICollection<UIElement>>();
+				foreach(var pair in namedUIInstances.ForwardMap) {
+					var elements = new List<UIElement>();
+					foreach(var element in pair.Value) {
+						if(element.Target != null) {
+							elements.Add((UIElement)element.Target);
+						}
+					}
+					
+					dict.Add(pair.Key, elements);
+				}
+				
+				return dict;
+			}
+		}
+		
+		/// <summary>
+		/// Get collection of names associated with <see cref="UIElement" /> instance
+		/// </summary>
+		/// <param name="instance">Instance</param>
+		/// <returns>Names collection</returns>
+		public static ICollection<string> GetUIElementNameCollection(UIElement instance)
+		{
+			if(instance == null) {
+				throw new ArgumentNullException("instance");
+			}
+			
+			return namedUIInstances.MapBackward(new WeakReference(instance));
+		}
+		
+		/// <summary>
+		/// Register <see cref="Type" /> accessible by unique name
+		/// </summary>
+		/// <param name="typeName">Type name</param>
+		/// <param name="type">Type</param>
+		public static void RegisterNamedUIType(string typeName, Type type)
+		{
+			if(typeName == null) {
+				throw new ArgumentNullException("typeName");
+			}
+			if(type == null) {
+				throw new ArgumentNullException("type");
+			}
+			
+			var oldTypes = GetNamedUITypeCollection(typeName).ToArray();
+			
+			if(namedUITypes.Add(typeName, type)) {
+				InvokeBindingsChanged(null, 
+					new NotifyBindingsChangedEventArgs(
+						NotifyBindingsChangedAction.NamedTypeModified,
+						typeName,
+						oldTypes,
+						GetNamedUITypeCollection(typeName)));
+			}
+		}
+		
+		
+		/// <summary>
+		/// Make <see cref="Type" /> no longer accessible by provided name
+		/// </summary>
+		/// <param name="typeName">Type name</param>
+		/// <param name="type">Type</param>
+		public static void UnregisterNamedUIType(string typeName, Type type)
+		{	
+			if(typeName == null) {
+				throw new ArgumentNullException("typeName");
+			}
+			if(type == null) {
+				throw new ArgumentNullException("type");
+			}
+			
+			var oldTypes = GetNamedUITypeCollection(typeName).ToArray();
+			
+			if(namedUITypes.Remove(typeName, type)) {
+				InvokeBindingsChanged(
+					null, 
+					new NotifyBindingsChangedEventArgs(
+						NotifyBindingsChangedAction.NamedTypeModified,
+						typeName,
+						oldTypes,
+						GetNamedUITypeCollection(typeName)));
+			}
+		}
+		
+		/// <summary>
+		/// Get collection of <see cref="Type" /> associated with provided type name
+		/// </summary>
+		/// <param name="typeName">Type name</param>
+		/// <returns>Types collection</returns>
+		public static ICollection<Type> GetNamedUITypeCollection(string typeName)
+		{
+			if(typeName == null) {
+				throw new ArgumentNullException("typeName");
+			}
+			
+			return namedUITypes.MapForward(typeName);
+		}
+		
+		/// <summary>
+		/// Get collection of names associated with <see cref="Type" />
+		/// </summary>
+		/// <param name="type">Type</param>
+		/// <returns>Names collection</returns>
+		public static ICollection<string> GetUITypeNameCollection(Type type)
+		{
+			if(type == null) {
+				throw new ArgumentNullException("type");
+			}
+			
+			return namedUITypes.MapBackward(type);
+		}
+		
+		
+		/// <summary>
+		/// Gets all name-to-typ relationships
+		/// </summary>
+		public static IDictionary<string, ICollection<Type>> RegisteredNamedUITypes
+		{
+			get {
+				var dict = new Dictionary<string, ICollection<Type>>();
+				foreach(var pair in namedUITypes.ForwardMap) {
+					dict.Add(pair.Key, new List<Type>(pair.Value));
+				}
+				
+				return dict;
+			}
+		}
+
+		/// <summary>
+		/// Register newly created <see cref="RoutedUICommand" /> with unique name
+		/// 
+		/// Use "." to organize commands into groups
+		/// </summary>
+		/// <param name="routedCommandName">Routed command name</param>
+		/// <param name="text">Short text describing command functionality</param>
+		public static RoutedUICommand RegisterRoutedUICommand(string routedCommandName, string text) {
+			if(routedCommands.ContainsKey(routedCommandName)) {
+				throw new IndexOutOfRangeException("Routed UI command with name " + routedCommandName + " is already registered");
+			}
+			
+			var routedCommand = new RoutedUICommand(text, routedCommandName, typeof(SDCommandManager));
+			
+			routedCommands.Add(routedCommandName, routedCommand);
+							
+			InvokeBindingsChanged(null, new NotifyBindingsChangedEventArgs(NotifyBindingsChangedAction.RoutedUICommandModified, routedCommandName));
+					
+			return routedCommand;
+		}
+
+		/// <summary>
+		/// Register existing routed command
+		/// </summary>
+		/// <param name="routedCommandName">Existing routed command</param>
+		public static void RegisterRoutedUICommand(RoutedUICommand existingRoutedUICommand) {
+			string routedCommandName = existingRoutedUICommand.OwnerType.Name + "." + existingRoutedUICommand.Name;
+			
+			if(routedCommands.ContainsKey(routedCommandName)) {
+				throw new IndexOutOfRangeException("Routed UI command with name " + routedCommandName + " is already registered");
+			}
+			
+			routedCommands.Add(routedCommandName, existingRoutedUICommand);
+			
+			InvokeBindingsChanged(null, new NotifyBindingsChangedEventArgs(NotifyBindingsChangedAction.RoutedUICommandModified, routedCommandName));
+		}
+	
+		/// <summary>
+		/// Unregister routed command
+		/// </summary>
+		/// <param name="routedCommandName">Unregistered routed command name</param>
+		public static void UnregisterRoutedUICommand(string routedCommandName) {
+			if(routedCommands.ContainsKey(routedCommandName)) {
+				var routedCommand = routedCommands[routedCommandName];
+				routedCommands.Remove(routedCommandName);
+				
+				InvokeBindingsChanged(null, new NotifyBindingsChangedEventArgs(NotifyBindingsChangedAction.RoutedUICommandModified, routedCommandName));
+			}
+		}
+		
+		/// <summary>
+		/// Get instance of <see cref="RoutedUICommand" /> by name
+		/// </summary>
+		/// <param name="routedCommandName">Routed command name</param>
+		/// <returns>Routed UI command instance</returns>
+		public static RoutedUICommand GetRoutedUICommand(string routedCommandName) {
+			if(routedCommands != null && routedCommands.ContainsKey(routedCommandName)) {
+				return routedCommands[routedCommandName];
+			}
+			
+			return null;
+		}
+		
+		/// <summary>
+		/// Gets all name-to-routed_command relationships
+		/// </summary>
+		public static IDictionary<string, RoutedUICommand> RegisteredRoutedUICommands
+		{
+			get {
+				return new Dictionary<string, RoutedUICommand>(routedCommands);
+			}
+		}
+		
+		/// <summary>
+		/// Register <see cref="CommandBindingInfo" /> instance. If <see cref="CommandBindingInfo" /> with same signature
+		/// already exist ([<see cref="CommandBindingInfo.OwnerTypeName" /> or <see cref="InputBindingInfo.OwnerInstanceName" />] + <see cref="CommandBindingInfo.RoutedCommandName" /> 
+		/// + [<see cref="CommandBindingInfo.CommandTypeName" /> or <see cref="CommandBindingInfo.CommandInstance" /> or <see cref="CommandBindingInfo.ExecutedEventHandler" />) 
+		/// updates existing <see cref="CommandBindingInfo" />
+		/// </summary>
+		/// <param name="commandBindingInfo">Binding info</param>
+		public static void RegisterCommandBindingInfo(CommandBindingInfo commandBindingInfo) {
+			if(commandBindingInfo.OwnerInstanceName == null && commandBindingInfo.OwnerTypeName == null) {
+				throw new ArgumentException("OwnerTypeName or OwnerInstanceName must be specified");
+			}
+			
+			if(commandBindingInfo.RoutedCommandName == null) {
+				throw new ArgumentException("RoutedCommandName must be specified");
+			}
+			
+			if(commandBindingInfo.CommandTypeName != null && commandBindingInfo.AddIn == null) {
+				throw new ArgumentException("CommandTypeName is specified but AddIn is not");
+			}
+			
+			var similarTemplate = BindingInfoTemplate.CreateFromIBindingInfo(commandBindingInfo);
+			var similarCommandBindings = FindCommandBindingInfos(similarTemplate, null);
+			
+			if(similarCommandBindings != null && similarCommandBindings.Count > 0) {
+				foreach(var similarCommandBinding in similarCommandBindings) {
+					if((commandBindingInfo.CommandTypeName != null && commandBindingInfo.CommandTypeName == similarCommandBinding.CommandTypeName)
+					   || (commandBindingInfo.CommandTypeName == null && commandBindingInfo.CommandInstance != null && commandBindingInfo.CommandInstance == similarCommandBinding.CommandInstance)
+					   || (commandBindingInfo.ExecutedEventHandler != null && commandBindingInfo.ExecutedEventHandler == similarCommandBinding.ExecutedEventHandler && (commandBindingInfo.CanExecuteEventHandler == null || commandBindingInfo.CanExecuteEventHandler == similarCommandBinding.CanExecuteEventHandler))) {
+						
+						lock(similarCommandBinding) {
+							similarCommandBinding.IsRegistered = false;
+							similarCommandBinding.IsLazy = commandBindingInfo.IsLazy;
+							similarCommandBinding.AddIn = commandBindingInfo.AddIn;
+							similarCommandBinding.Groups.AddRange(commandBindingInfo.Groups);
+							similarCommandBinding.IsRegistered = true;
+						}
+					}
+				}
+			} else {
+				commandBindings.Add(BindingInfoTemplate.CreateFromIBindingInfo(commandBindingInfo), commandBindingInfo);
+				commandBindingInfo.IsRegistered = true;
+			}
+			
+			SDCommandManager.BindingsChanged += commandBindingInfo.BindingsChangedHandler;
+			InvokeBindingsChanged(null, new NotifyBindingsChangedEventArgs(NotifyBindingsChangedAction.BindingInfoModified, new []{ BindingInfoTemplate.CreateFromIBindingInfo(commandBindingInfo) }));
+		}
+
+		/// <summary>
+		/// Register <see cref="InputBindingInfo" /> instance. If <see cref="InputBindingInfo" /> with same signature
+		/// already exist (<see cref="InputBindingInfo.OwnerTypeName" />/<see cref="InputBindingInfo.OwnerInstanceName" /> + <see cref="InputBindingInfo.RoutedCommandName" />) 
+		/// updates existing <see cref="InputBindingInfo" />
+		/// </summary>
+		/// <param name="inputBindingInfo">Binding info</param>
+		public static void RegisterInputBindingInfo(InputBindingInfo inputBindingInfo)
+		{
+			if(inputBindingInfo.OwnerInstanceName == null && inputBindingInfo.OwnerTypeName == null) {
+				throw new ArgumentException("OwnerTypeName or OwnerInstanceName must be specified");
+			}
+			
+			if(inputBindingInfo.RoutedCommandName == null) {
+				throw new ArgumentException("Routed command name must be specified");
+			}
+			
+			var similarTemplate = BindingInfoTemplate.CreateFromIBindingInfo(inputBindingInfo);
+			var similarInputBindings = FindInputBindingInfos(similarTemplate, null);
+			
+			if(similarInputBindings != null && similarInputBindings.Count > 0) {
+				foreach(var similarInputBinding in similarInputBindings) {
+					foreach(InputGesture gesture in inputBindingInfo.DefaultGestures) {
+						var existingGesture = new InputGestureCollection(similarInputBinding.DefaultGestures.ToList());
+						if(!existingGesture.ContainsTemplateFor(gesture, GestureCompareMode.ExactlyMatches)) {
+							similarInputBinding.DefaultGestures.Add(gesture);
+						}
+					}
+					
+					lock(similarInputBinding) {
+						similarInputBinding.IsRegistered = false;
+						similarInputBinding.AddIn = inputBindingInfo.AddIn;
+						similarInputBinding.Categories.AddRange(inputBindingInfo.Categories);
+						similarInputBinding.Groups.AddRange(inputBindingInfo.Groups);
+						similarInputBinding.IsRegistered = true;
+					}
+				}
+			} else {
+				inputBidnings.Add(BindingInfoTemplate.CreateFromIBindingInfo(inputBindingInfo), inputBindingInfo);
+				inputBindingInfo.IsRegistered = true;
+				
+				SDCommandManager.BindingsChanged += inputBindingInfo.BindingsChangedHandler;
+				InvokeGesturesChanged(
+					typeof(SDCommandManager), 
+					new NotifyGesturesChangedEventArgs(
+						new GesturesModificationDescription(
+							similarTemplate,
+							null,
+							inputBindingInfo.ActiveGestures)));
+			}
+			
+			InvokeBindingsChanged(typeof(SDCommandManager), new NotifyBindingsChangedEventArgs(NotifyBindingsChangedAction.BindingInfoModified, new [] { similarTemplate }));
+		}
+		
+		/// <summary>
+		/// Remove input binding associated with type
+		/// </summary>
+		/// <param name="ownerType">Owner type</param>
+		/// <param name="inputBinding">Input binding</param>
+		public static void RemoveClassInputBinding(Type ownerType, InputBinding inputBinding)
+		{
+			var fieldInfo = typeof(System.Windows.Input.CommandManager).GetField("_classInputBindings", BindingFlags.Static | BindingFlags.NonPublic);
+			var fieldData = (HybridDictionary)fieldInfo.GetValue(null);
+			var classInputBindings = (InputBindingCollection)fieldData[ownerType];
+
+			if(classInputBindings != null) {
+				classInputBindings.Remove(inputBinding);
+			}
+		}
+		
+		/// <summary>
+		/// Remove command binding associated with type
+		/// </summary>
+		/// <param name="ownerType"></param>
+		/// <param name="commandBinding"></param>
+		public static void RemoveClassCommandBinding(Type ownerType, CommandBinding commandBinding) 
+		{
+			var fieldInfo = typeof(System.Windows.Input.CommandManager).GetField("_classCommandBindings", BindingFlags.Static | BindingFlags.NonPublic);
+			var fieldData = (HybridDictionary)fieldInfo.GetValue(null);
+			var classCommandBindings = (CommandBindingCollection)fieldData[ownerType];
+
+			if(classCommandBindings != null) {
+				classCommandBindings.Remove(commandBinding);
+			}
+		}
+		
+		/// <summary>
+		/// Occurs when information relevant to registered <see cref="IBindingInfo"/> changes
+		/// </summary>
+		public static event NotifyBindingsChangedEventHandler BindingsChanged;
+		
+		/// <summary>
+		/// Invoke <see cref="BindingsChanged" /> event handlers
+		/// </summary>
+		/// <param name="sender">Sender object</param>
+		/// <param name="args">Event arguments</param>
+		public static void InvokeBindingsChanged(object sender, NotifyBindingsChangedEventArgs args)
+		{
+			if(!SuspendEvents && BindingsChanged != null) {
+				BindingsChanged.Invoke(sender, args);
+			}
+		}
+		
+		/// <summary>
+		/// Occurs when <see cref="InputBindingInfo.ActiveGestures" /> in any registered
+		/// <see cref="InputBindingInfo" /> changes
+		/// </summary>
+		public static event NotifyGesturesChangedEventHandler GesturesChanged;
+		
+		/// <summary>
+		/// Invoke <see cref="GesturesChanged" /> event handlers
+		/// </summary>
+		/// <param name="sender">Sender object</param>
+		/// <param name="args">Event arguments</param>
+		public static void InvokeGesturesChanged(object sender, NotifyGesturesChangedEventArgs args)
+		{
+			if(!SuspendEvents && GesturesChanged != null) {
+				GesturesChanged.Invoke(sender, args);
+			}
+		}
+		
+		/// <summary>
+		/// Load all registered commands in add-in
+		/// </summary>
+		/// <param name="addIn">Add-in</param>
+		public static void LoadAddinCommands(AddIn addIn) {		
+			foreach(CommandBindingInfo binding in FindCommandBindingInfos(new BindingInfoTemplate(), null)) {
+				if(binding.AddIn != addIn) continue;
+		
+				if(binding.CommandTypeName != null && !commands.ContainsKey(binding.CommandTypeName)){
+					var command = addIn.CreateObject(binding.CommandTypeName);
+					var wpfCommand = command as System.Windows.Input.ICommand;
+					if(wpfCommand == null) {
+						wpfCommand = new WpfCommandWrapper((ICSharpCode.Core.ICommand)command);
+					}
+				
+					commands.Add(binding.CommandTypeName, wpfCommand);
+				}
+			}
+		}
+		
+		/// <summary>
+		/// Register command object (either instance of <see cref="System.Windows.Input.ICommand" /> or <see cref="ICSharpCode.Core.ICommand" />)
+		/// which can be identified by command name
+		/// </summary>
+		/// <param name="commandName">Command name</param>
+		/// <param name="command">Command instance</param>
+		public static void LoadCommand(string commandName, object command) {
+			var wpfCommand = command as System.Windows.Input.ICommand;
+			if(wpfCommand == null) {
+				wpfCommand = new WpfCommandWrapper((ICSharpCode.Core.ICommand)command);
+			}
+			
+			if(!commands.ContainsKey(commandName)) {
+				commands.Add(commandName, wpfCommand);
+			}
+		}
+		
+		#region Unregister binding infos
+		
+		/// <summary>
+		/// Unregister <see cref="InputBindingInfo" /> instance
+		/// </summary>
+		/// <param name="inputBindingInfo">Binding info</param>
+		public static void UnregisterInputBinding(InputBindingInfo inputBindingInfo)
+		{
+			UnregisterBindingInfo(inputBidnings, inputBindingInfo);
+		}
+		
+		/// <summary>
+		/// Unregister <see cref="CommandBindingInfo" /> instance
+		/// </summary>
+		/// <param name="commandBindingInfo">Command binding parameters</param>
+		public static void UnregisterCommandBinding(CommandBindingInfo commandBindingInfo) 
+		{
+			UnregisterBindingInfo(commandBindings, commandBindingInfo);
+		}
+		
+		private static void UnregisterBindingInfo(BindingInfoTemplateDictionary<BindingInfoBase> bindingInfoDictionary, BindingInfoBase bindingInfo)
+		{
+			bindingInfoDictionary.Remove(bindingInfo);
+			SDCommandManager.BindingsChanged -= bindingInfo.BindingsChangedHandler;
+			bindingInfo.RemoveActiveBindings();
+			bindingInfo.IsRegistered = false;
+			
+			InvokeBindingsChanged(null, new NotifyBindingsChangedEventArgs(NotifyBindingsChangedAction.BindingInfoModified, new[] { BindingInfoTemplate.CreateFromIBindingInfo(bindingInfo) } ));
+		}
+		
+		#endregion
+		
+		#region Find binding infos
+
+		/// <summary>
+		/// Get list of all <see cref="CommandBindingInfo" />  matched by provided <see cref="BindingInfoTemplate" />
+		/// </summary>
+		/// <param name="template">Template to match against</param>
+		/// <param name="filteredGroups">Groups contained in matched bindings. If this value is not null only bindings which have one of the specified grops assigned are filtered</param>
+		/// <returns>Collection of matched <see cref="CommandBindingInfo" /> instances</returns>
+		public static ICollection<CommandBindingInfo> FindCommandBindingInfos(BindingInfoTemplate template, BindingGroupCollection filteredGroups)
+		{
+			return FindBindingInfos(commandBindings, template, filteredGroups).Cast<CommandBindingInfo>().ToList();
+		}
+		
+		/// <summary>
+		/// Get list of all <see cref="InputBindingInfo" />  matched by provided <see cref="BindingInfoTemplate" />
+		/// </summary>
+		/// <param name="template">Template to match against</param>
+		/// <param name="filteredGroups">Groups contained in matched bindings. If this value is not null only bindings which have one of the specified grops assigned are filtered</param>
+		/// <returns>Collection of matched <see cref="InputBindingInfo" /> instances</returns>
+		public static ICollection<InputBindingInfo> FindInputBindingInfos(BindingInfoTemplate template, BindingGroupCollection filteredGroups)
+		{
+			return FindBindingInfos(inputBidnings, template, filteredGroups).Cast<InputBindingInfo>().ToList();
+		}
+		
+		private static ICollection<BindingInfoBase> FindBindingInfos(BindingInfoTemplateDictionary<BindingInfoBase> bindingInfos, BindingInfoTemplate template, BindingGroupCollection filteredGroups)
+		{
+			var items = bindingInfos.FindItems(template);
+			ICollection<BindingInfoBase> returnedItems = new List<BindingInfoBase>();
+			
+			if(filteredGroups != null && items != null) {
+				foreach(var item in items) {
+					if(item.Groups.ContainsAnyFromCollection(filteredGroups)) {
+						returnedItems.Add(item);
+					}
+				}
+			} else {
+				returnedItems = items ?? new List<BindingInfoBase>();
+			}
+		
+			return returnedItems;
+		}
+		
+		/// <summary>
+		/// Get list of <see cref="System.Windows.Input.InputGesture" /> from <see cref="InputBindingInfo" /> instances matched by
+		/// provided <see cref="BindingInfoTemplate" />
+		/// </summary>
+		/// <param name="template">Template to match against</param>
+		/// <param name="filteredGroups">Groups contained in matched bindings. If this value is not null only gestures registered in bindings which have one of the specified grops assigned are filtered</param>
+		/// <returns>Collection of matched <see cref="System.Windows.Input.InputGesture" /> instances</returns>
+		public static InputGestureCollection FindInputGestures(BindingInfoTemplate template, BindingGroupCollection filteredGroups) {
+			var bindings = FindInputBindingInfos(template, filteredGroups);
+			var gestures = new InputGestureCollection();
+			
+			foreach(InputBindingInfo bindingInfo in bindings) {
+				if(bindingInfo.ActiveGestures != null) {
+					foreach(InputGesture gesture in bindingInfo.ActiveGestures) {
+						if(!gestures.ContainsTemplateFor(gesture, GestureCompareMode.ExactlyMatches)) {
+							gestures.Add(gesture);
+						}
+					}
+				}
+			}
+			
+			return gestures;
+		}
+		#endregion
+		
+		/// <summary>
+		/// Get registered <see cref="InputBindingCategory" /> by path
+		/// </summary>
+		/// <param name="categoryPath">Category path</param>
+		/// <param name="throwWhenNotFound">Defines whether to throw an exception on category with this path not found or not</param>
+		/// <returns></returns>
+		public static InputBindingCategory GetInputBindingCategory(string categoryPath, bool throwWhenNotFound)
+		{
+			foreach(var category in InputBindingCategories) {
+				if(category.Path == categoryPath) {
+					return category;
+				}
+			}
+			
+			if(throwWhenNotFound) {
+				throw new ApplicationException(string.Format("InputBindingCategory with path {0} was not found", categoryPath));
+			}
+			
+			return null;
+		}
+		
+		/// <summary>
+		/// Get <see cref="InputBindingCategoryCollection" /> of categories matching any of provided paths
+		/// </summary>
+		/// <param name="categoryPathCollectionString">Category paths separated by comma</param>
+		/// <param name="throwWhenNotFound">Defines whether to throw an exception on category with this path not found or not</param>
+		/// <returns></returns>
+		public static InputBindingCategoryCollection GetInputBindingCategoryCollection(string categoryPathCollectionString, bool throwWhenNotFound)
+		{
+			var categoryPathCollection = categoryPathCollectionString.Split(',');
+			var categories = new InputBindingCategoryCollection();
+			foreach(var categoryPath in categoryPathCollection) {
+				var category = GetInputBindingCategory(categoryPath, throwWhenNotFound);
+				
+				if(category != null) {
+					categories.Add(category);
+				}
+			}
+			
+			return categories;
+		}
+		
+		/// <summary>
+		/// Get <see cref="InputBindingInfoCategoryCollection" /> of children categories from root category path
+		/// </summary>
+		/// <param name="rootCategoryPath">Root category path</param>
+		/// <returns>List of child categories</returns>
+		public static ICollection<InputBindingCategory> GetInputBindingCategoryChildren(string rootCategoryPath) 
+		{
+			var children = new InputBindingCategoryCollection();
+			var categoryDepth = rootCategoryPath.Count(c => c == '/');
+			foreach(var currentCategory in InputBindingCategories) {
+				if(currentCategory.Path.StartsWith(rootCategoryPath)) {
+					var currentCategoryDepth = currentCategory.Path.Count(c => c == '/');
+					
+					if(currentCategoryDepth == categoryDepth + 1)
+					{
+						children.Add(currentCategory);
+					}
+				}
+			}
+			
+			return children;
+		}
+		
+		/// <summary>
+		/// Register <see cref="InputBindingCateogyr" /> with unique path
+		/// </summary>
+		/// <param name="category">Registered category</param>
+		public static void RegisterInputBindingCategory(InputBindingCategory category) 
+		{
+			if(string.IsNullOrEmpty(category.Path)) {
+				throw new ArgumentException("InputBindingCategory path can not be empty");
+			}
+			
+			if(string.IsNullOrEmpty(category.Text)) {
+				throw new ArgumentException("InputBindingCategory text can not be empty");
+			}
+			
+			InputBindingCategories.Add(category);
+		}
+		
+		/// <summary>
+		/// Reset events handlers and registered objects
+		/// 
+		/// Use for nit testing only!
+		/// </summary>
+		public static void Reset()
+		{
+			
+			commandBindings.Clear();
+			inputBidnings.Clear();
+		
+			routedCommands.Clear();
+			commands.Clear();
+		
+			namedUIInstances.Clear();
+			namedUITypes.Clear();
+		
+			InputBindingCategories.Clear();
+			
+			BindingsChanged = null;
+			GesturesChanged = null;
+		}
+		
+	}	
+}
\ No newline at end of file
diff --git a/src/Main/ICSharpCode.Core.Presentation/CommandsService/UserGestureProfileChangedEvent.cs b/src/Main/ICSharpCode.Core.Presentation/CommandsService/UserGestureProfileChangedEvent.cs
new file mode 100644
index 0000000000..36a28e04b0
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/CommandsService/UserGestureProfileChangedEvent.cs
@@ -0,0 +1,25 @@
+/*
+ * Created by SharpDevelop.
+ * User: Sergej Andrejev
+ * Date: 8/3/2009
+ * Time: 7:47 PM
+ */
+using System;
+
+namespace ICSharpCode.Core.Presentation
+{
+	public class NotifyUserGestureProfileChangedEventArgs
+	{
+		public UserGesturesProfile OldProfile
+		{
+			get; set;
+		}
+		
+		public UserGesturesProfile NewProfile
+		{
+			get; set;
+		}
+	}
+	
+	public delegate void NotifyUserGestureProfileChangedEventHandler(object sender, NotifyUserGestureProfileChangedEventArgs args);
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/CommandsService/Utils/IObservableCollection.cs b/src/Main/ICSharpCode.Core.Presentation/CommandsService/Utils/IObservableCollection.cs
new file mode 100644
index 0000000000..acbd0553e9
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/CommandsService/Utils/IObservableCollection.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+
+namespace ICSharpCode.Core.Presentation
+{
+	/// <summary>
+	/// Interfaces describing observable collection
+	/// </summary>
+    public interface IObservableCollection<T> : ICollection<T>, INotifyCollectionChanged
+    {
+    }
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/CommandsService/Utils/WeakReferenceEqualirtyComparer.cs b/src/Main/ICSharpCode.Core.Presentation/CommandsService/Utils/WeakReferenceEqualirtyComparer.cs
new file mode 100644
index 0000000000..453a2af0a1
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/CommandsService/Utils/WeakReferenceEqualirtyComparer.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+
+namespace ICSharpCode.Core.Presentation
+{ 
+	/// <summary>
+	/// Compares two instances wrapped inside <see cref="WeakReference" />
+	/// </summary>
+	public class WeakReferenceTargetEqualirtyComparer : IEqualityComparer<WeakReference>
+	{
+		/// <summary>
+		/// Determines whether two instances found in <see cref="WeakReference.Target" /> are equal
+		/// </summary>
+		/// <param name="container1">First <see cref="WeakReference" /> container</param>
+		/// <param name="container2">Second <see cref="WeakReference" /> container</param>
+		/// <returns>Returns <code>true</code> if instances in <see cref="WeakReference.Target" /> are equal; otherwise <code>false</code></returns>
+		bool IEqualityComparer<WeakReference>.Equals(WeakReference container1, WeakReference container2) 
+		{
+			object value1 = null;
+			object value2 = null;
+			
+			if (container1 != null) {
+				value1 = container1.Target;
+				if (value1 == null) {
+					return container1 == container2;
+				}
+			}
+			
+			if (container2 != null) {
+				value2 = container2.Target;
+				if (value2 == null) {
+					return container1 == container2;
+				}
+			}
+			
+			return value1 == value2;
+		}
+		
+		/// <summary>
+		/// Get hash code of instance found in <see cref="WeakReference.Target" />
+		/// </summary>
+		/// <param name="container"><see cref="WeakReference" /> container</param>
+		/// <returns>Returns hash code of the instace found in <see cref="WeakReference.Target" /></returns>
+		int IEqualityComparer<WeakReference>.GetHashCode(WeakReference container)
+		{
+			object target = null;
+			
+			if (container != null) {
+				target = container.Target;
+				if (target == null) {
+					return container.GetHashCode();
+				}
+			}
+			
+			return target == null ? 0 : target.GetHashCode();
+		}
+	}
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/CommandsService/Utils/WpfCommandWrapper.cs b/src/Main/ICSharpCode.Core.Presentation/CommandsService/Utils/WpfCommandWrapper.cs
new file mode 100644
index 0000000000..c96719f6ef
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/CommandsService/Utils/WpfCommandWrapper.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Windows.Input;
+using ICSharpCode.Core;
+
+namespace ICSharpCode.Core.Presentation
+{
+	/// <summary>
+	/// Wraps SharpDevelop's native command inside WPF command
+	/// </summary>
+	public class WpfCommandWrapper : System.Windows.Input.ICommand
+	{
+		ICommand command;
+		
+		/// <summary>
+		/// Creates instance of <see cref="WpfCommandWrapper" />
+		/// </summary>
+		/// <param name="command">SharpDevelop native command</param>
+		public WpfCommandWrapper(ICSharpCode.Core.ICommand command)
+		{
+			this.command = command;
+		}
+		
+		/// <summary>
+		/// Occurs when <see cref="CanExecute" /> returned value changes
+		/// 
+		/// Not used because SharpDevelop's native command implementation
+		/// doesn't support it
+		/// </summary>
+		public event EventHandler CanExecuteChanged {
+			add { }
+			remove { }
+		}
+		
+		/// <inheritdoc />
+		public void Execute(object parameter)
+		{
+			command.Run();
+		}
+		
+		/// <inheritdoc />
+		public bool CanExecute(object parameter)
+		{
+			return true;
+		}
+	}
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/ICSharpCode.Core.Presentation.csproj b/src/Main/ICSharpCode.Core.Presentation/ICSharpCode.Core.Presentation.csproj
index 75520b1d4e..d40cee4b8b 100644
--- a/src/Main/ICSharpCode.Core.Presentation/ICSharpCode.Core.Presentation.csproj
+++ b/src/Main/ICSharpCode.Core.Presentation/ICSharpCode.Core.Presentation.csproj
@@ -72,11 +72,41 @@
     <Compile Include="RestrictDesiredSize.cs" />
     <Compile Include="SortableGridViewColumn.cs" />
     <Compile Include="CollapsiblePanel.cs" />
+    <Compile Include="CommandsService\BindingInfoBase.cs" />
+    <Compile Include="CommandsService\BindingGroup.cs" />
+    <Compile Include="CommandsService\BindingInfoTemplate.cs" />
+    <Compile Include="CommandsService\Collections\BindingGroupCollection.cs" />
+    <Compile Include="CommandsService\Collections\BindingInfoTemplateDictionary.cs" />
+    <Compile Include="CommandsService\Collections\InputBindingCategoryCollection.cs" />
+    <Compile Include="CommandsService\Collections\RelationshipMap.cs" />
+    <Compile Include="CommandsService\CommandBindingInfo.cs" />
+    <Compile Include="CommandsService\SDCommandManager.cs" />
+    <Compile Include="CommandsService\CommandsService.cs" />
+    <Compile Include="CommandsService\Events\NotifyBindingsChangedEvent.cs" />
+    <Compile Include="CommandsService\Events\NotifyGesturesChangedEvent.cs" />
+    <Compile Include="CommandsService\Events\NotifyUserGestureProfileChangedEvent.cs" />
+    <Compile Include="CommandsService\InputBindingCategory.cs" />
+    <Compile Include="CommandsService\InputBindingInfo.cs" />
+    <Compile Include="CommandsService\Profile\UserGestureProfileManager.cs" />
+    <Compile Include="CommandsService\Profile\UserGestureProfile.cs" />
+    <Compile Include="CommandsService\Utils\IObservableCollection.cs" />
+    <Compile Include="CommandsService\Utils\WeakReferenceEqualirtyComparer.cs" />
+    <Compile Include="CommandsService\Utils\WpfCommandWrapper.cs" />
     <Compile Include="ConditionalSeparator.cs" />
     <Compile Include="DropDownButton.cs" />
     <Compile Include="ExtensionMethods.cs" />
     <Compile Include="GetBitmapExtension.cs" />
+    <Compile Include="Input\GestureCompareMode.cs" />
+    <Compile Include="Input\InputGestureCollectionConverter.cs" />
+    <Compile Include="Input\ObservableInputGestureCollection.cs" />
     <Compile Include="IOptionBindingContainer.cs" />
+    <Compile Include="Input\InputGestureCollectionExtensions.cs" />
+    <Compile Include="Input\InputGestureExtensions.cs" />
+    <Compile Include="Input\MultiKeyBinding.cs" />
+    <Compile Include="Input\MultiKeyGesture.cs" />
+    <Compile Include="Input\MultiKeyGestureConverter.cs" />
+    <Compile Include="Input\PartialKeyGesture.cs" />
+    <Compile Include="Input\PartialKeyGestureConverter.cs" />
     <Compile Include="IStatusUpdate.cs" />
     <Compile Include="LanguageChangeWeakEventManager.cs" />
     <Compile Include="LocalizeExtension.cs" />
@@ -105,9 +135,6 @@
       <Name>ICSharpCode.Core</Name>
       <Private>False</Private>
     </ProjectReference>
-    <Folder Include="Menu" />
-    <Folder Include="themes" />
-    <Folder Include="ToolBar" />
     <Page Include="themes\Aero.NormalColor.xaml" />
     <Page Include="themes\generic.xaml" />
   </ItemGroup>
diff --git a/src/Main/ICSharpCode.Core.Presentation/Input/GestureCompareMode.cs b/src/Main/ICSharpCode.Core.Presentation/Input/GestureCompareMode.cs
new file mode 100644
index 0000000000..91e3c8f89d
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/Input/GestureCompareMode.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Windows.Input;
+
+namespace ICSharpCode.Core.Presentation
+{
+	public enum GestureCompareMode 
+	{
+		/// <summary>
+		/// Match is successfull when all chrods from both instance of <see cref="InputGesture" /> match
+		/// or all gestures in both instance of <see cref="InputGestureCollections" /> match
+		/// </summary>
+		ExactlyMatches,
+		
+		/// <summary>
+		/// Match is successfull when two instance of <see cref="InputGesture" /> ar conflicting.
+		/// 
+		/// Either one or another instance starts with the same chors as other one
+		/// </summary>
+		Conflicting,
+		
+		/// <summary>
+		/// Match is successfull when template <see cref="InputGesture" /> partly matches compared <see cref="InputGesture" />.
+		/// Template is found in any place within matched gesture 
+		/// </summary>
+		PartlyMatches,
+		
+		
+		/// <summary>
+		/// Match is successfull when examined <see cref="InputGesture" /> starts with the same keys as template
+		/// </summary>
+		StartsWith,
+		
+		/// <summary>
+		/// Match is successfull when examined <see cref="InputGesture" /> starts with the same complite chords as template
+		/// </summary>
+		StartsWithFullChords,
+	}
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/Input/InputGestureCollectionConverter.cs b/src/Main/ICSharpCode.Core.Presentation/Input/InputGestureCollectionConverter.cs
new file mode 100644
index 0000000000..2b56eab22f
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/Input/InputGestureCollectionConverter.cs
@@ -0,0 +1,128 @@
+using System;
+using System.Windows.Input;
+using System.ComponentModel;
+using System.Collections.Generic;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Globalization;
+
+namespace ICSharpCode.Core.Presentation
+{
+	/// <summary>
+	/// Converts input gesture from text representation to object and vice versa
+	/// 
+	/// Will be able to convert mouse and key gestures and handle gestures collections
+	/// </summary>
+	public class InputGestureCollectionConverter : TypeConverter
+	{
+		/// <summary>
+		/// Returns a value indicating whether this converter can convert an object in the
+		/// specified source type to the native type of the converter.
+		/// </summary>
+		/// <param name="context">Type descriptor context</param>
+		/// <param name="sourceType">Source type</param>
+		/// <returns>Array of keys</returns>
+		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType) {
+			if (sourceType == typeof(string)) {
+				return true;
+			}
+			
+			return base.CanConvertFrom(context, sourceType);
+		}
+		
+		/// <summary>
+		/// Returns a value indicating whether this converter can convert a
+		/// specified object to the specified destination type.
+		/// </summary>
+		/// <param name="context">An ITypeDescriptorContext that provides a format context, which can be used to extract additional information about the environment this converter is being invoked from. This parameter or properties of this parameter can be a null reference</param>
+		/// <param name="destinationType">Convertion destination type</param>
+		/// <returns>Destination object</returns>
+		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType) {
+			if (destinationType == typeof(string)) {
+				return true;
+			}
+			
+			return base.CanConvertTo(context, destinationType);
+		}
+		
+		/// <summary>
+		/// Parses the shortcut text. If there are warnings (e.g. SD3 syntax for shortcuts), context is displayed on the console.
+		/// </summary>
+		public static InputGestureCollection Parse(string shortcut, object context)
+		{
+			if (shortcut == null)
+				throw new ArgumentNullException("shortcut");
+			if (shortcut.Contains("|")) {
+				LoggingService.Warn("Old-syntax shortcut in " + context);
+				shortcut = shortcut.Replace('|', '+');
+			}
+			
+			var gestures = new InputGestureCollection();
+			var serializedGestures = Regex.Split(shortcut, @"\s*\;\s*");
+			
+			foreach (var serializedGesture in serializedGestures) {
+				if (string.IsNullOrEmpty(serializedGesture)) continue;
+				
+				if (serializedGesture.IndexOf(",") < 0) {
+					var keyGesture = (InputGesture)new KeyGestureConverter().ConvertFromInvariantString(serializedGesture);
+					gestures.Add(keyGesture);
+				} else {
+					var multiKeyGestyre = (InputGesture)new MultiKeyGestureConverter().ConvertFromInvariantString(serializedGesture);
+					gestures.Add(multiKeyGestyre);
+				}
+			}
+			
+			return gestures;
+		}
+		
+		/// <summary>
+		/// Convert from object to input gesture collection
+		/// </summary>
+		/// <param name="context">An ITypeDescriptorContext that provides a format context, which can be used to extract additional information about the environment this converter is being invoked from. This parameter or properties of this parameter can be a null reference </param>
+		/// <param name="culture">Locale information which can influence convertion</param>
+		/// <param name="value">Input gesture collection</param>
+		/// <returns></returns>
+		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value) {
+			if (value is string) {
+				return Parse((string)value, context);
+			}
+			
+			return base.ConvertFrom(context, culture, value);
+		}
+		
+		/// <summary>
+		/// Converts the input gesture collection to the specified destination type
+		/// </summary>
+		/// <param name="context">An ITypeDescriptorContext that provides a format context, which can be used to extract additional information about the environment this converter is being invoked from. This parameter or properties of this parameter can be a null reference </param>
+		/// <param name="culture">Locale information which can influence convertion</param>
+		/// <param name="value">Input gesture collection</param>
+		/// <param name="destinationType">Convertion destination type</param>
+		/// <returns></returns>
+		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType) {
+			if(destinationType == typeof(string)) {
+				var sb = new StringBuilder();
+				var gesturesCollection = (InputGestureCollection)value;
+				foreach(var gesture in gesturesCollection) {
+					string serializedGesture;
+					if (gesture is MultiKeyGesture) {
+						serializedGesture = (string)new MultiKeyGestureConverter().ConvertTo(context, culture, gesture, typeof(string));
+					} else if (gesture is PartialKeyGesture) {
+						serializedGesture = (string)new PartialKeyGestureConverter().ConvertTo(context, culture, gesture, typeof(string));
+					} else if (gesture is KeyGesture) {
+						serializedGesture = (string)new KeyGestureConverter().ConvertTo(context, culture, gesture, typeof(string));
+					} else if (gesture is MouseGesture) {
+						serializedGesture = (string)new MouseGestureConverter().ConvertTo(context, culture, gesture, typeof(string));
+					} else {
+						continue;
+					}
+					
+					sb.AppendFormat("{0};", serializedGesture);
+				}
+				
+				return sb.Length >= 3 ? sb.ToString(0, sb.Length - 1) : sb.ToString();
+			}
+			
+			return base.ConvertTo(context, culture, value, destinationType);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Main/ICSharpCode.Core.Presentation/Input/InputGestureCollectionExtensions.cs b/src/Main/ICSharpCode.Core.Presentation/Input/InputGestureCollectionExtensions.cs
new file mode 100644
index 0000000000..0bdaed1874
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/Input/InputGestureCollectionExtensions.cs
@@ -0,0 +1,92 @@
+using System;
+using System.Windows.Input;
+using System.Linq;
+using System.Collections;
+
+namespace ICSharpCode.Core.Presentation
+{
+	/// <summary>
+	/// Contains utility methods for work with <see cref="InputGestureCollection" />
+	/// </summary>
+	public static class InputGestureCollectionExtensions
+	{
+		/// <summary>
+		/// Determines whether any item from first <see cref="InputGestureCollection" /> is qualified as template for
+		/// any item from second <see cref="InputGestureCollection" /> when examining using specific <see cref="GestureCompareMode" /> 
+		/// </summary>
+		/// <param name="inputGestureTemplateCollection">Collection of examined templates</param>
+		/// <param name="testedInputGestureCollection">Collection of examined gestures</param>
+		/// <param name="mode">Additional comparing rules. See <see cref="GestureCompareMode" /> for details</param>
+		/// <returns><code>true</code> if first collection contains item which can be qualified as template for any item from second collection; otherwise <code>false</code></returns>
+		public static bool ContainsTemplateForAny(this InputGestureCollection inputGestureTemplateCollection, InputGestureCollection testedInputGestureCollection, GestureCompareMode mode) {
+			if((inputGestureTemplateCollection == null || inputGestureTemplateCollection.Count == 0) && (testedInputGestureCollection == null || testedInputGestureCollection.Count == 0)) {
+				return mode != GestureCompareMode.Conflicting;
+			}
+			foreach (InputGesture template in inputGestureTemplateCollection) {
+				if (template.IsTemplateForAny(testedInputGestureCollection, mode)) {
+					return true;
+				}   
+			}
+			
+			return false;
+		}
+		
+		/// <summary>
+		/// Determines whether any item from first <see cref="InputGestureCollection" /> is qualified as template for
+		/// provided <see cref="InputGesture" /> when examining using specific <see cref="GestureCompareMode" /> 
+		/// </summary>
+		/// <param name="inputGestureTemplateCollection">Collection of examined templates</param>
+		/// <param name="testedInputGestureCollection">Examined Gesture</param>
+		/// <param name="mode">Additional comparing rules. See <see cref="GestureCompareMode" /> for details</param>
+		/// <returns><code>true</code> if collection contains template which match provided <see cref="InputGesture" />; otherwise <code>false</code></returns>
+		public static bool ContainsTemplateFor(this InputGestureCollection inputGestureTemplateCollection, InputGesture testedGesture, GestureCompareMode mode) {
+			foreach (InputGesture template in inputGestureTemplateCollection) {
+				if (template.IsTemplateFor(testedGesture, mode)) {
+					return true;
+				}   
+			}
+			
+			return false;
+		}
+		
+		/// <summary>
+		/// Sort bindings in <see cref="InputBindingCollection" /> according to number of chords each <see cref="InputBinding" />
+		/// contains. 
+		/// 
+		/// Bindings associated with gestures having more chords should be on top.
+		/// </summary>
+		/// <param name="inputGestureCollection"></param>
+		public static void SortByChords(this InputBindingCollection inputGestureCollection) 
+		{
+			ArrayList.Adapter(inputGestureCollection).Sort(new ChordsCountComparer());
+		}
+		
+		private class ChordsCountComparer : IComparer
+		{
+			public int Compare(object x, object y)
+			{
+				var xInputBinding = (InputBinding)x;
+				var yInputBinding = (InputBinding)y;
+				
+				var xMultiKeyGesture = xInputBinding.Gesture as MultiKeyGesture;
+				var yMultiKeyGesture = yInputBinding.Gesture as MultiKeyGesture;
+				
+				var xLength = 0;
+				if(xMultiKeyGesture != null) {
+					xLength = xMultiKeyGesture.Chords != null ? xMultiKeyGesture.Chords.Count : 0;
+				} else if(xInputBinding.Gesture is KeyGesture) {
+					xLength = 1;
+				}
+				
+				var yLength = 0;
+				if(yMultiKeyGesture != null) {
+					yLength = yMultiKeyGesture.Chords != null ? yMultiKeyGesture.Chords.Count : 0;
+				} else if(yInputBinding.Gesture is KeyGesture) {
+					yLength = 1;
+				}
+				
+				return xLength.CompareTo(yLength);
+			}
+		}
+	}
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/Input/InputGestureExtensions.cs b/src/Main/ICSharpCode.Core.Presentation/Input/InputGestureExtensions.cs
new file mode 100644
index 0000000000..1a442ab8cd
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/Input/InputGestureExtensions.cs
@@ -0,0 +1,134 @@
+using System;
+using System.Windows.Input;
+using System.Collections.Generic;
+
+namespace ICSharpCode.Core.Presentation
+{	
+	/// <summary>
+	/// Contains utility methods for work with <see cref="InputGesture" />
+	/// </summary>
+	public static class InputGestureExtensions
+	{
+		/// <summary>
+		/// Determines whether provided <see cref="InputGesture" /> is qualified as template for
+		/// another instance of <see cref="InputGesture" /> when examining using specific <see cref="GestureCompareMode" /> 
+		/// </summary>
+		/// <param name="inputGestureTemplate">Examined input gesture template</param>
+		/// <param name="inputGesture">Examined input gesture</param>
+		/// <param name="mode">Additional comparing rules. See <see cref="GestureCompareMode" /> for details</param>
+		/// <returns><code>true</code> if template matches compared geture; otherwise <code>false</code></returns>
+		public static bool IsTemplateFor(this InputGesture inputGestureTemplate, InputGesture inputGesture, GestureCompareMode mode)
+		{
+			if(mode == GestureCompareMode.Conflicting) {
+				return inputGestureTemplate.IsTemplateFor(inputGesture, GestureCompareMode.StartsWithFullChords) || inputGesture.IsTemplateFor(inputGestureTemplate, GestureCompareMode.StartsWithFullChords);
+			}
+			
+			var multiKeyGesture = inputGesture as MultiKeyGesture;
+			var multiKeyGestureTemplate = inputGestureTemplate as MultiKeyGesture;
+			var partialKeyGesture = inputGesture as PartialKeyGesture;
+			var partialKeyGestureTemplate = inputGestureTemplate as PartialKeyGesture;
+			var keyGesture = inputGesture as KeyGesture;
+			var keyGestureTemplate = inputGestureTemplate as KeyGesture;
+			
+			// Create partial key gestures from key gestures
+			if(multiKeyGesture == null && partialKeyGesture == null && keyGesture != null) {
+				partialKeyGesture = new PartialKeyGesture(keyGesture);
+			}
+			
+			if(multiKeyGestureTemplate == null && partialKeyGestureTemplate == null && keyGestureTemplate != null) {
+				partialKeyGestureTemplate = new PartialKeyGesture(keyGestureTemplate);
+			}
+			
+			// Create multi key gestures from gestures
+			if(multiKeyGesture == null && partialKeyGesture != null) {
+				multiKeyGesture = new MultiKeyGesture(new [] { partialKeyGesture });
+			}
+			
+			if(multiKeyGestureTemplate == null && partialKeyGestureTemplate != null) {
+				multiKeyGestureTemplate = new MultiKeyGesture(new [] { partialKeyGestureTemplate });
+			}
+			
+			if(multiKeyGesture == null 
+			   || multiKeyGestureTemplate == null
+			   || multiKeyGesture.Chords == null
+			   || multiKeyGestureTemplate.Chords == null
+			   || multiKeyGestureTemplate.Chords.Count == 0
+			   || multiKeyGesture.Chords.Count == 0
+			   || (mode == GestureCompareMode.ExactlyMatches && multiKeyGestureTemplate.Chords.Count != multiKeyGesture.Chords.Count)) {
+				return false;
+			}
+			
+			// Stores N previous chords
+			var previousChords = new LinkedList<PartialKeyGesture>();
+			
+			// Search whether chord sequece matches template sequenc in any place
+			foreach (PartialKeyGesture chord in multiKeyGesture.Chords) {
+				// Accumulates previous chords
+				previousChords.AddLast(chord);
+				if (previousChords.Count > multiKeyGestureTemplate.Chords.Count) {
+					previousChords.RemoveFirst();
+				}
+				
+				// Only start comparing with template when needed amount of previous chords where collected
+				if (previousChords.Count == multiKeyGestureTemplate.Chords.Count) {
+					var multiKeyGestureTemplateEnumerator = multiKeyGestureTemplate.Chords.GetEnumerator();
+					var previousChordsEnumerator = previousChords.GetEnumerator();
+					
+					multiKeyGestureTemplateEnumerator.Reset();
+					
+					// Compare two chord sequences in a loop
+					var multiKeyGesturesMatch = true;
+					
+					var i = 0;
+					while (previousChordsEnumerator.MoveNext() && multiKeyGestureTemplateEnumerator.MoveNext()) {
+						var template = multiKeyGestureTemplateEnumerator.Current;
+						var gesture = previousChordsEnumerator.Current;
+						
+						if (((mode == GestureCompareMode.StartsWith || mode == GestureCompareMode.PartlyMatches) && i == previousChords.Count - 1)
+						   || (mode == GestureCompareMode.PartlyMatches && i == 0)) {
+							
+							if(!(template.Modifiers == (gesture.Modifiers & template.Modifiers) && (template.Key == Key.None || template.Key == gesture.Key))) {
+								multiKeyGesturesMatch = false;
+								break;                        		
+							}
+						} else if (template.Modifiers != gesture.Modifiers || template.Key != gesture.Key) {
+							multiKeyGesturesMatch = false;
+							break;
+						}
+						
+						i++;
+					}
+					
+					if(multiKeyGesturesMatch) {
+						return true;
+					}
+					
+					if (mode == GestureCompareMode.StartsWith || mode == GestureCompareMode.StartsWithFullChords) {
+						break;
+					}
+				}
+			}
+			
+			return false;
+		}
+		
+		
+		/// <summary>
+		/// Determines whether this instance of <see cref="InputGesture"/> qualifies as template for any of examined gestures
+		/// </summary>
+		/// <param name="thisGesture">Examined input gesture template</param>
+		/// <param name="examinedGestures">Collection of examined gestures</param>
+		/// <param name="mode">Additional comparing rules. See <see cref="GestureCompareMode" /> for details</param>
+		/// <returns><code>true</code> if template matches one of the compared getures; otherwise <code>false</code></returns>
+		public static bool IsTemplateForAny(this InputGesture thisGesture, InputGestureCollection examinedGestures, GestureCompareMode mode)
+		{
+			foreach (InputGesture gesture in examinedGestures) {
+				if (thisGesture.IsTemplateFor(gesture, mode)) {
+					return true;
+				}
+			}
+			
+			return false;
+		}
+	}
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/Input/MultiKeyBinding.cs b/src/Main/ICSharpCode.Core.Presentation/Input/MultiKeyBinding.cs
new file mode 100644
index 0000000000..0ecfa3c8bc
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/Input/MultiKeyBinding.cs
@@ -0,0 +1,30 @@
+using System;
+using System.ComponentModel;
+using System.Windows.Input;
+
+namespace ICSharpCode.Core.Presentation
+{
+	/// <summary>
+	/// Represents input binding which can be invoked by <see cref="MultiKeyGesture"/>
+	/// </summary>
+	public class MultiKeyBinding : InputBinding
+	{
+		/// <summary>
+		/// Gets or sets instance of <see cref="MultiKeyGesture"/>
+		/// </summary>
+		[TypeConverter(typeof(MultiKeyGestureConverter))]
+		public override InputGesture Gesture
+		{
+			get { 
+				return base.Gesture as MultiKeyGesture; 
+			}
+			set {
+				if (!(value is MultiKeyGesture)) {
+					throw new ArgumentException();
+				}
+				
+				base.Gesture = value;
+			}
+		}
+	}
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/Input/MultiKeyGesture.cs b/src/Main/ICSharpCode.Core.Presentation/Input/MultiKeyGesture.cs
new file mode 100644
index 0000000000..b568d9eb61
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/Input/MultiKeyGesture.cs
@@ -0,0 +1,118 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Windows.Input;
+
+namespace ICSharpCode.Core.Presentation
+{
+	/// <summary>
+	/// Describes gesture containing multiple chords
+	/// </summary>
+	[TypeConverter(typeof(MultiKeyGestureConverter))]
+	public class MultiKeyGesture : KeyGesture
+	{
+		private static readonly List<WeakReference> allGestures = new List<WeakReference>();
+		
+		// Set sequence indexes of all sequential key gestures to 0
+		private static void ResetAllGestures()
+		{
+			foreach (var gestureWrapper in allGestures) {
+				if(gestureWrapper.Target != null) {
+					((MultiKeyGesture)gestureWrapper.Target).currentGestureIndex = 0;
+				}
+			}
+		}
+		
+		private readonly ReadOnlyCollection<PartialKeyGesture> chords;
+		private int currentGestureIndex;
+		private DateTime lastGestureInput;
+		
+		/// <summary>
+		/// Maximum delay between pressing chords
+		/// </summary>
+		public static TimeSpan DelayBetweenChords 
+		{
+			get; set;
+		}
+		
+		static MultiKeyGesture()
+		{
+			DelayBetweenChords = TimeSpan.FromSeconds(2);
+		}
+		
+		/// <summary>
+		/// Creates instance of <see cref="MultiKeyGesture"/> from list of partial key gestures
+		/// </summary>
+		/// <param name="gestures">Sequence of partial key gestures</param>
+		public MultiKeyGesture(IList<PartialKeyGesture> gestures)
+			: base(Key.None, ModifierKeys.None) 
+		{
+			if(gestures == null || gestures.Count == 0) {
+				throw new ArgumentException("Must specify atleast one gesture");
+			}
+			
+			this.chords = new ReadOnlyCollection<PartialKeyGesture>(gestures);
+			
+			allGestures.Add(new WeakReference(this));
+		}
+		
+		/// <summary>
+		/// Sequence of partial key gestures which builds this <see cref="MultiKeyGesture" />
+		/// </summary>
+		public ICollection<PartialKeyGesture> Chords
+		{
+			get {
+				return chords;
+			}
+		}
+		
+		/// <summary>
+		/// Determines whether key event arguments matches this instance of <see cref="MultiKeyGesture"/>
+		/// </summary>
+		/// <param name="targetElement">The target</param>
+		/// <param name="inputEventArgs">Input event arguments</param>
+		/// <returns><code>true</code> if the event data matches this <see cref="MultiKeyGesture"/>; otherwise <code>false</code></returns>
+		public override bool Matches(object targetElement, InputEventArgs inputEventArgs)
+		{
+			var keyEventArgs = inputEventArgs as KeyEventArgs;
+			
+			if (keyEventArgs == null) {
+				return false;
+			}
+			
+			if (keyEventArgs.IsRepeat) {
+				return false;
+			}
+			
+			// Checks wheter it is not too long from last match
+			var isOnTime = (DateTime.Now - lastGestureInput) <= DelayBetweenChords;
+			
+			// If strict match is on time
+			var strictMatch = chords[currentGestureIndex].StrictlyMatches(targetElement, inputEventArgs);
+			if (strictMatch && (currentGestureIndex == 0 || isOnTime)) {
+				currentGestureIndex++;
+				lastGestureInput = DateTime.Now;
+				
+				inputEventArgs.Handled = true;
+				
+				// Check whether this is last gesture in sequence
+				if(currentGestureIndex == chords.Count) {
+					ResetAllGestures();
+					return true;
+				}
+				
+				return false;
+			}
+			
+			// If partial match is on time allow continue without reseting current gesture index
+			var partialMatch = chords[currentGestureIndex].Matches(targetElement, inputEventArgs);
+			if (partialMatch && currentGestureIndex > 0 && isOnTime) {
+				return false;
+			}
+			
+			currentGestureIndex = 0;
+			return false;
+		}
+	}
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/Input/MultiKeyGestureConverter.cs b/src/Main/ICSharpCode.Core.Presentation/Input/MultiKeyGestureConverter.cs
new file mode 100644
index 0000000000..639f81199e
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/Input/MultiKeyGestureConverter.cs
@@ -0,0 +1,96 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using System.Linq;
+
+namespace ICSharpCode.Core.Presentation
+{
+	/// <summary>
+	/// Converts <see cref="MultiKeyGesture"/> instance to and from other types
+	/// </summary>
+	public class MultiKeyGestureConverter : TypeConverter
+	{
+		private readonly PartialKeyGestureConverter partialKeyGestureConverter = new PartialKeyGestureConverter();
+		
+		/// <summary>
+		/// Determines whether object of specified type can be converted to instance of <see cref="MultiKeyGesture"/>
+		/// </summary>
+		/// <param name="context">A format context that provides information about the environment from which this converter is being invoked.</param>
+		/// <param name="sourceType">The type being evaluated for conversion.</param>
+		/// <returns>True if this converter can perform the operation; otherwise, false.</returns>
+		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+		{
+			if(sourceType == typeof(string)) {
+				return true;
+			}
+			
+			return base.CanConvertFrom(context, sourceType);
+		}
+		
+		/// <summary>
+		/// Determines whether an instance of <see cref="MultiKeyGesture"/> can be converted to the specified type, using the specified context.
+		/// </summary>
+		/// <param name="context">A format context that provides information about the environment from which this converter is being invoked.</param>
+		/// <param name="destinationType">The type being evaluated for conversion. </param>
+		/// <returns>True if this converter can perform the operation; otherwise, false. </returns>
+		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+		{
+			if (destinationType == typeof(string)) {
+				return true;
+			}
+			
+			return base.CanConvertFrom(context, destinationType);
+		}
+		
+		/// <summary>
+		/// Attempts to convert a <see cref="MultiKeyGesture"/> to the specified type, using the specified context.
+		/// </summary>
+		/// <param name="context">A format context that provides information about the environment from which this converter is being invoked.</param>
+		/// <param name="culture">Culture specific information. </param>
+		/// <param name="value">The object to convert</param>
+		/// <param name="destinationType">The type wich instance of <see cref="PartialKeyGesture"/> is being converted to.</param>
+		/// <returns>The converted object, or an empty string if value is a null reference</returns>
+		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+		{
+			if (value == null && destinationType == typeof(string)) {
+				return String.Empty;
+			}
+			
+			var MultiKeyGesture = value as MultiKeyGesture;
+			if (MultiKeyGesture != null && destinationType == typeof(string)) {
+				var partialKeyGestureStrings =  MultiKeyGesture.Chords.Select(gesture => (string)partialKeyGestureConverter.ConvertTo(context, culture, gesture, typeof(string))).ToArray();
+				var MultiKeyGestureString = string.Join(",", partialKeyGestureStrings);
+				
+				return MultiKeyGestureString;
+			}
+			
+			return base.ConvertFrom(context, culture, value);
+		}
+		
+		/// <summary>
+		/// Attempts to convert the specified object to a <see cref="MultiKeyGesture"/>, using the specified context.
+		/// </summary>
+		/// <param name="context">A format context that provides information about the environment from which this converter is being invoked.</param>
+		/// <param name="culture">Culture specific information.</param>
+		/// <param name="value">The object to convert</param>
+		/// <returns>The converted object.</returns>
+		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+		{
+			var gestureString = value as string;
+			if (gestureString != null) {
+				var keyGestures = new List<PartialKeyGesture>();
+				
+				var keyGestureStrings = gestureString.Split(',');
+				foreach (var keyGestureString in keyGestureStrings) {
+					var partialKeyGesture = (PartialKeyGesture)new PartialKeyGestureConverter().ConvertFrom(context, culture, keyGestureString);
+					keyGestures.Add(partialKeyGesture);
+				}
+				
+				return new MultiKeyGesture(keyGestures);
+			}
+			
+			return base.ConvertFrom(context, culture, value);
+		}
+	}
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/Input/ObservableInputGestureCollection.cs b/src/Main/ICSharpCode.Core.Presentation/Input/ObservableInputGestureCollection.cs
new file mode 100644
index 0000000000..4a27f63bed
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/Input/ObservableInputGestureCollection.cs
@@ -0,0 +1,156 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Windows.Input;
+
+namespace ICSharpCode.Core.Presentation
+{
+    /// <summary>
+    /// Represents observable collection of <see cref="InputGesture" />
+    /// </summary>
+    public class ObservableInputGestureCollection : IList<InputGesture>, INotifyCollectionChanged, IEnumerable<InputGesture>, ICollection<InputGesture>
+    {
+		private ObservableCollection<InputGesture> observedInputGestures;
+    	
+		/// <summary>
+		/// Creates new instance of <see cref="ObservableInputGestureCollection" />
+		/// </summary>
+		public ObservableInputGestureCollection()
+		{
+			observedInputGestures = new ObservableCollection<InputGesture>();
+			observedInputGestures.CollectionChanged += observedInputGestures_CollectionChanged;
+		}
+		
+		/// <inheritdoc /> 
+		public void Add(InputGesture item)
+		{
+			observedInputGestures.Add(item);
+		}
+		
+		/// <inheritdoc />
+		public void Insert(int index, InputGesture item)
+		{
+			observedInputGestures.Insert(index, item);
+		}
+		
+		/// <inheritdoc />
+		public void RemoveAt(int index)
+		{
+			observedInputGestures.RemoveAt(index);
+		}
+		
+		/// <inheritdoc />
+		public InputGesture this[int index] 
+		{
+			get {
+				return observedInputGestures[index];
+			}
+			set {
+				observedInputGestures[index] = value;
+			}
+		}
+		
+		/// <inheritdoc />
+		public bool IsReadOnly
+		{
+			get {
+				return false;
+			}
+		}
+		
+		/// <inheritdoc />
+		public int Count
+		{
+			get {
+				return observedInputGestures.Count;
+			}
+		}
+		
+		/// <inheritdoc />
+		public bool Remove(InputGesture item)
+		{
+			return observedInputGestures.Remove(item);
+		}
+		
+		/// <inheritdoc />
+		public void Clear()
+		{
+			observedInputGestures.Clear();
+		}
+		
+		/// <inheritdoc />
+		public bool Contains(InputGesture item)
+		{
+			return observedInputGestures.Contains(item);
+		}
+		
+		/// <summary>
+		/// Add all instances from another <see cref="InputGestureCollection" />
+		/// </summary>
+		/// <param name="gestures">Collection of gestures</param>
+		public void AddRange(InputGestureCollection gestures)
+		{
+			foreach(InputGesture item in gestures) {
+				Add(item);
+			}
+		}
+		
+		/// <summary>
+		/// Add all <see cref="InputGesture" /> instances from enumerable collection
+		/// </summary>
+		/// <param name="gestures">Collection of gestures</param>
+		public void AddRange(IEnumerable<InputGesture> gestures)
+		{
+			foreach(InputGesture item in gestures) {
+				Add(item);
+			}
+		}
+		
+		/// <inheritdoc />
+		public void CopyTo(InputGesture[] array, int arrayIndex)
+		{
+			observedInputGestures.CopyTo(array, arrayIndex);
+		}
+		
+		/// <inheritdoc />
+		public IEnumerator<InputGesture> GetEnumerator()
+		{
+			return observedInputGestures.GetEnumerator();
+		}
+		
+		/// <inheritdoc />
+		System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+		{
+			return observedInputGestures.GetEnumerator();
+		}
+
+		/// <inheritdoc />
+		public int IndexOf(InputGesture value)
+		{
+			return observedInputGestures.IndexOf(value);
+		}
+		
+		/// <inheritdoc />
+		public event NotifyCollectionChangedEventHandler CollectionChanged;
+		
+		/// <inheritdoc />
+		private void observedInputGestures_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+		{
+			if(CollectionChanged != null) {
+				CollectionChanged.Invoke(sender, e);
+			}
+		}
+		
+		/// <summary>
+		/// Gets <see cref="InputGestureCollection" /> containing all items from this observable collection
+		/// </summary>
+		public InputGestureCollection InputGesturesCollection
+		{
+			get {
+				return new InputGestureCollection(observedInputGestures);
+			}
+		}
+    }
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/Input/PartialKeyGesture.cs b/src/Main/ICSharpCode.Core.Presentation/Input/PartialKeyGesture.cs
new file mode 100644
index 0000000000..e74f460e01
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/Input/PartialKeyGesture.cs
@@ -0,0 +1,247 @@
+using System;
+using System.ComponentModel;
+using System.Text;
+using System.Windows.Input;
+
+namespace ICSharpCode.Core.Presentation
+{
+	/// <summary>
+	/// Describes full key gesture or part of a key gesture
+	/// 
+	/// This class is is designed to react to key events even it descibes only part of them
+	/// For example if event argument holds modifiers Ctrl, Shift and key C then partial template
+	/// with single modifier Ctrl and a key C will match this event
+	/// </summary>
+	[TypeConverter(typeof(PartialKeyGestureConverter))]
+	public class PartialKeyGesture : KeyGesture
+	{
+		private readonly Key _key;
+		private readonly ModifierKeys _modifiers;
+		
+		/// <summary>
+		/// Gets key associated with partial key gesture
+		/// </summary>
+		public new Key Key
+		{
+			get {
+				return _key;
+			}
+		}
+		
+		/// <summary>
+		/// Gets modifier keys associated with partial key gesture
+		/// </summary>
+		public new ModifierKeys Modifiers
+		{
+			get {
+				return _modifiers;
+			}
+		}
+		
+		/// <summary>
+		/// Create new instance of <see cref="PartialKeyGesture"/> from <see cref="KeyEventArgs"/>
+		/// </summary>
+		/// <param name="keyEventArgs">Arguments generated by key event</param>
+		public PartialKeyGesture(KeyEventArgs keyEventArgs)
+			: base(Key.None, ModifierKeys.None)
+		{
+			var keyboardDevice = (KeyboardDevice)keyEventArgs.Device;
+			
+			var enteredKey = keyEventArgs.Key == Key.System ? keyEventArgs.SystemKey : keyEventArgs.Key;
+			var enteredModifiers = keyboardDevice.Modifiers;
+			
+			if(Array.IndexOf(new[] {  Key.LeftAlt, Key.RightAlt, 
+			   Key.LeftShift, Key.RightShift,
+			   Key.LeftCtrl, Key.RightCtrl,
+			   Key.LWin, Key.RWin}, enteredKey) >= 0) {
+				_key = Key.None;
+				_modifiers = enteredModifiers;
+			} else {
+				_key = enteredKey;
+				_modifiers = enteredModifiers;
+			}
+		}
+		
+		/// <summary>
+		/// Create new instance of <see cref="PartialKeyGesture"/> from <see cref="KeyGesture"/> 
+		/// </summary>
+		/// <param name="gesture">Key gesture</param>
+		public PartialKeyGesture(KeyGesture gesture)
+			: base(Key.None, ModifierKeys.None)
+		{
+			var partialKeyGesture = gesture as PartialKeyGesture;
+			
+			if (partialKeyGesture != null) {
+				_key = partialKeyGesture.Key;
+				_modifiers = partialKeyGesture.Modifiers;
+			} else if (gesture is MultiKeyGesture) {
+				throw new ArgumentException("Can not create partial key gesture from multi-key gesture");
+			} else {
+				_key = gesture.Key;
+				_modifiers = gesture.Modifiers;
+			}
+		}
+		
+		/// <summary>
+		/// Create new instance of <see cref="PartialKeyGesture"/> having key and modifiers
+		/// </summary>
+		/// <param name="key">The key associated with partial key gesture</param>
+		/// <param name="modifiers">Modifier keys associated with partial key gesture</param>
+		public PartialKeyGesture(Key key, ModifierKeys modifiers)
+			: base(Key.None, ModifierKeys.None)
+		{
+			_key = key;
+			_modifiers = modifiers;
+		}
+		
+		/// <summary>
+		/// Create new instance of<see cref="PartialKeyGesture"/> having only key and no modifiers
+		/// </summary>
+		/// <param name="key">The key associated with partial key gesture</param>
+		public PartialKeyGesture(Key key)
+		: base(Key.None, ModifierKeys.None)
+		{
+			_key = key;
+			_modifiers = ModifierKeys.None;
+		}
+		
+		/// <summary>
+		/// Create new instance of<see cref="PartialKeyGesture"/> having only key and no modifiers
+		/// </summary>
+		/// <param name="modifiers">Modifier keys associated with partial key gesture</param>
+		public PartialKeyGesture(ModifierKeys modifiers)
+		: base(Key.None, ModifierKeys.None)
+		{
+			_key = Key.None;
+			_modifiers = modifiers;
+		}
+		
+		
+		/// <summary>
+		/// Determines whether input event supporting data strictly (all modifiers and keys) matches this instance of <see cref="PartialKeyGesture"/>
+		/// </summary>
+		/// <param name="targetElement">The target</param>
+		/// <param name="inputEventArgs">Input event arguments</param>
+		/// <returns><code>true</code> if event data matches partial gesture; otherwise <code>false</code></returns>
+		public bool StrictlyMatches(object targetElement, InputEventArgs args)
+		{
+			var keyEventArgs = args as KeyEventArgs;
+			if(keyEventArgs == null) {
+				return false;
+			}
+			
+			var keyboard = (KeyboardDevice)keyEventArgs.Device;
+			
+			// If system key is pressed
+			if (keyEventArgs.Key == Key.System) {
+				return keyboard.Modifiers == Modifiers && keyEventArgs.SystemKey == Key;
+			}
+			
+			return keyboard.Modifiers == Modifiers && keyEventArgs.Key == Key;
+		}
+		
+		/// <summary>
+		/// Determines whether input event arguments partly matches (part of modifiers or/and a key) this instance of <see cref="PartialKeyGesture"/>
+		/// </summary>
+		/// <param name="targetElement">The target</param>
+		/// <param name="inputEventArgs">Input event arguments</param>
+		/// <returns><code>true</code> if event data matches partial gesture; otherwise <code>false</code></returns>
+		public override bool Matches(object targetElement, InputEventArgs inputEventArgs)
+		{
+			var keyEventArgs = inputEventArgs as KeyEventArgs;
+			if(keyEventArgs == null) {
+			return false;
+			}
+			
+			var keyboard = (KeyboardDevice)keyEventArgs.Device;
+			
+			// When system key (Alt) is pressed real key is moved to SystemKey property
+			var enteredKey = keyEventArgs.Key == Key.System ? keyEventArgs.SystemKey : keyEventArgs.Key;
+			
+			var keyMatches = Key == enteredKey;
+			
+			// Determine whether template contains only part of modifier keys contained in
+			// gesture. For example if template contains Control modifier, but gesture contains
+			// Control and Alt true will be returned
+			var modifierMatches = keyboard.Modifiers - (keyboard.Modifiers ^ Modifiers) >= 0;
+			
+			// Template contains no modifiers compare only keys
+			if (Modifiers == ModifierKeys.None) {
+			return keyMatches;
+			}
+			
+			// If template has modifiers but key is one of modifier keys return true if
+			// modifiers match. This is used because when user presses modifier key it is 
+			// presented in Key property and Modifiers property
+			if (Array.IndexOf(new[] {  Key.LeftAlt, Key.RightAlt, 
+			   Key.LeftShift, Key.RightShift,
+			   Key.LeftCtrl, Key.RightCtrl,
+			   Key.LWin, Key.RWin,
+			   Key.System}, enteredKey) >= 0) {
+				return modifierMatches;
+			}
+			
+			return modifierMatches && keyMatches;
+		}
+		
+		/// <summary>
+		/// Gets value indicating whether this InputGesture is completed
+		/// 
+		/// Incomplete gestures are ones which have only modifiers or only
+		/// keys assigned
+		/// </summary>
+		public bool IsFull
+		{
+			get {
+				if(Key == Key.None) {
+					return false;
+				}
+				
+				// and function keys are valid without modifier
+				if (Key >= Key.F1 && Key <= Key.F24) {
+					return true;
+				}
+				
+				// Modifiers alone are not valid
+				if (Array.IndexOf(new[] { Key.LeftAlt, Key.RightAlt, 
+				   Key.LeftShift, Key.RightShift,
+				   Key.LeftCtrl, Key.RightCtrl,
+				   Key.LWin, Key.RWin,
+				   Key.System}, Key) > -1) {
+					return false;
+				}
+				
+				// All other gestures must have modifier (except shift alone because it would mean uppercase)
+				if((Modifiers & (ModifierKeys.Windows | ModifierKeys.Control | ModifierKeys.Alt)) != ModifierKeys.None) {
+					return true;   	
+				}
+				
+				return false;
+			}
+		}
+		
+		/// <summary>
+		/// Creates string that represents <see cref="PartialKeyGesture"/>
+		/// </summary>
+		/// <returns>String representation of this object</returns>
+		public override string ToString()
+		{
+			var pressedButton = new StringBuilder();
+			
+			if (Modifiers != ModifierKeys.None) {
+			pressedButton.AppendFormat("{0}+", new ModifierKeysConverter().ConvertToInvariantString(Modifiers));
+			}
+			
+			// Filter modifier keys from being displayed twice (example: Ctrl + LeftCtrl)
+			if (Array.IndexOf(new[] { Key.LeftAlt, Key.RightAlt, 
+			   Key.LeftShift, Key.RightShift,
+			   Key.LeftCtrl, Key.RightCtrl,
+			   Key.LWin, Key.RWin,
+			   Key.System}, Key) < 0) {
+				pressedButton.Append(new KeyConverter().ConvertToInvariantString(Key));
+			}
+			
+			return pressedButton.ToString();
+		}
+	}
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/Input/PartialKeyGestureConverter.cs b/src/Main/ICSharpCode.Core.Presentation/Input/PartialKeyGestureConverter.cs
new file mode 100644
index 0000000000..7e7cdf6b23
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/Input/PartialKeyGestureConverter.cs
@@ -0,0 +1,124 @@
+using System;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text;
+using System.Windows.Input;
+
+namespace ICSharpCode.Core.Presentation
+{
+	/// <summary>
+	/// Converts <see cref="PartialKeyGesture"/> instance to and from other types
+	/// </summary>
+	public class PartialKeyGestureConverter : TypeConverter
+	{
+		private readonly KeyConverter keyConverter = new KeyConverter();
+		private readonly ModifierKeysConverter modidierKeysConverter = new ModifierKeysConverter();
+		
+		/// <summary>
+		/// Determines whether object of specified type can be converted to instance of <see cref="PartialKeyGesture"/>
+		/// </summary>
+		/// <param name="context">A format context that provides information about the environment from which this converter is being invoked. </param>
+		/// <param name="sourceType">The type being evaluated for conversion. </param>
+		/// <returns>True if this converter can perform the operation; otherwise, false. </returns>
+		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+		{
+			if(sourceType == typeof(string)) {
+				return true;
+			}
+			
+			return base.CanConvertFrom(context, sourceType);
+		}
+		
+		/// <summary>
+		/// Determines whether an instance of <see cref="PartialKeyGesture"/> can be converted to the specified type, using the specified context.
+		/// </summary>
+		/// <param name="context">A format context that provides information about the environment from which this converter is being invoked.</param>
+		/// <param name="destinationType">The type being evaluated for conversion. </param>
+		/// <returns>True if this converter can perform the operation; otherwise, false. </returns>
+		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+		{
+			if (destinationType == typeof(string)) {
+				return true;
+			}
+			
+			return base.CanConvertFrom(context, destinationType);
+		}
+		
+		/// <summary>
+		/// Attempts to convert a <see cref="PartialKeyGesture"/> to the specified type, using the specified context.
+		/// </summary>
+		/// <param name="context">A format context that provides information about the environment from which this converter is being invoked.</param>
+		/// <param name="culture">Culture specific information. </param>
+		/// <param name="value">The object to convert</param>
+		/// <param name="destinationType">The type wich instance of <see cref="PartialKeyGesture"/> is being converted to.</param>
+		/// <returns>The converted object, or an empty string if value is a null reference</returns>
+		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+		{
+			if (value == null && destinationType == typeof(string)) {
+				return String.Empty;
+			}
+			
+			if(value is PartialKeyGesture && destinationType == typeof(string)) {
+				var partialKeyGesture = value as PartialKeyGesture;
+				
+				var modifierString = (string)new ModifierKeysConverter().ConvertTo(context, culture, partialKeyGesture.Modifiers, typeof(string));
+				var keyString = (string)new KeyConverter().ConvertTo(context, culture, partialKeyGesture.Key, typeof(string));
+				
+				var sb = new StringBuilder();
+				sb.Append(modifierString);
+				if(!string.IsNullOrEmpty(keyString) && !string.IsNullOrEmpty(modifierString)) {
+					sb.Append("+");
+				}
+				sb.Append(keyString);
+				
+				return sb.ToString();
+			}
+			
+			return base.ConvertTo(context, culture, value, destinationType);
+		}
+		
+		/// <summary>
+		/// Attempts to convert the specified object to a <see cref="PartialKeyGesture"/>, using the specified context.
+		/// </summary>
+		/// <param name="context">A format context that provides information about the environment from which this converter is being invoked.</param>
+		/// <param name="culture">Culture specific information.</param>
+		/// <param name="value">The object to convert</param>
+		/// <returns>The converted object.</returns>
+		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+		{
+			var gestureString = value as string;
+			if (gestureString != null) {
+				var keysStart = gestureString.LastIndexOf('+');
+				if (keysStart > 0) {
+					var modifierKeysString = gestureString.Substring(0, keysStart);
+					var keyString = gestureString.Substring(keysStart + 1);
+					
+					var modifierKeys = (ModifierKeys)modidierKeysConverter.ConvertFrom(context, culture, modifierKeysString);
+					var key = (Key)keyConverter.ConvertFrom(context, culture, keyString);
+					
+					return new PartialKeyGesture(key, modifierKeys);
+				}
+				
+				try {
+					var modifierKeys = (ModifierKeys)modidierKeysConverter.ConvertFrom(context, culture, gestureString);
+					
+					return new PartialKeyGesture(modifierKeys);
+				}
+				catch (NotSupportedException)
+				{ }
+				
+				
+				try
+				{
+					var key = (Key)keyConverter.ConvertFrom(context, culture, gestureString);
+					
+					return new PartialKeyGesture(key);
+				}
+				catch (NotSupportedException)
+				{ }
+			}
+			
+			return base.ConvertFrom(context, culture, value);
+		}
+	}
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/Menu/MenuCommand.cs b/src/Main/ICSharpCode.Core.Presentation/Menu/MenuCommand.cs
index 24234be91c..1dec967eb6 100644
--- a/src/Main/ICSharpCode.Core.Presentation/Menu/MenuCommand.cs
+++ b/src/Main/ICSharpCode.Core.Presentation/Menu/MenuCommand.cs
@@ -9,10 +9,12 @@ using System;
 using System.Collections;
 using System.Diagnostics;
 using System.Reflection;
+using System.Linq;
 using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using System.Text;
 
 namespace ICSharpCode.Core.Presentation
 {
@@ -123,19 +125,50 @@ namespace ICSharpCode.Core.Presentation
 	
 	class MenuCommand : CoreMenuItem
 	{
+		private BindingInfoTemplate bindingTemplate;
+		
 		public MenuCommand(UIElement inputBindingOwner, Codon codon, object caller, bool createCommand) : base(codon, caller)
 		{
-			this.Command = CommandWrapper.GetCommand(codon, caller, createCommand);
-			if (!string.IsNullOrEmpty(codon.Properties["shortcut"])) {
-				KeyGesture kg = MenuService.ParseShortcut(codon.Properties["shortcut"]);
-				if (inputBindingOwner != null) {
-					var shortcutCommand = this.Command;
-					string featureName = GetFeatureName();
-					if (shortcutCommand != null && !string.IsNullOrEmpty(featureName))
-						shortcutCommand = new ShortcutCommandWrapper(shortcutCommand, featureName);
-					inputBindingOwner.InputBindings.Add(new InputBinding(shortcutCommand, kg));
+			string tplRoutedCommandName = null;
+			if(codon.Properties.Contains("command")) {
+				tplRoutedCommandName = codon.Properties["command"];
+			} else if(codon.Properties.Contains("link") || codon.Properties.Contains("class")) {
+				tplRoutedCommandName = string.IsNullOrEmpty(codon.Properties["link"]) ? codon.Properties["class"] : codon.Properties["link"];
+			}
+			
+			string tplOwnerInstance = null;
+			string tplOwnerType = null;
+			if(codon.Properties.Contains("ownerinstance")) {
+				tplOwnerInstance = codon.Properties["ownerinstance"];
+			} else if(codon.Properties.Contains("ownertype")) {
+				tplOwnerType = codon.Properties["ownertype"];
+			}
+			
+			bindingTemplate = BindingInfoTemplate.Create(tplOwnerInstance, tplOwnerType, tplRoutedCommandName);
+
+			var routedCommand = SDCommandManager.GetRoutedUICommand(tplRoutedCommandName);
+			if(routedCommand != null) {
+				this.Command = routedCommand;
+			}
+			
+			var gestures = SDCommandManager.FindInputGestures(bindingTemplate, null);
+			
+			this.InputGestureText = (string)new InputGestureCollectionConverter().ConvertToInvariantString(gestures);
+			
+			SDCommandManager.GesturesChanged += MenuCommand_GesturesChanged;
+		}
+		
+		private void MenuCommand_GesturesChanged(object sender, NotifyGesturesChangedEventArgs e) 
+		{
+			foreach(var desc in e.ModificationDescriptions) {
+				var temp = desc.InputBindingIdentifier;
+				if((bindingTemplate.OwnerInstanceName == null || bindingTemplate.OwnerInstanceName == temp.OwnerInstanceName)
+					&& (bindingTemplate.OwnerTypeName == null || bindingTemplate.OwnerTypeName == temp.OwnerTypeName)
+					&& (bindingTemplate.RoutedCommandName == null || bindingTemplate.RoutedCommandName == temp.RoutedCommandName)) {
+
+					var updatedGestures = SDCommandManager.FindInputGestures(bindingTemplate, null);
+					this.InputGestureText = (string)new InputGestureCollectionConverter().ConvertToInvariantString(updatedGestures);
 				}
-				this.InputGestureText = kg.GetDisplayStringForCulture(Thread.CurrentThread.CurrentUICulture);
 			}
 		}
 		
diff --git a/src/Main/ICSharpCode.Core.Presentation/Menu/MenuService.cs b/src/Main/ICSharpCode.Core.Presentation/Menu/MenuService.cs
index 6ea7f8c97e..bc56147f11 100644
--- a/src/Main/ICSharpCode.Core.Presentation/Menu/MenuService.cs
+++ b/src/Main/ICSharpCode.Core.Presentation/Menu/MenuService.cs
@@ -212,7 +212,11 @@ namespace ICSharpCode.Core.Presentation
 					IMenuItemBuilder builder = codon.AddIn.CreateObject(codon.Properties["class"]) as IMenuItemBuilder;
 					if (builder == null)
 						throw new NotSupportedException("Menu item builder " + codon.Properties["class"] + " does not implement IMenuItemBuilder");
-					return new MenuItemBuilderPlaceholder(builder, descriptor.Codon, descriptor.Caller);
+						
+					var placeHolder = new MenuItemBuilderPlaceholder(builder, descriptor.Codon, descriptor.Caller);
+					placeHolder.BuildItems(); // Build items to register key gestures
+					
+					return placeHolder;
 				default:
 					throw new NotSupportedException("unsupported menu item type : " + type);
 			}
@@ -229,13 +233,5 @@ namespace ICSharpCode.Core.Presentation
 		
 		// HACK: find a better way to allow the host app to process link commands
 		public static Func<string, ICommand> LinkCommandCreator { get; set; }
-		
-		/// <summary>
-		/// Creates an KeyGesture for a shortcut.
-		/// </summary>
-		public static KeyGesture ParseShortcut(string text)
-		{
-			return (KeyGesture)new KeyGestureConverter().ConvertFromInvariantString(text.Replace(',', '+').Replace('|', '+'));
-		}
 	}
 }
diff --git a/src/Main/ICSharpCode.Core.Presentation/Test/BindingGroupTests.cs b/src/Main/ICSharpCode.Core.Presentation/Test/BindingGroupTests.cs
new file mode 100644
index 0000000000..b668cd91ae
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/Test/BindingGroupTests.cs
@@ -0,0 +1,160 @@
+using System;
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Input;
+using ICSharpCode.Core.Presentation;
+using NUnit.Framework;
+
+namespace ICSharpCode.Core.Presentation.Tests
+{
+    [TestFixture]
+    public class BindingGroupTests
+    {
+		BindingGroup bindingGroup;
+		UIElement uiElement;
+    	
+		[TestFixtureSetUp]
+		public void TestFixtureSetUp()
+		{
+			PropertyService.InitializeServiceForUnitTests();
+		}
+		
+		[SetUp]
+		public void SetUp()
+		{
+			bindingGroup = new BindingGroup("BindingGroupTests");
+        	uiElement = new UIElement();
+        	
+        	SDCommandManager.RegisterNamedUIElement("NamedInstance", uiElement);
+        	SDCommandManager.RegisterRoutedUICommand(ApplicationCommands.Copy);
+		}
+		
+		[TearDown]
+		public void TearDown()
+		{
+			SDCommandManager.Reset();
+		}
+        
+		[Test]
+		public void AttachGroupMethod()
+		{
+			var result = false;
+			
+			SDCommandManager.BindingsChanged += delegate(object sender, NotifyBindingsChangedEventArgs args) {  
+				if(args.Action == NotifyBindingsChangedAction.GroupAttachmendsModified 
+				   && args.GroupHandledInstances.Contains(uiElement)
+				   && args.ModifiedGroups.Contains(bindingGroup)) {
+					result = true;
+				}
+			};
+			
+			var bindingInfo = new InputBindingInfo();
+			bindingInfo.RoutedCommandName = "ApplicationCommands.Copy";
+			bindingInfo.OwnerInstanceName = "NamedInstance";
+			bindingInfo.DefaultGestures.Add(new KeyGesture(Key.C, ModifierKeys.Alt));
+			bindingInfo.Groups.Add(bindingGroup);
+			SDCommandManager.RegisterInputBindingInfo(bindingInfo);
+			                                    
+			Assert.IsEmpty(uiElement.InputBindings);
+			
+			bindingGroup.RegisterHandledInstance(uiElement);
+			Assert.AreEqual(1, uiElement.InputBindings.Count);
+			Assert.IsTrue(result);
+		}
+        
+		[Test]
+		public void DetachGroupMethod()
+		{
+			var result = false;
+			
+			SDCommandManager.BindingsChanged += delegate(object sender, NotifyBindingsChangedEventArgs args) {  
+				if(args.Action == NotifyBindingsChangedAction.GroupAttachmendsModified 
+				   && args.GroupHandledInstances.Contains(uiElement)
+				   && args.ModifiedGroups.Contains(bindingGroup)) {
+					result = true;
+				}
+			};
+			
+			var bindingInfo = new InputBindingInfo();
+			bindingInfo.RoutedCommandName = "ApplicationCommands.Copy";
+			bindingInfo.OwnerInstanceName = "NamedInstance";
+			bindingInfo.DefaultGestures.Add(new KeyGesture(Key.C, ModifierKeys.Alt));
+			bindingInfo.Groups.Add(bindingGroup);
+			SDCommandManager.RegisterInputBindingInfo(bindingInfo);
+			
+			bindingGroup.RegisterHandledInstance(uiElement);
+			Assert.AreEqual(1, uiElement.InputBindings.Count);
+			Assert.IsTrue(result);
+			
+			result = false;
+			bindingGroup.UnregisterHandledInstance(uiElement);
+			Assert.IsEmpty(uiElement.InputBindings);
+			Assert.IsTrue(result);
+		}
+		
+		[Test]
+		public void AddAttachedGroupTest()
+		{
+			var result = false;
+			
+			SDCommandManager.BindingsChanged += delegate(object sender, NotifyBindingsChangedEventArgs args) {  
+				if(args.Action == NotifyBindingsChangedAction.GroupAttachmendsModified 
+				   && args.GroupHandledInstances.Contains(uiElement)
+				   && args.ModifiedGroups.Contains(bindingGroup)) {
+					result = true;
+				}
+			};
+			
+			var bindingInfo = new InputBindingInfo();
+			bindingInfo.RoutedCommandName = "ApplicationCommands.Copy";
+			bindingInfo.OwnerInstanceName = "NamedInstance";
+			bindingInfo.DefaultGestures.Add(new KeyGesture(Key.C, ModifierKeys.Alt));
+			SDCommandManager.RegisterInputBindingInfo(bindingInfo);
+			
+			Assert.IsFalse(result);
+			
+			bindingGroup.RegisterHandledInstance(uiElement);
+			bindingInfo.Groups.Add(bindingGroup);
+			Assert.IsTrue(result);
+			Assert.IsTrue(uiElement.InputBindings[0].Command == ApplicationCommands.Copy);
+		}
+        
+		[Test]
+		public void RegisterNamedInstanceAfterGroupAttachTest()
+		{
+			var results = new List<string>();
+			
+			var otherUIElement = new UIElement();
+			
+			var bindingInfo = new InputBindingInfo();
+			bindingInfo.RoutedCommandName = "ApplicationCommands.Copy";
+			bindingInfo.OwnerInstanceName = "OtherNamedInstance";
+			bindingInfo.DefaultGestures.Add(new KeyGesture(Key.C, ModifierKeys.Alt));
+			bindingInfo.Groups.Add(bindingGroup);
+			SDCommandManager.RegisterInputBindingInfo(bindingInfo);
+			
+			bindingGroup.RegisterHandledInstance(otherUIElement);
+			Assert.IsEmpty(otherUIElement.InputBindings);
+			
+        	SDCommandManager.RegisterNamedUIElement("OtherNamedInstance", otherUIElement);
+        	Assert.AreEqual(1, otherUIElement.InputBindings.Count);
+        	
+        	SDCommandManager.UnregisterNamedUIElement("OtherNamedInstance", otherUIElement);
+        	Assert.IsEmpty(otherUIElement.InputBindings);
+		}
+		
+    	[Test]
+		public void BindingGroupCollectionClearTest()
+		{
+			var group = new BindingGroup("TestGroup");
+			var groups = new BindingGroupCollection{ group };
+			
+			var result = false;
+			groups.CollectionChanged += delegate { result = true; };
+			
+			Assert.IsFalse(result);
+			groups.Clear();
+			Assert.IsTrue(result);
+		}
+    }
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/Test/BindingInfoTemplateDictionaryTests.cs b/src/Main/ICSharpCode.Core.Presentation/Test/BindingInfoTemplateDictionaryTests.cs
new file mode 100644
index 0000000000..ad28174185
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/Test/BindingInfoTemplateDictionaryTests.cs
@@ -0,0 +1,91 @@
+using ICSharpCode.Core.Presentation;
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace ICSharpCode.Core.Presentation.Tests
+{
+	[TestFixture]
+    public class BindingInfoTemplateDictionary
+    {
+    	[Test]
+		public void FindAllSuperSetsTest()
+		{	
+			var dictionary = new BindingInfoTemplateDictionary<CommandBindingInfo>();
+			
+			dictionary.Add(
+				new BindingInfoTemplate {  }, 
+				new CommandBindingInfo { RoutedCommandName = "SuccessfullTest", OwnerInstanceName = "1" });
+			
+			dictionary.Add(
+				BindingInfoTemplate.Create(null, null, "TestCommands.DoSomething"),
+				new CommandBindingInfo { RoutedCommandName = "SuccessfullTest", OwnerInstanceName = "2" });
+			
+			dictionary.Add(
+				BindingInfoTemplate.Create(null, "Global2", "TestCommands.DoSomething"),
+				new CommandBindingInfo { RoutedCommandName = "SuccessfullTest", OwnerInstanceName = "3" });
+			
+			var allBindingInfos = dictionary.FindItems(new BindingInfoTemplate());
+			Assert.AreEqual(3, allBindingInfos.Count());
+			Assert.IsTrue(allBindingInfos.All(i => i.RoutedCommandName == "SuccessfullTest"));
+		}
+    	
+    	[Test]
+		public void FindSuperSetWithRoutedCommandTest()
+		{	
+			var dictionary = new BindingInfoTemplateDictionary<CommandBindingInfo>();
+			
+			dictionary.Add(
+				BindingInfoTemplate.Create(null, null, null),
+				new CommandBindingInfo { RoutedCommandName = "UnsuccessfullTest" });
+			
+			dictionary.Add(
+				BindingInfoTemplate.Create(null, null, "TestCommands.DoSomething"),
+				new CommandBindingInfo { RoutedCommandName = "SuccessfullTest" });
+			
+			dictionary.Add(
+				BindingInfoTemplate.Create(null, "Global", "TestCommands.DoSomething"),
+				new CommandBindingInfo { RoutedCommandName = "SuccessfullTest" });
+			
+			dictionary.Add(
+				BindingInfoTemplate.Create(null, "Global", "TestCommands.DoSomethingOther"),
+				new CommandBindingInfo { RoutedCommandName = "UnsuccessfullTest" });
+			
+			var doSomethingBindingInfos = dictionary.FindItems(BindingInfoTemplate.Create(null, null, "TestCommands.DoSomething"));
+			Assert.AreEqual(2, doSomethingBindingInfos.Count());
+			Assert.IsTrue(doSomethingBindingInfos.All(i => i.RoutedCommandName == "SuccessfullTest"));
+		}
+		
+		[Test]
+		public void FindSuperSetWithTwoAttributesTest()
+		{	
+			var dictionary = new BindingInfoTemplateDictionary<CommandBindingInfo>();
+			
+			dictionary.Add(
+				BindingInfoTemplate.Create(null, null, null),
+				new CommandBindingInfo { RoutedCommandName = "UnsuccessfullTest" });
+			
+			dictionary.Add(
+				BindingInfoTemplate.Create(null, null, "TestCommands.DoSomething"),
+				new CommandBindingInfo { RoutedCommandName = "UnsuccessfullTest" });
+			
+			dictionary.Add(
+				BindingInfoTemplate.Create(null, "Global", "TestCommands.DoSomething"),
+				new CommandBindingInfo { RoutedCommandName = "SuccessfullTest" });
+			
+			dictionary.Add(
+				BindingInfoTemplate.Create(null, "Global", "TestCommands.DoSomethingOther"),
+				new CommandBindingInfo { RoutedCommandName = "UnsuccessfullTest" });
+			
+			var doSomethingBindingInfos = dictionary.FindItems(BindingInfoTemplate.Create(null, "Global", "TestCommands.DoSomething"));
+			
+			Assert.AreEqual(1, doSomethingBindingInfos.Count());
+			Assert.IsTrue(doSomethingBindingInfos.All(i => i.RoutedCommandName == "SuccessfullTest"));
+		}
+    	
+    }
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/Test/CommandManagerTests.cs b/src/Main/ICSharpCode.Core.Presentation/Test/CommandManagerTests.cs
new file mode 100644
index 0000000000..08171a51de
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/Test/CommandManagerTests.cs
@@ -0,0 +1,429 @@
+using ICSharpCode.Core.Presentation;
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace ICSharpCode.Core.Presentation.Tests
+{
+	[TestFixture]
+    public class CommandManagerTests
+    {
+    	[TestFixtureSetUp]
+    	public void TestFixtureSetUp()
+    	{
+    		PropertyService.InitializeServiceForUnitTests();
+    	}
+    	
+    	[SetUp]
+    	public void SetuUp()
+    	{
+    	}
+    	
+    	[TearDown]
+    	public void TearDown()
+    	{
+    		SDCommandManager.Reset();
+    	}
+    	
+		[Test]
+		public void InvokeBindingUpdateHandlersManually()
+		{
+			var testResult = false;
+			
+			SDCommandManager.BindingsChanged += delegate(object sender, NotifyBindingsChangedEventArgs args) {
+				if(args.Action == NotifyBindingsChangedAction.NamedTypeModified && args.OldNamedTypes.Contains(typeof(UIElement))) {
+					testResult = true;
+				}
+			};
+			
+			SDCommandManager.InvokeBindingsChanged(
+				null, 
+				new NotifyBindingsChangedEventArgs(
+					NotifyBindingsChangedAction.NamedTypeModified,
+					"SomeType",
+					new [] { typeof(UIElement) },
+					new Type[0]));
+			
+			Assert.IsTrue(testResult);
+		}
+		
+		[Test]
+		public void InvokeInputBindingsOnRoutedCommandRegistration()
+		{
+			var testResult = false;
+			SDCommandManager.BindingsChanged += delegate(object sender, NotifyBindingsChangedEventArgs args) {
+				if(args.Action == NotifyBindingsChangedAction.RoutedUICommandModified && args.RoutedCommandName == "InvokeTest") {
+					testResult = true;
+				}
+			};
+			
+			var existingCommandTestResult = false;
+			SDCommandManager.BindingsChanged += delegate(object sender, NotifyBindingsChangedEventArgs args) {
+				if(args.Action == NotifyBindingsChangedAction.RoutedUICommandModified && args.RoutedCommandName == "ApplicationCommands.Copy") {
+					existingCommandTestResult = true;
+				}
+			};
+			
+			SDCommandManager.RegisterRoutedUICommand("InvokeTest", "text");
+			Assert.IsTrue(testResult);
+			Assert.IsFalse(existingCommandTestResult);
+			
+			SDCommandManager.RegisterRoutedUICommand(ApplicationCommands.Copy);
+			Assert.IsTrue(existingCommandTestResult);
+		}
+		
+		[Test]
+		public void InvokeInputBindingsOnOwnerTypeRegistration()
+		{
+			var results = new HashSet<string>();
+			
+			SDCommandManager.BindingsChanged += delegate(object sender, NotifyBindingsChangedEventArgs args) {
+				if(args.Action == NotifyBindingsChangedAction.NamedTypeModified && args.TypeName == "TestOwnerType") {
+					if(args.NewNamedTypes.Contains(typeof(UserControl)) && !args.OldNamedTypes.Contains(typeof(UserControl))) {
+						results.Add("UserControlAdded");
+					}
+					
+					if(args.OldNamedTypes.Contains(typeof(UserControl)) && !args.NewNamedTypes.Contains(typeof(UserControl))) {
+						results.Add("UserControlRemoved");
+					}
+				}
+			};
+			
+			results.Clear();
+			SDCommandManager.RegisterNamedUIType("TestOwnerType", typeof(UserControl));
+			Assert.IsTrue(results.Contains("UserControlAdded"));
+			Assert.IsFalse(results.Contains("UserControlRemoved"));
+			
+			results.Clear();
+			SDCommandManager.UnregisterNamedUIType("TestOwnerType", typeof(UserControl));
+			Assert.IsFalse(results.Contains("UserControlAdded"));
+			Assert.IsTrue(results.Contains("UserControlRemoved"));
+		}
+		
+		[Test]
+		public void InvokeInputBindingsOnOwnerInstanceRegistration()
+		{
+			var results = new HashSet<string>();
+			
+			var uiElement = new UIElement();
+			
+			SDCommandManager.BindingsChanged += delegate(object sender, NotifyBindingsChangedEventArgs args) {
+				if(args.Action == NotifyBindingsChangedAction.NamedInstanceModified && args.UIElementName == "TestOwner") {
+					if(args.NewNamedUIElements.Contains(uiElement) && !args.OldNamedUIElements.Contains(uiElement)) {
+						results.Add("UIElementAdded");
+					}
+					
+					if(!args.NewNamedUIElements.Contains(uiElement) && args.OldNamedUIElements.Contains(uiElement)) {
+						results.Add("UIElementRemoved");
+					}
+				}
+			};
+			
+			results.Clear();
+			SDCommandManager.RegisterNamedUIElement("TestOwner", uiElement);
+			Assert.IsTrue(results.Contains("UIElementAdded"));
+			Assert.IsFalse(results.Contains("UIElementRemoved"));
+			
+			results.Clear();
+			SDCommandManager.UnregisterNamedUIElement("TestOwner", uiElement);
+			Assert.IsFalse(results.Contains("UIElementAdded"));
+			Assert.IsTrue(results.Contains("UIElementRemoved"));
+		}
+		
+		[Test]
+		public void InvokeBindingsUpdateHandlersOnInputBindingInfoRegistration()
+		{
+			var testResult = false;
+			
+			var uiElement = new UIElement();
+			var bindingInfo = new InputBindingInfo { RoutedCommandName = "InvokeTest", OwnerInstanceName = "TestOwnerInstance", DefaultGestures = new ObservableInputGestureCollection { new KeyGesture(Key.K, ModifierKeys.Control) } };
+			 
+			SDCommandManager.RegisterRoutedUICommand("InvokeTest", "RoutedCommandText");
+			SDCommandManager.RegisterNamedUIElement("TestOwnerInstance", uiElement);
+			
+			SDCommandManager.BindingsChanged += delegate(object sender, NotifyBindingsChangedEventArgs args) {
+				var template = BindingInfoTemplate.CreateFromIBindingInfo(bindingInfo);
+				var contains = args.ModifiedBindingInfoTemplates.Contains(template);
+				if(args.Action == NotifyBindingsChangedAction.BindingInfoModified && contains) {
+					testResult = true;
+				}
+			};
+			
+			Assert.IsEmpty(uiElement.InputBindings);
+			
+			SDCommandManager.RegisterInputBindingInfo(bindingInfo);
+			
+			Assert.IsTrue(testResult);
+			Assert.AreEqual(1, uiElement.InputBindings.Count);
+			Assert.AreEqual("InvokeTest", ((RoutedUICommand)uiElement.InputBindings[0].Command).Name);
+		}
+		
+		[Test]
+		public void InvokeBindingsUpdateHandlersOnCommandBindingInfoRegistration()
+		{
+			var testResult = false;
+			
+			var uiElement = new UIElement();
+			var bindingInfo = new CommandBindingInfo { RoutedCommandName = "InvokeTest", OwnerInstanceName = "TestOwnerInstance"};
+			 
+			SDCommandManager.RegisterRoutedUICommand("InvokeTest", "RoutedCommandText");
+			SDCommandManager.RegisterNamedUIElement("TestOwnerInstance", uiElement);
+			
+			SDCommandManager.BindingsChanged += delegate(object sender, NotifyBindingsChangedEventArgs args) {
+				if(args.Action == NotifyBindingsChangedAction.BindingInfoModified && args.ModifiedBindingInfoTemplates.Contains(BindingInfoTemplate.CreateFromIBindingInfo(bindingInfo))) {
+					testResult = true;
+				}
+			};
+			
+			Assert.IsEmpty(uiElement.InputBindings);
+			
+			SDCommandManager.RegisterCommandBindingInfo(bindingInfo);
+			
+			Assert.IsTrue(testResult);
+			Assert.AreEqual(1, uiElement.CommandBindings.Count);
+			Assert.AreEqual("InvokeTest", ((RoutedUICommand)uiElement.CommandBindings[0].Command).Name);
+		}
+		
+		[Test]
+		public void GroupAddRemoveTests()
+		{
+			var testResults = new HashSet<string>();
+			
+			var removedGroup = new BindingGroup("Removed");
+			var addedGroup = new BindingGroup("Added");
+			
+			var bindingInfo = new CommandBindingInfo {
+				RoutedCommandName = "RoutedCommandName",
+				OwnerTypeName = "SomeOwner",
+				Groups = new BindingGroupCollection { removedGroup }
+			};
+			
+			SDCommandManager.BindingsChanged += delegate(object sender, NotifyBindingsChangedEventArgs args) { 
+				if(args.Action == NotifyBindingsChangedAction.GroupAttachmendsModified && args.ModifiedGroups.Contains(addedGroup)) {
+					testResults.Add("GroupAdded");
+				}
+				
+				if(args.Action == NotifyBindingsChangedAction.GroupAttachmendsModified && args.ModifiedGroups.Contains(removedGroup)) {
+					testResults.Add("GroupRemoved");
+				}
+			};
+			
+			SDCommandManager.RegisterCommandBindingInfo(bindingInfo);
+			
+			testResults.Clear();
+			bindingInfo.Groups = new BindingGroupCollection { addedGroup };
+			Assert.IsTrue(testResults.Contains("GroupAdded"));
+			Assert.IsTrue(testResults.Contains("GroupRemoved"));
+			bindingInfo.Groups.Clear();
+				
+			testResults.Clear();
+			bindingInfo.Groups.Add(addedGroup);
+			Assert.IsTrue(testResults.Contains("GroupAdded"));
+			
+			testResults.Clear();
+			bindingInfo.Groups.Remove(addedGroup);
+			Assert.IsTrue(testResults.Contains("GroupAdded"));
+			
+			bindingInfo.Groups.Add(removedGroup);
+			testResults.Clear();
+			bindingInfo.Groups.Clear();
+			Assert.IsTrue(testResults.Contains("GroupRemoved"));
+		}
+		
+		[Test]
+		public void NamedUIElementOperationsTest()
+		{
+        	var uiElementName = "test";
+        	var uiElement = new UIElement();
+        	SDCommandManager.RegisterNamedUIElement(uiElementName, uiElement);
+        	
+        	// Map forward
+        	var retrievedInstances = SDCommandManager.GetNamedUIElementCollection(uiElementName);
+        	Assert.AreEqual(1, retrievedInstances.Count);
+        	Assert.AreSame(retrievedInstances.First(), uiElement);
+        	retrievedInstances = null;
+        		
+        	// Map backward
+        	var retrievedNames = SDCommandManager.GetUIElementNameCollection(uiElement);
+        	Assert.AreEqual(1, retrievedNames.Count);
+        	Assert.AreSame(retrievedNames.First(), uiElementName);
+        	retrievedNames = null;
+        	
+        	uiElement = null;        	
+        	GC.Collect();
+        	
+        	// Map forward (after GC)
+        	var retrievedAfterGCInstances = SDCommandManager.GetNamedUIElementCollection(uiElementName);
+        	Assert.AreEqual(0, retrievedAfterGCInstances.Count);
+        	
+			// Map backward (after GC)
+			Assert.Throws(typeof(ArgumentNullException), delegate { SDCommandManager.GetUIElementNameCollection(uiElement); });
+		}
+		
+		[Test]
+		public void InvokeGesturesChangedManualyTest()
+		{
+			var result = false;
+			
+			var oldGestures = new InputGestureCollection();
+			var newGestures = new InputGestureCollection();
+			
+			var identifier = BindingInfoTemplate.Create("SomeOwner", null, "SomeCommand");
+			
+			SDCommandManager.GesturesChanged += delegate(object sender, NotifyGesturesChangedEventArgs args) { 
+				if(args.ModificationDescriptions.Count == 1 
+				   && args.ModificationDescriptions.All(
+				   	d => d.InputBindingIdentifier.Equals(identifier)
+				   		&& d.OldGestures == oldGestures
+						&& d.NewGestures == newGestures)) {
+					result = true;
+				}
+			};
+			
+			SDCommandManager.InvokeGesturesChanged(
+				null, 
+				new NotifyGesturesChangedEventArgs(
+					new GesturesModificationDescription(
+						identifier,
+						oldGestures,
+						newGestures
+					)));
+			
+			Assert.IsTrue(result);
+		}
+		
+		[Test]
+		public void InvokeGesturesChangedOnCurrentProfileSetTest()
+		{
+			var results = new HashSet<string>();
+			
+			var newGestures = new InputGestureCollection();
+			newGestures.Add(new KeyGesture(Key.C, ModifierKeys.Alt));
+			newGestures.Add(new KeyGesture(Key.D, ModifierKeys.Alt));
+			
+			var identifier = BindingInfoTemplate.Create("SomeOwner", null, "SomeCommand");
+			
+			SDCommandManager.GesturesChanged += delegate(object sender, NotifyGesturesChangedEventArgs args) { 
+				if(args.ModificationDescriptions.Count == 1 
+				   && args.ModificationDescriptions.Any(
+				   	d => d.InputBindingIdentifier.Equals(identifier)
+				   		&& d.OldGestures.Count == 0
+						&& d.NewGestures.Count == 2)) {
+					results.Add("SetResult");
+				}
+				
+				if(args.ModificationDescriptions.Count == 1 
+				   && args.ModificationDescriptions.Any(
+				   	d => d.InputBindingIdentifier.Equals(identifier)
+				   		&& d.OldGestures.Count == 2
+						&& d.NewGestures.Count == 0)) {
+					results.Add("ResetResult");
+				}
+			};
+			
+			var profile = new UserGestureProfile("");
+			profile[identifier] = newGestures;
+			
+			results.Clear();
+			UserGestureProfileManager.CurrentProfile = profile;
+			Assert.IsTrue(results.Contains("SetResult"));
+			Assert.IsFalse(results.Contains("ResetResult"));
+			
+			results.Clear();
+			UserGestureProfileManager.CurrentProfile = null;
+			Assert.IsFalse(results.Contains("SetResult"));
+			Assert.IsTrue(results.Contains("ResetResult"));
+		}
+		
+		[Test]
+		public void InvokeGesturesChangedOnDefaultGesturesSetTest()
+		{
+			var results = new HashSet<string>();
+			
+			var gestures = new InputGestureCollection();
+			gestures.Add(new KeyGesture(Key.C, ModifierKeys.Alt));
+			gestures.Add(new KeyGesture(Key.D, ModifierKeys.Alt));
+			
+			var profileGestures = new InputGestureCollection();
+			profileGestures.Add(new KeyGesture(Key.T, ModifierKeys.Alt));
+			
+			var bindingInfo = new InputBindingInfo();
+			bindingInfo.OwnerInstanceName = "SomeOwner";
+			bindingInfo.RoutedCommandName = "SomeCommand";
+			bindingInfo.DefaultGestures.AddRange(gestures);
+			SDCommandManager.RegisterInputBindingInfo(bindingInfo);
+			
+			SDCommandManager.GesturesChanged += delegate(object sender, NotifyGesturesChangedEventArgs args) { 
+				if(args.ModificationDescriptions.Count == 1 
+				   && args.ModificationDescriptions.Any(
+				   	d => d.InputBindingIdentifier.Equals(BindingInfoTemplate.CreateFromIBindingInfo(bindingInfo))
+				   		&& d.OldGestures.Count == 2
+						&& d.NewGestures.Count == 3)) {
+					results.Add("GestureAdded");
+				}
+				
+				if(args.ModificationDescriptions.Count == 1 
+				   && args.ModificationDescriptions.Any(
+				   	d => d.InputBindingIdentifier.Equals(BindingInfoTemplate.CreateFromIBindingInfo(bindingInfo))
+				   		&& d.OldGestures.Count == 3
+						&& d.NewGestures.Count == 2)) {
+					results.Add("GestureRemoved");
+				}
+				
+				
+				if(args.ModificationDescriptions.Count == 1 
+				   && args.ModificationDescriptions.Any(
+				   	d => d.InputBindingIdentifier.Equals(BindingInfoTemplate.CreateFromIBindingInfo(bindingInfo))
+				   		&& d.OldGestures.Count == 0
+						&& d.NewGestures.Count == 2)) {
+					results.Add("GesturesSet");
+				}
+				
+				if(args.ModificationDescriptions.Count == 1 
+				   && args.ModificationDescriptions.Any(
+				   	d => d.InputBindingIdentifier.Equals(BindingInfoTemplate.CreateFromIBindingInfo(bindingInfo))
+				   		&& d.OldGestures.Count == 2
+						&& d.NewGestures.Count == 0)) {
+					results.Add("GesturesReset");
+				}
+			};
+			
+			var key = new KeyGesture(Key.M, ModifierKeys.Control | ModifierKeys.Shift);
+			
+			results.Clear();
+			var c = bindingInfo.DefaultGestures.Count;
+			bindingInfo.DefaultGestures.Add(key);
+			Assert.IsTrue(results.Contains("GestureAdded"));
+			Assert.IsFalse(results.Contains("GestureRemoved"));
+			
+			results.Clear();
+			bindingInfo.DefaultGestures.Remove(key);
+			Assert.IsTrue(results.Contains("GestureRemoved"));
+			Assert.IsFalse(results.Contains("GestureAdded"));
+			
+			var profile = new UserGestureProfile("");
+			profile[BindingInfoTemplate.CreateFromIBindingInfo(bindingInfo)] = new InputGestureCollection();
+			UserGestureProfileManager.CurrentProfile = profile;
+			
+			// User defined gestures are used
+			results.Clear();
+			bindingInfo.DefaultGestures.Add(key);
+			bindingInfo.DefaultGestures.Remove(key);
+			Assert.IsFalse(results.Contains("GestureRemoved"));
+			Assert.IsFalse(results.Contains("GestureAdded"));
+			
+			profile[BindingInfoTemplate.CreateFromIBindingInfo(bindingInfo)] = null;
+			results.Clear();
+			var backupDefaultGestures = bindingInfo.DefaultGestures;
+			bindingInfo.DefaultGestures = null;
+			Assert.IsTrue(results.Contains("GesturesReset"));
+			
+			bindingInfo.DefaultGestures = backupDefaultGestures;
+			Assert.IsTrue(results.Contains("GesturesSet"));
+		}
+	}
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/Test/ICSharpCode.Core.Presentation.Tests.csproj b/src/Main/ICSharpCode.Core.Presentation/Test/ICSharpCode.Core.Presentation.Tests.csproj
new file mode 100644
index 0000000000..ba4875ea8e
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/Test/ICSharpCode.Core.Presentation.Tests.csproj
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
+  <PropertyGroup>
+    <ProjectGuid>{FFA7988E-7348-4669-9E9D-27E629C873A2}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <OutputType>Library</OutputType>
+    <RootNamespace>ICSharpCode.Core.Presentation.Tests</RootNamespace>
+    <AssemblyName>ICSharpCode.Core.Presentation.Tests</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <NoStdLib>False</NoStdLib>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <OutputPath>..\..\..\..\bin\UnitTests\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>Full</DebugType>
+    <Optimize>False</Optimize>
+    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DebugSymbols>False</DebugSymbols>
+    <DebugType>None</DebugType>
+    <Optimize>True</Optimize>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <DefineConstants>TRACE</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
+    <BaseAddress>4194304</BaseAddress>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <FileAlignment>4096</FileAlignment>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="nunit.framework">
+      <HintPath>..\..\..\Tools\NUnit\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="PresentationCore">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="PresentationFramework">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="BindingGroupTests.cs" />
+    <Compile Include="BindingInfoTemplateDictionaryTests.cs" />
+    <Compile Include="CommandManagerTests.cs" />
+    <Compile Include="InputBindingCategoryTests.cs" />
+    <Compile Include="InputGestureTests.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="RelationshipMapTests.cs" />
+    <Compile Include="UserDefinedGestureProfileTests.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Core\Project\ICSharpCode.Core.csproj">
+      <Project>{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}</Project>
+      <Name>ICSharpCode.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\ICSharpCode.Core.Presentation.csproj">
+      <Project>{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}</Project>
+      <Name>ICSharpCode.Core.Presentation</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
+</Project>
\ No newline at end of file
diff --git a/src/Main/ICSharpCode.Core.Presentation/Test/InputBindingCategoryTests.cs b/src/Main/ICSharpCode.Core.Presentation/Test/InputBindingCategoryTests.cs
new file mode 100644
index 0000000000..ab33bd4f40
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/Test/InputBindingCategoryTests.cs
@@ -0,0 +1,99 @@
+using ICSharpCode.Core.Presentation;
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace ICSharpCode.Core.Presentation.Tests
+{
+	[TestFixture]
+    public class InputBindingCategoryTests
+    {
+    	[TestFixtureSetUp]
+    	public void TestFixtureSetUp()
+    	{
+    		PropertyService.InitializeServiceForUnitTests();
+    	}
+    	
+
+    	[SetUp]
+    	public void SetuUp()
+    	{
+    	}
+    	
+    	[TearDown]
+    	public void TearDown()
+    	{
+    		SDCommandManager.Reset();
+    	}
+    	
+    	[Test]
+		public void AddUnregisteredInputBindingCategoryTests()
+		{
+			var bindingInfo = new InputBindingInfo();
+			var category = new InputBindingCategory("/test", "Test");
+			
+			bindingInfo.Categories = new InputBindingCategoryCollection();
+			Assert.Throws<ArgumentException>(delegate { bindingInfo.Categories.Add(category); });
+			
+			SDCommandManager.RegisterInputBindingCategory(category);
+			
+			bindingInfo.Categories = new InputBindingCategoryCollection();
+			Assert.DoesNotThrow(delegate { bindingInfo.Categories.Add(category); });
+		}
+		
+    	[Test]
+		public void AddManyUnregisteredInputBindingCategoriesTests()
+		{
+			var bindingInfo = new InputBindingInfo();
+			
+			var category1 = new InputBindingCategory("/test", "Test");
+			var category2 = new InputBindingCategory("/test2", "Test");
+			var categoryCollection = new InputBindingCategoryCollection { category1, category2 };
+			
+			bindingInfo.Categories = new InputBindingCategoryCollection();
+			Assert.Throws<ArgumentException>(delegate { bindingInfo.Categories.AddRange(categoryCollection); });
+			
+			bindingInfo.Categories = new InputBindingCategoryCollection();
+			SDCommandManager.RegisterInputBindingCategory(category1);
+			Assert.Throws<ArgumentException>(delegate { bindingInfo.Categories.AddRange(categoryCollection); });
+			
+			bindingInfo.Categories = new InputBindingCategoryCollection();
+			SDCommandManager.RegisterInputBindingCategory(category2);
+			Assert.DoesNotThrow(delegate { bindingInfo.Categories.AddRange(categoryCollection); });
+		}
+        
+    	[Test]
+		public void AssignInputBindingCategoryCollectionWithUnregistredCategoryTests()
+		{
+			var bindingInfo = new InputBindingInfo();
+			
+			var category = new InputBindingCategory("/test", "Test");
+			var categoryCollection = new InputBindingCategoryCollection { category };
+			
+			bindingInfo.Categories = new InputBindingCategoryCollection();
+			Assert.Throws<ArgumentException>(delegate { bindingInfo.Categories = categoryCollection; });
+			
+			bindingInfo.Categories = new InputBindingCategoryCollection();
+			SDCommandManager.RegisterInputBindingCategory(category);
+			Assert.DoesNotThrow(delegate { bindingInfo.Categories = categoryCollection; });
+		}
+        
+    	[Test]
+		public void InputBindingCategoryCollectionClearTest()
+		{
+			var category = new InputBindingCategory("/test", "Test");
+			var categories = new InputBindingCategoryCollection { category };
+			
+			var result = false;
+			categories.CollectionChanged += delegate { result = true; };
+			
+			Assert.IsFalse(result);
+			categories.Clear();
+			Assert.IsTrue(result);
+		}
+    }
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/Test/InputGestureTests.cs b/src/Main/ICSharpCode.Core.Presentation/Test/InputGestureTests.cs
new file mode 100644
index 0000000000..4ff249a012
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/Test/InputGestureTests.cs
@@ -0,0 +1,392 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Windows.Input;
+using NUnit.Framework;
+using ICSharpCode.Core.Presentation;
+
+namespace ICSharpCode.Core.Presentation.Tests
+{
+	/// <summary>
+	/// Description of InputGestureTests.
+	/// </summary>
+	[TestFixture]
+	public class InputGestureTest
+	{		
+		public MultiKeyGestureConverter multiKeyGestureConverter = new MultiKeyGestureConverter();
+		public PartialKeyGestureConverter partialKeyGestureConverter = new PartialKeyGestureConverter();
+		public KeyGestureConverter keyGestureConverter = new KeyGestureConverter();
+		
+		[Test]
+		public void MultiKeyGesturesMatchExactlyTest()
+		{
+			var template1 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C");
+			var original1 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C");
+			var result1 = template1.IsTemplateFor(original1, GestureCompareMode.ExactlyMatches);
+			Assert.IsTrue(result1);
+			
+			var template2 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Ctrl+V");
+			var original2 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Ctrl+V");
+			var result2 = template2.IsTemplateFor(original2, GestureCompareMode.ExactlyMatches);
+			Assert.IsTrue(result2);
+		}
+		
+		[Test]
+		public void MultiKeyGesturesDoNotMatchExactlyTest()
+		{
+			var template1 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+D");
+			var original1 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C");
+			Assert.IsFalse(template1.IsTemplateFor(original1, GestureCompareMode.ExactlyMatches));
+			Assert.IsFalse(original1.IsTemplateFor(template1, GestureCompareMode.ExactlyMatches));
+			
+			var template2 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Ctrl+D");
+			var original2 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Ctrl+V");
+			Assert.IsFalse(template2.IsTemplateFor(original2, GestureCompareMode.ExactlyMatches));
+			Assert.IsFalse(original2.IsTemplateFor(template2, GestureCompareMode.ExactlyMatches));
+			
+			var template3 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Ctrl+D");
+			var original3 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C");
+			Assert.IsFalse(template3.IsTemplateFor(original3, GestureCompareMode.ExactlyMatches));
+			Assert.IsFalse(original3.IsTemplateFor(template3, GestureCompareMode.ExactlyMatches));
+		}
+
+		[Test]
+		public void KeyGesturesMatchExactlyTest()
+		{
+			var template1 = (KeyGesture)keyGestureConverter.ConvertFromInvariantString("Ctrl+C");
+			var original1 = (KeyGesture)keyGestureConverter.ConvertFromInvariantString("Ctrl+C");
+			Assert.IsTrue(template1.IsTemplateFor(original1, GestureCompareMode.ExactlyMatches));
+			Assert.IsTrue(original1.IsTemplateFor(template1, GestureCompareMode.ExactlyMatches));
+			
+			var template2 = (KeyGesture)keyGestureConverter.ConvertFromInvariantString("Ctrl+D");
+			var original2 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+D");
+			Assert.IsTrue(template2.IsTemplateFor(original2, GestureCompareMode.ExactlyMatches));
+			Assert.IsTrue(original2.IsTemplateFor(template2, GestureCompareMode.ExactlyMatches));
+			
+			var template3 = (KeyGesture)keyGestureConverter.ConvertFromInvariantString("Ctrl+E");
+			var original3 = (PartialKeyGesture)partialKeyGestureConverter.ConvertFromInvariantString("Ctrl+E");
+			Assert.IsTrue(template3.IsTemplateFor(original3, GestureCompareMode.ExactlyMatches));
+			Assert.IsTrue(original3.IsTemplateFor(template3, GestureCompareMode.ExactlyMatches));
+			
+			var template4 = (PartialKeyGesture)partialKeyGestureConverter.ConvertFromInvariantString("F");
+			var original4 = (PartialKeyGesture)partialKeyGestureConverter.ConvertFromInvariantString("F");
+			Assert.IsTrue(template4.IsTemplateFor(original4, GestureCompareMode.ExactlyMatches));
+			Assert.IsTrue(original4.IsTemplateFor(template4, GestureCompareMode.ExactlyMatches));
+			
+			var template5 = (PartialKeyGesture)partialKeyGestureConverter.ConvertFromInvariantString("Ctrl+Shift");
+			var original5 = (PartialKeyGesture)partialKeyGestureConverter.ConvertFromInvariantString("Ctrl+Shift");
+			Assert.IsTrue(template5.IsTemplateFor(original5, GestureCompareMode.ExactlyMatches));
+			Assert.IsTrue(original5.IsTemplateFor(template5, GestureCompareMode.ExactlyMatches));
+		}
+		
+
+		[Test]
+		public void KeyGesturesDoNotMatchExactlyTest()
+		{
+			var template1 = (KeyGesture)keyGestureConverter.ConvertFromInvariantString("Ctrl+C");
+			var original1 = (KeyGesture)keyGestureConverter.ConvertFromInvariantString("Ctrl+D");
+			Assert.IsFalse(template1.IsTemplateFor(original1, GestureCompareMode.ExactlyMatches));
+			Assert.IsFalse(original1.IsTemplateFor(template1, GestureCompareMode.ExactlyMatches));
+			
+			var template2 = (KeyGesture)keyGestureConverter.ConvertFromInvariantString("Ctrl+C");
+			var original2 = (KeyGesture)keyGestureConverter.ConvertFromInvariantString("Alt+C");
+			Assert.IsFalse(template2.IsTemplateFor(original2, GestureCompareMode.ExactlyMatches));
+			Assert.IsFalse(original2.IsTemplateFor(template2, GestureCompareMode.ExactlyMatches));
+			
+			var template3 = (KeyGesture)keyGestureConverter.ConvertFromInvariantString("Ctrl+E");
+			var original3 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+F");
+			Assert.IsFalse(template3.IsTemplateFor(original3, GestureCompareMode.ExactlyMatches));
+			Assert.IsFalse(original3.IsTemplateFor(template3, GestureCompareMode.ExactlyMatches));
+			
+			var template4 = (KeyGesture)keyGestureConverter.ConvertFromInvariantString("Ctrl+E");
+			var original4 = (PartialKeyGesture)partialKeyGestureConverter.ConvertFromInvariantString("Ctrl+D");
+			Assert.IsFalse(template4.IsTemplateFor(original4, GestureCompareMode.ExactlyMatches));
+			Assert.IsFalse(original4.IsTemplateFor(template4, GestureCompareMode.ExactlyMatches));
+			
+			var template5 = (PartialKeyGesture)partialKeyGestureConverter.ConvertFromInvariantString("F");
+			var original5 = (PartialKeyGesture)partialKeyGestureConverter.ConvertFromInvariantString("D");
+			Assert.IsFalse(template5.IsTemplateFor(original5, GestureCompareMode.ExactlyMatches));
+			Assert.IsFalse(original5.IsTemplateFor(template5, GestureCompareMode.ExactlyMatches));
+			
+			var template6 = (PartialKeyGesture)partialKeyGestureConverter.ConvertFromInvariantString("Ctrl+Shift");
+			var original6 = (PartialKeyGesture)partialKeyGestureConverter.ConvertFromInvariantString("Ctrl");
+			Assert.IsFalse(template6.IsTemplateFor(original6, GestureCompareMode.ExactlyMatches));
+			Assert.IsFalse(original6.IsTemplateFor(template6, GestureCompareMode.ExactlyMatches));
+			
+			var template7 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,C");
+			var original7 = (PartialKeyGesture)partialKeyGestureConverter.ConvertFromInvariantString("Ctrl+C");
+			Assert.IsFalse(template7.IsTemplateFor(original7, GestureCompareMode.ExactlyMatches));
+			Assert.IsFalse(original7.IsTemplateFor(template7, GestureCompareMode.ExactlyMatches));
+		}
+		
+		[Test]
+		public void MultiKeyGesturesMatchStartsWithTest()
+		{
+			var template1 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+");
+			var original1 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+D");
+			Assert.IsTrue(template1.IsTemplateFor(original1, GestureCompareMode.StartsWith));
+			
+			var template2 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C");
+			var original2 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Ctrl+D");
+			Assert.IsTrue(template2.IsTemplateFor(original2, GestureCompareMode.StartsWith));
+			
+			var template3 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Ctrl+D");
+			var original3 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Ctrl+D,D");
+			Assert.IsTrue(template3.IsTemplateFor(original3, GestureCompareMode.StartsWith));
+			
+			var template4 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+Shift+");
+			var original4 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+Shift+D,D");
+			Assert.IsTrue(template4.IsTemplateFor(original4, GestureCompareMode.StartsWith));
+			
+			var template5 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+Shift+D,Ctrl+");
+			var original5 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+Shift+D,Ctrl+D");
+			Assert.IsTrue(template5.IsTemplateFor(original5, GestureCompareMode.StartsWith));
+		}
+		
+		[Test]
+		public void MultiKeyGesturesDoNotMatchStartsWithTest()
+		{
+			var template1 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+D");
+			var original1 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C");
+			Assert.IsFalse(template1.IsTemplateFor(original1, GestureCompareMode.StartsWith));
+			
+			var template2 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+D");
+			var original2 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Ctrl+D");
+			Assert.IsFalse(template2.IsTemplateFor(original2, GestureCompareMode.StartsWith));
+			
+			var template3 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Ctrl+E");
+			var original3 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Ctrl+D,D");
+			Assert.IsFalse(template3.IsTemplateFor(original3, GestureCompareMode.StartsWith));
+			
+			var template4 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Shift+D");
+			var original4 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Ctrl+D,D");
+			Assert.IsFalse(template4.IsTemplateFor(original4, GestureCompareMode.StartsWith));
+			
+			var template5 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Ctrl+D,E");
+			var original5 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Ctrl+D,D");
+			Assert.IsFalse(template5.IsTemplateFor(original5, GestureCompareMode.StartsWith));
+			
+			var template6 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Alt+");
+			var original6 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+Shift+D,D");
+			Assert.IsFalse(template6.IsTemplateFor(original6, GestureCompareMode.StartsWith));
+			
+			var template7 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("E");
+			var original7 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+Shift+D,D");
+			Assert.IsFalse(template7.IsTemplateFor(original7, GestureCompareMode.StartsWith));
+			
+			var template8 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+Shift+D,Alt+");
+			var original8 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+Shift+D,Ctrl+D");
+			Assert.IsFalse(template8.IsTemplateFor(original8, GestureCompareMode.StartsWith));
+		}
+		
+		[Test]
+		public void MultiKeyGesturesMatchPartlyTest()
+		{
+			var template1 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+D");
+			var original1 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+D");
+			Assert.IsTrue(template1.IsTemplateFor(original1, GestureCompareMode.PartlyMatches));
+			Assert.IsTrue(original1.IsTemplateFor(template1, GestureCompareMode.PartlyMatches));
+			
+			var template2 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C");
+			var original2 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Ctrl+D");
+			Assert.IsTrue(template2.IsTemplateFor(original2, GestureCompareMode.PartlyMatches));
+			
+			var template3 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+D");
+			var original3 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Ctrl+D");
+			Assert.IsTrue(template3.IsTemplateFor(original3, GestureCompareMode.PartlyMatches));
+			
+			var template4 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("D");
+			var original4 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+Shift+D,D");
+			Assert.IsTrue(template4.IsTemplateFor(original4, GestureCompareMode.PartlyMatches));
+			
+			var template5 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+");
+			var original5 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+Shift+D,D");
+			Assert.IsTrue(template5.IsTemplateFor(original5, GestureCompareMode.PartlyMatches));
+			
+			var template6 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("C,Ctrl+");
+			var original6 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Ctrl+D,D");
+			Assert.IsTrue(template6.IsTemplateFor(original6, GestureCompareMode.PartlyMatches));
+			
+			var template7 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+D,D");
+			var original7 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+Shift+D,D");
+			Assert.IsTrue(template7.IsTemplateFor(original7, GestureCompareMode.PartlyMatches));
+			
+			var template8 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+Shift+D,Ctrl+");
+			var original8 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+Shift+D,Ctrl+D");
+			Assert.IsTrue(template8.IsTemplateFor(original8, GestureCompareMode.PartlyMatches));
+		}
+		
+		[Test]
+		public void MultiKeyGesturesDoNotMatchPartlyTest()
+		{
+			var template1 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+D");
+			var original1 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C");
+			Assert.IsFalse(template1.IsTemplateFor(original1, GestureCompareMode.PartlyMatches));
+			Assert.IsFalse(original1.IsTemplateFor(template1, GestureCompareMode.PartlyMatches));
+			
+			var template2 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+E");
+			var original2 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Ctrl+D");
+			Assert.IsFalse(template2.IsTemplateFor(original2, GestureCompareMode.PartlyMatches));
+			
+			var template4 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("E");
+			var original4 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+Shift+D,D");
+			Assert.IsFalse(template4.IsTemplateFor(original4, GestureCompareMode.PartlyMatches));
+			
+			var template5 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Alt+");
+			var original5 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+Shift+D,D");
+			Assert.IsFalse(template5.IsTemplateFor(original5, GestureCompareMode.PartlyMatches));
+			
+			var template6 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("C,Ctrl+,D");
+			var original6 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Ctrl+D,D");
+			Assert.IsFalse(template6.IsTemplateFor(original6, GestureCompareMode.PartlyMatches));
+			
+			var template7 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Alt+D,D");
+			var original7 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+Shift+D,D");
+			Assert.IsFalse(template7.IsTemplateFor(original7, GestureCompareMode.PartlyMatches));
+			
+			var template8 = new PartialKeyGesture(Key.None, ModifierKeys.Control | ModifierKeys.Alt | ModifierKeys.Shift);
+			var original8 = new KeyGesture(Key.F11, ModifierKeys.Shift);
+			Assert.IsFalse(template8.IsTemplateFor(original8, GestureCompareMode.PartlyMatches));
+		}
+		
+		
+		
+		
+		
+		[Test]
+		public void MultiKeyGesturesMatchStartsFullChordWithTest()
+		{
+			var template1 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+D");
+			var original1 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+D");
+			Assert.IsTrue(template1.IsTemplateFor(original1, GestureCompareMode.StartsWithFullChords));
+			Assert.IsTrue(original1.IsTemplateFor(template1, GestureCompareMode.StartsWithFullChords));
+			
+			var template2 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C");
+			var original2 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Ctrl+D");
+			Assert.IsTrue(template2.IsTemplateFor(original2, GestureCompareMode.StartsWithFullChords));
+			
+			var template3 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C");
+			var original3 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Ctrl+D,D");
+			Assert.IsTrue(template3.IsTemplateFor(original3, GestureCompareMode.StartsWithFullChords));
+			
+			var template4 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+Shift+D");
+			var original4 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+Shift+D,Ctrl+D");
+			Assert.IsTrue(template4.IsTemplateFor(original4, GestureCompareMode.StartsWithFullChords));
+			
+			var template5 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+D,Ctrl+D");
+			var original5 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+D,Ctrl+D,Ctrl+E");
+			Assert.IsTrue(template5.IsTemplateFor(original5, GestureCompareMode.StartsWithFullChords));
+			
+			var template6 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+D,D");
+			var original6 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+D,D,E");
+			Assert.IsTrue(template6.IsTemplateFor(original6, GestureCompareMode.StartsWithFullChords));
+		}
+		
+		[Test]
+		public void MultiKeyGesturesDoNotMatchStartsWithFullChordTest()
+		{
+			var template1 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+D");
+			var original1 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C");
+			Assert.IsFalse(template1.IsTemplateFor(original1, GestureCompareMode.StartsWith));
+			
+			var template2 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+D");
+			var original2 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Ctrl+D");
+			Assert.IsFalse(template2.IsTemplateFor(original2, GestureCompareMode.StartsWith));
+			
+			var template3 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Ctrl+E");
+			var original3 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Ctrl+D,D");
+			Assert.IsFalse(template3.IsTemplateFor(original3, GestureCompareMode.StartsWith));
+			
+			var template4 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Shift+D");
+			var original4 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Ctrl+D,D");
+			Assert.IsFalse(template4.IsTemplateFor(original4, GestureCompareMode.StartsWith));
+			
+			var template5 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Ctrl+D,E");
+			var original5 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Ctrl+D,D");
+			Assert.IsFalse(template5.IsTemplateFor(original5, GestureCompareMode.StartsWith));
+			
+			var template6 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Alt+");
+			var original6 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+Shift+D,D");
+			Assert.IsFalse(template6.IsTemplateFor(original6, GestureCompareMode.StartsWith));
+			
+			var template7 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("E");
+			var original7 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+Shift+D,D");
+			Assert.IsFalse(template7.IsTemplateFor(original7, GestureCompareMode.StartsWith));
+			
+			var template8 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+Shift+D,Alt+");
+			var original8 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+Shift+D,Ctrl+D");
+			Assert.IsFalse(template8.IsTemplateFor(original8, GestureCompareMode.StartsWith));
+		}
+
+		[Test]
+		public void MultiKeyGesturesConflictingTest()
+		{
+			var template1 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+D");
+			var original1 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+D");
+			Assert.IsTrue(template1.IsTemplateFor(original1, GestureCompareMode.Conflicting));
+			Assert.IsTrue(original1.IsTemplateFor(template1, GestureCompareMode.Conflicting));
+			
+			var template2 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C");
+			var original2 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Ctrl+D");
+			Assert.IsTrue(template2.IsTemplateFor(original2, GestureCompareMode.Conflicting));
+			Assert.IsTrue(original2.IsTemplateFor(template2, GestureCompareMode.Conflicting));
+			
+			var template3 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Ctrl+D");
+			var original3 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Ctrl+D,D");
+			Assert.IsTrue(template3.IsTemplateFor(original3, GestureCompareMode.StartsWith));
+			Assert.IsTrue(original3.IsTemplateFor(template3, GestureCompareMode.Conflicting));
+		}		
+
+		[Test]
+		public void MultiKeyGesturesAreNotConflictingTest()
+		{
+			var template1 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+D");
+			var original1 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+E");
+			Assert.IsFalse(template1.IsTemplateFor(original1, GestureCompareMode.Conflicting));
+			Assert.IsFalse(original1.IsTemplateFor(template1, GestureCompareMode.Conflicting));
+			
+			var template2 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+D");
+			var original2 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Ctrl+D");
+			Assert.IsFalse(template2.IsTemplateFor(original2, GestureCompareMode.Conflicting));
+			Assert.IsFalse(original2.IsTemplateFor(template2, GestureCompareMode.Conflicting));
+			
+			var template3 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Ctrl+E");
+			var original3 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+C,Ctrl+D,D");
+			Assert.IsFalse(template3.IsTemplateFor(original3, GestureCompareMode.StartsWith));
+			Assert.IsFalse(original3.IsTemplateFor(template3, GestureCompareMode.Conflicting));
+			
+			
+			var template4 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+Shift+");
+			var original4 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+Shift+D,D");
+			Assert.False(template4.IsTemplateFor(original4, GestureCompareMode.Conflicting));
+			Assert.False(original4.IsTemplateFor(template4, GestureCompareMode.Conflicting));
+			
+			var template5 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+Shift+D,Ctrl+");
+			var original5 = (MultiKeyGesture)multiKeyGestureConverter.ConvertFromInvariantString("Ctrl+Shift+D,Ctrl+D");
+			Assert.IsFalse(template5.IsTemplateFor(original5, GestureCompareMode.Conflicting));
+			Assert.IsFalse(original5.IsTemplateFor(template5, GestureCompareMode.Conflicting));
+		}
+		
+		[Test]
+		public void PartialGestureIsFullTest()
+		{
+			Assert.IsTrue(((PartialKeyGesture)new PartialKeyGestureConverter().ConvertFromInvariantString("Ctrl+A")).IsFull);
+			Assert.IsTrue(((PartialKeyGesture)new PartialKeyGestureConverter().ConvertFromInvariantString("Ctrl+Shift+A")).IsFull);
+			Assert.IsTrue(((PartialKeyGesture)new PartialKeyGestureConverter().ConvertFromInvariantString("F8")).IsFull);
+			Assert.IsFalse(((PartialKeyGesture)new PartialKeyGestureConverter().ConvertFromInvariantString("A")).IsFull);
+			Assert.IsFalse(((PartialKeyGesture)new PartialKeyGestureConverter().ConvertFromInvariantString("Ctrl+")).IsFull);
+			Assert.IsFalse(((PartialKeyGesture)new PartialKeyGestureConverter().ConvertFromInvariantString("Shift+A")).IsFull);
+		}
+		
+		[Test]
+		public void IdentifierTest()
+		{
+			var sameBinding1 = new InputBindingInfo { OwnerTypeName="Binding", RoutedCommandName="Binding" };
+			var sameBinding2 = new InputBindingInfo { OwnerTypeName="Binding", RoutedCommandName="Binding" };
+			var sameBinding3 = new InputBindingInfo { OwnerTypeName="Binding3", RoutedCommandName="Binding" };
+			
+			Assert.AreEqual(BindingInfoTemplate.CreateFromIBindingInfo(sameBinding1), BindingInfoTemplate.CreateFromIBindingInfo(sameBinding2));
+			Assert.AreNotEqual(BindingInfoTemplate.CreateFromIBindingInfo(sameBinding1), BindingInfoTemplate.CreateFromIBindingInfo(sameBinding3));
+		}
+	}
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/Test/Properties/AssemblyInfo.cs b/src/Main/ICSharpCode.Core.Presentation/Test/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..eec2463629
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/Test/Properties/AssemblyInfo.cs
@@ -0,0 +1,31 @@
+#region Using directives
+
+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+#endregion
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("ICSharpCode.Core.Presentation.Tests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("ICSharpCode.Core.Presentation.Tests")]
+[assembly: AssemblyCopyright("Copyright 2009")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// This sets the default COM visibility of types in the assembly to invisible.
+// If you need to expose a type to COM, use [ComVisible(true)] on that type.
+[assembly: ComVisible(false)]
+
+// The assembly version has following format :
+//
+// Major.Minor.Build.Revision
+//
+// You can specify all the values or you can use the default the Revision and 
+// Build Numbers by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.*")]
diff --git a/src/Main/ICSharpCode.Core.Presentation/Test/RelationshipMapTests.cs b/src/Main/ICSharpCode.Core.Presentation/Test/RelationshipMapTests.cs
new file mode 100644
index 0000000000..eac394f13e
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/Test/RelationshipMapTests.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Linq;
+using System.Windows;
+using System.Windows.Input;
+using ICSharpCode.Core.Presentation;
+using NUnit.Framework;
+
+namespace ICSharpCode.Core.Presentation.Tests
+{
+    [TestFixture]
+    public class RelationshipMapTests
+    {
+        [Test]
+        public void WeakReferenceSupportTest()
+        {
+        	var map = new RelationshipMap<string, WeakReference>();
+        	var uiElement = new UIElement();
+        	var container = new WeakReference(uiElement);
+        	map.Add("test", container);
+        	
+			uiElement = null;
+			GC.Collect();
+        	
+			Assert.IsNull(map.MapForward("test").First().Target);
+			Assert.AreEqual(1, map.MapBackward(container).Count);
+        }
+        
+        [Test]
+        public void WeakEqualityComparerSupportTest()
+        {
+        	var map = new RelationshipMap<string, WeakReference>(null, new WeakReferenceTargetEqualirtyComparer());
+        	var uiElement = new UIElement();
+        	var container = new WeakReference(uiElement);
+        	map.Add("test", container);
+        	
+			Assert.AreEqual(1, map.MapForward("test").Count);
+			Assert.AreEqual(1, map.MapBackward(new WeakReference(uiElement)).Count);
+        	
+        	map.Remove("test", new WeakReference(uiElement));
+        	
+			Assert.AreEqual(0, map.MapForward("test").Count);
+			Assert.AreEqual(0, map.MapBackward(new WeakReference(uiElement)).Count);
+        }
+    }
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/Test/UserDefinedGestureProfileTests.cs b/src/Main/ICSharpCode.Core.Presentation/Test/UserDefinedGestureProfileTests.cs
new file mode 100644
index 0000000000..641a777b32
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/Test/UserDefinedGestureProfileTests.cs
@@ -0,0 +1,77 @@
+using System;
+using System.Windows.Input;
+using ICSharpCode.Core;
+using ICSharpCode.Core.Presentation;
+using NUnit.Framework;
+using System.IO;
+
+namespace ICSharpCode.Core.Presentation.Tests
+{
+	[TestFixture]
+	public class UserDefinedGestureProfileTests
+    {
+    	UserGestureProfile profile = null;
+    	InputBindingInfo binding = null;
+    	KeyGesture gesture = null;
+    	
+    	[TestFixtureSetUp]
+    	public void TestFixtureSetUp()
+    	{
+    		PropertyService.InitializeServiceForUnitTests();
+    	}
+    	
+    	[SetUp]
+    	public void SetuUp()
+    	{
+    		UserGestureProfileManager.CurrentProfile = null;
+    		profile = new UserGestureProfile("") { Name = "TestProfile1" };
+        	gesture = (KeyGesture)new KeyGestureConverter().ConvertFromInvariantString("Ctrl+A");
+        	binding = new InputBindingInfo { OwnerTypeName="Binding", RoutedCommandName="Binding" };
+    	}
+    	
+		[Test]
+		public void NoProfileTest()
+		{
+			binding.DefaultGestures.Add(gesture);
+			
+			Assert.AreEqual(1, binding.DefaultGestures.Count);
+			Assert.AreEqual(gesture, binding.DefaultGestures[0]);
+			Assert.AreEqual(1, binding.ActiveGestures.Count);
+			Assert.AreEqual(gesture, binding.ActiveGestures[0]);
+		}
+		
+		[Test]
+		public void ActiveProfileTest()
+		{
+			binding.DefaultGestures.Add(gesture);
+			
+			var userDefinedGestures = (InputGestureCollection)new InputGestureCollectionConverter().ConvertFromInvariantString("Ctrl+B;Ctrl+C");
+			profile[BindingInfoTemplate.CreateFromIBindingInfo(binding)] = userDefinedGestures;
+			UserGestureProfileManager.CurrentProfile = profile;
+			
+			// Default gestures stay the same
+			Assert.AreEqual(1, binding.DefaultGestures.Count);
+			Assert.AreEqual(gesture, binding.DefaultGestures[0]);
+			
+			// Only active gestures are modified
+			Assert.AreEqual(2, binding.ActiveGestures.Count);
+			Assert.AreEqual(userDefinedGestures[0], binding.ActiveGestures[0]);
+			Assert.AreEqual(userDefinedGestures[1], binding.ActiveGestures[1]);
+		}
+		
+		[Test]
+		public void NoGestureInActiveProfileTest()
+		{
+			var binding2 = new InputBindingInfo { OwnerTypeName="Binding2", RoutedCommandName="Binding2" };
+			binding2.DefaultGestures.Add(gesture);
+			
+			var userDefinedGestures = (InputGestureCollection)new InputGestureCollectionConverter().ConvertFromInvariantString("Ctrl+B;Ctrl+C");
+			profile[BindingInfoTemplate.CreateFromIBindingInfo(binding)] = userDefinedGestures;
+			UserGestureProfileManager.CurrentProfile = profile;
+			
+			// Default gestures are used because current profile doesn't contain modifications to this gesture
+			Assert.AreEqual(1, binding2.ActiveGestures.Count);
+			Assert.AreEqual(binding2.DefaultGestures[0], binding2.ActiveGestures[0]);
+		}
+    }
+}
diff --git a/src/Main/ICSharpCode.Core.Presentation/ToolBar/ToolBarButton.cs b/src/Main/ICSharpCode.Core.Presentation/ToolBar/ToolBarButton.cs
index 5e29a9ef3e..c190da8135 100644
--- a/src/Main/ICSharpCode.Core.Presentation/ToolBar/ToolBarButton.cs
+++ b/src/Main/ICSharpCode.Core.Presentation/ToolBar/ToolBarButton.cs
@@ -9,6 +9,7 @@ using System;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
+using System.Windows.Input;
 
 namespace ICSharpCode.Core.Presentation
 {
@@ -26,7 +27,35 @@ namespace ICSharpCode.Core.Presentation
 			
 			this.codon = codon;
 			this.caller = caller;
-			this.Command = CommandWrapper.GetCommand(codon, caller, createCommand);
+
+			
+			string routedCommandName = null;
+			string routedCommandText = null;
+			
+			if(codon.Properties.Contains("command")) {
+				routedCommandName = codon.Properties["command"];				
+				routedCommandText = codon.Properties["command"];
+			} else if(codon.Properties.Contains("link") || codon.Properties.Contains("class")) {
+				routedCommandName = string.IsNullOrEmpty(codon.Properties["link"]) ? codon.Properties["class"] : codon.Properties["link"];
+				routedCommandText = "Menu item \"" + codon.Properties["label"] + "\"";
+			}
+
+			var routedCommand = SDCommandManager.GetRoutedUICommand(routedCommandName);
+			if(routedCommand == null) {
+				routedCommand = SDCommandManager.RegisterRoutedUICommand(routedCommandName, routedCommandText);
+			}
+			   
+			this.Command = routedCommand;
+			
+			if(!codon.Properties.Contains("command") && (codon.Properties.Contains("link") || codon.Properties.Contains("class"))) {
+				var commandBindingInfo = new CommandBindingInfo();
+				commandBindingInfo.AddIn = codon.AddIn;
+				commandBindingInfo.OwnerTypeName = SDCommandManager.DefaultOwnerTypeName;
+				commandBindingInfo.CommandInstance = CommandWrapper.GetCommand(codon, caller, createCommand);
+				commandBindingInfo.RoutedCommandName = routedCommandName;
+				commandBindingInfo.IsLazy = true;
+				SDCommandManager.RegisterCommandBindingInfo(commandBindingInfo);
+			}
 			
 			if (codon.Properties.Contains("icon")) {
 				var image = PresentationResourceService.GetImage(StringParser.Parse(codon.Properties["icon"]));
diff --git a/src/Main/ICSharpCode.Core.WinForms/CommandsService/KeysCollectionConverter.cs b/src/Main/ICSharpCode.Core.WinForms/CommandsService/KeysCollectionConverter.cs
new file mode 100644
index 0000000000..08c927018e
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.WinForms/CommandsService/KeysCollectionConverter.cs
@@ -0,0 +1,114 @@
+using System;
+using System.Windows.Forms;
+using System.ComponentModel;
+using System.Collections.Generic;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Globalization;
+
+namespace ICSharpCode.Core.WinForms
+{
+	/// <summary>
+	/// Converts objects of different types to array of keys and 
+	/// convert enumerable back to objects of different type
+	/// </summary>
+	public class KeysCollectionConverter : TypeConverter
+	{
+		/// <summary>
+		/// Returns a value indicating whether this converter can convert an object in the 
+		/// specified source type to the native type of the converter.
+		/// </summary>
+		/// <param name="context">Type descriptor context</param>
+		/// <param name="sourceType">Source type</param>
+		/// <returns>Array of keys</returns>
+		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType) {
+			if (sourceType == typeof(string)) {
+				return true;
+			} if (sourceType == typeof(string[])) {
+				return true;
+			}
+			
+			return base.CanConvertFrom(context, sourceType);
+		}
+		
+		/// <summary>
+		/// Returns a value indicating whether this converter can convert a 
+		/// specified object to the specified destination type.
+		/// </summary>
+		/// <param name="context">An ITypeDescriptorContext that provides a format context, which can be used to extract additional information about the environment this converter is being invoked from. This parameter or properties of this parameter can be a null reference</param>
+		/// <param name="destinationType">Convertion destination type</param>
+		/// <returns>Destination object</returns>
+		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType) {
+			if (destinationType == typeof(string) || destinationType == typeof(string[])) {
+				return true;
+			}
+			
+			return base.CanConvertTo(context, destinationType);
+		}
+
+		/// <summary>
+		/// Convert from source object to array of keys
+		/// </summary>
+		/// <param name="context">An ITypeDescriptorContext that provides a format context, which can be used to extract additional information about the environment this converter is being invoked from. This parameter or properties of this parameter can be a null reference </param>
+		/// <param name="culture">Locale information which can influence convertion</param>
+		/// <param name="value">Array of Keys</param>
+		/// <returns></returns>
+		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value) {
+			if(value is string || value is string[]) {
+				var gestures = new List<Keys>();
+				
+				string[] serializedGestures;
+				if(value is string) {
+					serializedGestures = Regex.Split((string)value, @"\s*\|\s*");
+				} else {
+					serializedGestures = (string[])value;
+				}
+				
+				foreach(var serializedGesture in serializedGestures) {
+					if(string.IsNullOrEmpty(serializedGesture)) continue;
+					
+					gestures.Add((Keys)new KeysConverter().ConvertFromInvariantString(serializedGesture));
+				}
+				
+				return gestures.ToArray();
+			}
+			
+			return base.ConvertFrom(context, culture, value);
+		}
+		
+		/// <summary>
+		/// Converts array of keys to the specified destination type
+		/// </summary>
+		/// <param name="context">An ITypeDescriptorContext that provides a format context, which can be used to extract additional information about the environment this converter is being invoked from. This parameter or properties of this parameter can be a null reference </param>
+		/// <param name="culture">Locale information which can influence convertion</param>
+		/// <param name="value">Array of keys</param>
+		/// <param name="destinationType">Convertion destination type</param>
+		/// <returns></returns>
+		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType) {  
+			if(destinationType == typeof(string) || destinationType == typeof(string[]))
+			{
+				if(value == null) return null;
+			
+				var keysCollection = (IEnumerable<Keys>)value;
+				var serializedKeysCollection = new List<string>();
+				
+				foreach(var gesture in keysCollection) {
+					var serializedGesture = new KeysConverter().ConvertToInvariantString(gesture);
+					serializedKeysCollection.Add(serializedGesture);
+				}
+				
+				if(destinationType == typeof(string[])) {
+					return serializedKeysCollection.ToArray();
+				} else if(destinationType == typeof(string)) {
+					var sb = new StringBuilder();
+					foreach(var serializedGesture in serializedKeysCollection) {
+						sb.AppendFormat("{0} | ", serializedGesture);
+					}
+					
+					return sb.Length >= 3 ? sb.ToString(0, sb.Length - 3) : sb.ToString();
+				}
+			}
+			return base.ConvertTo(context, culture, value, destinationType);
+		}
+	}
+}
diff --git a/src/Main/ICSharpCode.Core.WinForms/ICSharpCode.Core.WinForms.csproj b/src/Main/ICSharpCode.Core.WinForms/ICSharpCode.Core.WinForms.csproj
index 852cea5228..54a99d7583 100644
--- a/src/Main/ICSharpCode.Core.WinForms/ICSharpCode.Core.WinForms.csproj
+++ b/src/Main/ICSharpCode.Core.WinForms/ICSharpCode.Core.WinForms.csproj
@@ -50,6 +50,7 @@
     <Compile Include="..\GlobalAssemblyInfo.cs">
       <Link>Properties\GlobalAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="CommandsService\KeysCollectionConverter.cs" />
     <Compile Include="Menu\IStatusUpdate.cs" />
     <Compile Include="Menu\ISubmenuBuilder.cs" />
     <Compile Include="Menu\Menu.cs" />
@@ -85,6 +86,7 @@
     </ProjectReference>
     <Folder Include="Menu" />
     <Folder Include="MessageService" />
+    <Folder Include="CommandsService" />
     <Folder Include="ToolBar" />
     <Folder Include="Util" />
   </ItemGroup>
diff --git a/src/Main/ICSharpCode.Core.WinForms/Menu/MenuCommand.cs b/src/Main/ICSharpCode.Core.WinForms/Menu/MenuCommand.cs
index 89178ff943..50574728b2 100644
--- a/src/Main/ICSharpCode.Core.WinForms/Menu/MenuCommand.cs
+++ b/src/Main/ICSharpCode.Core.WinForms/Menu/MenuCommand.cs
@@ -75,22 +75,6 @@ namespace ICSharpCode.Core.WinForms
 			
 		}
 		
-		public static Keys ParseShortcut(string shortcutString)
-		{
-			Keys shortCut = Keys.None;
-			if (shortcutString.Length > 0) {
-				try {
-					foreach (string key in shortcutString.Split('|')) {
-						shortCut  |= (System.Windows.Forms.Keys)Enum.Parse(typeof(System.Windows.Forms.Keys), key);
-					}
-				} catch (Exception ex) {
-					MessageService.ShowException(ex);
-					return System.Windows.Forms.Keys.None;
-				}
-			}
-			return shortCut;
-		}
-		
 		public MenuCommand(Codon codon, object caller, bool createCommand)
 		{
 			this.RightToLeft = RightToLeft.Inherit;
@@ -102,10 +86,17 @@ namespace ICSharpCode.Core.WinForms
 			}
 			
 			UpdateText();
-			if (codon.Properties.Contains("shortcut")) {
-				ShortcutKeys =  ParseShortcut(codon.Properties["shortcut"]);
+			
+			// GesturePlaceHolderRegistry.RegisterPlaceHolder(codon.Properties["class"], StringParser.Parse(codon.Properties["label"]));
+			// GesturePlaceHolderRegistry.RegisterUpdateHandler(codon.Properties["class"], delegate {
+			//                                                           	ShortcutKeys = GesturePlaceHolderRegistry.GetGestures(codon.Properties["class"])[0];
+			//                                            });
+			// GesturePlaceHolderRegistry.InvokeUpdateHandlers(codon.Properties["class"]);
+			
+			// if (codon.Properties.Contains("shortcut")) {
+			// 	GesturePlaceHolderRegistry.InvokeUpdateHandlers(codon.Properties["class"]);
+			// }
 			}
-		}
 		
 		public MenuCommand(string label, EventHandler handler) : this(label)
 		{
diff --git a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Configuration/AssemblyInfo.cs b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Configuration/AssemblyInfo.cs
index c6a53d6d6b..0610951deb 100644
--- a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Configuration/AssemblyInfo.cs
+++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Configuration/AssemblyInfo.cs
@@ -20,4 +20,3 @@ using System.Security.Permissions;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-[assembly: SecurityPermission(SecurityAction.RequestMinimum, Unrestricted=true)]