diff --git a/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.addin b/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.addin
index 8393efebc4..3bf1169d5a 100644
--- a/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.addin
+++ b/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.addin
@@ -18,19 +18,24 @@
 		<OptionPanel id = "Application1"
 		             label = "${res:Dialog.ProjectOptions.ApplicationSettings}"
 		             class = "ICSharpCode.CppBinding.Project.ApplicationOptions" />
-		
+		<!--
 		<OptionPanel id = "Preprocessor"
 				label = "${res:ICSharpCode.CppBinding.ProjectOptions.Preprocessor}"
 				class = "ICSharpCode.CppBinding.Project.PreprocessorOptions" />
+		-->
 		
-		<OptionPanel id = "Preprocessor1"
+		<OptionPanel id = "Preprocessor"
 				label = "${res:ICSharpCode.CppBinding.ProjectOptions.Preprocessor}"
-				class = "ICSharpCode.CppBinding.Project.PreprocessorOptionsXaml" />
+				class = "ICSharpCode.CppBinding.Project.PreprocessorOptions" />
 		
 		<OptionPanel id = "Linker"
 				label = "${res:ICSharpCode.CppBinding.ProjectOptions.Linker}"
 				class = "ICSharpCode.CppBinding.Project.LinkerOptions" />
 	
+		<OptionPanel id = "Linker1"
+				label = "${res:ICSharpCode.CppBinding.ProjectOptions.Linker}"
+				class = "ICSharpCode.CppBinding.Project.LinkerOptionsXaml" />
+		
 		<Include id = "AllManaged" path="/SharpDevelop/BackendBindings/ProjectOptions/AllManaged"/>
 	</Path>	
 	
diff --git a/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.csproj b/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.csproj
index 2a88197d6e..a546a87ecb 100644
--- a/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.csproj
+++ b/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.csproj
@@ -83,6 +83,10 @@
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Project\DependencyRelation.cs" />
+    <Compile Include="Project\LinkerOptionsXaml.xaml.cs">
+      <DependentUpon>LinkerOptionsXaml.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Project\MultiDictionary.cs" />
     <Compile Include="Project\old_ApplicationOptions.cs">
       <SubType>UserControl</SubType>
@@ -96,11 +100,11 @@
     <Compile Include="Project\ItemDefinitionGroupBinding.cs" />
     <Compile Include="Project\ObservedBinding.cs" />
     <Compile Include="Project\OpenStringListEditorEvent.cs" />
-    <Compile Include="Project\PreprocessorOptions.cs">
+    <Compile Include="Project\old_PreprocessorOptions.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="Project\PreprocessorOptionsXaml.xaml.cs">
-      <DependentUpon>PreprocessorOptionsXaml.xaml</DependentUpon>
+    <Compile Include="Project\PreprocessorOptions.xaml.cs">
+      <DependentUpon>PreprocessorOptions.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Project\ProjectConfigurationProjectItem.cs" />
@@ -123,7 +127,7 @@
     <Compile Include="Configuration\AssemblyInfo.cs" />
     <Compile Include="CppProjectBinding.cs" />
     <EmbeddedResource Include="Resources\LinkerOptions.xfrm" />
-    <EmbeddedResource Include="Resources\PreprocessorOptions.xfrm" />
+    <EmbeddedResource Include="Resources\old_PreprocessorOptions.xfrm" />
     <None Include="Templates\ConsoleProject.xpt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -179,7 +183,8 @@
   </ItemGroup>
   <ItemGroup>
     <Page Include="Project\ApplicationOptions.xaml" />
-    <Page Include="Project\PreprocessorOptionsXaml.xaml" />
+    <Page Include="Project\LinkerOptionsXaml.xaml" />
+    <Page Include="Project\PreprocessorOptions.xaml" />
     <Page Include="Project\StringListEditorDialogXaml.xaml" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptionsXaml.xaml b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptionsXaml.xaml
new file mode 100644
index 0000000000..f21eac3be1
--- /dev/null
+++ b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptionsXaml.xaml
@@ -0,0 +1,32 @@
+<optionpanels:ProjectOptionPanel x:Class="ICSharpCode.CppBinding.Project.LinkerOptionsXaml"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:gui="clr-namespace:ICSharpCode.SharpDevelop.Gui;assembly=ICSharpCode.SharpDevelop"
+	xmlns:optionpanels="clr-namespace:ICSharpCode.SharpDevelop.Gui.OptionPanels;assembly=ICSharpCode.SharpDevelop"
+	xmlns:project="clr-namespace:ICSharpCode.SharpDevelop.Project;assembly=ICSharpCode.SharpDevelop"
+	xmlns:widgets="http://icsharpcode.net/sharpdevelop/widgets"
+	xmlns:core="http://icsharpcode.net/sharpdevelop/core">
+	
+	<GroupBox Header="{core:Localize ICSharpCode.CppBinding.ProjectOptions.Linker}">
+		<Grid ShowGridLines="True">
+			<Grid.RowDefinitions>
+				<RowDefinition Height="30"></RowDefinition>
+				<RowDefinition Height="30"></RowDefinition>
+				<RowDefinition Height="30"></RowDefinition>
+				<RowDefinition Height="30"></RowDefinition>
+				<RowDefinition Height="30"></RowDefinition>
+				<RowDefinition Height="30"></RowDefinition>
+				<RowDefinition Height="30"></RowDefinition>
+				<RowDefinition Height="30"></RowDefinition>
+				<RowDefinition Height="30"></RowDefinition>
+				<RowDefinition Height="30"></RowDefinition>
+				<RowDefinition Height="30"></RowDefinition>
+			</Grid.RowDefinitions>
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition></ColumnDefinition>
+				<ColumnDefinition Width="50"></ColumnDefinition>
+			</Grid.ColumnDefinitions>
+		
+		</Grid>
+	</GroupBox>
+</optionpanels:ProjectOptionPanel>
\ No newline at end of file
diff --git a/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptionsXaml.xaml.cs b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptionsXaml.xaml.cs
new file mode 100644
index 0000000000..7a4bd20508
--- /dev/null
+++ b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptionsXaml.xaml.cs
@@ -0,0 +1,34 @@
+/*
+ * Created by SharpDevelop.
+ * User: Peter Forstmeier
+ * Date: 21.04.2012
+ * Time: 20:14
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+
+using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop.Gui.OptionPanels;
+using ICSharpCode.SharpDevelop.Project;
+
+namespace ICSharpCode.CppBinding.Project
+{
+	/// <summary>
+	/// Interaction logic for LinkerOptionsXaml.xaml
+	/// </summary>
+	public partial class LinkerOptionsXaml :  ProjectOptionPanel
+	{
+		public LinkerOptionsXaml()
+		{
+			InitializeComponent();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/PreprocessorOptionsXaml.xaml b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/PreprocessorOptions.xaml
similarity index 95%
rename from src/AddIns/BackendBindings/CppBinding/CppBinding/Project/PreprocessorOptionsXaml.xaml
rename to src/AddIns/BackendBindings/CppBinding/CppBinding/Project/PreprocessorOptions.xaml
index 91c33851b3..ab93ada3e8 100644
--- a/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/PreprocessorOptionsXaml.xaml
+++ b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/PreprocessorOptions.xaml
@@ -1,4 +1,4 @@
-<optionpanels:ProjectOptionPanel x:Class="ICSharpCode.CppBinding.Project.PreprocessorOptionsXaml"
+<optionpanels:ProjectOptionPanel x:Class="ICSharpCode.CppBinding.Project.PreprocessorOptions"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:gui="clr-namespace:ICSharpCode.SharpDevelop.Gui;assembly=ICSharpCode.SharpDevelop"
@@ -20,7 +20,7 @@
 			</Grid.RowDefinitions>
 			<Grid.ColumnDefinitions>
 				<ColumnDefinition></ColumnDefinition>
-				<ColumnDefinition Width="30"></ColumnDefinition>
+				<ColumnDefinition Width="50"></ColumnDefinition>
 			</Grid.ColumnDefinitions>
 			
 			<Label Content="{core:Localize ICSharpCode.CppBinding.ProjectOptions.Preprocessor.Includes}"></Label>
diff --git a/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/PreprocessorOptionsXaml.xaml.cs b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/PreprocessorOptions.xaml.cs
similarity index 93%
rename from src/AddIns/BackendBindings/CppBinding/CppBinding/Project/PreprocessorOptionsXaml.xaml.cs
rename to src/AddIns/BackendBindings/CppBinding/CppBinding/Project/PreprocessorOptions.xaml.cs
index 01767b2358..3c6fd0dd51 100644
--- a/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/PreprocessorOptionsXaml.xaml.cs
+++ b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/PreprocessorOptions.xaml.cs
@@ -6,20 +6,11 @@
  * To change this template use Tools | Options | Coding | Edit Standard Headers.
  */
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Text;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
 
 using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop;
-using ICSharpCode.SharpDevelop.Dom;
-using ICSharpCode.SharpDevelop.Editor;
 using ICSharpCode.SharpDevelop.Gui.OptionPanels;
 using ICSharpCode.SharpDevelop.Project;
 
@@ -28,13 +19,13 @@ namespace ICSharpCode.CppBinding.Project
 	/// <summary>
 	/// Interaction logic for PreprocessorOptionsXaml.xaml
 	/// </summary>
-	public partial class PreprocessorOptionsXaml : ProjectOptionPanel,INotifyPropertyChanged
+	public partial class PreprocessorOptions : ProjectOptionPanel,INotifyPropertyChanged
 	{
 		private const string metaElement ="ClCompile";
 		
 		MSBuildBasedProject project;
 		
-		public PreprocessorOptionsXaml()
+		public PreprocessorOptions()
 		{
 			InitializeComponent();
 		}
diff --git a/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/PreprocessorOptions.cs b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/old_PreprocessorOptions.cs
similarity index 96%
rename from src/AddIns/BackendBindings/CppBinding/CppBinding/Project/PreprocessorOptions.cs
rename to src/AddIns/BackendBindings/CppBinding/CppBinding/Project/old_PreprocessorOptions.cs
index 4e7d1aa7a6..12a8845d5f 100644
--- a/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/PreprocessorOptions.cs
+++ b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/old_PreprocessorOptions.cs
@@ -23,7 +23,7 @@ namespace ICSharpCode.CppBinding.Project
 	/// <summary>
 	/// Directory settings for c++ application.
 	/// </summary>
-	public class PreprocessorOptions : AbstractXmlFormsProjectOptionPanel
+	public class old_PreprocessorOptions : AbstractXmlFormsProjectOptionPanel
 	{
 		public override void LoadPanelContents()
 		{
diff --git a/src/AddIns/BackendBindings/CppBinding/CppBinding/Resources/PreprocessorOptions.xfrm b/src/AddIns/BackendBindings/CppBinding/CppBinding/Resources/old_PreprocessorOptions.xfrm
similarity index 100%
rename from src/AddIns/BackendBindings/CppBinding/CppBinding/Resources/PreprocessorOptions.xfrm
rename to src/AddIns/BackendBindings/CppBinding/CppBinding/Resources/old_PreprocessorOptions.xfrm