From 03cc414929d629554ce7d8789c0732da3b42c43b Mon Sep 17 00:00:00 2001
From: brianlagunas_cp <XceedBoucherS@users.noreply.github.com>
Date: Mon, 24 Oct 2011 22:17:59 +0000
Subject: [PATCH] More theming fun with the ButtonSpinner

---
 .../ButtonSpinner/Themes/Generic.xaml         | 13 ++--
 .../Core/Themes/ResourceKeys.cs               | 34 +++++++++++
 .../Core/Themes/StaticResourceKey.cs          | 25 ++++++++
 .../Themes/Aero.NormalColor.xaml              |  8 +++
 .../Themes/Aero/Brushes_NormalColor.xaml      | 10 +++
 .../WPFToolkit.Extended/Themes/Generic.xaml   |  7 ++-
 .../Themes/{Aero => Generic}/Brushes.xaml     | 61 +++++++------------
 .../Themes/{Aero => Generic}/Buttons.xaml     | 34 +++++------
 .../Common.xaml}                              |  2 +-
 .../WPFToolkit.Extended.csproj                | 18 ++++--
 10 files changed, 144 insertions(+), 68 deletions(-)
 create mode 100644 ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Themes/ResourceKeys.cs
 create mode 100644 ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Themes/StaticResourceKey.cs
 create mode 100644 ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero.NormalColor.xaml
 create mode 100644 ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero/Brushes_NormalColor.xaml
 rename ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/{Aero => Generic}/Brushes.xaml (66%)
 rename ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/{Aero => Generic}/Buttons.xaml (60%)
 rename ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/{Common/Generic_Common.xaml => Generic/Common.xaml} (98%)

diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Themes/Generic.xaml
index 7971d2ef..24579bca 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Themes/Generic.xaml
@@ -1,10 +1,11 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
-                    xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes">
+                    xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes"
+                    xmlns:themes="clr-namespace:Microsoft.Windows.Controls.Themes">
 
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="../../Themes/Aero/Buttons.xaml" />
+        <ResourceDictionary Source="../../Themes/Generic/Buttons.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
     <!-- =============================================================================== -->
@@ -14,12 +15,12 @@
     <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
     
     <Style TargetType="{x:Type local:ButtonSpinner}">
-        <Setter Property="Background" Value="{StaticResource ControlNormalBackgroundKey}" />
+        <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBackgroundKey}}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+        <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="IsTabStop" Value="True" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
-        <Setter Property="BorderBrush" Value="{StaticResource ControlNormalBorderFillKey}" />
-        <Setter Property="BorderThickness" Value="1" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="Template">
             <Setter.Value>
@@ -51,7 +52,7 @@
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Background" Value="{StaticResource ControlDisabledBackgroundKey}"/>
+                            <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Themes/ResourceKeys.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Themes/ResourceKeys.cs
new file mode 100644
index 00000000..70013e2b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Themes/ResourceKeys.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Windows;
+
+namespace Microsoft.Windows.Controls.Themes
+{
+    public static class ResourceKeys
+    {
+        #region Brush Keys
+
+        public static readonly ResourceKey ControlNormalBackgroundKey = new StaticResourceKey(typeof(ResourceKeys), "ControlNormalBackgroundKey");
+        public static readonly ResourceKey ControlDisabledBackgroundKey = new StaticResourceKey(typeof(ResourceKeys), "ControlDisabledBackgroundKey");
+        public static readonly ResourceKey ControlNormalBorderKey = new StaticResourceKey(typeof(ResourceKeys), "ControlNormalBorderKey");
+        public static readonly ResourceKey ControlMouseOverBorderKey = new StaticResourceKey(typeof(ResourceKeys), "ControlMouseOverBorderKey");
+        public static readonly ResourceKey ControlFocusedBorderKey = new StaticResourceKey(typeof(ResourceKeys), "ControlFocusedBorderKey");
+
+        public static readonly ResourceKey ButtonNormalOuterBorderKey = new StaticResourceKey(typeof(ResourceKeys), "ButtonNormalOuterBorderKey");
+        public static readonly ResourceKey ButtonNormalInnerBorderKey = new StaticResourceKey(typeof(ResourceKeys), "ButtonNormalInnerBorderKey");
+        public static readonly ResourceKey ButtonNormalBackgroundKey = new StaticResourceKey(typeof(ResourceKeys), "ButtonNormalBackgroundKey");
+
+        public static readonly ResourceKey ButtonMouseOverBackgroundKey = new StaticResourceKey(typeof(ResourceKeys), "ButtonMouseOverBackgroundKey");
+        public static readonly ResourceKey ButtonMouseOverOuterBorderKey = new StaticResourceKey(typeof(ResourceKeys), "ButtonMouseOverOuterBorderKey");
+        public static readonly ResourceKey ButtonMouseOverInnerBorderKey = new StaticResourceKey(typeof(ResourceKeys), "ButtonMouseOverInnerBorderKey");
+
+        public static readonly ResourceKey ButtonPressedOuterBorderKey = new StaticResourceKey(typeof(ResourceKeys), "ButtonPressedOuterBorderKey");
+        public static readonly ResourceKey ButtonPressedInnerBorderKey = new StaticResourceKey(typeof(ResourceKeys), "ButtonPressedInnerBorderKey");
+        public static readonly ResourceKey ButtonPressedBackgroundKey = new StaticResourceKey(typeof(ResourceKeys), "ButtonPressedBackgroundKey");
+
+        #endregion //Brush Keys
+
+        public static readonly ResourceKey GlyphNormalForegroundKey = new StaticResourceKey(typeof(ResourceKeys), "GlyphNormalForegroundKey");
+
+        public static readonly ResourceKey SpinButtonCornerRadiusKey = new StaticResourceKey(typeof(ResourceKeys), "SpinButtonCornerRadiusKey");
+    }
+}
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Themes/StaticResourceKey.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Themes/StaticResourceKey.cs
new file mode 100644
index 00000000..47c5e643
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Themes/StaticResourceKey.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Windows;
+
+namespace Microsoft.Windows.Controls.Themes
+{
+    public sealed class StaticResourceKey : ResourceKey
+    {
+        private string _key;
+        public string Key { get { return _key; } }
+
+        private Type _type;
+        public Type Type { get { return _type; } }
+
+        public StaticResourceKey(Type type, string key)
+        {
+            _type = type;
+            _key = key;
+        }
+
+        public override System.Reflection.Assembly Assembly
+        {
+            get { return _type.Assembly; }
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero.NormalColor.xaml
new file mode 100644
index 00000000..628178f4
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero.NormalColor.xaml
@@ -0,0 +1,8 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="/WPFToolkit.Extended;component/Themes/Aero/Brushes_NormalColor.xaml" />
+    </ResourceDictionary.MergedDictionaries>    
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero/Brushes_NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero/Brushes_NormalColor.xaml
new file mode 100644
index 00000000..d6c77289
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero/Brushes_NormalColor.xaml
@@ -0,0 +1,10 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Microsoft.Windows.Controls"
+                    xmlns:PresentationOptions="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
+                    xmlns:themes="clr-namespace:Microsoft.Windows.Controls.Themes" >
+
+    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlNormalBackgroundKey}" Color="Red" PresentationOptions:Freeze="true"/>
+    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlNormalBorderKey}" Color="Purple"   PresentationOptions:Freeze="true" />
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic.xaml
index 0e62e9fe..85ccc5b2 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic.xaml
@@ -1,10 +1,15 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/Themes/Common/Generic_Common.xaml" />
+        <ResourceDictionary Source="/WPFToolkit.Extended;component/Themes/Generic/Brushes.xaml" />        
+        <ResourceDictionary Source="/WPFToolkit.Extended;component/Themes/Generic/Common.xaml" />
+        
         <ResourceDictionary Source="/WPFToolkit.Extended;component/Chromes/Themes/Generic.xaml" />
+        
         <ResourceDictionary Source="/WPFToolkit.Extended;component/BusyIndicator/Themes/Generic.xaml" />
+        
         <ResourceDictionary Source="/WPFToolkit.Extended;component/ButtonSpinner/Themes/Generic.xaml" />
+        
         <ResourceDictionary Source="/WPFToolkit.Extended;component/Calculator/Themes/Generic.xaml" />
         <ResourceDictionary Source="/WPFToolkit.Extended;component/CalculatorUpDown/Themes/Generic.xaml" />
         <ResourceDictionary Source="/WPFToolkit.Extended;component/CheckComboBox/Themes/Generic.xaml" />
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero/Brushes.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Brushes.xaml
similarity index 66%
rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero/Brushes.xaml
rename to ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Brushes.xaml
index 4548400e..7cf5305c 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero/Brushes.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Brushes.xaml
@@ -1,11 +1,12 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:PresentationOptions="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options" >
-
-    <SolidColorBrush x:Key="ControlNormalBackgroundKey" Color="#FFFFFF" PresentationOptions:Freeze="true"/>
-    <SolidColorBrush x:Key="ControlDisabledBackgroundKey" Color="#F4F4F4" PresentationOptions:Freeze="true"/>
-
-    <LinearGradientBrush x:Key="ControlNormalBorderFillKey" StartPoint="0.5,0" EndPoint="0.5,1" PresentationOptions:Freeze="true">
+                    xmlns:local="clr-namespace:Microsoft.Windows.Controls"
+                    xmlns:PresentationOptions="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
+                    xmlns:themes="clr-namespace:Microsoft.Windows.Controls.Themes">
+    
+    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlNormalBackgroundKey}" Color="#FFFFFF" PresentationOptions:Freeze="true"/>
+    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}" Color="#F4F4F4" PresentationOptions:Freeze="true"/>
+    <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlNormalBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1" PresentationOptions:Freeze="true">
         <LinearGradientBrush.GradientStops>
             <GradientStopCollection>
                 <GradientStop Color="#FFabadb3" Offset="0" />
@@ -15,8 +16,7 @@
             </GradientStopCollection>
         </LinearGradientBrush.GradientStops>
     </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="ControlMouseOverBorderFillKey" StartPoint="0.5,0" EndPoint="0.5,1" PresentationOptions:Freeze="true" >
+    <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlMouseOverBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1" PresentationOptions:Freeze="true" >
         <LinearGradientBrush.GradientStops>
             <GradientStopCollection>
                 <GradientStop Color="#FF3d7bad" Offset="0" />
@@ -25,9 +25,8 @@
                 <GradientStop Color="#FFb7d9ed" Offset="1" />
             </GradientStopCollection>
         </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="ControlFocusedBorderFillKey" StartPoint="0.5,0" EndPoint="0.5,1" PresentationOptions:Freeze="true">
+    </LinearGradientBrush>    
+    <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlFocusedBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1" PresentationOptions:Freeze="true">
         <LinearGradientBrush.GradientStops>
             <GradientStopCollection>
                 <GradientStop Color="#FF3d7bad" Offset="0" />
@@ -38,18 +37,8 @@
         </LinearGradientBrush.GradientStops>
     </LinearGradientBrush>
 
-
-
-
-
-
-
-
-
-
-
-    <SolidColorBrush PresentationOptions:Freeze="true" x:Key="DropdownBtnNormalOuterBorderFillKey" Color="#FFABADB3"/>
-    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="DropdownBtnNormalInnerBorderFillKey" StartPoint="0.5,0" EndPoint="0.5,1">
+    <SolidColorBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}" Color="#FFABADB3"/>
+    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonNormalInnerBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1">
         <LinearGradientBrush.GradientStops>
             <GradientStopCollection>
                 <GradientStop Offset="0" Color="#FFfcfcfc"/>
@@ -59,7 +48,7 @@
             </GradientStopCollection>
         </LinearGradientBrush.GradientStops>
     </LinearGradientBrush>
-    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="DropdownBtnNormalCenterFillKey" StartPoint="0.5,0" EndPoint="0.5,1">
+    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}" StartPoint="0.5,0" EndPoint="0.5,1">
         <LinearGradientBrush.GradientStops>
             <GradientStopCollection>
                 <GradientStop Offset="0" Color="#FFf2f2f2"/>
@@ -70,8 +59,8 @@
         </LinearGradientBrush.GradientStops>
     </LinearGradientBrush>
 
-    <SolidColorBrush PresentationOptions:Freeze="true" x:Key="DropdownBtnHottrackOuterBorderFillKey" Color="#FF3C7FB1"/>
-    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="DropdownBtnHottrackInnerBorderFillKey" StartPoint="0.5,0" EndPoint="0.5,1">
+    <SolidColorBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}" Color="#FF3C7FB1"/>
+    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverInnerBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1">
         <LinearGradientBrush.GradientStops>
             <GradientStopCollection>
                 <GradientStop Color="#FFfafdfe" Offset="0" />
@@ -81,7 +70,7 @@
             </GradientStopCollection>
         </LinearGradientBrush.GradientStops>
     </LinearGradientBrush>
-    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="DropdownBtnHottrackCenterFillKey" StartPoint="0.5,0" EndPoint="0.5,1">
+    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}" StartPoint="0.5,0" EndPoint="0.5,1">
         <LinearGradientBrush.GradientStops>
             <GradientStopCollection>
                 <GradientStop Color="#FFeaf6fd" Offset="0" />
@@ -91,8 +80,9 @@
             </GradientStopCollection>
         </LinearGradientBrush.GradientStops>
     </LinearGradientBrush>
-    <SolidColorBrush PresentationOptions:Freeze="true" x:Key="DropdownBtnPressedOuterBorderFillKey" Color="#FF2C628B"/>
-    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="DropdownBtnPressedInnerBorderFillKey" StartPoint="0.5,0" EndPoint="0.5,1">
+
+    <SolidColorBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}" Color="#FF2C628B"/>
+    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedInnerBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1">
         <LinearGradientBrush.GradientStops>
             <GradientStopCollection>
                 <GradientStop Color="#FF9eb0ba" Offset="0" />
@@ -103,7 +93,7 @@
             </GradientStopCollection>
         </LinearGradientBrush.GradientStops>
     </LinearGradientBrush>
-    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="DropdownBtnPressedCenterFillKey" StartPoint="0.5,0" EndPoint="0.5,1">
+    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}" StartPoint="0.5,0" EndPoint="0.5,1">
         <LinearGradientBrush.GradientStops>
             <GradientStopCollection>
                 <GradientStop Color="#FFe5f4fc" Offset="0" />
@@ -114,14 +104,7 @@
         </LinearGradientBrush.GradientStops>
     </LinearGradientBrush>
 
-    <SolidColorBrush PresentationOptions:Freeze="true" x:Key="DropdownBtnGlyphNormalForegroundFillKey" Color="#FF000000" />
-
-
-
-
-
-
-
-    <CornerRadius x:Key="SpinButtonCornerRadiusKey" TopLeft="0" TopRight="0" BottomRight="0" BottomLeft="0" PresentationOptions:Freeze="true" />
+    <SolidColorBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.GlyphNormalForegroundKey}" Color="#FF000000" />
+    <CornerRadius x:Key="{x:Static themes:ResourceKeys.SpinButtonCornerRadiusKey}" TopLeft="0" TopRight="0" BottomRight="0" BottomLeft="0" PresentationOptions:Freeze="true" />    
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero/Buttons.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Buttons.xaml
similarity index 60%
rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero/Buttons.xaml
rename to ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Buttons.xaml
index 30d4977f..11d89486 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero/Buttons.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Buttons.xaml
@@ -1,16 +1,13 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="Brushes.xaml" />
-    </ResourceDictionary.MergedDictionaries>
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:themes="clr-namespace:Microsoft.Windows.Controls.Themes">
 
     <DataTemplate x:Key="IncreaseGlyphKey">
         <Path
 			Width="7"
 			Height="4"
 			Data="M 0,3 C0,3 0,4 0,4 0,4 3,4 3,4 3,4 3,3 3,3 3,3 4,3 4,3 4,3 4,4 4,4 4,4 7,4 7,4 7,4 7,3 7,3 7,3 6,3 6,3 6,3 6,2 6,2 6,2 5,2 5,2 5,2 5,1 5,1 5,1 4,1 4,1 4,1 4,0 4,0 4,0 3,0 3,0 3,0 3,1 3,1 3,1 2,1 2,1 2,1 2,2 2,2 2,2 1,2 1,2 1,2 1,3 1,3 1,3 0,3 0,3 z"
-			Fill="{StaticResource DropdownBtnGlyphNormalForegroundFillKey}"
+			Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphNormalForegroundKey}}"
             SnapsToDevicePixels="True"
              HorizontalAlignment="Center" VerticalAlignment="Center" Focusable="False" />
     </DataTemplate>
@@ -20,36 +17,39 @@
 			Width="7"
 			Height="4"
 			Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z"
-			Fill="{StaticResource DropdownBtnGlyphNormalForegroundFillKey}"
+			Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphNormalForegroundKey}}"
             SnapsToDevicePixels="True"
              HorizontalAlignment="Center" VerticalAlignment="Center" Focusable="False" />
     </DataTemplate>
-    
+
     <Style x:Key="SpinnerButtonStyle" TargetType="RepeatButton">
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="BorderBrush" Value="Transparent"/>
-        <Setter Property="BorderThickness" Value="1"/>        
-        <Setter Property="Foreground" Value="{StaticResource DropdownBtnGlyphNormalForegroundFillKey}"/>
+        <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="Padding" Value="4,2"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="RepeatButton">
-                    <Border x:Name="Bd" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" CornerRadius="{StaticResource SpinButtonCornerRadiusKey}" >
+                    <Border x:Name="Bd" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" CornerRadius="{DynamicResource {x:Static themes:ResourceKeys.SpinButtonCornerRadiusKey}}" >
                         <Grid>
+                            <!--<Border x:Name="innerBd" BorderBrush="{StaticResource DropdownBtnNormalInnerBorderFillKey}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{DynamicResource {x:Static themes:ResourceKeys.SpinButtonCornerRadiusKey}}"/>-->
+                            <Border x:Name="innerBd" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{DynamicResource {x:Static themes:ResourceKeys.SpinButtonCornerRadiusKey}}"/>
                             <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}"/>
                         </Grid>
-                    </Border>                    
+                    </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" TargetName="Bd" Value="{StaticResource DropdownBtnHottrackCenterFillKey}"/>
-                            <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource DropdownBtnHottrackOuterBorderFillKey}"/>
+                            <Setter Property="Background" TargetName="Bd" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}}"/>
+                            <Setter Property="BorderBrush" TargetName="Bd" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}}"/>
+                            <Setter Property="BorderBrush" TargetName="innerBd" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverInnerBorderKey}}"/>
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource DropdownBtnPressedOuterBorderFillKey}"/>
-                            <Setter Property="Background" TargetName="Bd" Value="{StaticResource DropdownBtnPressedCenterFillKey}"/>
+                            <Setter Property="BorderBrush" TargetName="Bd" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}"/>
+                            <Setter Property="Background" TargetName="Bd" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}"/>
+                            <Setter Property="BorderBrush" TargetName="innerBd" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedInnerBorderKey}}"/>
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Background" TargetName="Bd" Value="{StaticResource ControlDisabledBackgroundKey}" />
+                            <Setter Property="Background" TargetName="Bd" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Common/Generic_Common.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Common.xaml
similarity index 98%
rename from ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Common/Generic_Common.xaml
rename to ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Common.xaml
index cb7d3894..555f772a 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Common/Generic_Common.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Common.xaml
@@ -101,7 +101,7 @@
     <!-- =============================================================================== -->
     <!-- SelectorItem                                                                    -->
     <!-- =============================================================================== -->
-    
+
     <Style TargetType="{x:Type primitives:SelectorItem}">
         <Setter Property="Template">
             <Setter.Value>
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj
index 922c4f52..32bd54d1 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj
@@ -151,22 +151,30 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Themes\Aero\Brushes.xaml">
+    <Page Include="Themes\Aero.NormalColor.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Themes\Aero\Buttons.xaml">
+    <Page Include="Themes\Aero\Brushes_NormalColor.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Themes\Common\Generic_Common.xaml">
+    <Page Include="Themes\Generic.xaml">
+      <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Themes\Generic\Brushes.xaml">
       <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
     </Page>
-    <Page Include="Themes\Generic.xaml">
+    <Page Include="Themes\Generic\Buttons.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Themes\Generic\Common.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="TimePicker\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -211,6 +219,7 @@
     <Compile Include="ColorPicker\Implementation\ColorPicker.cs" />
     <Compile Include="Core\Primitives\Selector.cs" />
     <Compile Include="Core\Primitives\SelectorItem.cs" />
+    <Compile Include="Core\Themes\StaticResourceKey.cs" />
     <Compile Include="Core\Utilities\CalculatorUtilities.cs" />
     <Compile Include="Core\Utilities\ColorUtilities.cs" />
     <Compile Include="ColorCanvas\Implementation\ColorSpectrumSlider.cs" />
@@ -305,6 +314,7 @@
     <Compile Include="RichTextBox\RichTextBox.cs" />
     <Compile Include="Core\Primitives\UpDownBase.cs" />
     <Compile Include="SplitButton\Implementation\SplitButton.cs" />
+    <Compile Include="Core\Themes\ResourceKeys.cs" />
     <Compile Include="TimePicker\Implementation\TimeFormat.cs" />
     <Compile Include="TimePicker\Implementation\TimeItem.cs" />
     <Compile Include="TimePicker\Implementation\TimePicker.cs" />