diff --git a/src/Eto.Wpf/Forms/ColorDialogHandler.cs b/src/Eto.Wpf/Forms/ColorDialogHandler.cs
index e9dc0f6fab..b99dea4a32 100644
--- a/src/Eto.Wpf/Forms/ColorDialogHandler.cs
+++ b/src/Eto.Wpf/Forms/ColorDialogHandler.cs
@@ -25,7 +25,6 @@ public bool UsingAlphaChannel
 		public XceedColorDialog()
 		{
 			canvas = new xwt.ColorCanvas();
-			SetResourceReference(BackgroundProperty, sw.SystemColors.ControlBrushKey);
 
 			var doneButton = new swc.Button { Content = "OK", IsDefault = true, MinWidth = 80, Margin = new sw.Thickness(5) };
 			doneButton.Click += doneButton_Click;
diff --git a/src/Eto.Wpf/Forms/Controls/GridHandler.cs b/src/Eto.Wpf/Forms/Controls/GridHandler.cs
index e57c292d46..5a26a67838 100755
--- a/src/Eto.Wpf/Forms/Controls/GridHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/GridHandler.cs
@@ -47,7 +47,7 @@ public EtoDataGrid()
 			Loaded += EtoDataGrid_Loaded;
 		}
 
-		private void EtoDataGrid_Loaded(object sender, sw.RoutedEventArgs e)
+				private void EtoDataGrid_Loaded(object sender, sw.RoutedEventArgs e)
 		{
 			var scp = this.FindChild<swc.ScrollContentPresenter>();
 			if (scp != null) scp.RequestBringIntoView += OnRequestBringIntoView;
@@ -146,7 +146,6 @@ protected GridHandler()
 				EnableColumnVirtualization = true,
 				EnableRowVirtualization = true,
 			};
-			Control.SetResourceReference(swc.Control.BackgroundProperty, sw.SystemColors.WindowBrushKey);
 		}
 
 		protected ColumnCollection Columns { get; private set; }
diff --git a/src/Eto.Wpf/Forms/Controls/TreeGridViewHandler.cs b/src/Eto.Wpf/Forms/Controls/TreeGridViewHandler.cs
index 626037afdf..d8fe88a08c 100755
--- a/src/Eto.Wpf/Forms/Controls/TreeGridViewHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/TreeGridViewHandler.cs
@@ -16,7 +16,6 @@ protected override void Initialize()
 		{
 			base.Initialize();
 			controller = new TreeController { Handler = this };
-			Control.SetResourceReference(swc.Panel.BackgroundProperty, sw.SystemColors.WindowBrushKey);
 			Control.PreviewKeyDown += Control_PreviewKeyDown;
 		}
 
diff --git a/src/Eto.Wpf/Forms/WpfWindow.cs b/src/Eto.Wpf/Forms/WpfWindow.cs
index 8adbb1a888..e9e19b751d 100755
--- a/src/Eto.Wpf/Forms/WpfWindow.cs
+++ b/src/Eto.Wpf/Forms/WpfWindow.cs
@@ -30,6 +30,11 @@ static class WpfWindow
 		internal static readonly object Icon_Key = new object();
 		internal static readonly object ShowSystemMenu_Key = new object();
 	}
+	
+	public class EtoWindowContent : swc.DockPanel
+	{
+		
+	}
 
 	public abstract class WpfWindow<TControl, TWidget, TCallback> : WpfPanel<TControl, TWidget, TCallback>, Window.IHandler, IWpfWindow, IInputBindingHost
 		where TControl : sw.Window
@@ -99,7 +104,7 @@ protected override void Initialize()
 		{
 			if (IsAttached)
 				return;
-			content = new swc.DockPanel();
+			content = new EtoWindowContent();
 			UseShellDropManager = true;
 
 			base.Initialize();
@@ -109,7 +114,6 @@ protected override void Initialize()
 			main = new swc.DockPanel();
 			menuHolder = new swc.ContentControl { IsTabStop = false };
 			toolBarHolder = new swc.ContentControl { IsTabStop = false };
-			content.SetResourceReference(swc.Panel.BackgroundProperty, sw.SystemColors.ControlBrushKey);
 			swc.DockPanel.SetDock(menuHolder, swc.Dock.Top);
 			swc.DockPanel.SetDock(toolBarHolder, swc.Dock.Top);
 			main.Children.Add(menuHolder);
diff --git a/src/Eto.Wpf/themes/controls/DataGrid.xaml b/src/Eto.Wpf/themes/controls/DataGrid.xaml
new file mode 100755
index 0000000000..fb977bd4e2
--- /dev/null
+++ b/src/Eto.Wpf/themes/controls/DataGrid.xaml
@@ -0,0 +1,14 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:r="clr-namespace:Eto.Wpf.CustomControls.TreeGridView"
+    xmlns:efc="clr-namespace:Eto.Wpf.Forms.Controls"
+    xmlns:e="clr-namespace:Eto.Wpf"
+    xmlns:s="clr-namespace:System;assembly=mscorlib"
+    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes;assembly=Xceed.Wpf.Toolkit"
+    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit;assembly=Xceed.Wpf.Toolkit">
+
+    <Style TargetType="efc:EtoDataGrid">
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"/>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Eto.Wpf/themes/controls/Window.xaml b/src/Eto.Wpf/themes/controls/Window.xaml
new file mode 100755
index 0000000000..81f785690f
--- /dev/null
+++ b/src/Eto.Wpf/themes/controls/Window.xaml
@@ -0,0 +1,15 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:r="clr-namespace:Eto.Wpf.CustomControls.TreeGridView"
+    xmlns:efc="clr-namespace:Eto.Wpf.Forms.Controls"
+    xmlns:e="clr-namespace:Eto.Wpf"
+    xmlns:ef="clr-namespace:Eto.Wpf.Forms"
+    xmlns:s="clr-namespace:System;assembly=mscorlib"
+    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes;assembly=Xceed.Wpf.Toolkit"
+    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit;assembly=Xceed.Wpf.Toolkit">
+
+    <Style TargetType="ef:EtoWindowContent">
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Eto.Wpf/themes/controls/XceedColorDialog.xaml b/src/Eto.Wpf/themes/controls/XceedColorDialog.xaml
new file mode 100755
index 0000000000..25f0dd57dd
--- /dev/null
+++ b/src/Eto.Wpf/themes/controls/XceedColorDialog.xaml
@@ -0,0 +1,15 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:r="clr-namespace:Eto.Wpf.CustomControls.TreeGridView"
+    xmlns:efc="clr-namespace:Eto.Wpf.Forms.Controls"
+    xmlns:e="clr-namespace:Eto.Wpf"
+    xmlns:ef="clr-namespace:Eto.Wpf.Forms"
+    xmlns:s="clr-namespace:System;assembly=mscorlib"
+    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes;assembly=Xceed.Wpf.Toolkit"
+    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit;assembly=Xceed.Wpf.Toolkit">
+
+    <Style TargetType="ef:XceedColorDialog">
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Eto.Wpf/themes/generic.xaml b/src/Eto.Wpf/themes/generic.xaml
index fcbc3a362e..7ea71fb3fc 100755
--- a/src/Eto.Wpf/themes/generic.xaml
+++ b/src/Eto.Wpf/themes/generic.xaml
@@ -6,9 +6,13 @@
     xmlns:s="clr-namespace:System;assembly=mscorlib">
 
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/Eto.Wpf;Component/themes/wpftoolkit/ButtonSpinner.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/Eto.Wpf;Component/themes/controls/WatermarkTextBox.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Eto.Wpf;Component/themes/controls/DataGrid.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Eto.Wpf;Component/themes/controls/SearchTextBox.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Eto.Wpf;Component/themes/controls/WatermarkTextBox.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Eto.Wpf;Component/themes/controls/Window.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Eto.Wpf;Component/themes/controls/XceedColorDialog.xaml" />
+		
+        <ResourceDictionary Source="pack://application:,,,/Eto.Wpf;Component/themes/wpftoolkit/ButtonSpinner.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
     <Style TargetType="{x:Type r:TreeToggleButton}">