diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
index f54f1a2d44..5e3a2a3183 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
@@ -42,7 +42,7 @@
     <Compile Include="Src\FormattingStrategy\DocumentAccessor.cs" />
     <Compile Include="Src\FormattingStrategy\Indentation.cs" />
     <Compile Include="Src\OptionPanels\BuildOptions.cs">
-      <SubType>UserControl</SubType>
+      <SubType>Form</SubType>
     </Compile>
     <Compile Include="Src\Parser\ExpressionFinder.cs" />
     <Compile Include="Src\Parser\Parser.cs" />
@@ -73,6 +73,8 @@
       <Name>ICSharpCode.Core</Name>
       <Private>False</Private>
     </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
     <Folder Include="Src\PrettyPrinter\Gui\" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
diff --git a/src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/DesignerGenerator/CodeDOMGenerator.cs b/src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/DesignerGenerator/CodeDOMGenerator.cs
index 583d8650c0..7ae1556973 100644
--- a/src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/DesignerGenerator/CodeDOMGenerator.cs
+++ b/src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/DesignerGenerator/CodeDOMGenerator.cs
@@ -66,15 +66,15 @@ namespace ICSharpCode.FormDesigner
 			CodeGeneratorOptions options = codeDOMGeneratorUtility.CreateCodeGeneratorOptions;
 			options.IndentString = "\t\t\t";
 			
-			ICSharpCode.NRefactory.Parser.CodeDOMVerboseOutputGenerator outputGenerator = new ICSharpCode.NRefactory.Parser.CodeDOMVerboseOutputGenerator();
+//			ICSharpCode.NRefactory.Parser.CodeDOMVerboseOutputGenerator outputGenerator = new ICSharpCode.NRefactory.Parser.CodeDOMVerboseOutputGenerator();
+//			Console.WriteLine("<<<<START.");
 			
-			Console.WriteLine("<<<<START.");
 			foreach (CodeStatement statement in statements) {
 				if (!(statement is CodeVariableDeclarationStatement)) {
 					// indentation isn't generated when calling GenerateCodeFromStatement
 					writer.Write(options.IndentString);
 					try {
-						outputGenerator.PublicGenerateCodeFromStatement(statement, Console.Out, options);
+//						outputGenerator.PublicGenerateCodeFromStatement(statement, Console.Out, options);
 						
 						codeProvider.GenerateCodeFromStatement(statement, writer, options);
 					} catch (Exception e) {
@@ -86,7 +86,7 @@ namespace ICSharpCode.FormDesigner
 			}
 			designerResourceService.SerializationEnded(true);
 			session.Dispose();
-			Console.WriteLine("<<<<END.");
+//			Console.WriteLine("<<<<END.");
 		}
 	}
 }
diff --git a/src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/DesignerLoader/NRefactoryDesignerLoader.cs b/src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/DesignerLoader/NRefactoryDesignerLoader.cs
index b00955dfbd..bbc6a9e1b5 100644
--- a/src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/DesignerLoader/NRefactoryDesignerLoader.cs
+++ b/src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/DesignerLoader/NRefactoryDesignerLoader.cs
@@ -40,9 +40,9 @@ namespace ICSharpCode.FormDesigner
 	
 	public class NRefactoryDesignerLoader : CodeDomDesignerLoader, ICodeDomDesignerReload
 	{
-		bool                  loading               = false;
+		bool                  loading               = true;
 		IDesignerLoaderHost   designerLoaderHost    = null;
-		TypeResolutionService typeResolutionService = new TypeResolutionService();
+		ITypeResolutionService typeResolutionService = null;
 		SupportedLanguages    language;
 		Microsoft.CSharp.CSharpCodeProvider provider = new Microsoft.CSharp.CSharpCodeProvider();
 		
@@ -101,6 +101,20 @@ namespace ICSharpCode.FormDesigner
 		}
 		#endregion
 		
+		public override void BeginLoad(IDesignerLoaderHost host) 
+		{
+			this.loading = true;
+			typeResolutionService = (ITypeResolutionService)host.GetService(typeof(ITypeResolutionService));
+			base.BeginLoad(host);
+		}
+		protected override void OnEndLoad(bool successful, ICollection errors)
+		{
+			this.loading = false;
+			base.OnEndLoad(successful, errors);
+		}
+ 
+
+		
 		protected override CodeCompileUnit Parse()
 		{
 			Console.Write("ParseCompileUnit");
@@ -112,8 +126,9 @@ namespace ICSharpCode.FormDesigner
 			visitor.Visit(p.CompilationUnit, null);
 			
 			// output generated CodeDOM to the console :
-			CodeDOMVerboseOutputGenerator outputGenerator = new CodeDOMVerboseOutputGenerator();
-			outputGenerator.GenerateCodeFromMember(visitor.codeCompileUnit.Namespaces[0].Types[0], Console.Out, null);
+//			CodeDOMVerboseOutputGenerator outputGenerator = new CodeDOMVerboseOutputGenerator();
+//			outputGenerator.GenerateCodeFromMember(visitor.codeCompileUnit.Namespaces[0].Types[0], Console.Out, null);
+			
 //			provider.GenerateCodeFromCompileUnit(visitor.codeCompileUnit, Console.Out, null);
 			
 			return visitor.codeCompileUnit;
diff --git a/src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/FormDesignerViewContent.cs b/src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/FormDesignerViewContent.cs
index ecfeb81402..db4b5b3cc3 100644
--- a/src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/FormDesignerViewContent.cs
+++ b/src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/FormDesignerViewContent.cs
@@ -140,7 +140,7 @@ namespace ICSharpCode.FormDesigner
 			serviceContainer.AddService(typeof(AmbientProperties), ambientProperties);
 			serviceContainer.AddService(typeof(ITypeResolutionService), ToolboxProvider.TypeResolutionService);
 			serviceContainer.AddService(typeof(System.ComponentModel.Design.IDesignerEventService), new DesignerEventService());
-//			serviceContainer.AddService(typeof(System.ComponentModel.Design.IDesignerOptionService), new ICSharpCode.FormDesigner.Services.DesignerOptionService());
+			serviceContainer.AddService(typeof(System.ComponentModel.Design.IDesignerOptionService), new ICSharpCode.FormDesigner.Services.DesignerOptionService());
 			
 			serviceContainer.AddService(typeof(System.ComponentModel.Design.IDesignerOptionService), new System.Windows.Forms.Design.WindowsFormsDesignerOptionService());
 			
@@ -160,6 +160,7 @@ namespace ICSharpCode.FormDesigner
 			designSurface.Flush();
 			
 			generator.Attach(this);
+			Console.WriteLine("!!!!!! END LOAD");
 		}
 		
 		PropertyContainer propertyContainer = new PropertyContainer();
diff --git a/src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/DefaultServiceContainer.cs b/src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/DefaultServiceContainer.cs
index 402927e04b..c33e1210c4 100644
--- a/src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/DefaultServiceContainer.cs
+++ b/src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/DefaultServiceContainer.cs
@@ -98,12 +98,12 @@ namespace ICSharpCode.FormDesigner.Services
 		#region System.IServiceProvider interface implementation
 		public object GetService(System.Type serviceType)
 		{
-//			if (IsServiceMissing(serviceType)) {
-//				Console.WriteLine("request missing service : {0} from Assembly {1} is not aviable.", serviceType, serviceType.Assembly.FullName);
-////				Console.ReadLine();
-//			} else {
-////				Console.WriteLine("get service : {0} from Assembly {1}.", serviceType, serviceType.Assembly.FullName);
-//			}
+			if (IsServiceMissing(serviceType)) {
+				Console.WriteLine("request missing service : {0} from Assembly {1} is not aviable.", serviceType, serviceType.Assembly.FullName);
+//				Console.ReadLine();
+			} else {
+//				Console.WriteLine("get service : {0} from Assembly {1}.", serviceType, serviceType.Assembly.FullName);
+			}
 			return serviceContainer.GetService(serviceType);
 		}
 		#endregion
diff --git a/src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/TypeResolutionService.cs b/src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/TypeResolutionService.cs
index 6b4d7cd2de..a5fd73ec3f 100644
--- a/src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/TypeResolutionService.cs
+++ b/src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/TypeResolutionService.cs
@@ -26,8 +26,7 @@ namespace ICSharpCode.FormDesigner.Services
 		{
 			return Assembly.Load(name);
 		}
-		
-		
+			
 		public string GetPathOfAssembly(AssemblyName name)
 		{
 			Assembly assembly = GetAssembly(name);
diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
index 70cb8f42c5..76685e9d7d 100644
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
@@ -199,7 +199,7 @@
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="Src\Gui\Dialogs\TipOfTheDay.cs">
-      <SubType>UserControl</SubType>
+      <SubType>Form</SubType>
     </Compile>
     <Compile Include="Src\Gui\Dialogs\TreeViewOptions.cs">
       <SubType>Form</SubType>