diff --git a/src/AddIns/Misc/HtmlHelp2/Project/Resources/ClosedBook.png b/src/AddIns/Misc/HtmlHelp2/Project/ClosedBook.png
similarity index 100%
rename from src/AddIns/Misc/HtmlHelp2/Project/Resources/ClosedBook.png
rename to src/AddIns/Misc/HtmlHelp2/Project/ClosedBook.png
diff --git a/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.DynamicHelp.addin b/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.DynamicHelp.addin
new file mode 100644
index 0000000000..88ecc5a04b
--- /dev/null
+++ b/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.DynamicHelp.addin
@@ -0,0 +1,28 @@
+<AddIn name        = "Help 2.0 Environment for SharpDevelop"
+       author      = "Mathias Simmack"
+       copyright   = "Copyright (c) 2005"
+       url         = "unknown"
+       description = "integrates Microsoft's Help 2.0 Environment"
+       version     = "2.0.0.3">
+
+	<Runtime>
+		<Import assembly="HtmlHelp2.dll"/>
+	</Runtime>
+
+	<Path name = "/SharpDevelop/Workbench/Pads">
+		<Pad id       = "DynamicHelpPad"
+		     category = "Help2"
+		     title    = "${res:AddIns.HtmlHelp2.DynamicHelp}"
+		     icon     = "HtmlHelp2.16x16.DynamicHelp"
+		     class    = "HtmlHelp2.HtmlHelp2DynamicHelpPad"/>
+	</Path>
+
+	<Path name = "/SharpDevelop/Workbench/MainMenu/Help">
+		<MenuItem id           = "DynamicHelpPadCommand"
+			      insertbefore = "TocPadCommand"
+			      label        = "${res:AddIns.HtmlHelp2.DynamicHelp}"
+			      icon         = "HtmlHelp2.16x16.DynamicHelp"
+			      shortcut     = "Control|F1"
+			      class        = "HtmlHelp2.ShowDynamicHelpMenuCommand"/>
+	</Path>
+</AddIn>
diff --git a/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.addin b/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.addin
index dd74a45361..406ae9af06 100644
--- a/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.addin
+++ b/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.addin
@@ -12,17 +12,12 @@
 	<Path name = "/SharpDevelop/Views/Browser/SchemeExtensions">
 		<BrowserSchemeExtension id    = "ms-help" class = "HtmlHelp2.BrowserScheme"/>
 	</Path>
-	
+
 	<Path name = "/SharpDevelop/Services/HelpProvider">
 		<Class id = "HtmlHelp2" class = "HtmlHelp2.MsHelpProvider"/>
 	</Path>
-	
+
 	<Path name = "/SharpDevelop/Workbench/Pads">
-		<!--<Pad id       = "DynamicHelpPad"
-		     category = "Help2"
-		     title    = "${res:AddIns.HtmlHelp2.DynamicHelp}"
-		     icon     = "HtmlHelp2.16x16.DynamicHelp"
-		     class    = "HtmlHelp2.HtmlHelp2DynamicHelpPad"/>-->
 		<Pad id       = "TocPad"
 		     category = "Help2"
 		     title    = "${res:AddIns.HtmlHelp2.Contents}"
@@ -38,11 +33,6 @@
 		     title    = "${res:AddIns.HtmlHelp2.Search}"
 		     icon     = "HtmlHelp2.16x16.Search"
 		     class    = "HtmlHelp2.HtmlHelp2SearchPad"/>
-		<!--<Pad id       = "FavoritesPad"
-		     category = "Help2"
-		     title    = "${res:AddIns.HtmlHelp2.Favorites}"
-		     icon     = "HtmlHelp2.16x16.Favorites"
-		     class    = "HtmlHelp2.HtmlHelp2FavoritesPad"/>-->
 		<Pad id       = "IndexResultsPad"
 		     category = "Help2"
 		     title    = "${res:AddIns.HtmlHelp2.IndexResults}"
@@ -57,12 +47,6 @@
 	</Path>
 	
 	<Path name = "/SharpDevelop/Workbench/MainMenu/Help">
-		<!--<MenuItem id           = "DynamicHelpPadCommand"
-			      insertafter  = "Separator1"
-			      label        = "${res:AddIns.HtmlHelp2.DynamicHelp}"
-			      icon         = "HtmlHelp2.16x16.DynamicHelp"
-			      shortcut     = "Control|F1"
-			      class        = "HtmlHelp2.ShowDynamicHelpMenuCommand"/> -->
 		<MenuItem id           = "TocPadCommand"
 		          insertafter  = "Separator1"
 		          label        = "${res:AddIns.HtmlHelp2.Contents}"
@@ -81,15 +65,6 @@
 		          shortcut     = "Control|Alt|F3"
 		          class        = "HtmlHelp2.ShowSearchMenuCommand"
 		          insertafter  = "IndexPadCommand"/>
-		<!--<MenuItem id           = "FavoritesPadCommand"
-		          label        = "${res:AddIns.HtmlHelp2.Favorites}"
-		          icon         = "HtmlHelp2.16x16.Favorites"
-		          shortcut     = "Control|Alt|F"
-		          class        = "HtmlHelp2.ShowFavoritesMenuCommand"
-		          insertafter  = "SearchPadCommand"/>
-		<MenuItem id           = "HtmlHelp2Separator1"
-		          type         = "Separator"
-		          insertafter  = "FavoritesPadCommand"/>-->
 		<MenuItem id           = "IndexResultsPadCommand"
 		          label        = "${res:AddIns.HtmlHelp2.IndexResults}"
 		          icon         = "HtmlHelp2.16x16.IndexResults"
diff --git a/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.csproj b/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.csproj
index 9a481690b1..1195a9b3cb 100644
--- a/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.csproj
+++ b/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.csproj
@@ -6,7 +6,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{918487B7-2153-4618-BBB3-344DBDDF2A2A}</ProjectGuid>
-    <ProductVersion>8.0.50630</ProductVersion>
+    <ProductVersion>8.0.50215</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -45,7 +45,9 @@
     <Compile Include="src\BaseControls\TocPad.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <None Include="src\BaseControls\DynamicHelpPad.cs" />
+    <Compile Include="src\BaseControls\DynamicHelpPad.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
     <None Include="src\BaseControls\FavoritesPad.cs" />
     <Compile Include="src\BaseControls\IndexPad.cs">
       <SubType>UserControl</SubType>
@@ -69,14 +71,12 @@
     <Compile Include="src\Service\AxMSHelpControls.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="src\Service\HtmlHelp2Options.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="src\Service\HtmlHelp2Options.cs" />
     <Compile Include="Configuration\AssemblyInfo.cs" />
-    <EmbeddedResource Include="Resources\Favorites.16x16.Delete.bmp" />
-    <EmbeddedResource Include="Resources\Favorites.16x16.MoveDown.bmp" />
-    <EmbeddedResource Include="Resources\Favorites.16x16.MoveUp.bmp" />
-    <EmbeddedResource Include="Resources\Favorites.16x16.Rename.bmp" />
+    <None Include="Resources\Favorites.16x16.Delete.bmp" />
+    <None Include="Resources\Favorites.16x16.MoveDown.bmp" />
+    <None Include="Resources\Favorites.16x16.MoveUp.bmp" />
+    <None Include="Resources\Favorites.16x16.Rename.bmp" />
     <EmbeddedResource Include="Resources\HtmlHelp2Options.xfrm" />
     <EmbeddedResource Include="Resources\HtmlHelp2.16x16.TextZoom.png" />
     <EmbeddedResource Include="Resources\HtmlHelp2.16x16.AddToFavorites.png" />
@@ -87,15 +87,8 @@
     <EmbeddedResource Include="Resources\HtmlHelp2.16x16.Search.png" />
     <EmbeddedResource Include="Resources\HtmlHelp2.16x16.Toc.png" />
     <EmbeddedResource Include="Resources\HtmlHelp2.16x16.Index.png" />
-    <None Include="Resources\OpenBook.png">
-      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-    </None>
-    <None Include="Resources\ClosedBook.png">
-      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-    </None>
-    <None Include="Resources\context.html">
-      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-    </None>
+    <Compile Include="src\Service\SharpDevLanguageClass.cs" />
+    <None Include="HtmlHelp2.DynamicHelp.addin" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
@@ -108,6 +101,15 @@
       <Name>ICSharpCode.Core</Name>
       <Private>False</Private>
     </ProjectReference>
+    <Content Include="ClosedBook.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="context.html">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="OpenBook.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
 </Project>
\ No newline at end of file
diff --git a/src/AddIns/Misc/HtmlHelp2/Project/Resources/OpenBook.png b/src/AddIns/Misc/HtmlHelp2/Project/OpenBook.png
similarity index 100%
rename from src/AddIns/Misc/HtmlHelp2/Project/Resources/OpenBook.png
rename to src/AddIns/Misc/HtmlHelp2/Project/OpenBook.png
diff --git a/src/AddIns/Misc/HtmlHelp2/Project/Resources/DynamicHelpDefaultEntries.xml b/src/AddIns/Misc/HtmlHelp2/Project/Resources/DynamicHelpDefaultEntries.xml
deleted file mode 100644
index 8dea93af7e..0000000000
--- a/src/AddIns/Misc/HtmlHelp2/Project/Resources/DynamicHelpDefaultEntries.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<defaultentries>
-	<section name="Web Resources">
-		<url name="SharpDevelop Homepage"><![CDATA[http://sharpdevelop.net/OpenSource/SD/]]></url>
-		<url name="SharpDevelop Wiki"><![CDATA[http://wiki.sharpdevelop.net/]]></url>
-		<url name="SharpDevelop Community"><![CDATA[http://community.sharpdevelop.net/]]></url>
-	</section>
-</defaultentries>
-
-
-
diff --git a/src/AddIns/Misc/HtmlHelp2/Project/Resources/context.html b/src/AddIns/Misc/HtmlHelp2/Project/context.html
similarity index 100%
rename from src/AddIns/Misc/HtmlHelp2/Project/Resources/context.html
rename to src/AddIns/Misc/HtmlHelp2/Project/context.html
diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/DynamicHelpPad.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/DynamicHelpPad.cs
index f96379b432..0b1fe2f27b 100644
--- a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/DynamicHelpPad.cs
+++ b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/DynamicHelpPad.cs
@@ -84,21 +84,17 @@ namespace HtmlHelp2
 					helpResults   = (this.CallDynamicHelp(currentHelpTerm, false) || helpResults);
 				}
 			}
-//			if(!helpResults)
-//			{
-				foreach(string currentHelpTerm in this.dynamicHelpTerms)
+			foreach(string currentHelpTerm in this.dynamicHelpTerms)
+			{
+				if(currentHelpTerm.StartsWith("!"))
 				{
-					if(currentHelpTerm.StartsWith("!"))
-					{
-						helpResults   = (this.CallDynamicHelp(currentHelpTerm.Substring(1), true) || helpResults);
-					}
+					helpResults   = (this.CallDynamicHelp(currentHelpTerm.Substring(1), true) || helpResults);
 				}
-//			}
+			}
 			if(!helpResults)
 			{
 				dynamicHelpBrowser.BuildANothing();
 			}
-//			dynamicHelpBrowser.BuildDefaultHelpEntries();
 			Cursor.Current        = Cursors.Default;
 
 			this.debugPreElement += String.Format("<br>Current project language: {0}",
@@ -420,7 +416,6 @@ namespace HtmlHelp2
 		{
 			this.LoadDynamicHelpPage();
 			this.RemoveAllChildren();
-			this.BuildDefaultHelpEntries();
 		}
 		#endregion
 
@@ -618,7 +613,6 @@ namespace HtmlHelp2
 			catch {}
 		}
 
-
 		public void RemoveAllChildren()
 		{
 			try
@@ -628,30 +622,6 @@ namespace HtmlHelp2
 			}
 			catch {}
 		}
-
-		public void BuildDefaultHelpEntries()
-		{
-			try
-			{
-				XmlDocument xmldoc   = new XmlDocument();
-				xmldoc.Load(String.Format("{0}\\DynamicHelpDefaultEntries.xml",
-				                          Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)));
-
-				XmlNodeList sectionNodes = xmldoc.SelectNodes("/defaultentries/section[@name]");
-				foreach(XmlNode sectionNode in sectionNodes)
-				{
-					XmlNodeList urlNodes = sectionNode.SelectNodes("url[@name and text()!=\"\"]");
-					foreach(XmlNode urlNode in urlNodes)
-					{
-						string sectionName = sectionNode.Attributes.GetNamedItem("name").InnerText;
-						string url         = urlNode.InnerText;
-						string id          = urlNode.Attributes.GetNamedItem("name").InnerText;
-						this.BuildNewChild(StringParser.Parse(sectionName), id, url);
-					}
-				}
-			}
-			catch { /* I don't care about the results */ }			
-		}
 		#endregion
 
 		#region DebugInfo