diff --git a/data/templates/project/CSharp/WPFApplication.xpt b/data/templates/project/CSharp/WPFApplication.xpt
index ecbd2d5d48..37d67858aa 100644
--- a/data/templates/project/CSharp/WPFApplication.xpt
+++ b/data/templates/project/CSharp/WPFApplication.xpt
@@ -37,13 +37,9 @@
 			<OutputType>WinExe</OutputType>
 		</PropertyGroup>
 		
-		<Imports failureMessage="Please ensure the .NET Framework 3.0 is installed on your machine!">
-			<Import Project="$(MSBuildBinPath)\Microsoft.WinFX.targets" />
-		</Imports>
-		
 		<Files>
 			<File name="App.xaml" buildAction="ApplicationDefinition" language="XML"><![CDATA[<Application x:Class="${StandardNamespace}.App"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns="http://schemas.microsoft.com/netfx/2007/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     StartupUri="Window1.xaml"
     >
@@ -59,28 +55,25 @@ using System.Configuration;
 
 namespace ${StandardNamespace}
 {
-    /// <summary>
-    /// Interaction logic for App.xaml
-    /// </summary>
-
-    public partial class App : Application
-    {
-
-        public App()
-        {
-            InitializeComponent();
-        }
-
-    }
+	/// <summary>
+	/// Interaction logic for App.xaml
+	/// </summary>
+	public partial class App : Application
+	{
+		public App()
+		{
+			InitializeComponent();
+		}
+	}
 }]]></File>
 				<File name="Window1.xaml" buildAction="Page" language="XML"><![CDATA[<Window x:Class="${StandardNamespace}.Window1"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    Title="${StandardNamespace}" Height="300" Width="300"
-    >
-    <Grid>
-        
-    </Grid>
+	xmlns="http://schemas.microsoft.com/netfx/2007/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	Title="${StandardNamespace}" Height="300" Width="300"
+	>
+	<Grid>
+		
+	</Grid>
 </Window>]]></File>
 				<File name="Window1.xaml.cs" SubType="Code" DependentUpon="Window1.xaml"><![CDATA[using System;
 using System.Collections.Generic;
@@ -94,22 +87,18 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 
-
 namespace ${StandardNamespace}
 {
-    /// <summary>
-    /// Interaction logic for Window1.xaml
-    /// </summary>
-
-    public partial class Window1 : Window
-    {
-
-        public Window1()
-        {
-            InitializeComponent();
-        }
-
-    }
+	/// <summary>
+	/// Interaction logic for Window1.xaml
+	/// </summary>
+	public partial class Window1 : Window
+	{
+		public Window1()
+		{
+			InitializeComponent();
+		}
+	}
 }]]></File>
 				<File name="AssemblyInfo.cs" src="WPFAssemblyInfo.cs" />
 		</Files>
diff --git a/data/templates/project/CSharp/WPFNavigationApplication.xpt b/data/templates/project/CSharp/WPFNavigationApplication.xpt
index 6e90ff8ba6..fa2995c582 100644
--- a/data/templates/project/CSharp/WPFNavigationApplication.xpt
+++ b/data/templates/project/CSharp/WPFNavigationApplication.xpt
@@ -36,20 +36,16 @@
 		<PropertyGroup>
 			<OutputType>WinExe</OutputType>
 		</PropertyGroup>
-
-		<Imports failureMessage="Please ensure the .NET Framework 3.0 is installed on your machine!">
-			<Import Project="$(MSBuildBinPath)\Microsoft.WinFX.targets" />
-		</Imports>
 		
 		<Files>
 			<File name="App.xaml" buildAction="ApplicationDefinition" language="XML"><![CDATA[<Application x:Class="${StandardNamespace}.App"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    StartupUri="Page1.xaml"
-    >
-    <Application.Resources>
-         
-    </Application.Resources>
+	xmlns="http://schemas.microsoft.com/netfx/2007/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	StartupUri="Page1.xaml"
+	>
+	<Application.Resources>
+		
+	</Application.Resources>
 </Application>]]></File>
 				<File name="App.xaml.cs" SubType="Code" DependentUpon="App.xaml"><![CDATA[using System;
 using System.Windows;
@@ -59,28 +55,25 @@ using System.Configuration;
 
 namespace ${StandardNamespace}
 {
-    /// <summary>
-    /// Interaction logic for App.xaml
-    /// </summary>
-
-    public partial class App : Application
-    {
-
-        public App()
-        {
-            InitializeComponent();
-        }
-
-    }
+	/// <summary>
+	/// Interaction logic for App.xaml
+	/// </summary>
+	public partial class App : Application
+	{
+		public App()
+		{
+			InitializeComponent();
+		}
+	}
 }]]></File>
 				<File name="Page1.xaml" language="XML" buildAction="Page"><![CDATA[<Page x:Class="${StandardNamespace}.Page1"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    Title="Page1"
-    >
-    <StackPanel>
-        
-    </StackPanel>
+	xmlns="http://schemas.microsoft.com/netfx/2007/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	Title="Page1"
+	>
+	<Grid>
+		
+	</Grid>
 </Page>]]></File>
 				<File name="Page1.xaml.cs" language="C#" DependentUpon="Page1.xaml" SubType="Code"><![CDATA[using System;
 using System.Collections.Generic;
@@ -97,18 +90,16 @@ using System.Windows.Shapes;
 
 namespace ${StandardNamespace}
 {
-    /// <summary>
-    /// Interaction logic for Page1.xaml
-    /// </summary>
-
-    public partial class Page1 : Page
-    {
-        public Page1()
-        {
-            InitializeComponent();
-        }
-
-    }
+	/// <summary>
+	/// Interaction logic for Page1.xaml
+	/// </summary>
+	public partial class Page1 : Page
+	{
+		public Page1()
+		{
+			InitializeComponent();
+		}
+	}
 }]]></File>
 				<File name="AssemblyInfo.cs" src="WPFAssemblyInfo.cs" />
 		</Files>
diff --git a/src/AddIns/DisplayBindings/WpfDesign/StandaloneDesigner/Toolbox.cs b/src/AddIns/DisplayBindings/WpfDesign/StandaloneDesigner/Toolbox.cs
index 3ee4eb23aa..e205875d51 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/StandaloneDesigner/Toolbox.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/StandaloneDesigner/Toolbox.cs
@@ -12,6 +12,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 using ICSharpCode.WpfDesign;
+using ICSharpCode.WpfDesign.Designer;
 using ICSharpCode.WpfDesign.Designer.Services;
 
 namespace StandaloneDesigner
@@ -35,12 +36,10 @@ namespace StandaloneDesigner
 				this.Items.Clear();
 				if (toolService != null) {
 					AddTool("Pointer", toolService.PointerTool);
-					AddTool(typeof(Button));
-					AddTool(typeof(TextBox));
-					AddTool(typeof(CheckBox));
-					AddTool(typeof(Label));
-					AddTool(typeof(Canvas));
-					AddTool(typeof(Grid));
+					
+					foreach (Type t in DesignSurface.SupportedToolboxControls)
+						AddTool(t);
+					
 					toolService.CurrentToolChanged += OnCurrentToolChanged;
 					OnCurrentToolChanged(null, null);
 				}
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfToolbox.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfToolbox.cs
index c78e87b8e6..f95c5bfed5 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfToolbox.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfToolbox.cs
@@ -45,11 +45,8 @@ namespace ICSharpCode.WpfDesign.AddIn
 			sideTab.ChoosedItemChanged += OnChoosedItemChanged;
 			
 			sideTab.Items.Add(new WpfSideTabItem());
-			sideTab.Items.Add(new WpfSideTabItem(typeof(WPF.Button)));
-			sideTab.Items.Add(new WpfSideTabItem(typeof(WPF.CheckBox)));
-			sideTab.Items.Add(new WpfSideTabItem(typeof(WPF.TextBox)));
-			sideTab.Items.Add(new WpfSideTabItem(typeof(WPF.Grid)));
-			sideTab.Items.Add(new WpfSideTabItem(typeof(WPF.Canvas)));
+			foreach (Type t in Designer.DesignSurface.SupportedToolboxControls)
+				sideTab.Items.Add(new WpfSideTabItem(t));
 			
 			sideBar.Tabs.Add(sideTab);
 			sideBar.ActiveTab = sideTab;
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfViewContent.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfViewContent.cs
index 5248fa7565..0b7a83fb07 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfViewContent.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfViewContent.cs
@@ -24,7 +24,7 @@ using ICSharpCode.WpfDesign.PropertyEditor;
 namespace ICSharpCode.WpfDesign.AddIn
 {
 	/// <summary>
-	/// Description of WpfViewContent.
+	/// IViewContent implementation that hosts the WPF designer.
 	/// </summary>
 	public class WpfViewContent : AbstractViewContentHandlingLoadErrors, IHasPropertyContainer, IToolsHost
 	{
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/TypeEditors/ContentEditor.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/TypeEditors/ContentEditor.cs
index 85e1cfef48..a7966281d1 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/TypeEditors/ContentEditor.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/TypeEditors/ContentEditor.cs
@@ -109,7 +109,6 @@ namespace ICSharpCode.WpfDesign.Designer.Controls.TypeEditors
 			{
 			}
 			
-			EventHandler valueChangedListeners;
 			internal bool preventSetValue;
 			
 			public override object Value {
@@ -121,10 +120,8 @@ namespace ICSharpCode.WpfDesign.Designer.Controls.TypeEditors
 				}
 			}
 			
-			public override event EventHandler ValueChanged {
-				add    { valueChangedListeners += value; }
-				remove { valueChangedListeners -= value; }
-			}
+			// don't forward add/remove calls to the underlying property, but register them here
+			public override event EventHandler ValueChanged;
 			
 			public override System.ComponentModel.TypeConverter TypeConverter {
 				get { return System.ComponentModel.TypeDescriptor.GetConverter(typeof(string)); }
@@ -132,8 +129,8 @@ namespace ICSharpCode.WpfDesign.Designer.Controls.TypeEditors
 			
 			internal void RaiseValueChanged()
 			{
-				if (valueChangedListeners != null) {
-					valueChangedListeners(this, EventArgs.Empty);
+				if (ValueChanged != null) {
+					ValueChanged(this, EventArgs.Empty);
 				}
 			}
 		}
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/TypeEditors/CursorEditor.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/TypeEditors/CursorEditor.cs
new file mode 100644
index 0000000000..fb265a66bd
--- /dev/null
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/TypeEditors/CursorEditor.cs
@@ -0,0 +1,25 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="Daniel Grunwald" email="daniel@danielgrunwald.de"/>
+//     <version>$Revision$</version>
+// </file>
+
+using System;
+using System.Windows.Controls;
+using ICSharpCode.WpfDesign.PropertyEditor;
+
+namespace ICSharpCode.WpfDesign.Designer.Controls.TypeEditors
+{
+	[TypeEditor(typeof(System.Windows.Input.Cursor))]
+	public class CursorEditor : ComboBox
+	{
+		public CursorEditor(IPropertyEditorDataProperty property)
+		{
+			foreach (object o in property.TypeConverter.GetStandardValues()) {
+				this.Items.Add(o);
+			}
+			SetBinding(ComboBox.SelectedItemProperty, PropertyEditorBindingHelper.CreateBinding(this, property));
+		}
+	}
+}
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/TypeEditors/NullableBoolEditor.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/TypeEditors/NullableBoolEditor.cs
new file mode 100644
index 0000000000..684b295f0e
--- /dev/null
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/TypeEditors/NullableBoolEditor.cs
@@ -0,0 +1,51 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="Daniel Grunwald" email="daniel@danielgrunwald.de"/>
+//     <version>$Revision$</version>
+// </file>
+
+using System;
+using System.Windows.Controls;
+using ICSharpCode.WpfDesign.PropertyEditor;
+
+namespace ICSharpCode.WpfDesign.Designer.Controls.TypeEditors
+{
+	[TypeEditor(typeof(bool?))]
+	public class NullableBoolEditor : ComboBox
+	{
+		readonly static Entry[] entries = {
+			new Entry(SharedInstances.BoxedTrue, bool.TrueString),
+			new Entry(SharedInstances.BoxedFalse, bool.FalseString),
+			new Entry(null, "Null")
+		};
+		
+		public NullableBoolEditor(IPropertyEditorDataProperty property)
+		{
+			this.SelectedValuePath = "Value";
+			this.ItemsSource = entries;
+			SetBinding(ComboBox.SelectedValueProperty, PropertyEditorBindingHelper.CreateBinding(this, property));
+		}
+		
+		sealed class Entry
+		{
+			object val;
+			string description;
+			
+			public object Value {
+				get { return val; }
+			}
+			
+			public Entry(object val, string description)
+			{
+				this.val = val;
+				this.description = description;
+			}
+			
+			public override string ToString()
+			{
+				return description;
+			}
+		}
+	}
+}
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/DesignSurface.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/DesignSurface.cs
index d979eefab7..cf18d409c4 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/DesignSurface.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/DesignSurface.cs
@@ -23,6 +23,38 @@ namespace ICSharpCode.WpfDesign.Designer
 	/// </summary>
 	public sealed class DesignSurface : SingleVisualChildElement
 	{
+		public static Type[] SupportedToolboxControls = {
+			typeof(Button),
+			typeof(CheckBox),
+			typeof(ComboBox),
+			typeof(Label),
+			typeof(TextBox),
+			typeof(RadioButton),
+			typeof(Canvas),
+			typeof(Grid),
+			typeof(Border),
+			typeof(DockPanel),
+			typeof(Expander),
+			typeof(GroupBox),
+			typeof(Image),
+			typeof(InkCanvas),
+			typeof(ListBox),
+			typeof(ListView),
+			typeof(Menu),
+			typeof(PasswordBox),
+			typeof(ProgressBar),
+			typeof(RichTextBox),
+			typeof(ScrollViewer),
+			typeof(Slider),
+			typeof(StackPanel),
+			typeof(TabControl),
+			typeof(ToolBar),
+			typeof(TreeView),
+			typeof(Viewbox),
+			typeof(Viewport3D),
+			typeof(WrapPanel)
+		};
+		
 		readonly ScrollViewer _scrollViewer;
 		readonly DesignPanel _designPanel;
 		DesignContext _designContext;
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/WpfDesign.Designer.csproj b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/WpfDesign.Designer.csproj
index 6f2c45d744..5b2f4f3c68 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/WpfDesign.Designer.csproj
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/WpfDesign.Designer.csproj
@@ -73,6 +73,8 @@
     <Compile Include="Controls\SingleVisualChildElement.cs" />
     <Compile Include="Controls\TypeEditors\BrushEditor.cs" />
     <Compile Include="Controls\TypeEditors\ContentEditor.cs" />
+    <Compile Include="Controls\TypeEditors\CursorEditor.cs" />
+    <Compile Include="Controls\TypeEditors\NullableBoolEditor.cs" />
     <Compile Include="Controls\WindowClone.cs" />
     <Compile Include="DesignPanel.cs" />
     <Compile Include="DragDropExceptionHandler.cs" />