diff --git a/src/AddIns/BackendBindings/Boo/BooBinding/Project/PostBuildEvent.proj b/src/AddIns/BackendBindings/Boo/BooBinding/Project/PostBuildEvent.proj
index e508de3598..a585d08204 100644
--- a/src/AddIns/BackendBindings/Boo/BooBinding/Project/PostBuildEvent.proj
+++ b/src/AddIns/BackendBindings/Boo/BooBinding/Project/PostBuildEvent.proj
@@ -6,6 +6,7 @@
 		<MyCopyItem Include="$(MSBuildProjectDirectory)\..\..\RequiredLibraries\booc.*" />
 		<MyCopyItem Include="$(MSBuildProjectDirectory)\..\..\RequiredLibraries\*.targets" />
 		<MyCopyItem Include="$(MSBuildProjectDirectory)\..\..\RequiredLibraries\Boo.Microsoft.Build.Tasks.dll" />
+		<MyCopyItem Include="$(MSBuildProjectDirectory)\..\..\RequiredLibraries\Boo.Lang.Extensions.dll" />
 	</ItemGroup>
 	<Target Name="MyPostBuildTarget">
 		<Copy SourceFiles="@(MyCopyItem)" DestinationFolder="$(OutputPath)" />
diff --git a/src/AddIns/BackendBindings/Boo/BooBinding/Project/Resources/BuildOptions.xfrm b/src/AddIns/BackendBindings/Boo/BooBinding/Project/Resources/BuildOptions.xfrm
index fac73231be..9cb131e401 100644
--- a/src/AddIns/BackendBindings/Boo/BooBinding/Project/Resources/BuildOptions.xfrm
+++ b/src/AddIns/BackendBindings/Boo/BooBinding/Project/Resources/BuildOptions.xfrm
@@ -40,7 +40,6 @@
             <Location value="{X=6,Y=16}" />
             <Text value="${res:Dialog.ProjectOptions.BuildOptions.ConditionalSymbols}" />
             <Anchor value="Top, Left, Right" />
-            <Visible value="False" />
             <TextAlign value="BottomLeft" />
             <Size value="{Width=492, Height=16}" />
             <TabIndex value="0" />
@@ -49,7 +48,6 @@
             <Name value="conditionalSymbolsTextBox" />
             <TabIndex value="1" />
             <Size value="{Width=492, Height=21}" />
-            <Visible value="False" />
             <Location value="{X=6,Y=36}" />
             <Anchor value="Top, Left, Right" />
           </System.Windows.Forms.TextBox>
diff --git a/src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/BuildOptions.cs b/src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/BuildOptions.cs
index aba3e923ea..8728d4b3aa 100644
--- a/src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/BuildOptions.cs
+++ b/src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/BuildOptions.cs
@@ -22,12 +22,10 @@ namespace Grunwald.BooBinding
 			//InitXmlDoc();
 			InitDebugInfo();
 			
-			//ConfigurationGuiBinding b;
-			
-			//b = helper.BindString("conditionalSymbolsTextBox", "DefineConstants");
-			//b.TreatPropertyValueAsLiteral = false;
-			//b.DefaultLocation = PropertyStorageLocations.ConfigurationSpecific;
-			//b.CreateLocationButton("conditionalSymbolsTextBox");
+			ConfigurationGuiBinding b;
+			b = helper.BindString("conditionalSymbolsTextBox", "DefineConstants", TextBoxEditMode.EditRawProperty);
+			b.DefaultLocation = PropertyStorageLocations.ConfigurationSpecific;
+			b.CreateLocationButton("conditionalSymbolsTextBox");
 			
 			helper.BindBoolean("noCorlibCheckBox", "NoStdLib", false).CreateLocationButton("noCorlibCheckBox");
 			helper.BindBoolean("duckyCheckBox", "Ducky", false).CreateLocationButton("duckyCheckBox");
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/NewProjectDialog.cs b/src/Main/Base/Project/Src/Gui/Dialogs/NewProjectDialog.cs
index 7fc6d5a92f..e39b16f906 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/NewProjectDialog.cs
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/NewProjectDialog.cs
@@ -95,10 +95,12 @@ namespace ICSharpCode.SharpDevelop.Project.Dialogs
 			InsertCategories(null, categories);
 			categoryTreeView.TreeViewNodeSorter = new TemplateCategoryComparer();
 			categoryTreeView.Sort();
+			string initialSelectedCategory = StringParser.Parse("C#\\${res:Templates.File.Categories.WindowsApplications}");
 			TreeViewHelper.ApplyViewStateString(PropertyService.Get("Dialogs.NewProjectDialog.CategoryTreeState", ""), categoryTreeView);
-			categoryTreeView.SelectedNode = TreeViewHelper.GetNodeByPath(categoryTreeView, PropertyService.Get("Dialogs.NewProjectDialog.LastSelectedCategory", "C#"));
+			categoryTreeView.SelectedNode = TreeViewHelper.GetNodeByPath(categoryTreeView, PropertyService.Get("Dialogs.NewProjectDialog.LastSelectedCategory", initialSelectedCategory));
 		}
 		
+		
 		void InsertCategories(TreeNode node, IEnumerable<Category> catarray)
 		{
 			foreach (Category cat in catarray) {
@@ -336,9 +338,12 @@ namespace ICSharpCode.SharpDevelop.Project.Dialogs
 					return;
 				}
 				if (createNewSolution) {
-					ProjectService.LoadSolution(NewSolutionLocation);
+					ProjectService.BeforeLoadSolution();
 				}
 				item.Template.RunOpenActions(cinfo);
+				if (createNewSolution) {
+					ProjectService.LoadSolution(NewSolutionLocation);
+				}
 				
 				NewProjectLocation = cinfo.createdProjects.Count > 0 ? cinfo.createdProjects[0].FileName : "";
 				DialogResult = DialogResult.OK;
diff --git a/src/Main/Base/Project/Src/Project/CompilableProject.cs b/src/Main/Base/Project/Src/Project/CompilableProject.cs
index 359e2c50ce..695b625342 100644
--- a/src/Main/Base/Project/Src/Project/CompilableProject.cs
+++ b/src/Main/Base/Project/Src/Project/CompilableProject.cs
@@ -431,6 +431,7 @@ namespace ICSharpCode.SharpDevelop.Project
 					CompilableProject cp = p as CompilableProject;
 					if (cp != null && cp.TargetFrameworkVersion == "v3.5") {
 						cp.AddDotnet35References();
+						cp.Save();
 					}
 				}
 			}
diff --git a/src/Main/Base/Project/Src/Services/ProjectService/ProjectService.cs b/src/Main/Base/Project/Src/Services/ProjectService/ProjectService.cs
index 0627ca4780..83512e932d 100644
--- a/src/Main/Base/Project/Src/Services/ProjectService/ProjectService.cs
+++ b/src/Main/Base/Project/Src/Services/ProjectService/ProjectService.cs
@@ -232,7 +232,7 @@ namespace ICSharpCode.SharpDevelop.Project
 			}
 		}
 		
-		static void BeforeLoadSolution()
+		internal static void BeforeLoadSolution()
 		{
 			if (openSolution != null) {
 				SaveSolutionPreferences();