diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
index 6d4b519886..1422e280c4 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj
@@ -76,7 +76,6 @@
       <DependentUpon>BuildOptions.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Src\OptionPanels\HexValidator.cs" />
     <Compile Include="Src\Parser\Parser.cs" />
     <Compile Include="Src\Project\RemoveMembersInRangeVisitor.cs" />
     <Compile Include="Src\Project\VBNetToCSharpConvertVisitorWithMyFormsSupport.cs" />
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptions.xaml b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptions.xaml
index 0dec8145a6..4cd68e0855 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptions.xaml
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptions.xaml
@@ -230,7 +230,7 @@
 								<TextBox.Text>
 									<Binding Path="BaseAddress.Value" UpdateSourceTrigger="PropertyChanged">
 										<Binding.ValidationRules>
-											<local:HexValidator />
+											<optionpanels:HexValidator />
 										</Binding.ValidationRules>
 									</Binding>
 								</TextBox.Text>
diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml
new file mode 100644
index 0000000000..8e04d698ae
--- /dev/null
+++ b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml
@@ -0,0 +1,359 @@
+<optionpanels:ProjectOptionPanel
+	x:Class="ICSharpCode.VBNetBinding.OptionPanels.BuildOptionsXaml"
+	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:project="clr-namespace:ICSharpCode.SharpDevelop.Project;assembly=ICSharpCode.SharpDevelop"
+	xmlns:optionpanels="clr-namespace:ICSharpCode.SharpDevelop.Gui.OptionPanels;assembly=ICSharpCode.SharpDevelop"
+	xmlns:core="http://icsharpcode.net/sharpdevelop/core"
+	xmlns:widgets="http://icsharpcode.net/sharpdevelop/widgets">
+	
+	<optionpanels:ProjectOptionPanel.Resources>
+		<optionpanels:StringToBoolConverter x:Key="strToBool"></optionpanels:StringToBoolConverter>
+		<optionpanels:StorageLocationConverter x:Key="locationConverter" />
+	</optionpanels:ProjectOptionPanel.Resources>
+	
+	<ScrollViewer>
+		<StackPanel>
+			<GroupBox Header="{core:Localize Dialog.ProjectOptions.BuildOptions.General}">
+				<Grid ShowGridLines="True">
+					<Grid.RowDefinitions>
+						<RowDefinition></RowDefinition>
+						<RowDefinition></RowDefinition>
+						<RowDefinition></RowDefinition>
+						<RowDefinition></RowDefinition>
+						<RowDefinition></RowDefinition>
+						<RowDefinition></RowDefinition>
+					</Grid.RowDefinitions>
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="30"></ColumnDefinition>
+						<ColumnDefinition></ColumnDefinition>
+						<ColumnDefinition></ColumnDefinition>
+					</Grid.ColumnDefinitions>
+					
+					<Label Grid.ColumnSpan="3" VerticalAlignment="Center"
+					       Content="{core:Localize Dialog.ProjectOptions.BuildOptions.ConditionalSymbols}"></Label>
+					
+					<optionpanels:StorageLocationPicker Grid.Row="1" Location="{Binding DefineConstants.Location}"  />
+					<TextBox x:Name="conditionalSymbolsTextBox"
+					         Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" VerticalAlignment="Center"
+					         Text="{Binding DefineConstants.Value, UpdateSourceTrigger=PropertyChanged}">
+					</TextBox>
+					
+					<optionpanels:StorageLocationPicker Grid.Row="2" Location="{Binding Optimize.Location}"  />
+					<CheckBox x:Name="optimizeCodeCheckBox"
+					          Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" VerticalAlignment="Center"
+					          Content="{core:Localize Dialog.ProjectOptions.BuildOptions.OptimizeCode}"
+					          IsChecked="{Binding Optimize.Value,Converter={StaticResource strToBool}}">
+					</CheckBox>
+					
+					<optionpanels:StorageLocationPicker Grid.Row="3" Location="{Binding RemoveIntegerChecks.Location}"  />
+					<CheckBox x:Name="removeOverflowCheckBox"
+					          Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" VerticalAlignment="Center"
+					          Content="{core:Localize Dialog.ProjectOptions.BuildOptions.RemoveOverflowChecks}"
+					          IsChecked="{Binding RemoveIntegerChecks.Value,Converter={StaticResource strToBool}}">
+					</CheckBox>
+					
+					<optionpanels:StorageLocationPicker Grid.Row="5" VerticalAlignment="Center" >
+						<optionpanels:StorageLocationPicker.Location>
+							<MultiBinding
+								Converter="{StaticResource locationConverter}">
+								<Binding Path="OptionExplicit.Location" />
+								<Binding Path="OptionStrict.Location" />
+								<Binding Path="OptionCompare.Location" />
+								<Binding Path="OptionInfer.Location" />
+							</MultiBinding>
+						</optionpanels:StorageLocationPicker.Location>
+					</optionpanels:StorageLocationPicker>
+					
+					<widgets:StackPanelWithSpacing Grid.Row="5" Grid.Column="1"
+						Orientation="Horizontal" SpaceBetweenItems="8">
+						<ComboBox
+							ItemsSource="{Binding  OptionExplicitItems}"
+							DisplayMemberPath="Value"
+							SelectedItem="{Binding OptionExplicitItem}">
+						</ComboBox>
+						
+						<ComboBox
+							ItemsSource="{Binding OptionStrictItems}"
+							DisplayMemberPath="Value"
+							SelectedItem="{Binding OptionStrictItem}"
+						></ComboBox>
+						
+						<ComboBox
+							ItemsSource="{Binding OptionCompareItems}"
+							DisplayMemberPath="Value"
+							SelectedItem="{Binding OptionCompareItem}"
+						></ComboBox>
+						<ComboBox
+							ItemsSource="{Binding OptionInferItems}"
+							DisplayMemberPath="Value"
+							SelectedItem="{Binding OptionInferItem}"
+						></ComboBox>
+					</widgets:StackPanelWithSpacing>
+				</Grid>
+			</GroupBox>
+			
+			<GroupBox Header="{core:Localize Dialog.ProjectOptions.Build.Output}">
+				<Grid >
+					<Grid.RowDefinitions>
+						<RowDefinition Height="Auto"></RowDefinition>
+						<RowDefinition Height="Auto"></RowDefinition>
+						<RowDefinition Height="Auto"></RowDefinition>
+						<RowDefinition Height="Auto"></RowDefinition>
+						<RowDefinition Height="Auto"></RowDefinition>
+						<RowDefinition></RowDefinition>
+					</Grid.RowDefinitions>
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="Auto"></ColumnDefinition>
+						<ColumnDefinition Width="Auto"></ColumnDefinition>
+						<ColumnDefinition Width="*"></ColumnDefinition>
+						<ColumnDefinition Width="50"></ColumnDefinition>
+					</Grid.ColumnDefinitions>
+					
+					<Label Grid.ColumnSpan="2" Content="{core:Localize Dialog.ProjectOptions.Build.OutputPath}"></Label>
+					
+					<optionpanels:StorageLocationPicker Grid.Row="1" DockPanel.Dock="Left"
+						Location="{Binding OutputPath.Location}"/>
+					
+					<TextBox x:Name="outputPathTextBox" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2"
+					         Text="{Binding OutputPath.Value, UpdateSourceTrigger=PropertyChanged}"></TextBox>
+					
+					<Button Grid.Row="1" Grid.Column="3"  Margin="3,0,3,0"
+					        VerticalAlignment="Center"
+					        Content="..."
+					        Command="{Binding ChangeOutputPath}"></Button>
+					
+					<optionpanels:StorageLocationPicker Grid.Row="2" DockPanel.Dock="Left" Location="{Binding DocumentationFile.Location}"/>
+					
+					<CheckBox x:Name="xmlDocumentationCheckBox" Grid.Row="2" Grid.Column="1"
+					          VerticalAlignment="Center"
+					          Margin="3,0,3,0"
+					          IsChecked="{Binding DocumentFileIsChecked}"
+					          Content="{core:Localize Dialog.ProjectOptions.Build.XmlDocumentationFile}"></CheckBox>
+					
+					<TextBox x:Name="xmlDocumentationTextBox" Grid.Row="2" Grid.Column="2" Grid.ColumnSpan="2"
+					         IsEnabled="{Binding DocumentFileIsChecked}"
+					         Text="{Binding DocumentationFile.Value, UpdateSourceTrigger=PropertyChanged}"></TextBox>
+					
+					<optionpanels:StorageLocationPicker Grid.Row="3" DockPanel.Dock="Left" Location="{Binding DebugType.Location}" />
+					
+					<Label Grid.Row="3" Grid.Column="1" Margin="3,0,3,0"
+					       HorizontalAlignment="Right"
+					       Content="{core:Localize Dialog.ProjectOptions.Build.DebugInfo}"></Label>
+					
+					<ComboBox Grid.Row="3" Grid.Column="2" Width="150"
+					          VerticalAlignment="Center"
+					          HorizontalAlignment="Left"
+					          SelectedValue="{Binding Path=DebugType.Value}"
+					          gui:EnumBinding.EnumType="{x:Type project:DebugSymbolType}"></ComboBox>
+					
+					<Label Grid.Row="4" Grid.Column="1" Margin="3,0,3,0"
+					       HorizontalAlignment="Right"
+					       Content="{core:Localize Dialog.ProjectOptions.Build.TargetFramework}"></Label>
+					
+					<StackPanel Orientation="Horizontal" Grid.Row="4" Grid.Column="2" Grid.ColumnSpan="2">
+						
+						<ComboBox x:Name="targetFrameworkComboBox" Width="200" Margin="0,0,3,0"
+						          VerticalAlignment="Center"
+						          IsEnabled="False"></ComboBox>
+						
+						<Button Margin="3,0,3,0" VerticalAlignment="Center"
+						        Content="Change"
+						        Command="{Binding UpdateProjectCommand}"
+						        Style="{x:Static core:GlobalStyles.ButtonStyle}"></Button>
+					</StackPanel>
+					
+					<GroupBox Grid.Row="5" Grid.ColumnSpan="4" Margin="5,10,0,0"
+					          Header="{core:Localize Dialog.ProjectOptions.Build.Advanced}">
+						<Grid>
+							<Grid.RowDefinitions>
+								<RowDefinition Height="Auto"></RowDefinition>
+								<RowDefinition Height="Auto"></RowDefinition>
+								<RowDefinition Height="Auto"></RowDefinition>
+								<RowDefinition Height="Auto"></RowDefinition>
+								<RowDefinition Height="Auto"></RowDefinition>
+								<RowDefinition Height="Auto"></RowDefinition>
+								<RowDefinition Height="Auto"></RowDefinition>
+								<RowDefinition Height="Auto"></RowDefinition>
+								<RowDefinition Height="Auto"></RowDefinition>
+								<RowDefinition Height="Auto"></RowDefinition>
+							</Grid.RowDefinitions>
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="Auto"></ColumnDefinition>
+								<ColumnDefinition Width="Auto"></ColumnDefinition>
+								<ColumnDefinition MinWidth="120"></ColumnDefinition>
+								<ColumnDefinition></ColumnDefinition>
+								<ColumnDefinition Width="50"></ColumnDefinition>
+							</Grid.ColumnDefinitions>
+							
+							<optionpanels:StorageLocationPicker Grid.Row="1" VerticalAlignment="Center">
+								<optionpanels:StorageLocationPicker.Location>
+									<MultiBinding Converter="{StaticResource locationConverter}">
+										<Binding Path="RegisterForComInterop.Location" />
+										<Binding Path="GenerateSerializationAssemblies.Location" />
+										<Binding Path="PlatformTarget.Location" />
+										<Binding Path="FileAlignment.Location" />
+										<Binding Path="BaseAddress.Location" />
+									</MultiBinding>
+								</optionpanels:StorageLocationPicker.Location>
+							
+							</optionpanels:StorageLocationPicker>
+							
+							<!--x:Name="registerCOMInteropCheckBox"-->
+							<CheckBox Grid.Column="2"
+							          IsChecked="{Binding RegisterForComInterop.Value}"
+							          Content="{core:Localize Dialog.ProjectOptions.Build.RegisterForCOM}"></CheckBox>
+							
+							<Label Grid.Row="1" Grid.Column="1"
+							       HorizontalAlignment="Right"
+							       Content="{core:Localize Dialog.ProjectOptions.Build.GenerateSerializationAssembly}"></Label>
+							
+							<!--x:Name="generateSerializationAssemblyComboBox"-->
+							<ComboBox  Grid.Row="1" Grid.Column="2"
+							          VerticalAlignment="Center"
+							          ItemsSource="{Binding Path=DataContext.SerializationInfo}"
+							          SelectedValue="{Binding Path=GenerateSerializationAssemblies.Value}"
+							          DisplayMemberPath="DisplayValue"
+							          SelectedValuePath="Key"></ComboBox>
+							
+							<Label Grid.Row="2" Grid.Column="1" HorizontalAlignment="Right"
+							       Content="{core:Localize Dialog.ProjectOptions.Build.TargetCPU}"></Label>
+							
+							<!--x:Name="targetCpuComboBox"-->
+							<ComboBox Grid.Row="2" Grid.Column="2" VerticalAlignment="Center"
+							          ItemsSource="{Binding Path=DataContext.TargetCPU}"
+							          SelectedValue="{Binding Path=PlatformTarget.Value}"
+							          DisplayMemberPath="DisplayValue"
+							          SelectedValuePath="Key"></ComboBox>
+							
+							<Label Grid.Row="3" Grid.Column="1" HorizontalAlignment="Right"
+							       Content="{core:Localize Dialog.ProjectOptions.Build.FileAlignment}"></Label>
+							
+							<!--x:Name="fileAlignmentComboBox"-->
+							<ComboBox Grid.Row="3" Grid.Column="2" VerticalAlignment="Center"
+							          ItemsSource="{Binding Path=DataContext.FileAlign}"
+							          SelectedValue="{Binding Path=FileAlignment.Value}"
+							          DisplayMemberPath="DisplayValue"
+							          SelectedValuePath="Key"></ComboBox>
+							
+							<Label Grid.Row="4" Grid.Column="1" HorizontalAlignment="Right"
+							       Content="{core:Localize Dialog.ProjectOptions.Build.DLLBaseAddress}"></Label>
+							
+							<!-- Hex binding -->
+							<!--x:Name="dllBaseAddressTextBox"-->
+							<TextBox Grid.Row="4" Grid.Column="2">
+								<TextBox.Text>
+									<Binding Path="BaseAddress.Value" UpdateSourceTrigger="PropertyChanged">
+										<Binding.ValidationRules>
+											<optionpanels:HexValidator />
+										</Binding.ValidationRules>
+									</Binding>
+								</TextBox.Text>
+							</TextBox>
+							
+							<!-- location multibinding -->
+							<Label Grid.Row="6" Grid.ColumnSpan="2"
+							       Content="{core:Localize Dialog.ProjectOptions.Build.BaseIntermediateOutputPath}"></Label>
+							
+							<optionpanels:StorageLocationPicker Grid.Row="7"
+								Location="{Binding BaseIntermediateOutputPath.Location}"
+								DockPanel.Dock="Left" />
+							
+							<TextBox x:Name="baseIntermediateOutputPathTextBox" Grid.Row="7" Grid.Column="1" Grid.ColumnSpan="3"
+							         Text="{Binding BaseIntermediateOutputPath.Value, UpdateSourceTrigger=PropertyChanged}"></TextBox>
+							
+							<Button Grid.Row="7" Grid.Column="4" Margin="3,0,3,0"
+							        Content="..."
+							        VerticalAlignment="Center"
+							        Command="{Binding BaseIntermediateOutputPathCommand}"></Button>
+							
+							<Label Grid.Row="8" Grid.ColumnSpan="2" Content="{core:Localize Dialog.ProjectOptions.Build.IntermediateOutputPath}"></Label>
+							
+							<optionpanels:StorageLocationPicker Grid.Row="9" DockPanel.Dock="Left"
+								Location="{Binding IntermediateOutputPath.Location}"/>
+							
+							<TextBox x:Name="intermediateOutputPathTextBox" Grid.Row="9" Grid.Column="1" Grid.ColumnSpan="3"
+							         Text="{Binding IntermediateOutputPath.Value, UpdateSourceTrigger=PropertyChanged}"></TextBox>
+							
+							<Button Grid.Row="9" Grid.Column="4" Margin="3,0,3,0"
+							        Content="..."
+							        VerticalAlignment="Center"
+							        Command="{Binding IntermediateOutputPathCommand}"></Button>
+						</Grid>
+					</GroupBox>
+				</Grid>
+			</GroupBox>
+			
+			
+			<GroupBox Margin="0,8,0,0"
+			          Header="{core:Localize Dialog.ProjectOptions.Build.TreatWarningsAsErrors}">
+				<Grid>
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="Auto"></ColumnDefinition>
+						<ColumnDefinition Width="Auto"></ColumnDefinition>
+						<ColumnDefinition Width="*"></ColumnDefinition>
+					</Grid.ColumnDefinitions>
+					<Grid.RowDefinitions>
+						<RowDefinition Height="Auto"></RowDefinition>
+						<RowDefinition Height="Auto"></RowDefinition>
+					</Grid.RowDefinitions>
+					
+					<Label Grid.Column="1" Content="{core:Localize Dialog.ProjectOptions.Build.WarningLevel}"></Label>
+					
+					<!--x:Name="warningLevelComboBox"-->
+					<ComboBox Grid.Column="2" Width="40" VerticalAlignment="Center" HorizontalAlignment="Left"
+					          ItemsSource="{Binding Path=DataContext.WarnLevel}"
+					          SelectedValue="{Binding Path=WarningLevel.Value}"
+					          DisplayMemberPath="DisplayValue"
+					          SelectedValuePath="Key"
+					          SelectedIndex="4"></ComboBox>
+					
+					<optionpanels:StorageLocationPicker Grid.Row="1" Location="{Binding NoWarn.Location}" DockPanel.Dock="Left" />
+					
+					<Label Grid.Row="1" Grid.Column="1"
+					       Content="{core:Localize Dialog.ProjectOptions.Build.SuppressWarnings}"></Label>
+					
+					<!--x:Name="suppressWarningsTextBox"-->
+					<TextBox Grid.Row="1" Grid.Column="2"
+					         Text="{Binding NoWarn.Value, UpdateSourceTrigger=PropertyChanged}"></TextBox>
+				</Grid>
+			</GroupBox>
+			
+			<GroupBox Margin="0,8,0,0"
+			          Header="{core:Localize Dialog.ProjectOptions.Build.ErrorsAndWarnings}">
+				<Grid>
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="Auto"></ColumnDefinition>
+						<ColumnDefinition Width="Auto"></ColumnDefinition>
+						<ColumnDefinition Width="*"></ColumnDefinition>
+					</Grid.ColumnDefinitions>
+					<Grid.RowDefinitions>
+						<RowDefinition Height="Auto"></RowDefinition>
+						<RowDefinition Height="Auto"></RowDefinition>
+						<RowDefinition Height="Auto"></RowDefinition>
+					</Grid.RowDefinitions>
+					
+					<optionpanels:StorageLocationPicker Grid.Row="1" Location="{Binding TreatWarningsAsErrors.Location}">
+					</optionpanels:StorageLocationPicker>
+					
+					<RadioButton x:Name="noneRadioButton" Grid.Column="1" VerticalAlignment="Center" Margin="3,0,3,0"
+					             Content="{core:Localize Dialog.ProjectOptions.Build.TreatWarningsAsErrors.None}"></RadioButton>
+					
+					<RadioButton x:Name="specificWarningsRadioButton" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Margin="3,0,3,0"
+					             Content="{core:Localize Dialog.ProjectOptions.Build.TreatWarningsAsErrors.Specific}"></RadioButton>
+					
+					<TextBox x:Name="specificWarningsTextBox" Grid.Row="1" Grid.Column="2" VerticalAlignment="Center"
+					         Margin="3,0,3,0"
+					         IsEnabled="{Binding ElementName=specificWarningsRadioButton, Path=IsChecked}"
+					         Text="{Binding WarningsAsErrors.Value, UpdateSourceTrigger=PropertyChanged}"></TextBox>
+					
+					<RadioButton x:Name="allRadioButton" Grid.Row="2" Grid.Column="1"
+					             Margin="3,0,3,0"
+					             VerticalAlignment="Center"
+					             Content="{core:Localize Dialog.ProjectOptions.Build.TreatWarningsAsErrors.All}"></RadioButton>
+				</Grid>
+			</GroupBox>
+		</StackPanel>
+	</ScrollViewer>
+</optionpanels:ProjectOptionPanel>
\ No newline at end of file
diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/ProjectImportsXaml.xaml b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/ProjectImports.xaml
similarity index 100%
rename from src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/ProjectImportsXaml.xaml
rename to src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/ProjectImports.xaml
diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/ProjectImportsXaml.xaml.cs b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/ProjectImports.xaml.cs
similarity index 100%
rename from src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/ProjectImportsXaml.xaml.cs
rename to src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/ProjectImports.xaml.cs
diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin b/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin
index b2af5d2e89..cd428ec7c7 100644
--- a/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin
+++ b/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin
@@ -84,6 +84,10 @@
 		<OptionPanel id    = "BuildOptions"
 		             label = "${res:Dialog.ProjectOptions.BuildOptions}"
 		             class = "ICSharpCode.VBNetBinding.OptionPanels.BuildOptions"/>
+		
+		<OptionPanel id    = "BuildOptions1"
+		             label = "${res:Dialog.ProjectOptions.BuildOptions}"
+		             class = "ICSharpCode.VBNetBinding.OptionPanels.BuildOptionsXaml"/>
 		<OptionPanel id    = "DebugOptions"
 		             label = "${res:Dialog.ProjectOptions.DebugOptions}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.DebugOptions"/>
diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj b/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj
index 87b370e272..632bee7f83 100644
--- a/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj
+++ b/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj
@@ -65,8 +65,12 @@
     <Compile Include="Src\Extensions.cs" />
     <Compile Include="Src\FormattingStrategy\VBStatement.cs" />
     <Compile Include="Src\LanguageUtils.cs" />
-    <Compile Include="Src\OptionPanels\ProjectImportsXaml.xaml.cs">
-      <DependentUpon>ProjectImportsXaml.xaml</DependentUpon>
+    <Compile Include="Src\OptionPanels\BuildOptionsXaml.xaml.cs">
+      <DependentUpon>BuildOptionsXaml.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Src\OptionPanels\ProjectImports.xaml.cs">
+      <DependentUpon>ProjectImports.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Src\OptionPanels\TextEditorOptions.xaml.cs">
@@ -132,7 +136,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Page Include="Src\OptionPanels\ProjectImportsXaml.xaml" />
+    <Page Include="Src\OptionPanels\BuildOptionsXaml.xaml" />
+    <Page Include="Src\OptionPanels\ProjectImports.xaml" />
     <Page Include="Src\OptionPanels\TextEditorOptions.xaml" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
index dd5e1614a3..8a8bc8fb94 100644
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
@@ -279,6 +279,7 @@
       <DependentUpon>DebugOptions.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\HexValidator.cs" />
     <Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\KeyValuePair.cs" />
     <Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\OptionsHelper.cs" />
     <Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\ProjectOptionPanel.cs" />
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/HexValidator.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/HexValidator.cs
similarity index 90%
rename from src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/HexValidator.cs
rename to src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/HexValidator.cs
index 0c542ca6c0..6a7410e3f4 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/HexValidator.cs
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/HexValidator.cs
@@ -1,15 +1,15 @@
 /*
  * Created by SharpDevelop.
  * User: Peter Forstmeier
- * Date: 22.05.2012
- * Time: 20:46
+ * Date: 09.08.2012
+ * Time: 20:10
  * To change this template use Tools | Options | Coding | Edit Standard Headers.
  */
 using System;
 using System.Globalization;
 using System.Windows.Controls;
 
-namespace CSharpBinding.OptionPanels
+namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
 {
 	/// <summary>
 	/// Description of HexValidator.