diff --git a/doc/SharpDevelopInfoResources.txt b/doc/SharpDevelopInfoResources.txt
index 58e3b42204..8acc7ac723 100644
--- a/doc/SharpDevelopInfoResources.txt
+++ b/doc/SharpDevelopInfoResources.txt
@@ -26,3 +26,6 @@ http://wiki.sharpdevelop.net/FeaturesWeSolicitHelpFor.ashx
 
 http://wiki.sharpdevelop.net/Wishlist.ashx
 
+++ TECH NOTES ++
+https://www.github.com/icsharpcode/SharpDevelop/tree/master/doc/technotes/
+(doc/technotes/ in source code download)
diff --git a/src/AddIns/Analysis/UnitTesting/UnitTesting.csproj b/src/AddIns/Analysis/UnitTesting/UnitTesting.csproj
index 24a0416b98..83b58e16b4 100644
--- a/src/AddIns/Analysis/UnitTesting/UnitTesting.csproj
+++ b/src/AddIns/Analysis/UnitTesting/UnitTesting.csproj
@@ -38,6 +38,7 @@
   <ItemGroup>
     <Reference Include="nunit.framework">
       <HintPath>..\..\..\Tools\NUnit\nunit.framework.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="PresentationCore">
       <RequiredTargetFramework>3.0</RequiredTargetFramework>
@@ -57,11 +58,6 @@
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
     </Reference>
-    <Reference Include="nunit.uikit">
-      <HintPath>..\..\..\Tools\NUnit\lib\nunit.uikit.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj
index cefb638143..4badfa23d5 100644
--- a/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj
+++ b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj
@@ -180,14 +180,17 @@
     <ProjectReference Include="..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj">
       <Project>{53DCA265-3C3C-42F9-B647-F72BA678122B}</Project>
       <Name>ICSharpCode.NRefactory.CSharp</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
       <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
       <Name>ICSharpCode.NRefactory</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Libraries\SharpTreeView\ICSharpCode.TreeView\ICSharpCode.TreeView.csproj">
       <Project>{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}</Project>
       <Name>ICSharpCode.TreeView</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
       <Project>{2748AD25-9C63-4E12-877B-4DCE96FBED54}</Project>
diff --git a/src/AddIns/Debugger/Debugger.Core/Debugger.Core.csproj b/src/AddIns/Debugger/Debugger.Core/Debugger.Core.csproj
index bb4ee6d80c..6e70907bf1 100644
--- a/src/AddIns/Debugger/Debugger.Core/Debugger.Core.csproj
+++ b/src/AddIns/Debugger/Debugger.Core/Debugger.Core.csproj
@@ -136,10 +136,12 @@
     <ProjectReference Include="..\..\..\Libraries\Mono.Cecil\Mono.Cecil.csproj">
       <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
       <Name>Mono.Cecil</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
       <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
       <Name>ICSharpCode.NRefactory</Name>
+      <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj b/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj
index 28a49522bc..720479b1f6 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj
+++ b/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj
@@ -202,6 +202,7 @@
     <ProjectReference Include="..\..\..\..\Libraries\NRefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
       <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
       <Name>ICSharpCode.NRefactory</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
       <Project>{2748AD25-9C63-4E12-877B-4DCE96FBED54}</Project>
diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
index 7f65ae8d41..69cd2fee8c 100755
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
@@ -1869,10 +1869,6 @@
 			<MenuItem id    = "ViewReadme"
 			          label = "${res:XML.MainMenu.HelpMenu.ReadMe}"
 			          link  = "home://doc/ReadMe.rtf" />
-			<MenuItem id    = "ViewStyleguide"
-			          label = "${res:XML.MainMenu.HelpMenu.StyleGuide}"
-			          link  = "home://doc/technotes/CodingStyleGuide.rtf" />
-			<MenuItem id = "Separator2" type = "Separator" />
 			<MenuItem id = "Web" label = "${res:XML.MainMenu.HelpMenu.WebMenu}" type="Menu">
 				<MenuItem id = "SharpDevelop" label = "SharpDevelop" type="Menu">
 					<MenuItem id = "Downloads" label = "Downloads" icon = "Icons.16x16.WebSearchIcon" link = "http://www.sharpdevelop.net/OpenSource/SD/Download/" />
@@ -1899,7 +1895,7 @@
 					<MenuItem id = "DotGNU" label = "DotGNU" icon = "Icons.16x16.WebSearchIcon" link = "http://www.dotgnu.org" />
 				</MenuItem>
 			</MenuItem>
-			<MenuItem id = "Separator3" type = "Separator" />
+			<MenuItem id = "Separator2" type = "Separator" />
 			<MenuItem id = "About"
 			          label = "${res:XML.MainMenu.HelpMenu.About}"
 			          icon = "Icons.16x16.AboutIcon"
diff --git a/src/Main/Base/Project/Src/Internal/Templates/Project/ProjectDescriptor.cs b/src/Main/Base/Project/Src/Internal/Templates/Project/ProjectDescriptor.cs
index e6291fe94a..e23625016a 100644
--- a/src/Main/Base/Project/Src/Internal/Templates/Project/ProjectDescriptor.cs
+++ b/src/Main/Base/Project/Src/Internal/Templates/Project/ProjectDescriptor.cs
@@ -179,7 +179,7 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates
 						#endif
 						return project => {
 							#if !DEBUG
-							ICommand command = (ICommand)AddInTree.BuildItem(path, null);
+							ICommand command = (ICommand)SD.AddInTree.BuildItem(path, null);
 							#endif
 							if (command != null) {
 								command.Owner = project;
diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs
index b1d3d3c5ab..1b5990ed15 100644
--- a/src/Setup/Files.wxs
+++ b/src/Setup/Files.wxs
@@ -495,23 +495,6 @@
 								<File Source="..\..\doc\readme.rtf" Name="readme.rtf" Id="readme.rtf" />
 								<File Source="..\..\doc\SharpDevelopInfoResources.txt" Id="SharpDevelopInfoResources.txt" Name="SharpDevelopInfoResources.txt" />
 							</Component>
-							<Directory Id="TechNoteFolder" Name="technotes">
-								<Component Guid="167B7AF9-7267-4AD4-9C47-3373F0329840" Id="SharpDevelopTechNoteFiles" DiskId="1">
-									<File Source="..\..\doc\technotes\Versioning.html" Id="Versioning.html" Name="Versioning.html" />
-									<File Source="..\..\doc\technotes\AddInBuildingGuide.rtf" Id="AddInBuildingGuide.rtf" Name="AddInBuildingGuide.rtf" />
-									<File Source="..\..\doc\technotes\AddInManager.rtf" Id="AddInManager.rtf" Name="AddInManager.rtf" />
-									<File Source="..\..\doc\technotes\AddInTree.rtf" Id="AddInTree.rtf" Name="AddInTree.rtf" />
-									<File Source="..\..\doc\technotes\CodingStyleGuide.rtf" Id="CodingStyleGuide.rtf" Name="CodingStyleGuide.rtf" />
-									<File Source="..\..\doc\technotes\ConditionList.html" Id="ConditionList.html" Name="ConditionList.html" />
-									<File Source="..\..\doc\technotes\DoozerList.html" Id="DoozerList.html" Name="DoozerList.html" />
-									<File Source="..\..\doc\technotes\listing.css" Name="listing.css" Id="listing.css" />
-									<File Source="..\..\doc\technotes\TechicalWritingMadeEasier.rtf" Id="TechicalWritingMadeEasier.rtf" Name="TechicalWritingMadeEasier.rtf" />
-									<File Source="..\..\doc\technotes\TheFineArtOfCommenting.rtf" Id="TheFineArtOfCommenting.rtf" Name="TheFineArtOfCommenting.rtf" />
-								</Component>
-								<Component Guid="B5E6404F-E602-42AA-9C3A-996425AC3B40" Id="AddInWritingHelpWebsiteShortcut" DiskId="1">
-									<File Id="AddInWritingHelp.url" Name="AddIn Writing Help.url" Source="..\..\doc\technotes\AddIn Writing Help.url" KeyPath="yes" />
-								</Component>
-							</Directory>
 						</Directory>
 						<Directory Id="DataFolder" Name="data">
 							<Directory Id="ConversionStyleSheetsFolder" Name="ConversionStyleSheets">
@@ -952,8 +935,8 @@
 							<Component Guid="BD536EB3-6629-4699-9083-673B6175E044" Id="ICSharpCode.SharpDevelop.addin" DiskId="1">
 								<File Source="..\..\AddIns\ICSharpCode.SharpDevelop.addin" Id="ICSharpCode.SharpDevelop.addin" Name="ICSharpCode.SharpDevelop.addin" />
 							</Component>
-							<!--
 							<Directory Id="AnalysisFolder" Name="Analysis">
+								<!--
 								<Directory Id="CodeAnalysisFolder" Name="CodeAnalysis">
 									<Component Guid="6CF33D51-953D-4E5F-840C-7FDCFD757520" Id="CodeAnalysisFiles" DiskId="1">
 										<File Source="..\..\AddIns\Analysis\CodeAnalysis\CodeAnalysis.dll" Id="CodeAnalysis.dll" Name="CodeAnalysis.dll" Assembly=".net" AssemblyApplication="CodeAnalysis.dll" AssemblyManifest="CodeAnalysis.dll" KeyPath="yes" />
@@ -965,13 +948,13 @@
 										<File Source="..\..\AddIns\Analysis\CodeCoverage\CodeCoverage.dll" Id="CodeCoverage.dll" Name="CodeCoverage.dll" Assembly=".net" AssemblyApplication="CodeCoverage.dll" AssemblyManifest="CodeCoverage.dll" KeyPath="yes" />
 										<File Source="..\..\AddIns\Analysis\CodeCoverage\CodeCoverage.addin" Id="CodeCoverage.addin" Name="CodeCoverage.addin" />
 									</Component>
-								</Directory>
+								</Directory>-->
 								<Directory Id="UnitTestingFolder" Name="UnitTesting">
 									<Component Guid="F2F7F12D-1920-49BC-86B0-65B5A1B76516" Id="UnitTestingAddInFiles" DiskId="1">
 										<File Source="..\..\AddIns\Analysis\UnitTesting\UnitTesting.dll" Id="UnitTesting.dll" Name="UnitTesting.dll" Assembly=".net" AssemblyApplication="UnitTesting.dll" AssemblyManifest="UnitTesting.dll" KeyPath="yes" />
 										<File Source="..\..\AddIns\Analysis\UnitTesting\UnitTesting.addin" Id="UnitTesting.addin" Name="UnitTesting.addin" />
 									</Component>
-								</Directory>
+								</Directory><!--
 								<Directory Id="SourceAnalysis" Name="SourceAnalysis">
 									<Component Guid="C9D099BC-CF4D-404A-BB2F-B13D4541DA0F" Id="SharpDevelopSourceAnalysisTargets" DiskId="1">
 										<File Source="..\..\AddIns\Analysis\SourceAnalysis\SharpDevelop.SourceAnalysis.targets" Name="SharpDevelop.SourceAnalysis.targets" Id="SharpDevelop.SourceAnalysis.targets" KeyPath="yes" />
@@ -1029,9 +1012,8 @@
 										<File Id="ICSharpCode.NRefactory.CSharp.dll_CQA" Name="ICSharpCode.NRefactory.CSharp.dll" Source="..\..\AddIns\Analysis\CodeQuality\ICSharpCode.NRefactory.CSharp.dll" />
 										<File Source="..\..\AddIns\Analysis\CodeQuality\CodeQuality.addin" Id="CodeQuality.addin" Name="CodeQuality.addin" />
 									</Component>
-								</Directory>
+								</Directory>-->
 							</Directory>
-							-->
 							<Directory Id="BackendBindingsFolder" Name="BackendBindings">
 								<Directory Id="CSharpBindingFolder" Name="CSharpBinding">
 									<Component Guid="1E6F20EC-6BF4-45C0-AE99-319FBF568BD1" Id="CSharpBindingFiles" DiskId="1">
@@ -1590,7 +1572,6 @@
 								</Directory>
 								-->
 							</Directory>
-							<!--
 							<Directory Id="DebuggerFolder" Name="Debugger">
 								<Component Guid="27C66A5A-0149-45F4-B1AF-C320FE005E6B" Id="DebuggerAddInFiles" DiskId="1">
 									<File Source="..\..\AddIns\Debugger\Debugger.AddIn.addin" Id="Debugger.AddIn.addin" Name="Debugger.AddIn.addin" />
@@ -1598,7 +1579,6 @@
 									<File Source="..\..\AddIns\Debugger\Debugger.Core.dll" Id="Debugger.Core.dll" Name="Debugger.Core.dll" />
 								</Component>
 							</Directory>
-							-->
 							<Directory Id="MiscAddInsFolder" Name="Misc">
 								<Directory Id="AddInManagerFolder" Name="AddInManager">
 									<Component Guid="AA44E205-CCE8-46F3-B84B-D031BDB3570D" Id="AddInManagerSharpZipLibDll" DiskId="1">
diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs
index e09ccf4e9f..dfe34dfc8d 100644
--- a/src/Setup/Setup.wxs
+++ b/src/Setup/Setup.wxs
@@ -199,7 +199,6 @@
 				<ComponentRef Id="MonoCecilDll"/>
 				<ComponentRef Id="AvalonDockDll"/>
 				<ComponentRef Id="ICSharpCodeCorePresentationDll"/>
-				<ComponentRef Id="SharpDevelopTechNoteFiles"/>
 				<ComponentRef Id="SharpDevelopProgramMenuItems"/>
 				<ComponentRef Id="DesktopFolderItems"/>
 				
@@ -365,8 +364,8 @@
 				<ComponentRef Id="AddInScoutFiles"/>
 				<!--<ComponentRef Id="CodeAnalysisFiles"/>
 				<ComponentRef Id="CodeQualityFiles"/>
-				<ComponentRef Id="CodeCoverageFiles"/>
-				<ComponentRef Id="DebuggerAddInFiles"/>-->
+				<ComponentRef Id="CodeCoverageFiles"/>-->
+				<ComponentRef Id="DebuggerAddInFiles"/>
 				<ComponentRef Id="FiletypeIcons"/>
 				<ComponentRef Id="FiletypeRegistererFiles"/>
 				<ComponentRef Id="HtmlHelp2Files"/>
@@ -378,14 +377,13 @@
 				<ComponentRef Id="StartPageAddInFiles"/>
 				<ComponentRef Id="SubversionAddInDll"/>
 				<ComponentRef Id="GitAddInDll"/>
-				<!--<ComponentRef Id="UnitTestingAddInFiles"/>-->
+				<ComponentRef Id="UnitTestingAddInFiles"/>
 				<ComponentRef Id="SyntaxModesFiles"/>
 				<ComponentRef Id="SharpDevelopWebsiteShortcut"/>
 				<ComponentRef Id="SharpDevelopAppPathRegistrySetting"/>
 				<ComponentRef Id="WPFAssemblyInfoTemplate"/>
 				<ComponentRef Id="AddInWritingHelp"/>
 				<ComponentRef Id="CSharpProjectSharpDevelopCustomToolTemplates"/>
-				<ComponentRef Id="AddInWritingHelpWebsiteShortcut"/>
 				<ComponentRef Id="AppConfigFileTemplate"/>
 				<ComponentRef Id="InteropPartCoverDll"/>
 				<ComponentRef Id="PartCoverDll"/>