diff --git a/src/AddIns/Analysis/UnitTesting/Pad/UnitTestNode.cs b/src/AddIns/Analysis/UnitTesting/Pad/UnitTestNode.cs
index 6e313c2e87..1d76c7bf17 100644
--- a/src/AddIns/Analysis/UnitTesting/Pad/UnitTestNode.cs
+++ b/src/AddIns/Analysis/UnitTesting/Pad/UnitTestNode.cs
@@ -15,8 +15,6 @@ namespace ICSharpCode.UnitTesting
 {
 	public class UnitTestNode : ModelCollectionTreeNode
 	{
-		protected static readonly IComparer<SharpTreeNode> NodeTextComparer = KeyComparer.Create((SharpTreeNode n) => n.Text.ToString(), StringComparer.OrdinalIgnoreCase, StringComparer.OrdinalIgnoreCase);
-		
 		readonly ITest test;
 		
 		public UnitTestNode(ITest test)
diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.addin b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.addin
index ff88438cc2..a7594e853d 100644
--- a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.addin
+++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.addin
@@ -72,19 +72,20 @@
 		             class = "ICSharpCode.XamlBinding.Options.CodeCompletion" />
 	</Path>
 	
+	<!-- TODO reimplement as context actions
 	<Path name="/SharpDevelop/Workbench/MainMenu">
 		<ComplexCondition>
 			<And>
 				<Condition name="ActiveContentExtension" activeextension=".xaml" />
-				<Condition name="WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditorProvider" />
+				<Condition name="WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditor" />
 			</And>
 			<MenuItem id="XamlRefactoring" insertafter="Refactor" insertbefore="Project" label="${res:XML.MainMenu.RefactorMenu}" type="Menu">
 				<MenuItem id="RemoveMargin"
 				          class="ICSharpCode.XamlBinding.PowerToys.Commands.RemoveMarginCommand"
 				          label="${res:AddIns.XamlBinding.Menu.RemoveMargin}" />
-				<!--				<MenuItem id="RemoveUnnecessaryAttributes"
+								<MenuItem id="RemoveUnnecessaryAttributes"
 						   class="ICSharpCode.XamlBinding.PowerToys.Commands.RemoveUnnecessaryAttributesCommand"
-						   label="${res:AddIns.XamlBinding.Menu.RemoveUnnecessaryAttributes}" />-->
+						   label="${res:AddIns.XamlBinding.Menu.RemoveUnnecessaryAttributes}" />
 				<MenuItem type="Separator" />
 				<MenuItem id="ExtractPropertiesAsStyle"
 				          class="ICSharpCode.XamlBinding.PowerToys.Commands.ExtractPropertiesAsStyleCommand"
@@ -138,10 +139,11 @@
 				<MenuItem id="EditGridColumnsAndRows"
 				          class="ICSharpCode.XamlBinding.PowerToys.Commands.EditGridColumnsAndRowsCommand"
 				          label="${res:AddIns.XamlBinding.Menu.EditGridColumnsAndRows}" />
-				<!--				<MenuItem id="CreateBusinessForm"
+								<MenuItem id="CreateBusinessForm"
 						   class="ICSharpCode.XamlBinding.PowerToys.Commands.CreateBusinessFormFromClassCommand"
-						   label="${res:AddIns.XamlBinding.Menu.CreateBusinessFormFromClass}" />-->
+						   label="${res:AddIns.XamlBinding.Menu.CreateBusinessFormFromClass}" />
 			</MenuItem>
 		</ComplexCondition>
 	</Path>
+	-->
 </AddIn>
diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.addin b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.addin
index b8d2d83dbf..dd005cc46d 100755
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.addin
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.addin
@@ -44,7 +44,7 @@
 	
 	<!--
 	<Path name = "/SharpDevelop/ViewContent/TextEditor/ContextMenu">
-		<Condition name = "WindowActive" activewindow="ICSharpCode.AvalonEdit.AddIn.ICodeEditorProvider">
+		<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditor">
 			<MenuItem id = "SaveWithEncoding"
 			          label = "${res:XML.MainMenu.FileMenu.SaveWithEncoding}"
 			          insertafter="SaveAs"
@@ -55,7 +55,7 @@
 	-->
 	
 	<Path name = "/SharpDevelop/Workbench/MainMenu/File">
-		<Condition name = "WindowActive" activewindow="ICSharpCode.AvalonEdit.AddIn.ICodeEditorProvider" action="Disable">
+		<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditor" action="Disable">
 			<MenuItem id = "SaveWithEncoding"
 			          label = "${res:XML.MainMenu.FileMenu.SaveWithEncoding}"
 			          insertafter="SaveAs"
@@ -65,7 +65,7 @@
 	</Path>
 	
 	<Path name = "/SharpDevelop/Workbench/MainMenu/Edit/Format">
-		<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditorProvider" action="Disable">
+		<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditor" action="Disable">
 			<MenuItem id = "RemoveLeadingWs"
 			          insertbefore = "Separator4"
 			          label = "${res:XML.MainMenu.EditMenu.FormatMenu.RlWs}"
@@ -126,7 +126,7 @@
 	
 	<Path name = "/SharpDevelop/Workbench/MainMenu/Edit">
 		<MenuItem id = "Folding" label = "${res:XML.MainMenu.EditMenu.FoldingMenu}" type="Menu" insertafter="Format">
-			<Condition name = "WindowActive" activewindow="ICSharpCode.AvalonEdit.AddIn.ICodeEditorProvider" action="Disable">
+			<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditor" action="Disable">
 				<MenuItem id          = "ToggleFolding"
 				          label       = "${res:XML.MainMenu.EditMenu.FoldingMenu.ToggleFolding}"
 				          shortcut    = "Shift|Control|M"
diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
index cdd9bf4c90..1373a70e39 100755
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
@@ -1561,7 +1561,7 @@
 			          type = "Item"
 			          command = "Delete"/>
 			<MenuItem id = "Separator2" type = "Separator"  />
-			<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditorProvider" action="Disable">
+			<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditor" action="Disable">
 				<MenuItem id = "Insert" label = "${res:XML.MainMenu.EditMenu.Insert}" type="Menu">
 					<MenuItem id = "PasteAsComment"
 					          label = "${res:XML.MainMenu.EditMenu.Paste.AsComment}"
@@ -1814,7 +1814,7 @@
 			<MenuItem id = "ToggleBreakpointSeparator" type = "Separator" />
 			<ComplexCondition action="Disable">
 				<And>
-					<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditorProvider"/>
+					<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditor"/>
 					<Condition name = "ActiveViewContentUntitled" activewindowuntitled="False"/>
 				</And>
 				<MenuItem id       = "Toggle Breakpoint"
@@ -1827,7 +1827,7 @@
 		
 		<MenuItem id = "Search" label = "${res:XML.MainMenu.SearchMenu}" type="Menu">
 			<MenuItem id = "SearchSeparator" type = "Separator" />
-			<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditorProvider" action="Disable">
+			<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditor" action="Disable">
 				<MenuItem id = "ToggleBookmark"
 				          label = "${res:XML.MainMenu.SearchMenu.ToggleBookmark}"
 				          shortcut = "Control|M"
@@ -1889,7 +1889,7 @@
 			<Include id = "ToolList" path = "/SharpDevelop/Workbench/Tools" />
 			<MenuItem id = "Separator2" type = "Separator" />
 			
-			<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditorProvider">
+			<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditor">
 				<MenuItem id = "ConvertCode" label = "${res:XML.MainMenu.ToolMenu.ConvertCodeTo}" type="Menu">
 					<Condition name="ActiveContentExtension" activeextension=".vb" action = "Disable">
 						<MenuItem id = "CSharp"
@@ -2063,7 +2063,7 @@
 	
 	<Path name = "/SharpDevelop/Workbench/ToolBar/Standard">
 		<ToolbarItem id = "SearchSeparator" type = "Separator"/>
-		<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditorProvider" action="Disable">
+		<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditor" action="Disable">
 			<ToolbarItem id = "Comment"
 			             icon = "Icons.16x16.CommentRegion"
 			             tooltip = "${res:XML.TextAreaContextMenu.CommentUncommentSelection}"
@@ -2155,7 +2155,7 @@
 	</Path>
 	
 	<Path name = "/SharpDevelop/Pads/BookmarkPad/Toolbar">
-		<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditorProvider" action="Disable">
+		<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditor" action="Disable">
 			<ToolbarItem id = "ToggleBookmark"
 			             tooltip = "${res:XML.MainMenu.SearchMenu.ToggleBookmark}"
 			             icon = "Bookmarks.ToggleMark"
diff --git a/src/Main/Base/Project/Src/Internal/ConditionEvaluators/WindowOpenEvaluator.cs b/src/Main/Base/Project/Src/Internal/ConditionEvaluators/WindowOpenEvaluator.cs
index 032ba3ff9b..6905f6d798 100644
--- a/src/Main/Base/Project/Src/Internal/ConditionEvaluators/WindowOpenEvaluator.cs
+++ b/src/Main/Base/Project/Src/Internal/ConditionEvaluators/WindowOpenEvaluator.cs
@@ -34,7 +34,7 @@ namespace ICSharpCode.SharpDevelop
 			
 			Type openWindowType = Type.GetType(openWindow, false);
 			if (openWindowType == null) {
-				SD.Log.WarnFormatted("WindowActiveCondition: cannot find Type {0}", openWindow);
+				SD.Log.WarnFormatted("WindowOpenCondition: cannot find Type {0}", openWindow);
 				return false;
 			}