diff --git a/src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptionsPanel.xaml b/src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptionsPanel.xaml
new file mode 100644
index 0000000000..8050bf6e46
--- /dev/null
+++ b/src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptionsPanel.xaml
@@ -0,0 +1,87 @@
+<optionpanels:ProjectOptionPanel x:Class="ICSharpCode.CodeAnalysis.AnalysisProjectOptionsPanel"
+	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:tv="http://icsharpcode.net/sharpdevelop/treeview"
+	xmlns:local="clr-namespace:ICSharpCode.CodeAnalysis"
+	xmlns:core="http://icsharpcode.net/sharpdevelop/core">
+	
+	<ScrollViewer VerticalScrollBarVisibility="Auto">
+		<Grid >
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto"></RowDefinition>
+				<RowDefinition Height="Auto"></RowDefinition>
+				<RowDefinition></RowDefinition>
+				<RowDefinition></RowDefinition>
+			</Grid.RowDefinitions>
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="Auto"></ColumnDefinition>
+				<ColumnDefinition Width="30"></ColumnDefinition>
+				<ColumnDefinition></ColumnDefinition>
+			</Grid.ColumnDefinitions>
+			
+			<optionpanels:StorageLocationPicker  Location="{Binding RunCodeAnalysis.Location}"></optionpanels:StorageLocationPicker>
+			
+			<CheckBox Grid.Column="1" VerticalAlignment="Center" Grid.ColumnSpan="2"
+			          IsChecked="{Binding RunCodeAnalysis.Value}"
+			          Content="{core:Localize ICSharpCode.CodeAnalysis.ProjectOptions.RunOnBuild}"></CheckBox>
+			
+			<Button Grid.Row="1" VerticalAlignment="Center" Grid.ColumnSpan="2" Margin="0,10,0,10"
+			        Style="{x:Static core:GlobalStyles.ButtonStyle}"
+			        Click="ChangeRuleAssembliesButtonClick"
+			        Content="{core:Localize ICSharpCode.CodeAnalysis.ProjectOptions.AddRemoveRuleAssembly}"></Button>
+			
+			<tv:SharpTreeView x:Name="ruleTreeView" ShowRoot="False" ShowLines="False" IsSynchronizedWithCurrentItem="True"
+				Grid.Row="2" Grid.ColumnSpan="3">
+				
+				<ListView.View>
+					<tv:SharpGridView >
+						<tv:SharpGridView.Columns>
+							<GridViewColumn Width="500" Header="ID">
+								<GridViewColumn.CellTemplate>
+									<DataTemplate>
+										<tv:SharpTreeNodeView />
+									</DataTemplate>
+								</GridViewColumn.CellTemplate>
+							</GridViewColumn>
+							
+							<GridViewColumn Header="Action">
+								<GridViewColumn.CellTemplate>
+									<DataTemplate>
+										<StackPanel Orientation="Horizontal">
+											<ComboBox  Background="Transparent" Width="100"
+											          HorizontalAlignment="Center" VerticalAlignment="Center"
+											          ItemsSource="{Binding Path=RuleState}"
+											          IsSynchronizedWithCurrentItem="True"
+											          IsReadOnly="False"
+											          SelectedIndex="{Binding Index}">
+												
+												<ComboBox.ItemTemplate>
+													<DataTemplate>
+														<StackPanel Orientation="Horizontal">
+															<Image VerticalAlignment="Center" Height="15" Margin="3,0,5,0"
+															       Source="{Binding Item1}"></Image>
+															
+															<TextBlock  VerticalAlignment="Center" Text="{Binding Item2}"></TextBlock>
+														
+														</StackPanel>
+													
+													</DataTemplate>
+												</ComboBox.ItemTemplate>
+											</ComboBox>
+										</StackPanel>
+									</DataTemplate>
+								</GridViewColumn.CellTemplate>
+							</GridViewColumn>
+						</tv:SharpGridView.Columns>
+					
+					</tv:SharpGridView>
+				</ListView.View>
+			</tv:SharpTreeView>
+		
+		</Grid>
+	</ScrollViewer>
+</optionpanels:ProjectOptionPanel>
\ No newline at end of file
diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
index 40e6319f36..766ec7783f 100755
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
@@ -2115,6 +2115,11 @@
 		             insertafter="Behavior"
 		             label = "${res:Dialog.Options.IDEOptions.TextEditor.CodeCompletion.PanelName}"
 		             class = "ICSharpCode.SharpDevelop.Editor.CodeCompletion.CodeCompletionPanel"/>
+	
+	<OptionPanel id = "CodeCompletion1"
+		             insertafter="Behavior"
+		             label = "${res:Dialog.Options.IDEOptions.TextEditor.CodeCompletion.PanelName}"
+		             class = "ICSharpCode.SharpDevelop.Editor.CodeCompletion.CodeCompletionPanelXaml"/>
 	</Path>
 	
 	<Path name = "/SharpDevelop/Pads/BookmarkPad/Toolbar">
diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
index d6d6281eea..745854e2bc 100644
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
@@ -113,6 +113,10 @@
     <Compile Include="Src\Editor\CodeCompletion\CodeCompletionPanel.cs">
       <SubType>UserControl</SubType>
     </Compile>
+    <Compile Include="Src\Editor\CodeCompletion\CodeCompletionPanelXaml.xaml.cs">
+      <DependentUpon>CodeCompletionPanelXaml.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Src\Editor\CodeCompletion\ICompletionItemHandler.cs" />
     <Compile Include="Src\Editor\CodeCompletion\IInsightWindowHandler.cs" />
     <Compile Include="Src\Editor\CodeCompletion\NRefactoryInsightWindowHandler.cs" />
@@ -923,6 +927,7 @@
   </ItemGroup>
   <ItemGroup>
     <Page Include="Src\Bookmarks\Pad\Controls\ListViewPad.xaml" />
+    <Page Include="Src\Editor\CodeCompletion\CodeCompletionPanelXaml.xaml" />
     <Page Include="Src\Gui\Components\StringListEditorDialog.xaml" />
     <Page Include="Src\Gui\Components\StringListEditorXaml.xaml" />
     <Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\CodeGenerationPanel.xaml" />