From 8c963ec8e2505255afea3f46b237d9278870c36f Mon Sep 17 00:00:00 2001
From: Sunyunpeng <sunyunpeng@hangxin.com>
Date: Mon, 15 Jul 2019 09:53:00 +0800
Subject: [PATCH 01/46] Add delegate to costomize external dialog window.
 Openup dialog button's height, using MinHeight instead of Height.

---
 src/MahApps.Metro/Controls/Dialogs/DialogManager.cs    | 10 ++++++++--
 src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml    |  6 +++---
 src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml    |  6 +++---
 src/MahApps.Metro/Controls/Dialogs/MessageDialog.xaml  | 10 +++++-----
 src/MahApps.Metro/Controls/Dialogs/ProgressDialog.xaml |  4 ++--
 5 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/MahApps.Metro/Controls/Dialogs/DialogManager.cs b/src/MahApps.Metro/Controls/Dialogs/DialogManager.cs
index 62e1b2c8b1..7386e630ba 100644
--- a/src/MahApps.Metro/Controls/Dialogs/DialogManager.cs
+++ b/src/MahApps.Metro/Controls/Dialogs/DialogManager.cs
@@ -538,11 +538,14 @@ private static void RemoveDialog(this MetroWindow window, BaseMetroDialog dialog
         /// </summary>
         /// <param name="dialog">The dialog which will be shown externally.</param>
         /// <param name="windowOwner">The owner for the external window. If it's null the main window will be use.</param>
+        /// <param name="handleExternalDialogWindow">The delegate for customizing dialog window. It can be null.</param>
         /// <returns>The given dialog.</returns>
-        public static BaseMetroDialog ShowDialogExternally(this BaseMetroDialog dialog, [CanBeNull] Window windowOwner = null)
+        public static BaseMetroDialog ShowDialogExternally(this BaseMetroDialog dialog, [CanBeNull] Window windowOwner = null, [CanBeNull] Action<Window> handleExternalDialogWindow = null)
         {
             Window win = SetupExternalDialogWindow(dialog, windowOwner);
 
+            handleExternalDialogWindow?.Invoke(win);
+
             dialog.OnShown();
             win.Show();
 
@@ -554,11 +557,14 @@ public static BaseMetroDialog ShowDialogExternally(this BaseMetroDialog dialog,
         /// </summary>
         /// <param name="dialog">The dialog which will be shown externally.</param>
         /// <param name="windowOwner">The owner for the external window. If it's null the main window will be use.</param>
+        /// <param name="handleExternalDialogWindow">The delegate for customizing dialog window. It can be null.</param>
         /// <returns>The given dialog.</returns>
-        public static BaseMetroDialog ShowModalDialogExternally(this BaseMetroDialog dialog, [CanBeNull] Window windowOwner = null)
+        public static BaseMetroDialog ShowModalDialogExternally(this BaseMetroDialog dialog, [CanBeNull] Window windowOwner = null, [CanBeNull] Action<Window> handleExternalDialogWindow = null)
         {
             Window win = SetupExternalDialogWindow(dialog, windowOwner);
 
+            handleExternalDialogWindow?.Invoke(win);
+
             dialog.OnShown();
             win.ShowDialog();
 
diff --git a/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml b/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml
index c3a23e0c4e..b0b2187ed3 100644
--- a/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml
+++ b/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml
@@ -26,17 +26,17 @@
                  TextWrapping="Wrap" />
 
         <StackPanel Grid.Row="2"
-                    Height="85"
+                    MinHeight="85"
                     HorizontalAlignment="Right"
                     Orientation="Horizontal">
             <Button x:Name="PART_AffirmativeButton"
-                    Height="35"
+                    MinHeight="35"
                     MinWidth="80"
                     Margin="0 0 5 0"
                     Content="{Binding AffirmativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:InputDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                     Style="{DynamicResource MahApps.Metro.Styles.Dialogs.AccentButton}" />
             <Button x:Name="PART_NegativeButton"
-                    Height="35"
+                    MinHeight="35"
                     MinWidth="80"
                     Margin="5 0 5 0"
                     Content="{Binding NegativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:InputDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
diff --git a/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml b/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml
index 43c1d1484a..75823ef1c3 100644
--- a/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml
+++ b/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml
@@ -45,17 +45,17 @@
                   IsChecked="{Binding RememberCheckBoxChecked, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                   Visibility="{Binding RememberCheckBoxVisibility, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}" />
         <StackPanel Grid.Row="4"
-                    Height="85"
+                    MinHeight="85"
                     HorizontalAlignment="Right"
                     Orientation="Horizontal">
             <Button x:Name="PART_AffirmativeButton"
-                    Height="35"
+                    MinHeight="35"
                     MinWidth="80"
                     Margin="0 0 5 0"
                     Content="{Binding AffirmativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                     Style="{DynamicResource MahApps.Metro.Styles.Dialogs.AccentButton}" />
             <Button x:Name="PART_NegativeButton"
-                    Height="35"
+                    MinHeight="35"
                     MinWidth="80"
                     Margin="5 0 5 0"
                     Content="{Binding NegativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
diff --git a/src/MahApps.Metro/Controls/Dialogs/MessageDialog.xaml b/src/MahApps.Metro/Controls/Dialogs/MessageDialog.xaml
index b72c87f19c..7caa6dc5f6 100644
--- a/src/MahApps.Metro/Controls/Dialogs/MessageDialog.xaml
+++ b/src/MahApps.Metro/Controls/Dialogs/MessageDialog.xaml
@@ -24,30 +24,30 @@
         </ScrollViewer>
 
         <StackPanel Grid.Row="1"
-                    Height="85"
+                    MinHeight="85"
                     HorizontalAlignment="Right"
                     Orientation="Horizontal">
             <Button x:Name="PART_AffirmativeButton"
-                    Height="35"
+                    MinHeight="35"
                     MinWidth="80"
                     Margin="0 0 5 0"
                     Content="{Binding AffirmativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:MessageDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                     Style="{DynamicResource MahApps.Metro.Styles.Dialogs.Button}" />
             <Button x:Name="PART_NegativeButton"
-                    Height="35"
+                    MinHeight="35"
                     MinWidth="80"
                     Margin="5 0 5 0"
                     Content="{Binding NegativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:MessageDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                     Style="{DynamicResource MahApps.Metro.Styles.Dialogs.Button}" />
             <Button x:Name="PART_FirstAuxiliaryButton"
-                    Height="35"
+                    MinHeight="35"
                     MinWidth="80"
                     Margin="5 0 5 0"
                     Content="{Binding FirstAuxiliaryButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:MessageDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                     Style="{DynamicResource MahApps.Metro.Styles.Dialogs.Button}"
                     Visibility="Collapsed" />
             <Button x:Name="PART_SecondAuxiliaryButton"
-                    Height="35"
+                    MinHeight="35"
                     MinWidth="80"
                     Margin="5 0 0 0"
                     Content="{Binding SecondAuxiliaryButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:MessageDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
diff --git a/src/MahApps.Metro/Controls/Dialogs/ProgressDialog.xaml b/src/MahApps.Metro/Controls/Dialogs/ProgressDialog.xaml
index 5189a8232b..acf9c210b8 100644
--- a/src/MahApps.Metro/Controls/Dialogs/ProgressDialog.xaml
+++ b/src/MahApps.Metro/Controls/Dialogs/ProgressDialog.xaml
@@ -18,11 +18,11 @@
                        TextWrapping="Wrap" />
 
             <StackPanel Grid.Row="1"
-                        Height="85"
+                        MinHeight="85"
                         HorizontalAlignment="Right"
                         Orientation="Horizontal">
                 <Button x:Name="PART_NegativeButton"
-                        Height="35"
+                        MinHeight="35"
                         MinWidth="80"
                         Margin="5 0 0 0"
                         Content="{Binding NegativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:ProgressDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"

From 7512b1c1fddc76f200f0d7f0a5fb9ee5621ede6e Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Mon, 15 Jul 2019 14:34:36 +0200
Subject: [PATCH 02/46] Set MinHeight and MinWidth via styles

---
 .../MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml  | 4 ++--
 src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml      | 4 ----
 src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml      | 4 ----
 src/MahApps.Metro/Controls/Dialogs/MessageDialog.xaml    | 8 --------
 src/MahApps.Metro/Controls/Dialogs/ProgressDialog.xaml   | 2 --
 src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml    | 9 +++++++++
 6 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
index d98d2a326f..80cdd0fc5a 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
@@ -239,9 +239,9 @@
                                    OnLabel="Enabled"
                                    Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}" />
             <Controls:ToggleSwitch x:Name="visibleSwitch"
-                                   Controls:ValidationHelper.ShowValidationErrorOnMouseOver="True"
-                                   Controls:ValidationHelper.CloseOnMouseLeftButtonDown="True"
                                    Margin="{StaticResource ControlMargin}"
+                                   Controls:ValidationHelper.CloseOnMouseLeftButtonDown="True"
+                                   Controls:ValidationHelper.ShowValidationErrorOnMouseOver="True"
                                    IsChecked="{Binding IsToggleSwitchVisible, ValidatesOnDataErrors=True}"
                                    OffLabel="Collapsed"
                                    OnLabel="Visible"
diff --git a/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml b/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml
index b0b2187ed3..bb7c33660f 100644
--- a/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml
+++ b/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml
@@ -30,14 +30,10 @@
                     HorizontalAlignment="Right"
                     Orientation="Horizontal">
             <Button x:Name="PART_AffirmativeButton"
-                    MinHeight="35"
-                    MinWidth="80"
                     Margin="0 0 5 0"
                     Content="{Binding AffirmativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:InputDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                     Style="{DynamicResource MahApps.Metro.Styles.Dialogs.AccentButton}" />
             <Button x:Name="PART_NegativeButton"
-                    MinHeight="35"
-                    MinWidth="80"
                     Margin="5 0 5 0"
                     Content="{Binding NegativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:InputDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                     Style="{DynamicResource MahApps.Metro.Styles.Dialogs.Button}" />
diff --git a/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml b/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml
index 75823ef1c3..64cc54af8d 100644
--- a/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml
+++ b/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml
@@ -49,14 +49,10 @@
                     HorizontalAlignment="Right"
                     Orientation="Horizontal">
             <Button x:Name="PART_AffirmativeButton"
-                    MinHeight="35"
-                    MinWidth="80"
                     Margin="0 0 5 0"
                     Content="{Binding AffirmativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                     Style="{DynamicResource MahApps.Metro.Styles.Dialogs.AccentButton}" />
             <Button x:Name="PART_NegativeButton"
-                    MinHeight="35"
-                    MinWidth="80"
                     Margin="5 0 5 0"
                     Content="{Binding NegativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                     Style="{DynamicResource MahApps.Metro.Styles.Dialogs.Button}"
diff --git a/src/MahApps.Metro/Controls/Dialogs/MessageDialog.xaml b/src/MahApps.Metro/Controls/Dialogs/MessageDialog.xaml
index 7caa6dc5f6..50dc79201a 100644
--- a/src/MahApps.Metro/Controls/Dialogs/MessageDialog.xaml
+++ b/src/MahApps.Metro/Controls/Dialogs/MessageDialog.xaml
@@ -28,27 +28,19 @@
                     HorizontalAlignment="Right"
                     Orientation="Horizontal">
             <Button x:Name="PART_AffirmativeButton"
-                    MinHeight="35"
-                    MinWidth="80"
                     Margin="0 0 5 0"
                     Content="{Binding AffirmativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:MessageDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                     Style="{DynamicResource MahApps.Metro.Styles.Dialogs.Button}" />
             <Button x:Name="PART_NegativeButton"
-                    MinHeight="35"
-                    MinWidth="80"
                     Margin="5 0 5 0"
                     Content="{Binding NegativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:MessageDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                     Style="{DynamicResource MahApps.Metro.Styles.Dialogs.Button}" />
             <Button x:Name="PART_FirstAuxiliaryButton"
-                    MinHeight="35"
-                    MinWidth="80"
                     Margin="5 0 5 0"
                     Content="{Binding FirstAuxiliaryButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:MessageDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                     Style="{DynamicResource MahApps.Metro.Styles.Dialogs.Button}"
                     Visibility="Collapsed" />
             <Button x:Name="PART_SecondAuxiliaryButton"
-                    MinHeight="35"
-                    MinWidth="80"
                     Margin="5 0 0 0"
                     Content="{Binding SecondAuxiliaryButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:MessageDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                     Style="{DynamicResource MahApps.Metro.Styles.Dialogs.Button}"
diff --git a/src/MahApps.Metro/Controls/Dialogs/ProgressDialog.xaml b/src/MahApps.Metro/Controls/Dialogs/ProgressDialog.xaml
index acf9c210b8..fcdbf6c3d1 100644
--- a/src/MahApps.Metro/Controls/Dialogs/ProgressDialog.xaml
+++ b/src/MahApps.Metro/Controls/Dialogs/ProgressDialog.xaml
@@ -22,8 +22,6 @@
                         HorizontalAlignment="Right"
                         Orientation="Horizontal">
                 <Button x:Name="PART_NegativeButton"
-                        MinHeight="35"
-                        MinWidth="80"
                         Margin="5 0 0 0"
                         Content="{Binding NegativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:ProgressDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                         Cursor="Arrow"
diff --git a/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml b/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml
index 11c66f6f23..beee02df53 100644
--- a/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml
+++ b/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml
@@ -10,18 +10,27 @@
     <Style x:Key="MahApps.Metro.Styles.Dialogs.Button"
            BasedOn="{StaticResource SquareButtonStyle}"
            TargetType="{x:Type Button}">
+        <Setter Property="MinHeight" Value="35" />
+        <Setter Property="MinWidth" Value="80" />
+        <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="controls:ControlsHelper.ContentCharacterCasing" Value="Normal" />
     </Style>
 
     <Style x:Key="MahApps.Metro.Styles.Dialogs.AccentButton"
            BasedOn="{StaticResource AccentedSquareButtonStyle}"
            TargetType="{x:Type ButtonBase}">
+        <Setter Property="MinHeight" Value="35" />
+        <Setter Property="MinWidth" Value="80" />
+        <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="controls:ControlsHelper.ContentCharacterCasing" Value="Normal" />
     </Style>
 
     <Style x:Key="MahApps.Metro.Styles.Dialogs.AccentHighlightButton"
            BasedOn="{StaticResource HighlightedSquareButtonStyle}"
            TargetType="{x:Type ButtonBase}">
+        <Setter Property="MinHeight" Value="35" />
+        <Setter Property="MinWidth" Value="80" />
+        <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="controls:ControlsHelper.ContentCharacterCasing" Value="Normal" />
     </Style>
 

From a5d0c3afbbc78dc33fc3a120d270ad80a33c870a Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Wed, 17 Jul 2019 17:25:40 +0200
Subject: [PATCH 03/46] Update PackageReference for ControlzEx and
 MaterialDesignThemes

---
 .../MahApps.Metro.Demo/MahApps.Metro.Demo.csproj                | 1 +
 src/MahApps.Metro/MahApps.Metro.csproj                          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.csproj b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.csproj
index 4b0d01ae70..780e5ee982 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.csproj
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.csproj
@@ -27,6 +27,7 @@
     <ItemGroup>
         <PackageReference Include="MahApps.Metro.IconPacks" Version="3.0.0-alpha*" />
         <PackageReference Include="MaterialDesignThemes" Version="2.*" />
+        <PackageReference Include="MaterialDesignColors" Version="1.*" />
         <PackageReference Include="NHotkey.Wpf" Version="1.2.1" />
         <PackageReference Include="Fody" Version="5.*">
           <PrivateAssets>all</PrivateAssets>
diff --git a/src/MahApps.Metro/MahApps.Metro.csproj b/src/MahApps.Metro/MahApps.Metro.csproj
index d6853d8f2a..7f04e0793e 100644
--- a/src/MahApps.Metro/MahApps.Metro.csproj
+++ b/src/MahApps.Metro/MahApps.Metro.csproj
@@ -14,7 +14,7 @@
         <Reference Include="System.Configuration" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="ControlzEx" Version="[4.0.0-alpha*, 5.0)" />
+        <PackageReference Include="ControlzEx" Version="[4.*, 5.0)" />
         <PackageReference Include="Newtonsoft.Json" Version="12.*" PrivateAssets="All" />
         <PackageReference Include="XamlColorSchemeGenerator" Version="3.0.0.31" PrivateAssets="All" />
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2*" PrivateAssets="All" />

From 95a5e13d0b76169bbf173e9ab318843340411444 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Thu, 11 Jul 2019 11:29:45 +0200
Subject: [PATCH 04/46] Update color names

---
 src/MahApps.Metro/Controls/Flyout.cs          |  22 +-
 .../Styles/Controls.ContextMenu.xaml          |   6 +-
 .../Styles/Controls.ProgressBar.xaml          |  16 +-
 src/MahApps.Metro/Styles/Shared.xaml          |   2 +-
 .../Styles/Themes/GeneratorParameters.json    | 356 +++++++++---------
 .../Styles/Themes/Theme.Template.xaml         | 214 +++++------
 src/MahApps.Metro/Styles/VS/Colors.xaml       |  60 +--
 .../ThemeManager/ThemeManager.StyleKeys.cs    |   4 +-
 src/MahApps.Metro/Themes/MetroWindow.xaml     |   2 +-
 .../TestHelpers/ThemeHelper.cs                |  14 +-
 10 files changed, 348 insertions(+), 348 deletions(-)

diff --git a/src/MahApps.Metro/Controls/Flyout.cs b/src/MahApps.Metro/Controls/Flyout.cs
index e140147ae0..ee10b873b8 100644
--- a/src/MahApps.Metro/Controls/Flyout.cs
+++ b/src/MahApps.Metro/Controls/Flyout.cs
@@ -329,13 +329,13 @@ internal void ChangeFlyoutTheme(MahApps.Metro.Theme windowTheme)
 
         private void OverrideFlyoutResources(ResourceDictionary resources, bool accent = false)
         {
-            var fromColorKey = accent ? "HighlightColor" : "FlyoutColor";
+            var fromColorKey = accent ? "MahApps.Colors.Highlight" : "MahApps.Colors.Flyout";
 
             resources.BeginInit();
 
             var fromColor = (Color)resources[fromColorKey];
-            resources["WhiteColor"] = fromColor;
-            resources["FlyoutColor"] = fromColor;
+            resources["MahApps.Colors.White"] = fromColor;
+            resources["MahApps.Colors.Flyout"] = fromColor;
 
             var newBrush = new SolidColorBrush(fromColor);
             newBrush.Freeze();
@@ -349,25 +349,25 @@ private void OverrideFlyoutResources(ResourceDictionary resources, bool accent =
 
             if (accent)
             {
-                fromColor = (Color)resources["IdealForegroundColor"];
+                fromColor = (Color)resources["MahApps.Colors.IdealForeground"];
                 newBrush = new SolidColorBrush(fromColor);
                 newBrush.Freeze();
                 resources["FlyoutForegroundBrush"] = newBrush;
                 resources["TextBrush"] = newBrush;
                 resources["LabelTextBrush"] = newBrush;
 
-                if (resources.Contains("AccentBaseColor"))
+                if (resources.Contains("MahApps.Colors.AccentBase"))
                 {
-                    fromColor = (Color)resources["AccentBaseColor"];
+                    fromColor = (Color)resources["MahApps.Colors.AccentBase"];
                 }
                 else
                 {
-                    var accentColor = (Color)resources["AccentColor"];
+                    var accentColor = (Color)resources["MahApps.Colors.Accent"];
                     fromColor = Color.FromArgb(255, accentColor.R, accentColor.G, accentColor.B);
                 }
                 newBrush = new SolidColorBrush(fromColor);
                 newBrush.Freeze();
-                resources["HighlightColor"] = fromColor;
+                resources["MahApps.Colors.Highlight"] = fromColor;
                 resources["HighlightBrush"] = newBrush;
             }
 
@@ -451,7 +451,7 @@ private static void IsOpenedChanged(DependencyObject dependencyObject, Dependenc
                             }
                         }
                         else
-                        {                            
+                        {
                             flyout.StopAutoCloseTimer();
                             if (flyout.hideStoryboard != null)
                             {
@@ -518,7 +518,7 @@ private static void AutoCloseIntervalChanged(DependencyObject dependencyObject,
         {
             var flyout = (Flyout)dependencyObject;
 
-            Action autoCloseIntervalChangedAction = () => { 
+            Action autoCloseIntervalChangedAction = () => {
                 if (e.NewValue != e.OldValue)
                 {
                     flyout.InitializeAutoCloseTimer();
@@ -580,7 +580,7 @@ private void TryFocusElement()
             {
                 // first focus itself
                 this.Focus();
-                
+
                 if (this.FocusedElement != null)
                 {
                     this.FocusedElement.Focus();
diff --git a/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml b/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml
index 63310d784f..97d52c2cfa 100644
--- a/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml
@@ -108,7 +108,7 @@
                                                       Direction="315"
                                                       Opacity="0.3"
                                                       ShadowDepth="2"
-                                                      Color="{DynamicResource MenuShadowColor}" />
+                                                      Color="{DynamicResource MahApps.Colors.MenuShadow}" />
                                 </Setter.Value>
                             </Setter>
                             <Setter TargetName="LayoutRoot" Property="Margin" Value="0 0 6 6" />
@@ -363,7 +363,7 @@
                                           Direction="315"
                                           Opacity="0.3"
                                           ShadowDepth="2"
-                                          Color="{DynamicResource MenuShadowColor}" />
+                                          Color="{DynamicResource MahApps.Colors.MenuShadow}" />
                     </Setter.Value>
                 </Setter>
                 <Setter TargetName="LayoutRoot" Property="Margin" Value="0 0 6 6" />
@@ -526,7 +526,7 @@
                                           Direction="315"
                                           Opacity="0.3"
                                           ShadowDepth="2"
-                                          Color="{DynamicResource MenuShadowColor}" />
+                                          Color="{DynamicResource MahApps.Colors.MenuShadow}" />
                     </Setter.Value>
                 </Setter>
                 <Setter TargetName="LayoutRoot" Property="Margin" Value="0 0 6 6" />
diff --git a/src/MahApps.Metro/Styles/Controls.ProgressBar.xaml b/src/MahApps.Metro/Styles/Controls.ProgressBar.xaml
index 24f0ee1560..168e21fa9b 100644
--- a/src/MahApps.Metro/Styles/Controls.ProgressBar.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ProgressBar.xaml
@@ -39,10 +39,10 @@
                                                     <SkewTransform AngleX="-30" />
                                                 </TransformGroup>
                                             </LinearGradientBrush.Transform>
-                                            <GradientStop Offset="0" Color="{DynamicResource ProgressIndeterminateColor1}" />
-                                            <GradientStop Offset="0.651" Color="{DynamicResource ProgressIndeterminateColor2}" />
-                                            <GradientStop Offset="0.093" Color="{DynamicResource ProgressIndeterminateColor3}" />
-                                            <GradientStop Offset="0.548" Color="{DynamicResource ProgressIndeterminateColor4}" />
+                                            <GradientStop Offset="0" Color="{DynamicResource MahApps.Colors.ProgressIndeterminate1}" />
+                                            <GradientStop Offset="0.651" Color="{DynamicResource MahApps.Colors.ProgressIndeterminate2}" />
+                                            <GradientStop Offset="0.093" Color="{DynamicResource MahApps.Colors.ProgressIndeterminate3}" />
+                                            <GradientStop Offset="0.548" Color="{DynamicResource MahApps.Colors.ProgressIndeterminate4}" />
                                         </LinearGradientBrush>
                                     </Rectangle.Fill>
                                 </Rectangle>
@@ -63,10 +63,10 @@
                                                         <SkewTransform AngleX="-30" />
                                                     </TransformGroup>
                                                 </LinearGradientBrush.Transform>
-                                                <GradientStop Offset="0" Color="{DynamicResource ProgressIndeterminateColor1}" />
-                                                <GradientStop Offset="0.651" Color="{DynamicResource ProgressIndeterminateColor2}" />
-                                                <GradientStop Offset="0.093" Color="{DynamicResource ProgressIndeterminateColor3}" />
-                                                <GradientStop Offset="0.548" Color="{DynamicResource ProgressIndeterminateColor4}" />
+                                                <GradientStop Offset="0" Color="{DynamicResource MahApps.Colors.ProgressIndeterminate1}" />
+                                                <GradientStop Offset="0.651" Color="{DynamicResource MahApps.Colors.ProgressIndeterminate2}" />
+                                                <GradientStop Offset="0.093" Color="{DynamicResource MahApps.Colors.ProgressIndeterminate3}" />
+                                                <GradientStop Offset="0.548" Color="{DynamicResource MahApps.Colors.ProgressIndeterminate4}" />
                                             </LinearGradientBrush>
                                         </Rectangle.Fill>
                                     </Rectangle>
diff --git a/src/MahApps.Metro/Styles/Shared.xaml b/src/MahApps.Metro/Styles/Shared.xaml
index 5356fdc60f..3979ecde26 100644
--- a/src/MahApps.Metro/Styles/Shared.xaml
+++ b/src/MahApps.Metro/Styles/Shared.xaml
@@ -11,7 +11,7 @@
                       BlurRadius="10"
                       Opacity="0"
                       ShadowDepth="0"
-                      Color="{DynamicResource BlackColor}"
+                      Color="{DynamicResource MahApps.Colors.Black}"
                       po:Freeze="True" />
 
     <Storyboard x:Key="WaitingForDataStoryboard" po:Freeze="True">
diff --git a/src/MahApps.Metro/Styles/Themes/GeneratorParameters.json b/src/MahApps.Metro/Styles/Themes/GeneratorParameters.json
index 2ba54e789c..66f65c7da0 100644
--- a/src/MahApps.Metro/Styles/Themes/GeneratorParameters.json
+++ b/src/MahApps.Metro/Styles/Themes/GeneratorParameters.json
@@ -1,31 +1,31 @@
 {
   "TemplateFile": "Theme.Template.xaml",
   "DefaultValues": {
-    "IdealForegroundColor": "White"
+    "MahApps.Colors.IdealForeground": "White"
   },
   "BaseColorSchemes": [
     {
       "Name": "Dark",
       "Values": {
-        "BlackColor": "#FFFFFFFF",
-        "BlackColor20": "#51FFFFFF",
-        "WhiteColor": "#FF252525",
-        "WhiteColor20": "#51252525",
-        "Gray1": "#FFF9F9F9",
-        "Gray2": "#FF7F7F7F",
-        "Gray3": "#FF9D9D9D",
-        "Gray4": "#FFA59F93",
-        "Gray5": "#FFB9B9B9",
-        "Gray6": "#FFCCCCCC",
-        "Gray7": "#FF7E7E7E",
-        "Gray8": "#FF454545",
-        "Gray9": "#5EC9C9C9",
-        "Gray10": "#FF2F2F2F",
-        "GrayNormal": "#FF7D7D7D",
-        "GrayHover": "#FFAAAAAA",
-        "FlyoutColor": "#FF2B2B2B",
-        "MenuShadowColor": "#FFFFFFFF",
-        "DisabledMenuItemForeground": "{StaticResource Gray7}",
+        "MahApps.Colors.Black": "#FFFFFFFF",
+        "MahApps.Colors.Black20": "#51FFFFFF",
+        "MahApps.Colors.White": "#FF252525",
+        "MahApps.Colors.White20": "#51252525",
+        "MahApps.Colors.Gray1": "#FFF9F9F9",
+        "MahApps.Colors.Gray2": "#FF7F7F7F",
+        "MahApps.Colors.Gray3": "#FF9D9D9D",
+        "MahApps.Colors.Gray4": "#FFA59F93",
+        "MahApps.Colors.Gray5": "#FFB9B9B9",
+        "MahApps.Colors.Gray6": "#FFCCCCCC",
+        "MahApps.Colors.Gray7": "#FF7E7E7E",
+        "MahApps.Colors.Gray8": "#FF454545",
+        "MahApps.Colors.Gray9": "#5EC9C9C9",
+        "MahApps.Colors.Gray10": "#FF2F2F2F",
+        "MahApps.Colors.GrayNormal": "#FF7D7D7D",
+        "MahApps.Colors.GrayHover": "#FFAAAAAA",
+        "MahApps.Colors.Flyout": "#FF2B2B2B",
+        "MahApps.Colors.MenuShadow": "#FFFFFFFF",
+        "DisabledMenuItemForeground": "{StaticResource MahApps.Colors.Gray7}",
         "SliderValueDisabled": "#FF535353",
         "SliderTrackDisabled": "#FF383838",
         "SliderThumbDisabled": "#FF7E7E7E",
@@ -52,25 +52,25 @@
     {
       "Name": "Light",
       "Values": {
-        "BlackColor": "#FF000000",
-        "BlackColor20": "#51000000",
-        "WhiteColor": "#FFFFFFFF",
-        "WhiteColor20": "#51FFFFFF",
-        "Gray1": "#FF333333",
-        "Gray2": "#FF7F7F7F",
-        "Gray3": "#FF9D9D9D",
-        "Gray4": "#FFA59F93",
-        "Gray5": "#FFB9B9B9",
-        "Gray6": "#FFCCCCCC",
-        "Gray7": "#FFD8D8D9",
-        "Gray8": "#FFE0E0E0",
-        "Gray9": "#5EC9C9C9",
-        "Gray10": "#FFF7F7F7",
-        "GrayNormal": "#FFBEBEBE",
-        "GrayHover": "#FF333333",
-        "FlyoutColor": "#FFFFFFFF",
-        "MenuShadowColor": "#FF000000",
-        "DisabledMenuItemForeground": "{StaticResource Gray2}",
+        "MahApps.Colors.Black": "#FF000000",
+        "MahApps.Colors.Black20": "#51000000",
+        "MahApps.Colors.White": "#FFFFFFFF",
+        "MahApps.Colors.White20": "#51FFFFFF",
+        "MahApps.Colors.Gray1": "#FF333333",
+        "MahApps.Colors.Gray2": "#FF7F7F7F",
+        "MahApps.Colors.Gray3": "#FF9D9D9D",
+        "MahApps.Colors.Gray4": "#FFA59F93",
+        "MahApps.Colors.Gray5": "#FFB9B9B9",
+        "MahApps.Colors.Gray6": "#FFCCCCCC",
+        "MahApps.Colors.Gray7": "#FFD8D8D9",
+        "MahApps.Colors.Gray8": "#FFE0E0E0",
+        "MahApps.Colors.Gray9": "#5EC9C9C9",
+        "MahApps.Colors.Gray10": "#FFF7F7F7",
+        "MahApps.Colors.GrayNormal": "#FFBEBEBE",
+        "MahApps.Colors.GrayHover": "#FF333333",
+        "MahApps.Colors.Flyout": "#FFFFFFFF",
+        "MahApps.Colors.MenuShadow": "#FF000000",
+        "DisabledMenuItemForeground": "{StaticResource MahApps.Colors.Gray2}",
         "SliderValueDisabled": "#FFBABABA",
         "SliderTrackDisabled": "#FFDBDBDB",
         "SliderThumbDisabled": "#FFA0A0A0",
@@ -99,255 +99,255 @@
     {
       "Name": "Amber",
       "Values": {
-        "AccentBaseColor": "#FFF0A30A",
-        "AccentColor": "#CCF0A30A",
-        "AccentColor2": "#99F0A30A",
-        "AccentColor3": "#66F0A30A",
-        "AccentColor4": "#33F0A30A",
-        "HighlightColor": "#FFB17807"
+        "MahApps.Colors.AccentBase": "#FFF0A30A",
+        "MahApps.Colors.Accent": "#CCF0A30A",
+        "MahApps.Colors.Accent2": "#99F0A30A",
+        "MahApps.Colors.Accent3": "#66F0A30A",
+        "MahApps.Colors.Accent4": "#33F0A30A",
+        "MahApps.Colors.Highlight": "#FFB17807"
       }
     },
     {
       "Name": "Blue",
       "Values": {
-        "AccentBaseColor": "#FF119EDA",
-        "AccentColor": "#CC119EDA",
-        "AccentColor2": "#99119EDA",
-        "AccentColor3": "#66119EDA",
-        "AccentColor4": "#33119EDA",
-        "HighlightColor": "#FF086F9E"
+        "MahApps.Colors.AccentBase": "#FF119EDA",
+        "MahApps.Colors.Accent": "#CC119EDA",
+        "MahApps.Colors.Accent2": "#99119EDA",
+        "MahApps.Colors.Accent3": "#66119EDA",
+        "MahApps.Colors.Accent4": "#33119EDA",
+        "MahApps.Colors.Highlight": "#FF086F9E"
       }
     },
     {
       "Name": "Brown",
       "Values": {
-        "AccentBaseColor": "#FF825A2C",
-        "AccentColor": "#CC825A2C",
-        "AccentColor2": "#99825A2C",
-        "AccentColor3": "#66825A2C",
-        "AccentColor4": "#33825A2C",
-        "HighlightColor": "#FF604220"
+        "MahApps.Colors.AccentBase": "#FF825A2C",
+        "MahApps.Colors.Accent": "#CC825A2C",
+        "MahApps.Colors.Accent2": "#99825A2C",
+        "MahApps.Colors.Accent3": "#66825A2C",
+        "MahApps.Colors.Accent4": "#33825A2C",
+        "MahApps.Colors.Highlight": "#FF604220"
       }
     },
     {
       "Name": "Cobalt",
       "Values": {
-        "AccentBaseColor": "#FF0050EF",
-        "AccentColor": "#CC0050EF",
-        "AccentColor2": "#990050EF",
-        "AccentColor3": "#660050EF",
-        "AccentColor4": "#330050EF",
-        "HighlightColor": "#FF003BB0"
+        "MahApps.Colors.AccentBase": "#FF0050EF",
+        "MahApps.Colors.Accent": "#CC0050EF",
+        "MahApps.Colors.Accent2": "#990050EF",
+        "MahApps.Colors.Accent3": "#660050EF",
+        "MahApps.Colors.Accent4": "#330050EF",
+        "MahApps.Colors.Highlight": "#FF003BB0"
       }
     },
     {
       "Name": "Crimson",
       "Values": {
-        "AccentBaseColor": "#FFA20025",
-        "AccentColor": "#CCA20025",
-        "AccentColor2": "#99A20025",
-        "AccentColor3": "#66A20025",
-        "AccentColor4": "#33A20025",
-        "HighlightColor": "#FF77001B"
+        "MahApps.Colors.AccentBase": "#FFA20025",
+        "MahApps.Colors.Accent": "#CCA20025",
+        "MahApps.Colors.Accent2": "#99A20025",
+        "MahApps.Colors.Accent3": "#66A20025",
+        "MahApps.Colors.Accent4": "#33A20025",
+        "MahApps.Colors.Highlight": "#FF77001B"
       }
     },
     {
       "Name": "Cyan",
       "Values": {
-        "AccentBaseColor": "#FF1BA1E2",
-        "AccentColor": "#CC1BA1E2",
-        "AccentColor2": "#991BA1E2",
-        "AccentColor3": "#661BA1E2",
-        "AccentColor4": "#331BA1E2",
-        "HighlightColor": "#FF1377A7"
+        "MahApps.Colors.AccentBase": "#FF1BA1E2",
+        "MahApps.Colors.Accent": "#CC1BA1E2",
+        "MahApps.Colors.Accent2": "#991BA1E2",
+        "MahApps.Colors.Accent3": "#661BA1E2",
+        "MahApps.Colors.Accent4": "#331BA1E2",
+        "MahApps.Colors.Highlight": "#FF1377A7"
       }
     },
     {
       "Name": "Emerald",
       "Values": {
-        "AccentBaseColor": "#FF008A00",
-        "AccentColor": "#CC008A00",
-        "AccentColor2": "#99008A00",
-        "AccentColor3": "#66008A00",
-        "AccentColor4": "#33008A00",
-        "HighlightColor": "#FF006600"
+        "MahApps.Colors.AccentBase": "#FF008A00",
+        "MahApps.Colors.Accent": "#CC008A00",
+        "MahApps.Colors.Accent2": "#99008A00",
+        "MahApps.Colors.Accent3": "#66008A00",
+        "MahApps.Colors.Accent4": "#33008A00",
+        "MahApps.Colors.Highlight": "#FF006600"
       }
     },
     {
       "Name": "Green",
       "Values": {
-        "AccentBaseColor": "#FF60A917",
-        "AccentColor": "#CC60A917",
-        "AccentColor2": "#9960A917",
-        "AccentColor3": "#6660A917",
-        "AccentColor4": "#3360A917",
-        "HighlightColor": "#FF477D11"
+        "MahApps.Colors.AccentBase": "#FF60A917",
+        "MahApps.Colors.Accent": "#CC60A917",
+        "MahApps.Colors.Accent2": "#9960A917",
+        "MahApps.Colors.Accent3": "#6660A917",
+        "MahApps.Colors.Accent4": "#3360A917",
+        "MahApps.Colors.Highlight": "#FF477D11"
       }
     },
     {
       "Name": "Indigo",
       "Values": {
-        "AccentBaseColor": "#FF6A00FF",
-        "AccentColor": "#CC6A00FF",
-        "AccentColor2": "#996A00FF",
-        "AccentColor3": "#666A00FF",
-        "AccentColor4": "#336A00FF",
-        "HighlightColor": "#FF4E00BC"
+        "MahApps.Colors.AccentBase": "#FF6A00FF",
+        "MahApps.Colors.Accent": "#CC6A00FF",
+        "MahApps.Colors.Accent2": "#996A00FF",
+        "MahApps.Colors.Accent3": "#666A00FF",
+        "MahApps.Colors.Accent4": "#336A00FF",
+        "MahApps.Colors.Highlight": "#FF4E00BC"
       }
     },
     {
       "Name": "Lime",
       "Values": {
-        "AccentBaseColor": "#FFA4C400",
-        "AccentColor": "#CCA4C400",
-        "AccentColor2": "#99A4C400",
-        "AccentColor3": "#66A4C400",
-        "AccentColor4": "#33A4C400",
-        "HighlightColor": "#FF799100"
+        "MahApps.Colors.AccentBase": "#FFA4C400",
+        "MahApps.Colors.Accent": "#CCA4C400",
+        "MahApps.Colors.Accent2": "#99A4C400",
+        "MahApps.Colors.Accent3": "#66A4C400",
+        "MahApps.Colors.Accent4": "#33A4C400",
+        "MahApps.Colors.Highlight": "#FF799100"
       }
     },
     {
       "Name": "Magenta",
       "Values": {
-        "AccentBaseColor": "#FFD80073",
-        "AccentColor": "#CCD80073",
-        "AccentColor2": "#99D80073",
-        "AccentColor3": "#66D80073",
-        "AccentColor4": "#33D80073",
-        "HighlightColor": "#FF9F0055"
+        "MahApps.Colors.AccentBase": "#FFD80073",
+        "MahApps.Colors.Accent": "#CCD80073",
+        "MahApps.Colors.Accent2": "#99D80073",
+        "MahApps.Colors.Accent3": "#66D80073",
+        "MahApps.Colors.Accent4": "#33D80073",
+        "MahApps.Colors.Highlight": "#FF9F0055"
       }
     },
     {
       "Name": "Mauve",
       "Values": {
-        "AccentBaseColor": "#FF76608A",
-        "AccentColor": "#CC76608A",
-        "AccentColor2": "#9976608A",
-        "AccentColor3": "#6676608A",
-        "AccentColor4": "#3376608A",
-        "HighlightColor": "#FF574766"
+        "MahApps.Colors.AccentBase": "#FF76608A",
+        "MahApps.Colors.Accent": "#CC76608A",
+        "MahApps.Colors.Accent2": "#9976608A",
+        "MahApps.Colors.Accent3": "#6676608A",
+        "MahApps.Colors.Accent4": "#3376608A",
+        "MahApps.Colors.Highlight": "#FF574766"
       }
     },
     {
       "Name": "Olive",
       "Values": {
-        "AccentBaseColor": "#FF6D8764",
-        "AccentColor": "#CC6D8764",
-        "AccentColor2": "#996D8764",
-        "AccentColor3": "#666D8764",
-        "AccentColor4": "#336D8764",
-        "HighlightColor": "#FF50634A"
+        "MahApps.Colors.AccentBase": "#FF6D8764",
+        "MahApps.Colors.Accent": "#CC6D8764",
+        "MahApps.Colors.Accent2": "#996D8764",
+        "MahApps.Colors.Accent3": "#666D8764",
+        "MahApps.Colors.Accent4": "#336D8764",
+        "MahApps.Colors.Highlight": "#FF50634A"
       }
     },
     {
       "Name": "Orange",
       "Values": {
-        "AccentBaseColor": "#FFFA6800",
-        "AccentColor": "#CCFA6800",
-        "AccentColor2": "#99FA6800",
-        "AccentColor3": "#66FA6800",
-        "AccentColor4": "#33FA6800",
-        "HighlightColor": "#FFB94C00"
+        "MahApps.Colors.AccentBase": "#FFFA6800",
+        "MahApps.Colors.Accent": "#CCFA6800",
+        "MahApps.Colors.Accent2": "#99FA6800",
+        "MahApps.Colors.Accent3": "#66FA6800",
+        "MahApps.Colors.Accent4": "#33FA6800",
+        "MahApps.Colors.Highlight": "#FFB94C00"
       }
     },
     {
       "Name": "Pink",
       "Values": {
-        "AccentBaseColor": "#FFF472D0",
-        "AccentColor": "#CCF472D0",
-        "AccentColor2": "#99F472D0",
-        "AccentColor3": "#66F472D0",
-        "AccentColor4": "#33F472D0",
-        "HighlightColor": "#FFB45499"
+        "MahApps.Colors.AccentBase": "#FFF472D0",
+        "MahApps.Colors.Accent": "#CCF472D0",
+        "MahApps.Colors.Accent2": "#99F472D0",
+        "MahApps.Colors.Accent3": "#66F472D0",
+        "MahApps.Colors.Accent4": "#33F472D0",
+        "MahApps.Colors.Highlight": "#FFB45499"
       }
     },
     {
       "Name": "Purple",
       "Values": {
-        "AccentBaseColor": "#FF6459DF",
-        "AccentColor": "#CC6459DF",
-        "AccentColor2": "#996459DF",
-        "AccentColor3": "#666459DF",
-        "AccentColor4": "#336459DF",
-        "HighlightColor": "#FF5133AB"
+        "MahApps.Colors.AccentBase": "#FF6459DF",
+        "MahApps.Colors.Accent": "#CC6459DF",
+        "MahApps.Colors.Accent2": "#996459DF",
+        "MahApps.Colors.Accent3": "#666459DF",
+        "MahApps.Colors.Accent4": "#336459DF",
+        "MahApps.Colors.Highlight": "#FF5133AB"
       }
     },
     {
       "Name": "Red",
       "Values": {
-        "AccentBaseColor": "#FFE51400",
-        "AccentColor": "#CCE51400",
-        "AccentColor2": "#99E51400",
-        "AccentColor3": "#66E51400",
-        "AccentColor4": "#33E51400",
-        "HighlightColor": "#FFA90E00"
+        "MahApps.Colors.AccentBase": "#FFE51400",
+        "MahApps.Colors.Accent": "#CCE51400",
+        "MahApps.Colors.Accent2": "#99E51400",
+        "MahApps.Colors.Accent3": "#66E51400",
+        "MahApps.Colors.Accent4": "#33E51400",
+        "MahApps.Colors.Highlight": "#FFA90E00"
       }
     },
     {
       "Name": "Sienna",
       "Values": {
-        "AccentBaseColor": "#FFA0522D",
-        "AccentColor": "#CCA0522D",
-        "AccentColor2": "#99A0522D",
-        "AccentColor3": "#66A0522D",
-        "AccentColor4": "#33A0522D",
-        "HighlightColor": "#FF763C21"
+        "MahApps.Colors.AccentBase": "#FFA0522D",
+        "MahApps.Colors.Accent": "#CCA0522D",
+        "MahApps.Colors.Accent2": "#99A0522D",
+        "MahApps.Colors.Accent3": "#66A0522D",
+        "MahApps.Colors.Accent4": "#33A0522D",
+        "MahApps.Colors.Highlight": "#FF763C21"
       }
     },
     {
       "Name": "Steel",
       "Values": {
-        "AccentBaseColor": "#FF647687",
-        "AccentColor": "#CC647687",
-        "AccentColor2": "#99647687",
-        "AccentColor3": "#66647687",
-        "AccentColor4": "#33647687",
-        "HighlightColor": "#FF4A5763"
+        "MahApps.Colors.AccentBase": "#FF647687",
+        "MahApps.Colors.Accent": "#CC647687",
+        "MahApps.Colors.Accent2": "#99647687",
+        "MahApps.Colors.Accent3": "#66647687",
+        "MahApps.Colors.Accent4": "#33647687",
+        "MahApps.Colors.Highlight": "#FF4A5763"
       }
     },
     {
       "Name": "Taupe",
       "Values": {
-        "AccentBaseColor": "#FF87794E",
-        "AccentColor": "#CC87794E",
-        "AccentColor2": "#9987794E",
-        "AccentColor3": "#6687794E",
-        "AccentColor4": "#3387794E",
-        "HighlightColor": "#FF635939"
+        "MahApps.Colors.AccentBase": "#FF87794E",
+        "MahApps.Colors.Accent": "#CC87794E",
+        "MahApps.Colors.Accent2": "#9987794E",
+        "MahApps.Colors.Accent3": "#6687794E",
+        "MahApps.Colors.Accent4": "#3387794E",
+        "MahApps.Colors.Highlight": "#FF635939"
       }
     },
     {
       "Name": "Teal",
       "Values": {
-        "AccentBaseColor": "#FF00ABA9",
-        "AccentColor": "#CC00ABA9",
-        "AccentColor2": "#9900ABA9",
-        "AccentColor3": "#6600ABA9",
-        "AccentColor4": "#3300ABA9",
-        "HighlightColor": "#FF007E7D"
+        "MahApps.Colors.AccentBase": "#FF00ABA9",
+        "MahApps.Colors.Accent": "#CC00ABA9",
+        "MahApps.Colors.Accent2": "#9900ABA9",
+        "MahApps.Colors.Accent3": "#6600ABA9",
+        "MahApps.Colors.Accent4": "#3300ABA9",
+        "MahApps.Colors.Highlight": "#FF007E7D"
       }
     },
     {
       "Name": "Violet",
       "Values": {
-        "AccentBaseColor": "#FFAA00FF",
-        "AccentColor": "#CCAA00FF",
-        "AccentColor2": "#99AA00FF",
-        "AccentColor3": "#66AA00FF",
-        "AccentColor4": "#33AA00FF",
-        "HighlightColor": "#FF7D00BC"
+        "MahApps.Colors.AccentBase": "#FFAA00FF",
+        "MahApps.Colors.Accent": "#CCAA00FF",
+        "MahApps.Colors.Accent2": "#99AA00FF",
+        "MahApps.Colors.Accent3": "#66AA00FF",
+        "MahApps.Colors.Accent4": "#33AA00FF",
+        "MahApps.Colors.Highlight": "#FF7D00BC"
       }
     },
     {
       "Name": "Yellow",
       "Values": {
-        "AccentBaseColor": "#FFFEDE06",
-        "AccentColor": "#CCFEDE06",
-        "AccentColor2": "#99FEDE06",
-        "AccentColor3": "#66FEDE06",
-        "AccentColor4": "#33FEDE06",
-        "HighlightColor": "#FFBBA404",
-        "IdealForegroundColor": "Black"
+        "MahApps.Colors.AccentBase": "#FFFEDE06",
+        "MahApps.Colors.Accent": "#CCFEDE06",
+        "MahApps.Colors.Accent2": "#99FEDE06",
+        "MahApps.Colors.Accent3": "#66FEDE06",
+        "MahApps.Colors.Accent4": "#33FEDE06",
+        "MahApps.Colors.Highlight": "#FFBBA404",
+        "MahApps.Colors.IdealForeground": "Black"
       }
     }
   ]
diff --git a/src/MahApps.Metro/Styles/Themes/Theme.Template.xaml b/src/MahApps.Metro/Styles/Themes/Theme.Template.xaml
index 1fd32da06f..6df2a88b28 100644
--- a/src/MahApps.Metro/Styles/Themes/Theme.Template.xaml
+++ b/src/MahApps.Metro/Styles/Themes/Theme.Template.xaml
@@ -10,117 +10,117 @@
     <system:String x:Key="Theme.DisplayName">{{ThemeDisplayName}}</system:String>
     <system:String x:Key="Theme.BaseColorScheme">{{BaseColorScheme}}</system:String>
     <system:String x:Key="Theme.ColorScheme">{{ColorScheme}}</system:String>
-    <SolidColorBrush x:Key="Theme.ShowcaseBrush" Color="{{AccentBaseColor}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="Theme.ShowcaseBrush" Color="{{MahApps.Colors.AccentBase}}" options:Freeze="True" />
 
     <!--  *************COLORS START*************  -->
 
     <!--  Theme Base Colors  -->
 
     <!--  ACCENT COLORS  -->
-    <Color x:Key="HighlightColor">{{HighlightColor}}</Color>
-    <Color x:Key="AccentBaseColor">{{AccentBaseColor}}</Color>
+    <Color x:Key="MahApps.Colors.Highlight">{{MahApps.Colors.Highlight}}</Color>
+    <Color x:Key="MahApps.Colors.AccentBase">{{MahApps.Colors.AccentBase}}</Color>
     <!--  80%  -->
-    <Color x:Key="AccentColor">{{AccentColor}}</Color>
+    <Color x:Key="MahApps.Colors.Accent">{{MahApps.Colors.Accent}}</Color>
     <!--  60%  -->
-    <Color x:Key="AccentColor2">{{AccentColor2}}</Color>
+    <Color x:Key="MahApps.Colors.Accent2">{{MahApps.Colors.Accent2}}</Color>
     <!--  40%  -->
-    <Color x:Key="AccentColor3">{{AccentColor3}}</Color>
+    <Color x:Key="MahApps.Colors.Accent3">{{MahApps.Colors.Accent3}}</Color>
     <!--  20%  -->
-    <Color x:Key="AccentColor4">{{AccentColor4}}</Color>
+    <Color x:Key="MahApps.Colors.Accent4">{{MahApps.Colors.Accent4}}</Color>
 
     <!--  BASE COLORS  -->
-    <Color x:Key="BlackColor">{{BlackColor}}</Color>
-    <Color x:Key="WhiteColor">{{WhiteColor}}</Color>
-    <Color x:Key="Gray1">{{Gray1}}</Color>
-    <Color x:Key="Gray2">{{Gray2}}</Color>
-    <Color x:Key="Gray3">{{Gray3}}</Color>
-    <Color x:Key="Gray4">{{Gray4}}</Color>
-    <Color x:Key="Gray5">{{Gray5}}</Color>
-    <Color x:Key="Gray6">{{Gray6}}</Color>
-    <Color x:Key="Gray7">{{Gray7}}</Color>
-    <Color x:Key="Gray8">{{Gray8}}</Color>
-    <Color x:Key="Gray9">{{Gray9}}</Color>
-    <Color x:Key="Gray10">{{Gray10}}</Color>
-
-    <Color x:Key="GrayNormal">{{GrayNormal}}</Color>
-    <Color x:Key="GrayHover">{{GrayHover}}</Color>
-
-    <Color x:Key="FlyoutColor">{{FlyoutColor}}</Color>
+    <Color x:Key="MahApps.Colors.Black">{{MahApps.Colors.Black}}</Color>
+    <Color x:Key="MahApps.Colors.White">{{MahApps.Colors.White}}</Color>
+    <Color x:Key="MahApps.Colors.Gray1">{{MahApps.Colors.Gray1}}</Color>
+    <Color x:Key="MahApps.Colors.Gray2">{{MahApps.Colors.Gray2}}</Color>
+    <Color x:Key="MahApps.Colors.Gray3">{{MahApps.Colors.Gray3}}</Color>
+    <Color x:Key="MahApps.Colors.Gray4">{{MahApps.Colors.Gray4}}</Color>
+    <Color x:Key="MahApps.Colors.Gray5">{{MahApps.Colors.Gray5}}</Color>
+    <Color x:Key="MahApps.Colors.Gray6">{{MahApps.Colors.Gray6}}</Color>
+    <Color x:Key="MahApps.Colors.Gray7">{{MahApps.Colors.Gray7}}</Color>
+    <Color x:Key="MahApps.Colors.Gray8">{{MahApps.Colors.Gray8}}</Color>
+    <Color x:Key="MahApps.Colors.Gray9">{{MahApps.Colors.Gray9}}</Color>
+    <Color x:Key="MahApps.Colors.Gray10">{{MahApps.Colors.Gray10}}</Color>
+
+    <Color x:Key="MahApps.Colors.GrayNormal">{{MahApps.Colors.GrayNormal}}</Color>
+    <Color x:Key="MahApps.Colors.GrayHover">{{MahApps.Colors.GrayHover}}</Color>
+
+    <Color x:Key="MahApps.Colors.Flyout">{{MahApps.Colors.Flyout}}</Color>
 
     <!--  CORE CONTROL COLORS  -->
-    <Color x:Key="ProgressIndeterminateColor1">#33878787</Color>
-    <Color x:Key="ProgressIndeterminateColor2">#33959595</Color>
-    <Color x:Key="ProgressIndeterminateColor3">#4C000000</Color>
-    <Color x:Key="ProgressIndeterminateColor4">#4C000000</Color>
+    <Color x:Key="MahApps.Colors.ProgressIndeterminate1">#33878787</Color>
+    <Color x:Key="MahApps.Colors.ProgressIndeterminate2">#33959595</Color>
+    <Color x:Key="MahApps.Colors.ProgressIndeterminate3">#4C000000</Color>
+    <Color x:Key="MahApps.Colors.ProgressIndeterminate4">#4C000000</Color>
 
     <!--  *************BRUSHES START*************  -->
     <!--  PROJECT TEMPLATE BRUSHES  -->
 
     <!--  UNIVERSAL CONTROL BRUSHES  -->
-    <SolidColorBrush x:Key="ControlBackgroundBrush" Color="{StaticResource WhiteColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="WhiteBrush" Color="{StaticResource WhiteColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="BlackBrush" Color="{StaticResource BlackColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="TextBrush" Color="{StaticResource BlackColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="LabelTextBrush" Color="{StaticResource BlackColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="WhiteColorBrush" Color="{StaticResource WhiteColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="BlackColorBrush" Color="{StaticResource BlackColor}" options:Freeze="True" />
-
-    <SolidColorBrush x:Key="WindowTitleColorBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="ControlBackgroundBrush" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
+    <SolidColorBrush x:Key="WhiteBrush" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
+    <SolidColorBrush x:Key="BlackBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="TextBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="LabelTextBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="WhiteColorBrush" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
+    <SolidColorBrush x:Key="BlackColorBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="WindowTitleColorBrush" Color="{StaticResource MahApps.Colors.Accent}" options:Freeze="True" />
     <SolidColorBrush x:Key="NonActiveWindowTitleColorBrush" Color="#808080" options:Freeze="True" />
     <SolidColorBrush x:Key="NonActiveBorderColorBrush" Color="#808080" options:Freeze="True" />
 
-    <SolidColorBrush x:Key="HighlightBrush" Color="{StaticResource HighlightColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="DisabledWhiteBrush" Color="{StaticResource WhiteColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="HighlightBrush" Color="{StaticResource MahApps.Colors.Highlight}" options:Freeze="True" />
+    <SolidColorBrush x:Key="DisabledWhiteBrush" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
 
     <SolidColorBrush x:Key="TransparentWhiteBrush" Color="#00FFFFFF" options:Freeze="True" />
     <SolidColorBrush x:Key="SemiTransparentWhiteBrush" Color="#55FFFFFF" options:Freeze="True" />
     <SolidColorBrush x:Key="SemiTransparentGreyBrush" Color="#40808080" options:Freeze="True" />
     <SolidColorBrush x:Key="ControlsDisabledBrush" Color="#A5FFFFFF" options:Freeze="True" />
 
-    <SolidColorBrush x:Key="AccentBaseColorBrush" Color="{StaticResource AccentBaseColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="AccentColorBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="AccentColorBrush2" Color="{StaticResource AccentColor2}" options:Freeze="True" />
-    <SolidColorBrush x:Key="AccentColorBrush3" Color="{StaticResource AccentColor3}" options:Freeze="True" />
-    <SolidColorBrush x:Key="AccentColorBrush4" Color="{StaticResource AccentColor4}" options:Freeze="True" />
-
-    <SolidColorBrush x:Key="GrayBrush1" Color="{StaticResource Gray1}" options:Freeze="True" />
-    <SolidColorBrush x:Key="GrayBrush2" Color="{StaticResource Gray2}" options:Freeze="True" />
-    <SolidColorBrush x:Key="GrayBrush3" Color="{StaticResource Gray3}" options:Freeze="True" />
-    <SolidColorBrush x:Key="GrayBrush4" Color="{StaticResource Gray4}" options:Freeze="True" />
-    <SolidColorBrush x:Key="GrayBrush5" Color="{StaticResource Gray5}" options:Freeze="True" />
-    <SolidColorBrush x:Key="GrayBrush6" Color="{StaticResource Gray6}" options:Freeze="True" />
-    <SolidColorBrush x:Key="GrayBrush7" Color="{StaticResource Gray7}" options:Freeze="True" />
-    <SolidColorBrush x:Key="GrayBrush8" Color="{StaticResource Gray8}" options:Freeze="True" />
-    <SolidColorBrush x:Key="GrayBrush9" Color="{StaticResource Gray9}" options:Freeze="True" />
-    <SolidColorBrush x:Key="GrayBrush10" Color="{StaticResource Gray10}" options:Freeze="True" />
-
-    <SolidColorBrush x:Key="GrayNormalBrush" Color="{StaticResource GrayNormal}" options:Freeze="True" />
-    <SolidColorBrush x:Key="GrayHoverBrush" Color="{StaticResource GrayHover}" options:Freeze="True" />
-
-    <SolidColorBrush x:Key="TextBoxBorderBrush" Color="{StaticResource Gray6}" options:Freeze="True" />
-    <SolidColorBrush x:Key="ControlBorderBrush" Color="{StaticResource Gray6}" options:Freeze="True" />
-    <SolidColorBrush x:Key="TextBoxMouseOverInnerBorderBrush" Color="{StaticResource BlackColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="TextBoxFocusBorderBrush" Color="{StaticResource BlackColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="TextBoxMouseOverBorderBrush" Color="{StaticResource Gray2}" options:Freeze="True" />
-
-    <SolidColorBrush x:Key="ButtonMouseOverBorderBrush" Color="{StaticResource BlackColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="ButtonMouseOverInnerBorderBrush" Color="{StaticResource BlackColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="ComboBoxMouseOverBorderBrush" Color="{StaticResource BlackColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="ComboBoxMouseOverInnerBorderBrush" Color="{StaticResource BlackColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="ComboBoxPopupBorderBrush" Color="{StaticResource Gray4}" options:Freeze="True" />
-
-    <SolidColorBrush x:Key="CheckBoxBrush" Color="{StaticResource Gray6}" options:Freeze="True" />
-    <SolidColorBrush x:Key="CheckBoxMouseOverBrush" Color="{StaticResource Gray2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="AccentBaseColorBrush" Color="{StaticResource MahApps.Colors.AccentBase}" options:Freeze="True" />
+    <SolidColorBrush x:Key="AccentColorBrush" Color="{StaticResource MahApps.Colors.Accent}" options:Freeze="True" />
+    <SolidColorBrush x:Key="AccentColorBrush2" Color="{StaticResource MahApps.Colors.Accent2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="AccentColorBrush3" Color="{StaticResource MahApps.Colors.Accent3}" options:Freeze="True" />
+    <SolidColorBrush x:Key="AccentColorBrush4" Color="{StaticResource MahApps.Colors.Accent4}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="GrayBrush1" Color="{StaticResource MahApps.Colors.Gray1}" options:Freeze="True" />
+    <SolidColorBrush x:Key="GrayBrush2" Color="{StaticResource MahApps.Colors.Gray2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="GrayBrush3" Color="{StaticResource MahApps.Colors.Gray3}" options:Freeze="True" />
+    <SolidColorBrush x:Key="GrayBrush4" Color="{StaticResource MahApps.Colors.Gray4}" options:Freeze="True" />
+    <SolidColorBrush x:Key="GrayBrush5" Color="{StaticResource MahApps.Colors.Gray5}" options:Freeze="True" />
+    <SolidColorBrush x:Key="GrayBrush6" Color="{StaticResource MahApps.Colors.Gray6}" options:Freeze="True" />
+    <SolidColorBrush x:Key="GrayBrush7" Color="{StaticResource MahApps.Colors.Gray7}" options:Freeze="True" />
+    <SolidColorBrush x:Key="GrayBrush8" Color="{StaticResource MahApps.Colors.Gray8}" options:Freeze="True" />
+    <SolidColorBrush x:Key="GrayBrush9" Color="{StaticResource MahApps.Colors.Gray9}" options:Freeze="True" />
+    <SolidColorBrush x:Key="GrayBrush10" Color="{StaticResource MahApps.Colors.Gray10}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="GrayNormalBrush" Color="{StaticResource MahApps.Colors.GrayNormal}" options:Freeze="True" />
+    <SolidColorBrush x:Key="GrayHoverBrush" Color="{StaticResource MahApps.Colors.GrayHover}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="TextBoxBorderBrush" Color="{StaticResource MahApps.Colors.Gray6}" options:Freeze="True" />
+    <SolidColorBrush x:Key="ControlBorderBrush" Color="{StaticResource MahApps.Colors.Gray6}" options:Freeze="True" />
+    <SolidColorBrush x:Key="TextBoxMouseOverInnerBorderBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="TextBoxFocusBorderBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="TextBoxMouseOverBorderBrush" Color="{StaticResource MahApps.Colors.Gray2}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="ButtonMouseOverBorderBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="ButtonMouseOverInnerBorderBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="ComboBoxMouseOverBorderBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="ComboBoxMouseOverInnerBorderBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="ComboBoxPopupBorderBrush" Color="{StaticResource MahApps.Colors.Gray4}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="CheckBoxBrush" Color="{StaticResource MahApps.Colors.Gray6}" options:Freeze="True" />
+    <SolidColorBrush x:Key="CheckBoxMouseOverBrush" Color="{StaticResource MahApps.Colors.Gray2}" options:Freeze="True" />
     <LinearGradientBrush x:Key="CheckBoxBackgroundBrush" StartPoint="0.5,0" EndPoint="0.5,1" options:Freeze="True">
-        <GradientStop Offset="0" Color="{StaticResource Gray7}" />
-        <GradientStop Offset="1" Color="{StaticResource WhiteColor}" />
+        <GradientStop Offset="0" Color="{StaticResource MahApps.Colors.Gray7}" />
+        <GradientStop Offset="1" Color="{StaticResource MahApps.Colors.White}" />
     </LinearGradientBrush>
 
-    <SolidColorBrush x:Key="ThumbBrush" Color="{StaticResource Gray5}" options:Freeze="True" />
+    <SolidColorBrush x:Key="ThumbBrush" Color="{StaticResource MahApps.Colors.Gray5}" options:Freeze="True" />
 
     <LinearGradientBrush x:Key="ProgressBrush" StartPoint="1.002,0.5" EndPoint="0.001,0.5" options:Freeze="True">
-        <GradientStop Offset="0" Color="{StaticResource HighlightColor}" />
-        <GradientStop Offset="1" Color="{StaticResource AccentColor3}" />
+        <GradientStop Offset="0" Color="{StaticResource MahApps.Colors.Highlight}" />
+        <GradientStop Offset="1" Color="{StaticResource MahApps.Colors.Accent3}" />
     </LinearGradientBrush>
 
     <SolidColorBrush x:Key="SliderValueDisabled" Color="{{SliderValueDisabled}}" options:Freeze="True" />
@@ -129,10 +129,10 @@
     <SolidColorBrush x:Key="SliderTrackHover" Color="{{SliderTrackHover}}" options:Freeze="True" />
     <SolidColorBrush x:Key="SliderTrackNormal" Color="{{SliderTrackNormal}}" options:Freeze="True" />
 
-    <SolidColorBrush x:Key="FlyoutBackgroundBrush" Color="{StaticResource FlyoutColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="FlyoutForegroundBrush" Color="{StaticResource BlackColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="FlyoutBackgroundBrush" Color="{StaticResource MahApps.Colors.Flyout}" options:Freeze="True" />
+    <SolidColorBrush x:Key="FlyoutForegroundBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
 
-    <SolidColorBrush x:Key="WindowBackgroundBrush" Color="{StaticResource WhiteColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="WindowBackgroundBrush" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
     <SolidColorBrush x:Key="SeperatorBrush" Color="#FFC4C4C5" options:Freeze="True" />
 
     <SolidColorBrush x:Key="FlatButtonBackgroundBrush" Color="#D5D5D5" options:Freeze="True" />
@@ -163,17 +163,17 @@
     <SolidColorBrush x:Key="ValidationTextBrush" Color="White" options:Freeze="True" />
 
     <!--  WPF default colors  -->
-    <SolidColorBrush x:Key="{x:Static SystemColors.WindowBrushKey}" Color="{StaticResource WhiteColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="{x:Static SystemColors.ControlTextBrushKey}" Color="{StaticResource BlackColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="{x:Static SystemColors.WindowBrushKey}" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
+    <SolidColorBrush x:Key="{x:Static SystemColors.ControlTextBrushKey}" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
 
     <!--  menu default colors  -->
-    <SolidColorBrush x:Key="MenuBackgroundBrush" Color="{StaticResource WhiteColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="ContextMenuBackgroundBrush" Color="{StaticResource WhiteColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="SubMenuBackgroundBrush" Color="{StaticResource WhiteColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MenuItemBackgroundBrush" Color="{StaticResource WhiteColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MenuBackgroundBrush" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
+    <SolidColorBrush x:Key="ContextMenuBackgroundBrush" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
+    <SolidColorBrush x:Key="SubMenuBackgroundBrush" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MenuItemBackgroundBrush" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
 
-    <SolidColorBrush x:Key="ContextMenuBorderBrush" Color="{StaticResource BlackColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="SubMenuBorderBrush" Color="{StaticResource BlackColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="ContextMenuBorderBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="SubMenuBorderBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
 
     <SolidColorBrush x:Key="MenuItemSelectionFill" Color="{{MenuItemSelectionFill}}" options:Freeze="True" />
     <SolidColorBrush x:Key="MenuItemSelectionStroke" Color="{{MenuItemSelectionStroke}}" options:Freeze="True" />
@@ -186,40 +186,40 @@
     <SolidColorBrush x:Key="DisabledMenuItemForeground" Color="{{DisabledMenuItemForeground}}" options:Freeze="True" />
     <SolidColorBrush x:Key="DisabledMenuItemGlyphPanel" Color="#848589" options:Freeze="True" />
 
-    <SolidColorBrush x:Key="{x:Static SystemColors.MenuTextBrushKey}" Color="{StaticResource BlackColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="{x:Static SystemColors.MenuTextBrushKey}" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
 
-    <SolidColorBrush x:Key="CheckmarkFill" Color="{StaticResource AccentColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="RightArrowFill" Color="{StaticResource AccentColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="CheckmarkFill" Color="{StaticResource MahApps.Colors.Accent}" options:Freeze="True" />
+    <SolidColorBrush x:Key="RightArrowFill" Color="{StaticResource MahApps.Colors.Accent}" options:Freeze="True" />
 
-    <Color x:Key="MenuShadowColor">{{MenuShadowColor}}</Color>
+    <Color x:Key="MahApps.Colors.MenuShadow">{{MahApps.Colors.MenuShadow}}</Color>
 
-    <Color x:Key="IdealForegroundColor">{{IdealForegroundColor}}</Color>
+    <Color x:Key="MahApps.Colors.IdealForeground">{{MahApps.Colors.IdealForeground}}</Color>
 
-    <SolidColorBrush x:Key="IdealForegroundColorBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="IdealForegroundDisabledBrush" Opacity="0.4" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="AccentSelectedColorBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="IdealForegroundColorBrush" Color="{StaticResource MahApps.Colors.IdealForeground}" options:Freeze="True" />
+    <SolidColorBrush x:Key="IdealForegroundDisabledBrush" Opacity="0.4" Color="{StaticResource MahApps.Colors.IdealForeground}" options:Freeze="True" />
+    <SolidColorBrush x:Key="AccentSelectedColorBrush" Color="{StaticResource MahApps.Colors.IdealForeground}" options:Freeze="True" />
 
     <!--  DataGrid brushes  -->
 
-    <SolidColorBrush x:Key="MetroDataGrid.HighlightBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MetroDataGrid.DisabledHighlightBrush" Color="{StaticResource Gray7}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MetroDataGrid.HighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MetroDataGrid.MouseOverHighlightBrush" Color="{StaticResource AccentColor3}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MetroDataGrid.FocusBorderBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightBrush" Color="{StaticResource AccentColor2}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightTextBrush" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MetroDataGrid.HighlightBrush" Color="{StaticResource MahApps.Colors.Accent}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MetroDataGrid.DisabledHighlightBrush" Color="{StaticResource MahApps.Colors.Gray7}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MetroDataGrid.HighlightTextBrush" Color="{StaticResource MahApps.Colors.IdealForeground}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MetroDataGrid.MouseOverHighlightBrush" Color="{StaticResource MahApps.Colors.Accent3}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MetroDataGrid.FocusBorderBrush" Color="{StaticResource MahApps.Colors.Accent}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightBrush" Color="{StaticResource MahApps.Colors.Accent2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightTextBrush" Color="{StaticResource MahApps.Colors.IdealForeground}" options:Freeze="True" />
 
     <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.PressedBrush.Win10" Color="{{MahApps.Metro.Brushes.ToggleSwitchButton.PressedBrush.Win10}}" options:Freeze="True" />
     <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OffBorderBrush.Win10" Color="{{MahApps.Metro.Brushes.ToggleSwitchButton.OffBorderBrush.Win10}}" options:Freeze="True" />
     <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OffMouseOverBorderBrush.Win10" Color="{{MahApps.Metro.Brushes.ToggleSwitchButton.OffMouseOverBorderBrush.Win10}}" options:Freeze="True" />
     <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OffDisabledBorderBrush.Win10" Color="{{MahApps.Metro.Brushes.ToggleSwitchButton.OffDisabledBorderBrush.Win10}}" options:Freeze="True" />
     <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OffSwitchBrush.Win10" Color="Transparent" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10" Color="{StaticResource AccentColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10" Color="{StaticResource MahApps.Colors.Accent}" options:Freeze="True" />
     <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchDisabledBrush.Win10" Color="{{MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchDisabledBrush.Win10}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchMouseOverBrush.Win10" Color="{StaticResource AccentColor2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchMouseOverBrush.Win10" Color="{StaticResource MahApps.Colors.Accent2}" options:Freeze="True" />
     <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorBrush.Win10" Color="{{MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorBrush.Win10}}" options:Freeze="True" />
     <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorMouseOverBrush.Win10" Color="{{MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorMouseOverBrush.Win10}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorCheckedBrush.Win10" Color="{StaticResource IdealForegroundColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorCheckedBrush.Win10" Color="{StaticResource MahApps.Colors.IdealForeground}" options:Freeze="True" />
     <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorPressedBrush.Win10" Color="{{MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorPressedBrush.Win10}}" options:Freeze="True" />
     <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorDisabledBrush.Win10" Color="{{MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorDisabledBrush.Win10}}" options:Freeze="True" />
 
diff --git a/src/MahApps.Metro/Styles/VS/Colors.xaml b/src/MahApps.Metro/Styles/VS/Colors.xaml
index 168364fc3c..9509476ba5 100644
--- a/src/MahApps.Metro/Styles/VS/Colors.xaml
+++ b/src/MahApps.Metro/Styles/VS/Colors.xaml
@@ -8,44 +8,44 @@
     <SolidColorBrush x:Key="Background" Color="#1C1C1C" options:Freeze="True" />
     <SolidColorBrush x:Key="LightBackground" Color="#2D2D30" options:Freeze="True" />
 
-    <Color x:Key="AccentColor">#2D2D30</Color>
-    <Color x:Key="BlackColor">#FFFFFFFF</Color>
-    <Color x:Key="WhiteColor">#2D2D30</Color>
+    <Color x:Key="MahApps.Colors.Accent">#2D2D30</Color>
+    <Color x:Key="MahApps.Colors.Black">#FFFFFFFF</Color>
+    <Color x:Key="MahApps.Colors.White">#2D2D30</Color>
 
     <!--  re-set brushes too  -->
-    <SolidColorBrush x:Key="HighlightBrush" Color="{StaticResource HighlightColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="AccentColorBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="AccentColorBrush2" Color="{StaticResource AccentColor2}" options:Freeze="True" />
-    <SolidColorBrush x:Key="AccentColorBrush3" Color="{StaticResource AccentColor3}" options:Freeze="True" />
-    <SolidColorBrush x:Key="AccentColorBrush4" Color="{StaticResource AccentColor4}" options:Freeze="True" />
+    <SolidColorBrush x:Key="HighlightBrush" Color="{StaticResource MahApps.Colors.Highlight}" options:Freeze="True" />
+    <SolidColorBrush x:Key="AccentColorBrush" Color="{StaticResource MahApps.Colors.Accent}" options:Freeze="True" />
+    <SolidColorBrush x:Key="AccentColorBrush2" Color="{StaticResource MahApps.Colors.Accent2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="AccentColorBrush3" Color="{StaticResource MahApps.Colors.Accent3}" options:Freeze="True" />
+    <SolidColorBrush x:Key="AccentColorBrush4" Color="{StaticResource MahApps.Colors.Accent4}" options:Freeze="True" />
 
-    <SolidColorBrush x:Key="WindowTitleColorBrush" Color="{StaticResource AccentColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="WindowTitleColorBrush" Color="{StaticResource MahApps.Colors.Accent}" options:Freeze="True" />
     <SolidColorBrush x:Key="NonActiveWindowTitleColorBrush" Color="#808080" options:Freeze="True" />
     <SolidColorBrush x:Key="NonActiveBorderColorBrush" Color="#808080" options:Freeze="True" />
 
-    <SolidColorBrush x:Key="BlackBrush" Color="{StaticResource BlackColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="TextBrush" Color="{StaticResource BlackColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="LabelTextBrush" Color="{StaticResource BlackColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="BlackColorBrush" Color="{StaticResource BlackColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="TextBoxMouseOverInnerBorderBrush" Color="{StaticResource BlackColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="TextBoxFocusBorderBrush" Color="{StaticResource BlackColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="ButtonMouseOverBorderBrush" Color="{StaticResource BlackColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="ButtonMouseOverInnerBorderBrush" Color="{StaticResource BlackColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="ComboBoxMouseOverBorderBrush" Color="{StaticResource BlackColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="ComboBoxMouseOverInnerBorderBrush" Color="{StaticResource BlackColor}" options:Freeze="True" />
-
-    <SolidColorBrush x:Key="ControlBackgroundBrush" Color="{StaticResource WhiteColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="WhiteBrush" Color="{StaticResource WhiteColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="WhiteColorBrush" Color="{StaticResource WhiteColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="DisabledWhiteBrush" Color="{StaticResource WhiteColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="WindowBackgroundBrush" Color="{StaticResource WhiteColor}" options:Freeze="True" />
-
-    <SolidColorBrush x:Key="{x:Static SystemColors.WindowBrushKey}" Color="{StaticResource WhiteColor}" options:Freeze="True" />
-    <SolidColorBrush x:Key="{x:Static SystemColors.ControlTextBrushKey}" Color="{StaticResource BlackColor}" options:Freeze="True" />
+    <SolidColorBrush x:Key="BlackBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="TextBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="LabelTextBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="BlackColorBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="TextBoxMouseOverInnerBorderBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="TextBoxFocusBorderBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="ButtonMouseOverBorderBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="ButtonMouseOverInnerBorderBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="ComboBoxMouseOverBorderBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="ComboBoxMouseOverInnerBorderBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="ControlBackgroundBrush" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
+    <SolidColorBrush x:Key="WhiteBrush" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
+    <SolidColorBrush x:Key="WhiteColorBrush" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
+    <SolidColorBrush x:Key="DisabledWhiteBrush" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
+    <SolidColorBrush x:Key="WindowBackgroundBrush" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="{x:Static SystemColors.WindowBrushKey}" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
+    <SolidColorBrush x:Key="{x:Static SystemColors.ControlTextBrushKey}" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
 
     <LinearGradientBrush x:Key="CheckBoxBackgroundBrush" StartPoint="0.5,0" EndPoint="0.5,1" options:Freeze="True">
-        <GradientStop Offset="0" Color="{StaticResource Gray7}" />
-        <GradientStop Offset="1" Color="{StaticResource WhiteColor}" />
+        <GradientStop Offset="0" Color="{StaticResource MahApps.Colors.Gray7}" />
+        <GradientStop Offset="1" Color="{StaticResource MahApps.Colors.White}" />
     </LinearGradientBrush>
 
     <!--  Foreground  -->
diff --git a/src/MahApps.Metro/ThemeManager/ThemeManager.StyleKeys.cs b/src/MahApps.Metro/ThemeManager/ThemeManager.StyleKeys.cs
index 1087cbd30c..d23f03bf3f 100644
--- a/src/MahApps.Metro/ThemeManager/ThemeManager.StyleKeys.cs
+++ b/src/MahApps.Metro/ThemeManager/ThemeManager.StyleKeys.cs
@@ -11,8 +11,8 @@ public static partial class ThemeManager
         // Note: add more checks if these keys aren't sufficient
         private static readonly List<string> styleKeys = new List<string>(new[]
                                                                           {
-                                                                              "HighlightColor",
-                                                                              "AccentBaseColor",
+                                                                              "MahApps.Colors.Highlight",
+                                                                              "MahApps.Colors.AccentBase",
                                                                               "HighlightBrush",
                                                                               "AccentBaseColorBrush"
                                                                           });
diff --git a/src/MahApps.Metro/Themes/MetroWindow.xaml b/src/MahApps.Metro/Themes/MetroWindow.xaml
index b1fed3f186..66ac7bce55 100644
--- a/src/MahApps.Metro/Themes/MetroWindow.xaml
+++ b/src/MahApps.Metro/Themes/MetroWindow.xaml
@@ -561,7 +561,7 @@
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="FlyoutOverlayBrush">
             <Setter.Value>
-                <SolidColorBrush Opacity="0.5" Color="{DynamicResource BlackColor}" />
+                <SolidColorBrush Opacity="0.5" Color="{DynamicResource MahApps.Colors.Black}" />
             </Setter.Value>
         </Setter>
         <Setter Property="Foreground" Value="{DynamicResource BlackBrush}" />
diff --git a/src/Mahapps.Metro.Tests/TestHelpers/ThemeHelper.cs b/src/Mahapps.Metro.Tests/TestHelpers/ThemeHelper.cs
index 722254fdc7..e83acc96b5 100644
--- a/src/Mahapps.Metro.Tests/TestHelpers/ThemeHelper.cs
+++ b/src/Mahapps.Metro.Tests/TestHelpers/ThemeHelper.cs
@@ -22,14 +22,14 @@ public static ResourceDictionary CreateTheme(string baseColorScheme, Color accen
             var colorScheme = new ColorScheme();
             colorScheme.Name = accentBaseColor.ToString().Replace("#", string.Empty);
             var values = colorScheme.Values;
-            values.Add("AccentBaseColor", accentBaseColor.ToString());
-            values.Add("AccentColor", Color.FromArgb(204, accentBaseColor.R, accentBaseColor.G, accentBaseColor.B).ToString());
-            values.Add("AccentColor2", Color.FromArgb(153, accentBaseColor.R, accentBaseColor.G, accentBaseColor.B).ToString());
-            values.Add("AccentColor3", Color.FromArgb(102, accentBaseColor.R, accentBaseColor.G, accentBaseColor.B).ToString());
-            values.Add("AccentColor4", Color.FromArgb(51, accentBaseColor.R, accentBaseColor.G, accentBaseColor.B).ToString());
+            values.Add("MahApps.Colors.AccentBase", accentBaseColor.ToString());
+            values.Add("MahApps.Colors.Accent", Color.FromArgb(204, accentBaseColor.R, accentBaseColor.G, accentBaseColor.B).ToString());
+            values.Add("MahApps.Colors.Accent2", Color.FromArgb(153, accentBaseColor.R, accentBaseColor.G, accentBaseColor.B).ToString());
+            values.Add("MahApps.Colors.Accent3", Color.FromArgb(102, accentBaseColor.R, accentBaseColor.G, accentBaseColor.B).ToString());
+            values.Add("MahApps.Colors.Accent4", Color.FromArgb(51, accentBaseColor.R, accentBaseColor.G, accentBaseColor.B).ToString());
 
-            values.Add("HighlightColor", accentBaseColor.ToString());
-            values.Add("IdealForegroundColor", IdealTextColor(accentBaseColor).ToString());
+            values.Add("MahApps.Colors.Highlight", accentBaseColor.ToString());
+            values.Add("MahApps.Colors.IdealForeground", IdealTextColor(accentBaseColor).ToString());
 
             var xamlContent = new ColorSchemeGenerator().GenerateColorSchemeFileContent(generatorParameters, variant, colorScheme, themeTemplateContent, name, name);
 

From e46e424ff870f4352050256eeb3a6390b870fec2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Thu, 11 Jul 2019 13:26:06 +0200
Subject: [PATCH 05/46] Update brush names

---
 .../Views/ShellView.xaml                      |   2 +-
 .../ExampleViews/ButtonsExample.xaml          |   8 +-
 .../ExampleViews/ColorExample.xaml            |   2 +-
 .../ExampleViews/DataGridExamples.xaml        |   4 +-
 .../HamburgerMenuCreatorsUpdate.xaml          |  18 +-
 .../ExampleViews/HamburgerMenuDefault.xaml    |   2 +-
 .../ExampleViews/OtherExamples.xaml           |   2 +-
 .../ExampleViews/TextExamples.xaml            |   2 +-
 .../ExampleViews/TilesExample.xaml            |   8 +-
 .../ExampleWindows/CleanWindowDemo.xaml       |   2 +-
 .../ExampleWindows/FlyoutDemo.xaml            |   6 +-
 .../ExampleWindows/InteropDemo.xaml           |   4 +-
 .../ExampleWindows/SizeToContentDemo.xaml     |   2 +-
 .../HamburgerMenuRipple.xaml                  |  18 +-
 .../MahApps.Metro.Demo/MainWindow.xaml        |   6 +-
 .../MahApps.Metro.Demo/MainWindow.xaml.cs     |   2 +-
 .../MahApps.Metro.Demo/MainWindowViewModel.cs |   2 +-
 .../Controls/DataGridNumericUpDownColumn.cs   |  22 +-
 .../Controls/Dialogs/BaseMetroDialog.cs       |  14 +-
 .../Controls/Dialogs/InputDialog.xaml         |   2 +-
 .../Controls/Dialogs/InputDialog.xaml.cs      |   4 +-
 .../Controls/Dialogs/LoginDialog.xaml.cs      |   4 +-
 .../Controls/Dialogs/ProgressDialog.xaml.cs   |   2 +-
 src/MahApps.Metro/Controls/Flyout.cs          |  20 +-
 .../Controls/MetroNavigationWindow.xaml       |   2 +-
 .../Styles/Clean/CleanGroupBox.xaml           |   4 +-
 .../Styles/Clean/CleanStatusBar.xaml          |   4 +-
 .../Styles/Clean/CleanWindow.xaml             |   8 +-
 .../Styles/Clean/CleanWindowButtons.xaml      |  12 +-
 .../Controls.AnimatedSingleRowTabControl.xaml |   6 +-
 .../Styles/Controls.Buttons.xaml              | 176 ++++++------
 .../Styles/Controls.Calendar.xaml             |  46 +--
 .../Styles/Controls.CheckBox.xaml             |  20 +-
 .../Styles/Controls.ComboBox.xaml             |  72 ++---
 .../Styles/Controls.ContextMenu.xaml          |  68 ++---
 .../Styles/Controls.DataGrid.xaml             |  90 +++---
 .../Styles/Controls.DatePicker.xaml           |  32 +--
 .../Styles/Controls.Expander.xaml             |  40 +--
 .../Styles/Controls.GroupBox.xaml             |   6 +-
 src/MahApps.Metro/Styles/Controls.Label.xaml  |   2 +-
 .../Styles/Controls.ListBox.xaml              |  28 +-
 .../Styles/Controls.ListView.xaml             |  44 +--
 src/MahApps.Metro/Styles/Controls.Page.xaml   |   4 +-
 .../Styles/Controls.PasswordBox.xaml          |  72 ++---
 .../Styles/Controls.ProgressBar.xaml          |  10 +-
 .../Styles/Controls.RadioButton.xaml          |  18 +-
 .../Styles/Controls.Scrollbars.xaml           |  12 +-
 src/MahApps.Metro/Styles/Controls.Slider.xaml |  56 ++--
 .../Styles/Controls.StatusBar.xaml            |  10 +-
 .../Styles/Controls.TabControl.xaml           |  22 +-
 .../Styles/Controls.TextBox.xaml              |  84 +++---
 .../Styles/Controls.Toolbar.xaml              |  60 ++--
 .../Styles/Controls.Tooltip.xaml              |   6 +-
 .../Styles/Controls.TreeView.xaml             |  42 +--
 src/MahApps.Metro/Styles/FlatSlider.xaml      |  18 +-
 .../Styles/Themes/GeneratorParameters.json    |  88 +++---
 .../Styles/Themes/Theme.Template.xaml         | 262 +++++++++---------
 src/MahApps.Metro/Styles/VS/Button.xaml       |  12 +-
 src/MahApps.Metro/Styles/VS/Colors.xaml       | 118 ++++----
 src/MahApps.Metro/Styles/VS/Expander.xaml     |  12 +-
 src/MahApps.Metro/Styles/VS/GroupBox.xaml     |   2 +-
 src/MahApps.Metro/Styles/VS/ListBox.xaml      |   6 +-
 src/MahApps.Metro/Styles/VS/Menu.xaml         |  28 +-
 src/MahApps.Metro/Styles/VS/ScrollBar.xaml    |  18 +-
 src/MahApps.Metro/Styles/VS/TabControl.xaml   |  18 +-
 src/MahApps.Metro/Styles/VS/TextBox.xaml      |  12 +-
 src/MahApps.Metro/Styles/VS/Window.xaml       |  24 +-
 .../Styles/ValidationErrorTemplate.xaml       |  18 +-
 .../ThemeManager/ThemeManager.StyleKeys.cs    |   4 +-
 src/MahApps.Metro/Themes/Badged.xaml          |   6 +-
 src/MahApps.Metro/Themes/DateTimePicker.xaml  |  46 +--
 .../Themes/Dialogs/BaseMetroDialog.xaml       |   4 +-
 src/MahApps.Metro/Themes/DropDownButton.xaml  |  16 +-
 src/MahApps.Metro/Themes/FlipView.xaml        |  22 +-
 src/MahApps.Metro/Themes/Flyout.xaml          |   4 +-
 src/MahApps.Metro/Themes/HamburgerMenu.xaml   |   4 +-
 .../Themes/HamburgerMenuTemplate.xaml         |   4 +-
 src/MahApps.Metro/Themes/HotKeyBox.xaml       |  10 +-
 .../Themes/MetroProgressBar.xaml              |   2 +-
 src/MahApps.Metro/Themes/MetroTabItem.xaml    |  20 +-
 src/MahApps.Metro/Themes/MetroWindow.xaml     |  18 +-
 src/MahApps.Metro/Themes/NumericUpDown.xaml   |  34 +--
 src/MahApps.Metro/Themes/Pivot.xaml           |   4 +-
 src/MahApps.Metro/Themes/ProgressRing.xaml    |   2 +-
 src/MahApps.Metro/Themes/RangeSlider.xaml     |  52 ++--
 src/MahApps.Metro/Themes/SplitButton.xaml     |  16 +-
 src/MahApps.Metro/Themes/SplitView.xaml       |   2 +-
 src/MahApps.Metro/Themes/Tile.xaml            |   4 +-
 src/MahApps.Metro/Themes/ToggleSwitch.xaml    |  22 +-
 src/MahApps.Metro/Themes/Underline.xaml       |   2 +-
 .../Themes/WindowButtonCommands.xaml          |   6 +-
 src/MahApps.Metro/Themes/WindowCommands.xaml  |  28 +-
 .../Tests/CleanWindowTest.cs                  |   2 +-
 src/Mahapps.Metro.Tests/Tests/FlyoutTest.cs   |   2 +-
 94 files changed, 1093 insertions(+), 1093 deletions(-)

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/ShellView.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/ShellView.xaml
index e77789c950..99cab47a17 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/ShellView.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/ShellView.xaml
@@ -8,7 +8,7 @@
                       Title="Flyouts Demo"
                       Width="800"
                       Height="600"
-                      BorderBrush="{DynamicResource AccentColorBrush}"
+                      BorderBrush="{DynamicResource MahApps.Brushes.Accent}"
                       BorderThickness="1"
                       SaveWindowPosition="True"
                       WindowStartupLocation="CenterScreen"
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
index 80cdd0fc5a..649dbb3b4e 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
@@ -146,13 +146,13 @@
                     <Style x:Key="AccentCircleButtonStyle"
                            BasedOn="{StaticResource MahApps.Metro.Styles.MetroCircleButtonStyle}"
                            TargetType="{x:Type ButtonBase}">
-                        <Setter Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                         <Style.Triggers>
                             <Trigger Property="IsMouseOver" Value="True">
-                                <Setter Property="BorderBrush" Value="{DynamicResource AccentColorBrush}" />
+                                <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
                             </Trigger>
                             <Trigger Property="IsEnabled" Value="False">
-                                <Setter Property="Foreground" Value="{DynamicResource GrayBrush7}" />
+                                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Gray7}" />
                             </Trigger>
                         </Style.Triggers>
                     </Style>
@@ -177,7 +177,7 @@
                 <Button Width="48"
                         Height="48"
                         Margin="4"
-                        Foreground="{DynamicResource AccentColorBrush}"
+                        Foreground="{DynamicResource MahApps.Brushes.Accent}"
                         IsEnabled="False"
                         Style="{StaticResource MahApps.Metro.Styles.MetroCircleButtonStyle}">
                     <Button.ContentTemplate>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ColorExample.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ColorExample.xaml
index c46073acef..be9d20484b 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ColorExample.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ColorExample.xaml
@@ -28,7 +28,7 @@
                              Grid.Column="0"
                              Width="30"
                              Height="30"
-                             Stroke="{DynamicResource GrayBrush2}">
+                             Stroke="{DynamicResource MahApps.Brushes.Gray2}">
                         <i:Interaction.Behaviors>
                             <behaviors:BindableResourceBehavior ResourceName="{Binding}" Property="{x:Static Shape.FillProperty}" />
                         </i:Interaction.Behaviors>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DataGridExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DataGridExamples.xaml
index 45827178fd..982b27bf64 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DataGridExamples.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DataGridExamples.xaml
@@ -187,7 +187,7 @@
             </DataGrid.Columns>
             <DataGrid.Style>
                 <Style BasedOn="{StaticResource MetroDataGrid}" TargetType="{x:Type DataGrid}">
-                    <Setter Property="AlternatingRowBackground" Value="{DynamicResource GrayBrush10}" />
+                    <Setter Property="AlternatingRowBackground" Value="{DynamicResource MahApps.Brushes.Gray10}" />
                 </Style>
             </DataGrid.Style>
             <DataGrid.RowStyle>
@@ -245,7 +245,7 @@
                                                        Margin="5 2"
                                                        VerticalAlignment="Center"
                                                        Background="Transparent"
-                                                       Foreground="{DynamicResource AccentColorBrush}"
+                                                       Foreground="{DynamicResource MahApps.Brushes.Accent}"
                                                        Maximum="20"
                                                        Minimum="0"
                                                        Value="{Binding Price}" />
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuCreatorsUpdate.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuCreatorsUpdate.xaml
index 8bdd7f9c42..57bb9ef376 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuCreatorsUpdate.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuCreatorsUpdate.xaml
@@ -75,14 +75,14 @@
                    BasedOn="{StaticResource HamburgerMenuItemStyle}"
                    TargetType="{x:Type ListBoxItem}">
                 <Setter Property="Controls:ItemHelper.ActiveSelectionBackgroundBrush" Value="Transparent" />
-                <Setter Property="Controls:ItemHelper.ActiveSelectionForegroundBrush" Value="{DynamicResource AccentBaseColorBrush}" />
-                <Setter Property="Controls:ItemHelper.DisabledForegroundBrush" Value="{DynamicResource GrayNormalBrush}" />
+                <Setter Property="Controls:ItemHelper.ActiveSelectionForegroundBrush" Value="{DynamicResource MahApps.Brushes.AccentBase}" />
+                <Setter Property="Controls:ItemHelper.DisabledForegroundBrush" Value="{DynamicResource MahApps.Brushes.GrayNormal}" />
                 <Setter Property="Controls:ItemHelper.DisabledSelectedBackgroundBrush" Value="Transparent" />
-                <Setter Property="Controls:ItemHelper.DisabledSelectedForegroundBrush" Value="{DynamicResource GrayNormalBrush}" />
-                <Setter Property="Controls:ItemHelper.HoverBackgroundBrush" Value="{DynamicResource GrayBrush9}" />
-                <Setter Property="Controls:ItemHelper.HoverSelectedBackgroundBrush" Value="{DynamicResource GrayBrush9}" />
+                <Setter Property="Controls:ItemHelper.DisabledSelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.GrayNormal}" />
+                <Setter Property="Controls:ItemHelper.HoverBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Gray9}" />
+                <Setter Property="Controls:ItemHelper.HoverSelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Gray9}" />
                 <Setter Property="Controls:ItemHelper.SelectedBackgroundBrush" Value="Transparent" />
-                <Setter Property="Controls:ItemHelper.SelectedForegroundBrush" Value="{DynamicResource AccentBaseColorBrush}" />
+                <Setter Property="Controls:ItemHelper.SelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.AccentBase}" />
             </Style>
 
             <Style x:Key="HamburgerMenuCreatorsStyle"
@@ -90,8 +90,8 @@
                    TargetType="{x:Type Controls:HamburgerMenu}">
                 <Setter Property="ItemContainerStyle" Value="{StaticResource HamburgerMenuCreatorsItemStyle}" />
                 <Setter Property="OptionsItemContainerStyle" Value="{StaticResource HamburgerMenuCreatorsItemStyle}" />
-                <Setter Property="PaneBackground" Value="{DynamicResource WhiteBrush}" />
-                <Setter Property="PaneForeground" Value="{DynamicResource TextBrush}" />
+                <Setter Property="PaneBackground" Value="{DynamicResource MahApps.Brushes.White}" />
+                <Setter Property="PaneForeground" Value="{DynamicResource MahApps.Brushes.Text}" />
                 <Setter Property="ShowSelectionIndicator" Value="True" />
             </Style>
 
@@ -169,7 +169,7 @@
 
         <Border Grid.Column="0"
                 Margin="10 10 0 10"
-                BorderBrush="{DynamicResource GrayBrush7}"
+                BorderBrush="{DynamicResource MahApps.Brushes.Gray7}"
                 BorderThickness="1">
 
             <Controls:HamburgerMenu x:Name="HamburgerMenuControl"
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuDefault.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuDefault.xaml
index 15e85d4472..9b7c50df99 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuDefault.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuDefault.xaml
@@ -176,7 +176,7 @@
 
         <Border Grid.Column="0"
                 Margin="10 10 0 10"
-                BorderBrush="{DynamicResource GrayBrush7}"
+                BorderBrush="{DynamicResource MahApps.Brushes.Gray7}"
                 BorderThickness="1">
 
             <Controls:HamburgerMenu x:Name="HamburgerMenuControl"
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/OtherExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/OtherExamples.xaml
index b2e34806c9..b18c072d87 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/OtherExamples.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/OtherExamples.xaml
@@ -161,7 +161,7 @@
             <Controls:FlipView x:Name="FlipView1st"
                                Height="200"
                                Margin="0 0 5 0"
-                               Foreground="{DynamicResource WhiteBrush}"
+                               Foreground="{DynamicResource MahApps.Brushes.White}"
                                SelectionChanged="FlipView_SelectionChanged">
                 <Controls:FlipView.Items>
                     <Grid Background="#2E8DEF">
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml
index caf07fbb36..a94eaafe72 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml
@@ -437,7 +437,7 @@
                                     AreModifierKeysRequired="{Binding ElementName=ModifierKeysRequired, Path=IsChecked}"
                                     HotKey="{Binding HotKey, ValidatesOnDataErrors=True, UpdateSourceTrigger=PropertyChanged, NotifyOnValidationError=True}" />
                 <TextBlock Margin="{StaticResource ControlMargin}"
-                           Foreground="{DynamicResource DarkIdealForegroundDisabledBrush}"
+                           Foreground="{DynamicResource MahApps.Brushes.DarkIdealForegroundDisabled}"
                            Text="Try SHIFT+D to demonstrate validation" />
                 <CheckBox x:Name="ModifierKeysRequired"
                           Margin="{StaticResource ControlMargin}"
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TilesExample.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TilesExample.xaml
index 26d630577c..6db1935cd2 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TilesExample.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TilesExample.xaml
@@ -29,7 +29,7 @@
         </ResourceDictionary>
     </UserControl.Resources>
 
-    <Grid Background="{DynamicResource AccentColorBrush4}">
+    <Grid Background="{DynamicResource MahApps.Brushes.Accent4}">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="100" />
             <ColumnDefinition Width="430*" />
@@ -44,7 +44,7 @@
                    FontFamily="Segoe UI"
                    FontSize="30"
                    FontWeight="Light"
-                   Foreground="{DynamicResource BlackBrush}"
+                   Foreground="{DynamicResource MahApps.Brushes.Black}"
                    Text="Only some Tiles in a WrapPanel" />
 
         <WrapPanel Grid.Row="1"
@@ -55,7 +55,7 @@
                    VerticalAlignment="Top">
             <Controls:Tile Title="Mail"
                            Margin="3"
-                           Controls:ControlsHelper.MouseOverBorderBrush="{DynamicResource BlackBrush}"
+                           Controls:ControlsHelper.MouseOverBorderBrush="{DynamicResource MahApps.Brushes.Black}"
                            Background="Teal"
                            HorizontalTitleAlignment="Right"
                            Style="{StaticResource LargeTileStyle}">
@@ -65,7 +65,7 @@
             </Controls:Tile>
             <Controls:Tile Title="Desktop"
                            Margin="3"
-                           Controls:ControlsHelper.MouseOverBorderBrush="{DynamicResource BlackBrush}"
+                           Controls:ControlsHelper.MouseOverBorderBrush="{DynamicResource MahApps.Brushes.Black}"
                            Style="{StaticResource LargeTileStyle}">
                 <iconPacks:PackIconFontAwesome Width="40"
                                                Height="40"
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/CleanWindowDemo.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/CleanWindowDemo.xaml
index d7e4f5557b..f8c1ac895e 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/CleanWindowDemo.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/CleanWindowDemo.xaml
@@ -7,7 +7,7 @@
                       Title="CleanWindowDemo"
                       Width="800"
                       Height="400"
-                      GlowBrush="{DynamicResource AccentColorBrush}"
+                      GlowBrush="{DynamicResource MahApps.Brushes.Accent}"
                       Icon="..\mahapps.metro.logo2.ico"
                       ResizeMode="CanResizeWithGrip"
                       ShowIconOnTitleBar="True"
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml
index 049fdcba1c..b0443c7918 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml
@@ -14,7 +14,7 @@
                       MinWidth="700"
                       MinHeight="500"
                       d:DataContext="{d:DesignInstance metroDemo:MainWindowViewModel}"
-                      BorderBrush="{DynamicResource AccentColorBrush}"
+                      BorderBrush="{DynamicResource MahApps.Brushes.Accent}"
                       BorderThickness="1"
                       IconOverlayBehavior="Never"
                       SaveWindowPosition="True"
@@ -49,7 +49,7 @@
             <iconPacks:PackIconModern Width="{TemplateBinding Width}"
                                       Height="{TemplateBinding Height}"
                                       Margin="4"
-                                      Foreground="{DynamicResource IdealForegroundColorBrush}"
+                                      Foreground="{DynamicResource MahApps.Brushes.IdealForeground}"
                                       Kind="Box" />
         </DataTemplate>
     </Controls:MetroWindow.IconTemplate>
@@ -260,7 +260,7 @@
                     <TextBlock Margin="10"
                                FontSize="22"
                                Text="Flyout on the top..." />
-                    <Grid VerticalAlignment="Bottom" Background="{DynamicResource AccentColorBrush2}">
+                    <Grid VerticalAlignment="Bottom" Background="{DynamicResource MahApps.Brushes.Accent2}">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*" />
                             <ColumnDefinition Width="Auto" />
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/InteropDemo.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/InteropDemo.xaml
index 1580f193cf..a929c32a5a 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/InteropDemo.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/InteropDemo.xaml
@@ -11,7 +11,7 @@
 
     <Grid>
         <Border Margin="10"
-                BorderBrush="{DynamicResource AccentColorBrush}"
+                BorderBrush="{DynamicResource MahApps.Brushes.Accent}"
                 BorderThickness="2">
             <Grid>
                 <Grid.RowDefinitions>
@@ -21,7 +21,7 @@
                 <TextBlock Grid.Row="0"
                            HorizontalAlignment="Center"
                            FontSize="24"
-                           Foreground="{DynamicResource BlackBrush}"
+                           Foreground="{DynamicResource MahApps.Brushes.Black}"
                            Text="you should see google below" />
                 <WindowsFormsHost Grid.Row="1">
                     <winForms:WebBrowser Url="http://www.google.com" />
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/SizeToContentDemo.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/SizeToContentDemo.xaml
index 341362ac1a..e63f3ff26c 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/SizeToContentDemo.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/SizeToContentDemo.xaml
@@ -4,7 +4,7 @@
                       xmlns:controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
                       xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
                       Title="SizeToContent Demo"
-                      GlowBrush="{DynamicResource AccentColorBrush}"
+                      GlowBrush="{DynamicResource MahApps.Brushes.Accent}"
                       SizeToContent="WidthAndHeight"
                       WindowStartupLocation="CenterOwner">
     <controls:MetroWindow.WindowButtonCommands>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/HamburgerMenuRipple/HamburgerMenuRipple.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/HamburgerMenuRipple/HamburgerMenuRipple.xaml
index 5f95c201d5..738f0badab 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/HamburgerMenuRipple/HamburgerMenuRipple.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/HamburgerMenuRipple/HamburgerMenuRipple.xaml
@@ -61,14 +61,14 @@
                    BasedOn="{StaticResource HamburgerMenuItemStyle}"
                    TargetType="{x:Type ListBoxItem}">
                 <Setter Property="Controls:ItemHelper.ActiveSelectionBackgroundBrush" Value="Transparent" />
-                <Setter Property="Controls:ItemHelper.ActiveSelectionForegroundBrush" Value="{DynamicResource AccentBaseColorBrush}" />
-                <Setter Property="Controls:ItemHelper.DisabledForegroundBrush" Value="{DynamicResource GrayNormalBrush}" />
+                <Setter Property="Controls:ItemHelper.ActiveSelectionForegroundBrush" Value="{DynamicResource MahApps.Brushes.AccentBase}" />
+                <Setter Property="Controls:ItemHelper.DisabledForegroundBrush" Value="{DynamicResource MahApps.Brushes.GrayNormal}" />
                 <Setter Property="Controls:ItemHelper.DisabledSelectedBackgroundBrush" Value="Transparent" />
-                <Setter Property="Controls:ItemHelper.DisabledSelectedForegroundBrush" Value="{DynamicResource GrayNormalBrush}" />
-                <Setter Property="Controls:ItemHelper.HoverBackgroundBrush" Value="{DynamicResource GrayBrush9}" />
-                <Setter Property="Controls:ItemHelper.HoverSelectedBackgroundBrush" Value="{DynamicResource GrayBrush9}" />
+                <Setter Property="Controls:ItemHelper.DisabledSelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.GrayNormal}" />
+                <Setter Property="Controls:ItemHelper.HoverBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Gray9}" />
+                <Setter Property="Controls:ItemHelper.HoverSelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Gray9}" />
                 <Setter Property="Controls:ItemHelper.SelectedBackgroundBrush" Value="Transparent" />
-                <Setter Property="Controls:ItemHelper.SelectedForegroundBrush" Value="{DynamicResource AccentBaseColorBrush}" />
+                <Setter Property="Controls:ItemHelper.SelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.AccentBase}" />
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="{x:Type ListBoxItem}">
@@ -153,8 +153,8 @@
                    TargetType="{x:Type Controls:HamburgerMenu}">
                 <Setter Property="ItemContainerStyle" Value="{StaticResource HamburgerMenuCreatorsItemStyle}" />
                 <Setter Property="OptionsItemContainerStyle" Value="{StaticResource HamburgerMenuCreatorsItemStyle}" />
-                <Setter Property="PaneBackground" Value="{DynamicResource WhiteBrush}" />
-                <Setter Property="PaneForeground" Value="{DynamicResource TextBrush}" />
+                <Setter Property="PaneBackground" Value="{DynamicResource MahApps.Brushes.White}" />
+                <Setter Property="PaneForeground" Value="{DynamicResource MahApps.Brushes.Text}" />
                 <Setter Property="ShowSelectionIndicator" Value="True" />
             </Style>
 
@@ -232,7 +232,7 @@
 
         <Border Grid.Column="0"
                 Margin="10 10 0 10"
-                BorderBrush="{DynamicResource GrayBrush7}"
+                BorderBrush="{DynamicResource MahApps.Brushes.Gray7}"
                 BorderThickness="1">
 
             <Controls:HamburgerMenu x:Name="HamburgerMenuControl"
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml
index f829c53a3a..9080f39afa 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml
@@ -16,7 +16,7 @@
                       d:DesignHeight="600"
                       d:DesignWidth="800"
                       Closing="MetroWindow_Closing"
-                      GlowBrush="{DynamicResource AccentColorBrush}"
+                      GlowBrush="{DynamicResource MahApps.Brushes.Accent}"
                       Icon="mahapps.metro.logo2.ico"
                       NonActiveGlowBrush="#CDFF0000"
                       ShowIconOnTitleBar="True"
@@ -67,7 +67,7 @@
                                  Title="This dialog allows arbitrary content.">
                 <TextBlock x:Name="MessageTextBlock"
                            Height="200"
-                           Foreground="{DynamicResource AccentColorBrush}"
+                           Foreground="{DynamicResource MahApps.Brushes.Accent}"
                            Text="{Binding Artists[0].Name}" />
             </Dialog:CustomDialog>
 
@@ -77,7 +77,7 @@
 
                 <StackPanel>
                     <TextBlock Height="30"
-                               Foreground="{DynamicResource AccentColorBrush}"
+                               Foreground="{DynamicResource MahApps.Brushes.Accent}"
                                Text="This dialog allows arbitrary content. You have to close it yourself by clicking the close button below."
                                TextWrapping="Wrap" />
                     <Button Click="CloseCustomDialog"
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml.cs b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml.cs
index 89e4d072c7..3e46af87d8 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml.cs
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml.cs
@@ -431,7 +431,7 @@ private void MenuWindowWithGlowOnClick(object sender, RoutedEventArgs e)
             w.Content = new Button() { Content = "MetroWindow with Glow", ToolTip = "And test tool tip", FontSize = 28, FontWeight = FontWeights.Light, VerticalAlignment = VerticalAlignment.Center, HorizontalAlignment = HorizontalAlignment.Center };
             w.BorderThickness = new Thickness(1);
             w.BorderBrush = null;
-            w.SetResourceReference(MetroWindow.GlowBrushProperty, "AccentColorBrush");
+            w.SetResourceReference(MetroWindow.GlowBrushProperty, "MahApps.Brushes.Accent");
             w.Show();
         }
 
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindowViewModel.cs b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindowViewModel.cs
index aad44ef5f4..ff79ce1df9 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindowViewModel.cs
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindowViewModel.cs
@@ -72,7 +72,7 @@ public MainWindowViewModel(IDialogCoordinator dialogCoordinator)
             this.AppThemes = ThemeManager.Themes
                                          .GroupBy(x => x.BaseColorScheme)
                                          .Select(x => x.First())
-                                         .Select(a => new AppThemeMenuData() { Name = a.BaseColorScheme, BorderColorBrush = a.Resources["BlackColorBrush"] as Brush, ColorBrush = a.Resources["WhiteColorBrush"] as Brush })
+                                         .Select(a => new AppThemeMenuData() { Name = a.BaseColorScheme, BorderColorBrush = a.Resources["MahApps.Brushes.BlackColor"] as Brush, ColorBrush = a.Resources["MahApps.Brushes.WhiteColor"] as Brush })
                                          .ToList();
 
             this.Albums = SampleData.Albums;
diff --git a/src/MahApps.Metro/Controls/DataGridNumericUpDownColumn.cs b/src/MahApps.Metro/Controls/DataGridNumericUpDownColumn.cs
index b0bf714dba..75aab25b78 100644
--- a/src/MahApps.Metro/Controls/DataGridNumericUpDownColumn.cs
+++ b/src/MahApps.Metro/Controls/DataGridNumericUpDownColumn.cs
@@ -152,10 +152,10 @@ private NumericUpDown GenerateNumericUpDown(bool isEditing, DataGridCell cell)
         }
 
         /// <summary>
-        ///     Called when a cell has just switched to edit mode. 
+        ///     Called when a cell has just switched to edit mode.
         /// </summary>
-        /// <param name="editingElement">A reference to element returned by GenerateEditingElement.</param> 
-        /// <param name="editingEventArgs">The event args of the input event that caused the cell to go into edit mode. May be null.</param> 
+        /// <param name="editingElement">A reference to element returned by GenerateEditingElement.</param>
+        /// <param name="editingEventArgs">The event args of the input event that caused the cell to go into edit mode. May be null.</param>
         /// <returns>The unedited value of the cell.</returns>
         protected override object PrepareCellForEdit(FrameworkElement editingElement, RoutedEventArgs editingEventArgs)
         {
@@ -422,8 +422,8 @@ public double UpDownButtonsWidth
                 typeof(DataGridNumericUpDownColumn),
                 new FrameworkPropertyMetadata(SystemFonts.MessageFontFamily, FrameworkPropertyMetadataOptions.Inherits, NotifyPropertyChangeForRefreshContent));
 
-        /// <summary> 
-        /// The font family of the desired font. 
+        /// <summary>
+        /// The font family of the desired font.
         /// </summary>
         public FontFamily FontFamily
         {
@@ -437,9 +437,9 @@ public FontFamily FontFamily
                 typeof(DataGridNumericUpDownColumn),
                 new FrameworkPropertyMetadata(SystemFonts.MessageFontSize, FrameworkPropertyMetadataOptions.Inherits, NotifyPropertyChangeForRefreshContent));
 
-        /// <summary> 
+        /// <summary>
         /// The size of the desired font.
-        /// </summary> 
+        /// </summary>
         [TypeConverter(typeof(FontSizeConverter))]
         [Localizability(LocalizationCategory.None)]
         public double FontSize
@@ -455,8 +455,8 @@ public double FontSize
                 new FrameworkPropertyMetadata(SystemFonts.MessageFontStyle, FrameworkPropertyMetadataOptions.Inherits, NotifyPropertyChangeForRefreshContent));
 
         /// <summary>
-        /// The style of the desired font. 
-        /// </summary> 
+        /// The style of the desired font.
+        /// </summary>
         public FontStyle FontStyle
         {
             get { return (FontStyle)this.GetValue(FontStyleProperty); }
@@ -470,7 +470,7 @@ public FontStyle FontStyle
                 new FrameworkPropertyMetadata(SystemFonts.MessageFontWeight, FrameworkPropertyMetadataOptions.Inherits, NotifyPropertyChangeForRefreshContent));
 
         /// <summary>
-        /// The weight or thickness of the desired font. 
+        /// The weight or thickness of the desired font.
         /// </summary>
         public FontWeight FontWeight
         {
@@ -486,7 +486,7 @@ public FontWeight FontWeight
 
         /// <summary>
         /// An brush that describes the foreground color. This overrides the cell foreground inherited color.
-        /// </summary> 
+        /// </summary>
         public Brush Foreground
         {
             get { return (Brush)this.GetValue(ForegroundProperty); }
diff --git a/src/MahApps.Metro/Controls/Dialogs/BaseMetroDialog.cs b/src/MahApps.Metro/Controls/Dialogs/BaseMetroDialog.cs
index cb32b8bb98..64f4771e8f 100644
--- a/src/MahApps.Metro/Controls/Dialogs/BaseMetroDialog.cs
+++ b/src/MahApps.Metro/Controls/Dialogs/BaseMetroDialog.cs
@@ -246,8 +246,8 @@ internal void HandleThemeChange()
                 {
                     case MetroDialogColorScheme.Theme:
                         ThemeManager.ChangeTheme(this.Resources, theme);
-                        this.SetValue(BackgroundProperty, TryGetResource(theme, "WhiteColorBrush"));
-                        this.SetValue(ForegroundProperty, TryGetResource(theme, "BlackBrush"));
+                        this.SetValue(BackgroundProperty, TryGetResource(theme, "MahApps.Brushes.WhiteColor"));
+                        this.SetValue(ForegroundProperty, TryGetResource(theme, "MahApps.Brushes.Black"));
                         break;
                     case MetroDialogColorScheme.Inverted:
                         theme = ThemeManager.GetInverseTheme(theme);
@@ -258,13 +258,13 @@ internal void HandleThemeChange()
                         }
 
                         ThemeManager.ChangeTheme(this.Resources, theme);
-                        this.SetValue(BackgroundProperty, TryGetResource(theme, "WhiteColorBrush"));
-                        this.SetValue(ForegroundProperty, TryGetResource(theme, "BlackBrush"));
+                        this.SetValue(BackgroundProperty, TryGetResource(theme, "MahApps.Brushes.WhiteColor"));
+                        this.SetValue(ForegroundProperty, TryGetResource(theme, "MahApps.Brushes.Black"));
                         break;
                     case MetroDialogColorScheme.Accented:
                         ThemeManager.ChangeTheme(this.Resources, theme);
-                        this.SetValue(BackgroundProperty, TryGetResource(theme, "HighlightBrush"));
-                        this.SetValue(ForegroundProperty, TryGetResource(theme, "IdealForegroundColorBrush"));
+                        this.SetValue(BackgroundProperty, TryGetResource(theme, "MahApps.Brushes.Highlight"));
+                        this.SetValue(ForegroundProperty, TryGetResource(theme, "MahApps.Brushes.IdealForeground"));
                         break;
                 }
             }
@@ -272,7 +272,7 @@ internal void HandleThemeChange()
             if (this.ParentDialogWindow != null)
             {
                 this.ParentDialogWindow.SetValue(BackgroundProperty, this.Background);
-                var glowBrush = TryGetResource(theme, "AccentColorBrush");
+                var glowBrush = TryGetResource(theme, "MahApps.Brushes.Accent");
                 if (glowBrush != null)
                 {
                     this.ParentDialogWindow.SetValue(MetroWindow.GlowBrushProperty, glowBrush);
diff --git a/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml b/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml
index bb7c33660f..94e8ef6fc2 100644
--- a/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml
+++ b/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml
@@ -18,7 +18,7 @@
         <TextBox x:Name="PART_TextBox"
                  Grid.Row="1"
                  Margin="0 5 0 0"
-                 controls:ControlsHelper.FocusBorderBrush="{DynamicResource AccentColorBrush}"
+                 controls:ControlsHelper.FocusBorderBrush="{DynamicResource MahApps.Brushes.Accent}"
                  controls:TextBoxHelper.SelectAllOnFocus="True"
                  FontSize="{Binding DialogMessageFontSize, RelativeSource={RelativeSource AncestorType=Dialogs:InputDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                  Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType=Dialogs:InputDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
diff --git a/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml.cs b/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml.cs
index d4ebde0108..865d912d1f 100644
--- a/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml.cs
+++ b/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml.cs
@@ -170,8 +170,8 @@ protected override void OnLoaded()
             {
                 case MetroDialogColorScheme.Accented:
                     this.PART_NegativeButton.SetResourceReference(StyleProperty, "MahApps.Metro.Styles.Dialogs.AccentHighlightButton");
-                    this.PART_TextBox.SetResourceReference(ForegroundProperty, "BlackColorBrush");
-                    this.PART_TextBox.SetResourceReference(ControlsHelper.FocusBorderBrushProperty, "TextBoxFocusBorderBrush");
+                    this.PART_TextBox.SetResourceReference(ForegroundProperty, "MahApps.Brushes.BlackColor");
+                    this.PART_TextBox.SetResourceReference(ControlsHelper.FocusBorderBrushProperty, "MahApps.Brushes.TextBox.FocusBorder");
                     break;
             }
         }
diff --git a/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml.cs b/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml.cs
index 12c5ee8158..35b108a9ee 100644
--- a/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml.cs
+++ b/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml.cs
@@ -292,8 +292,8 @@ protected override void OnLoaded()
             {
                 case MetroDialogColorScheme.Accented:
                     this.PART_NegativeButton.SetResourceReference(StyleProperty, "MahApps.Metro.Styles.Dialogs.AccentHighlightButton");
-                    this.PART_TextBox.SetResourceReference(ForegroundProperty, "BlackColorBrush");
-                    this.PART_TextBox2.SetResourceReference(ForegroundProperty, "BlackColorBrush");
+                    this.PART_TextBox.SetResourceReference(ForegroundProperty, "MahApps.Brushes.BlackColor");
+                    this.PART_TextBox2.SetResourceReference(ForegroundProperty, "MahApps.Brushes.BlackColor");
                     break;
             }
         }
diff --git a/src/MahApps.Metro/Controls/Dialogs/ProgressDialog.xaml.cs b/src/MahApps.Metro/Controls/Dialogs/ProgressDialog.xaml.cs
index 893bcf46aa..c5b8903370 100644
--- a/src/MahApps.Metro/Controls/Dialogs/ProgressDialog.xaml.cs
+++ b/src/MahApps.Metro/Controls/Dialogs/ProgressDialog.xaml.cs
@@ -64,7 +64,7 @@ internal ProgressDialog(MetroWindow parentWindow, MetroDialogSettings settings)
         protected override void OnLoaded()
         {
             this.NegativeButtonText = this.DialogSettings.NegativeButtonText;
-            this.SetResourceReference(ProgressBarForegroundProperty, this.DialogSettings.ColorScheme == MetroDialogColorScheme.Theme ? "AccentColorBrush" : "BlackBrush");
+            this.SetResourceReference(ProgressBarForegroundProperty, this.DialogSettings.ColorScheme == MetroDialogColorScheme.Theme ? "MahApps.Brushes.Accent" : "MahApps.Brushes.Black");
         }
 
         internal CancellationToken CancellationToken => this.DialogSettings.CancellationToken;
diff --git a/src/MahApps.Metro/Controls/Flyout.cs b/src/MahApps.Metro/Controls/Flyout.cs
index ee10b873b8..94c9a5ca78 100644
--- a/src/MahApps.Metro/Controls/Flyout.cs
+++ b/src/MahApps.Metro/Controls/Flyout.cs
@@ -339,12 +339,12 @@ private void OverrideFlyoutResources(ResourceDictionary resources, bool accent =
 
             var newBrush = new SolidColorBrush(fromColor);
             newBrush.Freeze();
-            resources["FlyoutBackgroundBrush"] = newBrush;
-            resources["ControlBackgroundBrush"] = newBrush;
-            resources["WhiteBrush"] = newBrush;
-            resources["WhiteColorBrush"] = newBrush;
-            resources["DisabledWhiteBrush"] = newBrush;
-            resources["WindowBackgroundBrush"] = newBrush;
+            resources["MahApps.Brushes.Flyout.Background"] = newBrush;
+            resources["MahApps.Brushes.Control.Background"] = newBrush;
+            resources["MahApps.Brushes.White"] = newBrush;
+            resources["MahApps.Brushes.WhiteColor"] = newBrush;
+            resources["MahApps.Brushes.DisabledWhite"] = newBrush;
+            resources["MahApps.Brushes.Window.Background"] = newBrush;
             resources[SystemColors.WindowBrushKey] = newBrush;
 
             if (accent)
@@ -352,9 +352,9 @@ private void OverrideFlyoutResources(ResourceDictionary resources, bool accent =
                 fromColor = (Color)resources["MahApps.Colors.IdealForeground"];
                 newBrush = new SolidColorBrush(fromColor);
                 newBrush.Freeze();
-                resources["FlyoutForegroundBrush"] = newBrush;
-                resources["TextBrush"] = newBrush;
-                resources["LabelTextBrush"] = newBrush;
+                resources["MahApps.Brushes.Flyout.Foreground"] = newBrush;
+                resources["MahApps.Brushes.Text"] = newBrush;
+                resources["MahApps.Brushes.Label.Text"] = newBrush;
 
                 if (resources.Contains("MahApps.Colors.AccentBase"))
                 {
@@ -368,7 +368,7 @@ private void OverrideFlyoutResources(ResourceDictionary resources, bool accent =
                 newBrush = new SolidColorBrush(fromColor);
                 newBrush.Freeze();
                 resources["MahApps.Colors.Highlight"] = fromColor;
-                resources["HighlightBrush"] = newBrush;
+                resources["MahApps.Brushes.Highlight"] = newBrush; resources["MahApps.Brushes.Highlight"] = newBrush;
             }
 
             resources.EndInit();
diff --git a/src/MahApps.Metro/Controls/MetroNavigationWindow.xaml b/src/MahApps.Metro/Controls/MetroNavigationWindow.xaml
index 8d9bf9fbdb..7554ea53c5 100644
--- a/src/MahApps.Metro/Controls/MetroNavigationWindow.xaml
+++ b/src/MahApps.Metro/Controls/MetroNavigationWindow.xaml
@@ -2,7 +2,7 @@
                       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                       xmlns:Controls="clr-namespace:MahApps.Metro.Controls"
-                      GlowBrush="{DynamicResource AccentColorBrush}">
+                      GlowBrush="{DynamicResource MahApps.Brushes.Accent}">
 
     <Grid>
         <Grid.RowDefinitions>
diff --git a/src/MahApps.Metro/Styles/Clean/CleanGroupBox.xaml b/src/MahApps.Metro/Styles/Clean/CleanGroupBox.xaml
index eefa76231d..59eb6463cd 100644
--- a/src/MahApps.Metro/Styles/Clean/CleanGroupBox.xaml
+++ b/src/MahApps.Metro/Styles/Clean/CleanGroupBox.xaml
@@ -3,10 +3,10 @@
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
     <Style x:Key="CleanGroupBoxStyleKey" TargetType="GroupBox">
-        <Setter Property="BorderBrush" Value="{DynamicResource GrayBrush7}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray7}" />
         <Setter Property="BorderThickness" Value="0.3" />
         <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="16" />
-        <Setter Property="Controls:GroupBoxHelper.HeaderForeground" Value="{DynamicResource TextBrush}" />
+        <Setter Property="Controls:GroupBoxHelper.HeaderForeground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="GroupBox">
diff --git a/src/MahApps.Metro/Styles/Clean/CleanStatusBar.xaml b/src/MahApps.Metro/Styles/Clean/CleanStatusBar.xaml
index ee3e8b3bf5..f827328d03 100644
--- a/src/MahApps.Metro/Styles/Clean/CleanStatusBar.xaml
+++ b/src/MahApps.Metro/Styles/Clean/CleanStatusBar.xaml
@@ -8,13 +8,13 @@
     <Style x:Key="CleanMetroStatusBarKey"
            BasedOn="{StaticResource MetroStatusBar}"
            TargetType="{x:Type StatusBar}">
-        <Setter Property="Foreground" Value="{DynamicResource BlackBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
     </Style>
 
     <Style x:Key="CleanMetroStatusBarSeparator"
            BasedOn="{StaticResource MetroStatusBarSeparator}"
            TargetType="{x:Type Separator}">
-        <Setter Property="Background" Value="{DynamicResource BlackBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Black}" />
     </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Clean/CleanWindow.xaml b/src/MahApps.Metro/Styles/Clean/CleanWindow.xaml
index 5acd4990f6..b9d4006521 100644
--- a/src/MahApps.Metro/Styles/Clean/CleanWindow.xaml
+++ b/src/MahApps.Metro/Styles/Clean/CleanWindow.xaml
@@ -3,11 +3,11 @@
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
     <Style x:Key="CleanWindowStyleKey" TargetType="{x:Type Controls:MetroWindow}">
-        <Setter Property="NonActiveWindowTitleBrush" Value="{DynamicResource TransparentWhiteBrush}" />
-        <Setter Property="OverrideDefaultWindowCommandsBrush" Value="{DynamicResource BlackBrush}" />
+        <Setter Property="NonActiveWindowTitleBrush" Value="{DynamicResource MahApps.Brushes.TransparentWhite}" />
+        <Setter Property="OverrideDefaultWindowCommandsBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="TitleAlignment" Value="Center" />
-        <Setter Property="TitleForeground" Value="{DynamicResource BlackBrush}" />
-        <Setter Property="WindowTitleBrush" Value="{DynamicResource TransparentWhiteBrush}" />
+        <Setter Property="TitleForeground" Value="{DynamicResource MahApps.Brushes.Black}" />
+        <Setter Property="WindowTitleBrush" Value="{DynamicResource MahApps.Brushes.TransparentWhite}" />
     </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Clean/CleanWindowButtons.xaml b/src/MahApps.Metro/Styles/Clean/CleanWindowButtons.xaml
index 5ea92b5173..9d60217f9c 100644
--- a/src/MahApps.Metro/Styles/Clean/CleanWindowButtons.xaml
+++ b/src/MahApps.Metro/Styles/Clean/CleanWindowButtons.xaml
@@ -11,11 +11,11 @@
            TargetType="{x:Type Button}">
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="{DynamicResource CleanWindowCloseButtonBackgroundBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource WhiteBrush}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.CleanWindowCloseButton.Background}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.White}" />
             </Trigger>
             <Trigger Property="IsPressed" Value="True">
-                <Setter Property="Background" Value="{DynamicResource CleanWindowCloseButtonPressedBackgroundBrush}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.CleanWindowCloseButton.PressedBackground}" />
             </Trigger>
         </Style.Triggers>
     </Style>
@@ -26,11 +26,11 @@
            TargetType="{x:Type Button}">
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="{DynamicResource CleanWindowCloseButtonBackgroundBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource WhiteBrush}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.CleanWindowCloseButton.Background}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.White}" />
             </Trigger>
             <Trigger Property="IsPressed" Value="True">
-                <Setter Property="Background" Value="{DynamicResource CleanWindowCloseButtonPressedBackgroundBrush}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.CleanWindowCloseButton.PressedBackground}" />
             </Trigger>
         </Style.Triggers>
     </Style>
diff --git a/src/MahApps.Metro/Styles/Controls.AnimatedSingleRowTabControl.xaml b/src/MahApps.Metro/Styles/Controls.AnimatedSingleRowTabControl.xaml
index 5ea20e0a7b..872bd833e1 100644
--- a/src/MahApps.Metro/Styles/Controls.AnimatedSingleRowTabControl.xaml
+++ b/src/MahApps.Metro/Styles/Controls.AnimatedSingleRowTabControl.xaml
@@ -11,7 +11,7 @@
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="Focusable" Value="False" />
-        <Setter Property="Foreground" Value="{DynamicResource GrayBrush3}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Gray3}" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="OverridesDefaultStyle" Value="True" />
         <Setter Property="Padding" Value="0" />
@@ -35,10 +35,10 @@
                             <Setter TargetName="PART_Arrow" Property="Opacity" Value="0.5" />
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="PART_Arrow" Property="Foreground" Value="{DynamicResource GrayBrush1}" />
+                            <Setter TargetName="PART_Arrow" Property="Foreground" Value="{DynamicResource MahApps.Brushes.Gray1}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter TargetName="PART_Arrow" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_Arrow" Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/src/MahApps.Metro/Styles/Controls.Buttons.xaml b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
index 7bb044b0de..35bb0a70d5 100644
--- a/src/MahApps.Metro/Styles/Controls.Buttons.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
@@ -11,7 +11,7 @@
                 <ControlTemplate>
                     <Rectangle Margin="2"
                                SnapsToDevicePixels="True"
-                               Stroke="{DynamicResource FlatButtonForegroundBrush}"
+                               Stroke="{DynamicResource MahApps.Brushes.FlatButton.Foreground}"
                                StrokeDashArray="1 2"
                                StrokeThickness="1"
                                UseLayoutRounding="True" />
@@ -21,11 +21,11 @@
     </Style>
 
     <Style x:Key="MetroFlatButton" TargetType="{x:Type Button}">
-        <Setter Property="Background" Value="{DynamicResource FlatButtonBackgroundBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.FlatButton.Background}" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="FocusVisualStyle" Value="{DynamicResource MahApps.Metro.Styles.FlatButtonFocusVisualStyle}" />
         <Setter Property="FontSize" Value="{DynamicResource FlatButtonFontSize}" />
-        <Setter Property="Foreground" Value="{DynamicResource FlatButtonForegroundBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.FlatButton.Foreground}" />
         <Setter Property="Padding" Value="10 5 10 5" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
@@ -57,22 +57,22 @@
                 <Setter Property="Background" Value="DarkGray" />
             </Trigger>
             <Trigger Property="IsPressed" Value="True">
-                <Setter Property="Background" Value="{DynamicResource FlatButtonPressedBackgroundBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource FlatButtonPressedForegroundBrush}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.FlatButton.PressedBackground}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.FlatButton.PressedForeground}" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
-                <Setter Property="Foreground" Value="{DynamicResource GrayBrush2}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Gray2}" />
             </Trigger>
         </Style.Triggers>
     </Style>
 
     <!--  style for flat toggle button like MetroFlatButton  -->
     <Style x:Key="MetroFlatToggleButton" TargetType="{x:Type ToggleButton}">
-        <Setter Property="Background" Value="{DynamicResource FlatButtonBackgroundBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.FlatButton.Background}" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="FocusVisualStyle" Value="{DynamicResource MahApps.Metro.Styles.FlatButtonFocusVisualStyle}" />
         <Setter Property="FontSize" Value="{DynamicResource FlatButtonFontSize}" />
-        <Setter Property="Foreground" Value="{DynamicResource FlatButtonForegroundBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.FlatButton.Foreground}" />
         <Setter Property="Padding" Value="10 5 10 5" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
@@ -101,8 +101,8 @@
         </Setter>
         <Style.Triggers>
             <Trigger Property="IsChecked" Value="True">
-                <Setter Property="Background" Value="{DynamicResource AccentColorBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource FlatButtonPressedForegroundBrush}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Accent}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.FlatButton.PressedForeground}" />
             </Trigger>
 
             <MultiTrigger>
@@ -117,8 +117,8 @@
                     <Condition Property="IsMouseOver" Value="True" />
                     <Condition Property="IsChecked" Value="True" />
                 </MultiTrigger.Conditions>
-                <Setter Property="Background" Value="{DynamicResource AccentColorBrush2}" />
-                <Setter Property="Foreground" Value="{DynamicResource FlatButtonPressedForegroundBrush}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Accent2}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.FlatButton.PressedForeground}" />
             </MultiTrigger>
 
             <MultiTrigger>
@@ -126,20 +126,20 @@
                     <Condition Property="IsPressed" Value="True" />
                     <Condition Property="IsChecked" Value="False" />
                 </MultiTrigger.Conditions>
-                <Setter Property="Background" Value="{DynamicResource FlatButtonPressedBackgroundBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource FlatButtonPressedForegroundBrush}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.FlatButton.PressedBackground}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.FlatButton.PressedForeground}" />
             </MultiTrigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
                     <Condition Property="IsPressed" Value="True" />
                     <Condition Property="IsChecked" Value="True" />
                 </MultiTrigger.Conditions>
-                <Setter Property="Background" Value="{DynamicResource AccentColorBrush3}" />
-                <Setter Property="Foreground" Value="{DynamicResource FlatButtonPressedForegroundBrush}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Accent3}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.FlatButton.PressedForeground}" />
             </MultiTrigger>
 
             <Trigger Property="IsEnabled" Value="False">
-                <Setter Property="Foreground" Value="{DynamicResource GrayBrush2}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Gray2}" />
             </Trigger>
         </Style.Triggers>
     </Style>
@@ -150,7 +150,7 @@
                 <ControlTemplate TargetType="{x:Type Control}">
                     <Ellipse Margin="3"
                              SnapsToDevicePixels="True"
-                             Stroke="{DynamicResource BlackBrush}"
+                             Stroke="{DynamicResource MahApps.Brushes.Black}"
                              StrokeDashArray="2 2"
                              StrokeThickness="1"
                              UseLayoutRounding="True" />
@@ -162,7 +162,7 @@
     <!--  style for WP7/Circle button  -->
     <Style x:Key="MahApps.Metro.Styles.MetroCircleButtonStyle" TargetType="{x:Type ButtonBase}">
         <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderBrush" Value="{DynamicResource GrayBrush3}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray3}" />
         <Setter Property="BorderThickness" Value="2" />
         <Setter Property="FocusVisualStyle" Value="{StaticResource MahApps.Metro.Styles.CircleButtonFocusVisualStyle}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
@@ -173,7 +173,7 @@
                     <Grid>
                         <Ellipse Fill="{TemplateBinding Background}" StrokeThickness="0" />
                         <Ellipse x:Name="ellipsebg"
-                                 Fill="{DynamicResource BlackBrush}"
+                                 Fill="{DynamicResource MahApps.Brushes.Black}"
                                  Opacity="0"
                                  StrokeThickness="0" />
                         <Ellipse x:Name="ellipse"
@@ -218,7 +218,7 @@
                             <Setter TargetName="ellipse" Property="Opacity" Value="0.7" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource GrayBrush7}" />
+                            <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource MahApps.Brushes.Gray7}" />
                             <Setter TargetName="ellipse" Property="Opacity" Value="0.3" />
                         </Trigger>
                     </ControlTemplate.Triggers>
@@ -253,7 +253,7 @@
     </ControlTemplate>
 
     <Style x:Key="ChromelessButtonStyle" TargetType="{x:Type ButtonBase}">
-        <Setter Property="Background" Value="{DynamicResource TransparentWhiteBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TransparentWhite}" />
         <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="Padding" Value="0" />
@@ -263,7 +263,7 @@
 
     <!--  base button style for min, max and close window buttons  -->
     <Style x:Key="BaseMetroWindowButtonStyle" TargetType="{x:Type Button}">
-        <Setter Property="Background" Value="{DynamicResource TransparentWhiteBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TransparentWhite}" />
         <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="Padding" Value="1" />
@@ -295,14 +295,14 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="{DynamicResource SemiTransparentWhiteBrush}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.SemiTransparentWhite}" />
             </Trigger>
             <Trigger Property="IsPressed" Value="True">
-                <Setter Property="Background" Value="{DynamicResource AccentColorBrush}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Accent}" />
                 <Setter Property="Foreground" Value="White" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
-                <Setter Property="Foreground" Value="{DynamicResource IdealForegroundDisabledBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.IdealForegroundDisabled}" />
             </Trigger>
         </Style.Triggers>
     </Style>
@@ -319,14 +319,14 @@
         <Setter Property="Width" Value="34" />
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="{DynamicResource SemiTransparentWhiteBrush}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.SemiTransparentWhite}" />
             </Trigger>
             <Trigger Property="IsPressed" Value="True">
-                <Setter Property="Background" Value="{DynamicResource AccentColorBrush}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Accent}" />
                 <Setter Property="Foreground" Value="White" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
-                <Setter Property="Foreground" Value="{DynamicResource IdealForegroundDisabledBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.IdealForegroundDisabled}" />
             </Trigger>
         </Style.Triggers>
     </Style>
@@ -337,14 +337,14 @@
            TargetType="{x:Type Button}">
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="{DynamicResource SemiTransparentGreyBrush}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.SemiTransparentGrey}" />
             </Trigger>
             <Trigger Property="IsPressed" Value="True">
-                <Setter Property="Background" Value="{DynamicResource AccentColorBrush}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Accent}" />
                 <Setter Property="Foreground" Value="White" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
-                <Setter Property="Foreground" Value="{DynamicResource DarkIdealForegroundDisabledBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DarkIdealForegroundDisabled}" />
             </Trigger>
         </Style.Triggers>
     </Style>
@@ -361,7 +361,7 @@
                 <Setter Property="Foreground" Value="Black" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
-                <Setter Property="Foreground" Value="{DynamicResource IdealForegroundDisabledBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.IdealForegroundDisabled}" />
             </Trigger>
         </Style.Triggers>
     </Style>
@@ -378,24 +378,24 @@
                 <Setter Property="Foreground" Value="Black" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
-                <Setter Property="Foreground" Value="{DynamicResource DarkIdealForegroundDisabledBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DarkIdealForegroundDisabled}" />
             </Trigger>
         </Style.Triggers>
     </Style>
 
     <!--  style for default button  -->
     <Style x:Key="MahApps.Metro.Styles.MetroButton" TargetType="{x:Type ButtonBase}">
-        <Setter Property="Background" Value="{DynamicResource GrayBrush10}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Gray10}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Upper" />
         <Setter Property="Controls:ControlsHelper.CornerRadius" Value="3" />
-        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource ButtonMouseOverBorderBrush}" />
+        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.Button.MouseOverBorder}" />
         <Setter Property="Controls:ControlsHelper.FocusBorderThickness" Value="2" />
         <Setter Property="FontFamily" Value="{DynamicResource DefaultFont}" />
         <Setter Property="FontSize" Value="{DynamicResource UpperCaseContentFontSize}" />
         <Setter Property="FontWeight" Value="Bold" />
-        <Setter Property="Foreground" Value="{DynamicResource BlackBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="MinHeight" Value="25" />
         <Setter Property="Padding" Value="5 6" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -410,7 +410,7 @@
                                 CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.CornerRadius), Mode=OneWay}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         <Border x:Name="DisabledVisualElement"
-                                Background="{DynamicResource ControlsDisabledBrush}"
+                                Background="{DynamicResource MahApps.Brushes.Controls.Disabled}"
                                 CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.CornerRadius), Mode=OneWay}"
                                 IsHitTestVisible="False"
                                 Opacity="0"
@@ -430,10 +430,10 @@
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource GrayBrush8}" />
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray8}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource GrayBrush7}" />
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray7}" />
                         </Trigger>
                         <Trigger Property="IsKeyboardFocusWithin" Value="True">
                             <Setter TargetName="Border" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush), Mode=OneWay}" />
@@ -450,13 +450,13 @@
     </Style>
 
     <Style x:Key="SquareButtonStyle" TargetType="{x:Type ButtonBase}">
-        <Setter Property="Background" Value="{DynamicResource WhiteBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource BlackBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="BorderThickness" Value="2" />
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Lower" />
         <Setter Property="FontFamily" Value="{DynamicResource DefaultFont}" />
         <Setter Property="FontWeight" Value="SemiBold" />
-        <Setter Property="Foreground" Value="{DynamicResource BlackBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="MinHeight" Value="25" />
         <Setter Property="Padding" Value="5 6" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -470,7 +470,7 @@
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         <Rectangle x:Name="DisabledVisualElement"
-                                   Fill="{DynamicResource ControlsDisabledBrush}"
+                                   Fill="{DynamicResource MahApps.Brushes.Controls.Disabled}"
                                    IsHitTestVisible="False"
                                    Opacity="0" />
                         <Controls:ContentControlEx x:Name="PART_ContentPresenter"
@@ -512,12 +512,12 @@
 
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource GrayBrush8}" />
-                            <Setter Property="Foreground" Value="{DynamicResource BlackBrush}" />
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Gray8}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource BlackBrush}" />
-                            <Setter Property="Foreground" Value="{DynamicResource WhiteBrush}" />
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Black}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.White}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -528,15 +528,15 @@
     <Style x:Key="AccentedSquareButtonStyle"
            BasedOn="{StaticResource SquareButtonStyle}"
            TargetType="{x:Type ButtonBase}">
-        <Setter Property="Background" Value="{DynamicResource AccentColorBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource IdealForegroundColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.IdealForeground}" />
     </Style>
 
     <Style x:Key="HighlightedSquareButtonStyle"
            BasedOn="{StaticResource SquareButtonStyle}"
            TargetType="{x:Type ButtonBase}">
-        <Setter Property="Background" Value="{DynamicResource HighlightBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource IdealForegroundColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Highlight}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.IdealForeground}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ButtonBase}">
@@ -547,7 +547,7 @@
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         <Rectangle x:Name="DisabledVisualElement"
-                                   Fill="{DynamicResource ControlsDisabledBrush}"
+                                   Fill="{DynamicResource MahApps.Brushes.Controls.Disabled}"
                                    IsHitTestVisible="False"
                                    Opacity="0" />
                         <Controls:ContentControlEx x:Name="PART_ContentPresenter"
@@ -589,12 +589,12 @@
 
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource AccentColorBrush}" />
-                            <Setter Property="Foreground" Value="{DynamicResource IdealForegroundColorBrush}" />
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Accent}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.IdealForeground}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource BlackBrush}" />
-                            <Setter Property="Foreground" Value="{DynamicResource WhiteBrush}" />
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Black}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.White}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -604,10 +604,10 @@
 
     <Style x:Key="MahApps.Metro.Styles.MetroCircleToggleButtonStyle" TargetType="{x:Type ToggleButton}">
         <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderBrush" Value="{DynamicResource GrayBrush3}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray3}" />
         <Setter Property="BorderThickness" Value="2" />
         <Setter Property="FocusVisualStyle" Value="{StaticResource MahApps.Metro.Styles.CircleButtonFocusVisualStyle}" />
-        <Setter Property="Foreground" Value="{DynamicResource BlackBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="Padding" Value="1" />
         <Setter Property="Template">
@@ -616,7 +616,7 @@
                     <Grid>
                         <Ellipse Fill="{TemplateBinding Background}" StrokeThickness="0" />
                         <Ellipse x:Name="ellipsebg"
-                                 Fill="{DynamicResource AccentColorBrush}"
+                                 Fill="{DynamicResource MahApps.Brushes.Accent}"
                                  Opacity="0"
                                  StrokeThickness="0" />
                         <Ellipse x:Name="ellipse"
@@ -653,8 +653,8 @@
                                     </Storyboard>
                                 </BeginStoryboard>
                             </Trigger.ExitActions>
-                            <Setter Property="Foreground" Value="{DynamicResource IdealForegroundColorBrush}" />
-                            <Setter TargetName="ellipse" Property="Stroke" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.IdealForeground}" />
+                            <Setter TargetName="ellipse" Property="Stroke" Value="{DynamicResource MahApps.Brushes.Accent}" />
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="True">
                             <Setter TargetName="ellipse" Property="Opacity" Value="1" />
@@ -663,7 +663,7 @@
                             <Setter TargetName="ellipse" Property="Opacity" Value="0.7" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource GrayBrush7}" />
+                            <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource MahApps.Brushes.Gray7}" />
                             <Setter TargetName="ellipse" Property="Opacity" Value="0.3" />
                         </Trigger>
                     </ControlTemplate.Triggers>
@@ -674,15 +674,15 @@
     </Style>
 
     <Style x:Key="MahApps.Metro.Styles.MetroToggleButton" TargetType="{x:Type ToggleButton}">
-        <Setter Property="Background" Value="{DynamicResource GrayBrush10}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Gray10}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Controls:ControlsHelper.CornerRadius" Value="3" />
-        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource ButtonMouseOverBorderBrush}" />
+        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.Button.MouseOverBorder}" />
         <Setter Property="FontFamily" Value="{DynamicResource DefaultFont}" />
         <Setter Property="FontSize" Value="{DynamicResource UpperCaseContentFontSize}" />
         <Setter Property="FontWeight" Value="Bold" />
-        <Setter Property="Foreground" Value="{DynamicResource BlackBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="MinHeight" Value="25" />
         <Setter Property="Padding" Value="5 6" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -697,7 +697,7 @@
                                 CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.CornerRadius), Mode=OneWay}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         <Border x:Name="DisabledVisualElement"
-                                Background="{DynamicResource ControlsDisabledBrush}"
+                                Background="{DynamicResource MahApps.Brushes.Controls.Disabled}"
                                 CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.CornerRadius), Mode=OneWay}"
                                 IsHitTestVisible="False"
                                 Opacity="0"
@@ -732,25 +732,25 @@
         </Setter>
         <Style.Triggers>
             <Trigger Property="IsChecked" Value="True">
-                <Setter Property="Background" Value="{DynamicResource GrayBrush2}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource GrayBrush5}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Gray2}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray5}" />
             </Trigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
                     <Condition Property="IsMouseOver" Value="True" />
                     <Condition Property="IsChecked" Value="False" />
                 </MultiTrigger.Conditions>
-                <Setter Property="Background" Value="{DynamicResource GrayBrush8}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Gray8}" />
             </MultiTrigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
                     <Condition Property="IsMouseOver" Value="True" />
                     <Condition Property="IsChecked" Value="True" />
                 </MultiTrigger.Conditions>
-                <Setter Property="Background" Value="{DynamicResource GrayBrush3}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Gray3}" />
             </MultiTrigger>
             <Trigger Property="IsPressed" Value="True">
-                <Setter Property="Background" Value="{DynamicResource GrayBrush7}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Gray7}" />
             </Trigger>
             <Trigger Property="IsKeyboardFocusWithin" Value="True">
                 <Setter Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush), Mode=OneWay}" />
@@ -760,11 +760,11 @@
 
     <Style x:Key="SquareMetroButton" TargetType="{x:Type ButtonBase}">
         <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderBrush" Value="{DynamicResource BlackBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="BorderThickness" Value="2" />
         <Setter Property="FontFamily" Value="{DynamicResource DefaultFont}" />
         <Setter Property="FontWeight" Value="SemiBold" />
-        <Setter Property="Foreground" Value="{DynamicResource BlackBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="Padding" Value="12 4 12 4" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -780,10 +780,10 @@
 
                             <Grid>
                                 <Rectangle x:Name="MouseOverRectangle"
-                                           Fill="{DynamicResource WhiteBrush}"
+                                           Fill="{DynamicResource MahApps.Brushes.White}"
                                            Opacity="0" />
                                 <Rectangle x:Name="PressedRectangle"
-                                           Fill="{DynamicResource BlackBrush}"
+                                           Fill="{DynamicResource MahApps.Brushes.Black}"
                                            Opacity="0" />
                                 <Controls:ContentControlEx x:Name="PART_ContentPresenter"
                                                            Padding="{TemplateBinding Padding}"
@@ -862,7 +862,7 @@
 
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="Foreground" Value="{DynamicResource WhiteBrush}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.White}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -874,9 +874,9 @@
     <Style x:Key="MetroAccentButton"
            BasedOn="{StaticResource SquareMetroButton}"
            TargetType="{x:Type ButtonBase}">
-        <Setter Property="Background" Value="{DynamicResource AccentColorBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource AccentSelectedColorBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource AccentSelectedColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.AccentSelectedColor}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.AccentSelectedColor}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ButtonBase}">
@@ -889,7 +889,7 @@
 
                             <Grid>
                                 <Rectangle x:Name="MouseOverRectangle"
-                                           Fill="{DynamicResource BlackBrush}"
+                                           Fill="{DynamicResource MahApps.Brushes.Black}"
                                            Opacity="0" />
                                 <Rectangle x:Name="PressedRectangle"
                                            Fill="White"
@@ -982,9 +982,9 @@
     <Style x:Key="ButtonDropDownStyle"
            BasedOn="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
            TargetType="{x:Type Button}">
-        <Setter Property="Background" Value="{DynamicResource WhiteBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Foreground" Value="{DynamicResource BlackBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="Padding" Value="2" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
@@ -1007,13 +1007,13 @@
                             <Setter TargetName="Border" Property="BorderBrush" Value="Transparent" />
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource GrayBrush8}" />
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray8}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource GrayBrush5}" />
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray5}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource GrayBrush10}" />
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray10}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/src/MahApps.Metro/Styles/Controls.Calendar.xaml b/src/MahApps.Metro/Styles/Controls.Calendar.xaml
index eb96db75f0..86d219fa6a 100644
--- a/src/MahApps.Metro/Styles/Controls.Calendar.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Calendar.xaml
@@ -12,23 +12,23 @@
                 <ControlTemplate TargetType="{x:Type CalendarDayButton}">
                     <Grid>
                         <Rectangle x:Name="TodayBackground"
-                                   Fill="{DynamicResource AccentColorBrush}"
+                                   Fill="{DynamicResource MahApps.Brushes.Accent}"
                                    Opacity="0" />
                         <Rectangle x:Name="SelectedBackground"
-                                   Fill="{DynamicResource AccentColorBrush4}"
+                                   Fill="{DynamicResource MahApps.Brushes.Accent4}"
                                    Opacity="0" />
                         <Border Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}" />
                         <Rectangle x:Name="HighlightBackground"
-                                   Fill="{DynamicResource AccentColorBrush4}"
+                                   Fill="{DynamicResource MahApps.Brushes.Accent4}"
                                    Opacity="0" />
                         <Path x:Name="Blackout"
                               Margin="3"
                               HorizontalAlignment="Stretch"
                               VerticalAlignment="Stretch"
                               Data="M8.1772461,11.029181 L10.433105,11.029181 L11.700684,12.801641 L12.973633,11.029181 L15.191895,11.029181 L12.844727,13.999395 L15.21875,17.060919 L12.962891,17.060919 L11.673828,15.256231 L10.352539,17.060919 L8.1396484,17.060919 L10.519043,14.042364 z"
-                              Fill="{DynamicResource AccentColorBrush3}"
+                              Fill="{DynamicResource MahApps.Brushes.Accent3}"
                               Opacity="0"
                               RenderTransformOrigin="0.5,0.5"
                               Stretch="Fill" />
@@ -39,7 +39,7 @@
                                           TextElement.Foreground="{TemplateBinding Foreground}" />
                         <Rectangle x:Name="DayButtonFocusVisual"
                                    IsHitTestVisible="false"
-                                   Stroke="{DynamicResource AccentColorBrush3}"
+                                   Stroke="{DynamicResource MahApps.Brushes.Accent3}"
                                    Visibility="Collapsed" />
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
@@ -86,7 +86,7 @@
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NormalText"
                                                                        Storyboard.TargetProperty="(TextElement.Foreground)"
                                                                        Duration="0">
-                                            <DiscreteObjectKeyFrame Value="{DynamicResource GrayBrush2}" />
+                                            <DiscreteObjectKeyFrame Value="{DynamicResource MahApps.Brushes.Gray2}" />
                                         </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
@@ -110,7 +110,7 @@
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsSelected" Value="True">
                             <Setter TargetName="DayButtonFocusVisual" Property="Visibility" Value="Visible" />
-                            <Setter TargetName="NormalText" Property="TextElement.Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="NormalText" Property="TextElement.Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                         </Trigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
@@ -118,16 +118,16 @@
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsToday}" Value="True" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsSelected}" Value="True" />
                             </MultiDataTrigger.Conditions>
-                            <Setter TargetName="DayButtonFocusVisual" Property="Stroke" Value="{DynamicResource GrayBrush1}" />
+                            <Setter TargetName="DayButtonFocusVisual" Property="Stroke" Value="{DynamicResource MahApps.Brushes.Gray1}" />
                             <Setter TargetName="DayButtonFocusVisual" Property="Visibility" Value="Visible" />
-                            <Setter TargetName="NormalText" Property="TextElement.Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="NormalText" Property="TextElement.Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                         </MultiDataTrigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
                                 <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Calendar}}, Path=IsTodayHighlighted}" Value="True" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsToday}" Value="True" />
                             </MultiDataTrigger.Conditions>
-                            <Setter TargetName="NormalText" Property="TextElement.Foreground" Value="{DynamicResource AccentSelectedColorBrush}" />
+                            <Setter TargetName="NormalText" Property="TextElement.Foreground" Value="{DynamicResource MahApps.Brushes.AccentSelectedColor}" />
                             <Setter TargetName="TodayBackground" Property="Opacity" Value="1" />
                         </MultiDataTrigger>
                         <MultiTrigger>
@@ -135,7 +135,7 @@
                                 <Condition Property="IsToday" Value="True" />
                                 <Condition Property="IsBlackedOut" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="Blackout" Property="Fill" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="Blackout" Property="Fill" Value="{DynamicResource MahApps.Brushes.Accent}" />
                             <Setter TargetName="TodayBackground" Property="Opacity" Value="0.5" />
                         </MultiTrigger>
                     </ControlTemplate.Triggers>
@@ -159,7 +159,7 @@
                                        HorizontalAlignment="Center"
                                        VerticalAlignment="Center"
                                        FontWeight="Bold"
-                                       Foreground="{DynamicResource BlackBrush}"
+                                       Foreground="{DynamicResource MahApps.Brushes.Black}"
                                        Opacity="0.8"
                                        Text="{Binding}" />
                         </DataTemplate>
@@ -173,7 +173,7 @@
                                 <Grid.Resources>
                                     <ControlTemplate x:Key="PreviousButtonTemplate" TargetType="{x:Type Button}">
                                         <Grid Cursor="Hand">
-                                            <Rectangle Fill="{DynamicResource AccentColorBrush}"
+                                            <Rectangle Fill="{DynamicResource MahApps.Brushes.Accent}"
                                                        Opacity="0.1"
                                                        Stretch="Fill" />
                                             <Path x:Name="path"
@@ -211,7 +211,7 @@
                                     </ControlTemplate>
                                     <ControlTemplate x:Key="NextButtonTemplate" TargetType="{x:Type Button}">
                                         <Grid Cursor="Hand">
-                                            <Rectangle Fill="{DynamicResource AccentColorBrush}"
+                                            <Rectangle Fill="{DynamicResource MahApps.Brushes.Accent}"
                                                        Opacity="0.1"
                                                        Stretch="Fill" />
                                             <Path x:Name="path"
@@ -301,7 +301,7 @@
 
                                 <Grid Grid.Row="0"
                                       HorizontalAlignment="Stretch"
-                                      Background="{DynamicResource AccentColorBrush}">
+                                      Background="{DynamicResource MahApps.Brushes.Accent}">
                                     <Button x:Name="PART_HeaderButton"
                                             Grid.Row="0"
                                             HorizontalAlignment="Center"
@@ -370,10 +370,10 @@
                             </Grid>
                         </Border>
                         <Rectangle x:Name="PART_DisabledVisual"
-                                   Fill="{DynamicResource ControlsDisabledBrush}"
+                                   Fill="{DynamicResource MahApps.Brushes.Controls.Disabled}"
                                    Opacity="0"
                                    Stretch="Fill"
-                                   Stroke="{DynamicResource ControlsDisabledBrush}"
+                                   Stroke="{DynamicResource MahApps.Brushes.Controls.Disabled}"
                                    StrokeThickness="1"
                                    Visibility="Collapsed" />
                         <VisualStateManager.VisualStateGroups>
@@ -410,7 +410,7 @@
 
     <!--  Style for Month and Year buttons  -->
     <Style x:Key="MahApps.Metro.Styles.MetroCalendarButtonStyle" TargetType="{x:Type CalendarButton}">
-        <Setter Property="Background" Value="{DynamicResource AccentColorBrush4}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Accent4}" />
         <Setter Property="FontFamily" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Calendar}}, Path=FontFamily, Mode=OneWay}" />
         <Setter Property="FontSize" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Calendar}}, Path=FontSize, Mode=OneWay}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
@@ -433,7 +433,7 @@
                                           TextElement.Foreground="{TemplateBinding Foreground}" />
                         <Rectangle x:Name="CalendarButtonFocusVisual"
                                    IsHitTestVisible="false"
-                                   Stroke="{DynamicResource AccentColorBrush3}"
+                                   Stroke="{DynamicResource MahApps.Brushes.Accent3}"
                                    Visibility="Collapsed" />
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
@@ -483,7 +483,7 @@
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NormalText"
                                                                        Storyboard.TargetProperty="(TextElement.Foreground)"
                                                                        Duration="0">
-                                            <DiscreteObjectKeyFrame Value="{DynamicResource GrayBrush2}" />
+                                            <DiscreteObjectKeyFrame Value="{DynamicResource MahApps.Brushes.Gray2}" />
                                         </ObjectAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
@@ -533,13 +533,13 @@
     </Style>
 
     <Style x:Key="MahApps.Metro.Styles.BaseMetroCalendar" TargetType="{x:Type Calendar}">
-        <Setter Property="Background" Value="{DynamicResource WhiteBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource BlackBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="CalendarButtonStyle" Value="{DynamicResource MahApps.Metro.Styles.MetroCalendarButtonStyle}" />
         <Setter Property="CalendarDayButtonStyle" Value="{DynamicResource MahApps.Metro.Styles.MetroCalendarDayButtonStyle}" />
         <Setter Property="CalendarItemStyle" Value="{DynamicResource MahApps.Metro.Styles.MetroCalendarItemStyle}" />
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
diff --git a/src/MahApps.Metro/Styles/Controls.CheckBox.xaml b/src/MahApps.Metro/Styles/Controls.CheckBox.xaml
index 022247a85b..4211fcc18c 100644
--- a/src/MahApps.Metro/Styles/Controls.CheckBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.CheckBox.xaml
@@ -5,14 +5,14 @@
     <!--  ********************************** CheckBoxStyle **********************************  -->
     <!--  adapted from http://brianlagunas.com/free-metro-light-and-dark-themes-for-wpf-and-silverlight-microsoft-controls/  -->
     <Style x:Key="MetroCheckBox" TargetType="CheckBox">
-        <Setter Property="Background" Value="{DynamicResource WhiteBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.CheckBox}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource HighlightBrush}" />
-        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource CheckBoxMouseOverBrush}" />
+        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.Highlight}" />
+        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.CheckBox.MouseOver}" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
         <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
-        <Setter Property="Foreground" Value="{DynamicResource LabelTextBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Label.Text}" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="Padding" Value="6 0 0 0" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -25,7 +25,7 @@
                             <ColumnDefinition x:Name="RightCol" Width="*" />
                         </Grid.ColumnDefinitions>
                         <Grid x:Name="PART_CHECKBOX">
-                            <Rectangle Margin="-6 0" Fill="{DynamicResource TransparentWhiteBrush}" />
+                            <Rectangle Margin="-6 0" Fill="{DynamicResource MahApps.Brushes.TransparentWhite}" />
                             <Border x:Name="normal"
                                     Width="18"
                                     Height="18"
@@ -37,19 +37,19 @@
                                   Width="12"
                                   Height="10"
                                   Data="M 1145.607177734375,430 C1145.607177734375,430 1141.449951171875,435.0772705078125 1141.449951171875,435.0772705078125 1141.449951171875,435.0772705078125 1139.232177734375,433.0999755859375 1139.232177734375,433.0999755859375 1139.232177734375,433.0999755859375 1138,434.5538330078125 1138,434.5538330078125 1138,434.5538330078125 1141.482177734375,438 1141.482177734375,438 1141.482177734375,438 1141.96875,437.9375 1141.96875,437.9375 1141.96875,437.9375 1147,431.34619140625 1147,431.34619140625 1147,431.34619140625 1145.607177734375,430 1145.607177734375,430 z"
-                                  Fill="{DynamicResource HighlightBrush}"
+                                  Fill="{DynamicResource MahApps.Brushes.Highlight}"
                                   Opacity="0"
                                   Stretch="Fill"
                                   UseLayoutRounding="False" />
                             <Rectangle x:Name="IndeterminateCheck"
                                        Width="8"
                                        Height="3"
-                                       Fill="{DynamicResource GrayBrush3}"
+                                       Fill="{DynamicResource MahApps.Brushes.Gray3}"
                                        Opacity="0" />
                             <Border x:Name="disabled"
                                     Width="18"
                                     Height="18"
-                                    Background="{DynamicResource SemiTransparentWhiteBrush}"
+                                    Background="{DynamicResource MahApps.Brushes.SemiTransparentWhite}"
                                     BorderThickness="{TemplateBinding BorderThickness}"
                                     Opacity="0"
                                     SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
@@ -106,7 +106,7 @@
                             <Setter TargetName="normal" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.MouseOverBorderBrush)}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter TargetName="normal" Property="BorderBrush" Value="{DynamicResource HighlightBrush}" />
+                            <Setter TargetName="normal" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Highlight}" />
                         </Trigger>
                         <Trigger Property="IsFocused" Value="True">
                             <Setter TargetName="normal" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
diff --git a/src/MahApps.Metro/Styles/Controls.ComboBox.xaml b/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
index 97362a69d8..200440b5b5 100644
--- a/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
@@ -158,16 +158,16 @@
                             <Setter TargetName="PART_ClearText" Property="IsEnabled" Value="False" />
                         </Trigger>
                         <Trigger Property="IsFocused" Value="True">
-                            <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                             <Setter TargetName="PART_FloatingMessage" Property="Opacity" Value="1" />
                         </Trigger>
                         <Trigger SourceName="PART_ClearText" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource GrayBrush8}" />
-                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray8}" />
+                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                         </Trigger>
                         <Trigger SourceName="PART_ClearText" Property="IsPressed" Value="True">
-                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource BlackBrush}" />
-                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource WhiteBrush}" />
+                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource MahApps.Brushes.Black}" />
+                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource MahApps.Brushes.White}" />
                         </Trigger>
 
                         <MultiTrigger>
@@ -234,7 +234,7 @@
                                   Height="4"
                                   HorizontalAlignment="Center"
                                   Data="F1 M 301.14,-189.041L 311.57,-189.041L 306.355,-182.942L 301.14,-189.041 Z "
-                                  Fill="{DynamicResource GrayBrush1}"
+                                  Fill="{DynamicResource MahApps.Brushes.Gray1}"
                                   IsHitTestVisible="false"
                                   SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
                                   Stretch="Uniform" />
@@ -242,20 +242,20 @@
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger SourceName="BtnArrowBackground" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="BtnArrowBackground" Property="Background" Value="{DynamicResource GrayBrush5}" />
+                            <Setter TargetName="BtnArrowBackground" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray5}" />
                         </Trigger>
                         <Trigger SourceName="PART_ClearText" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource GrayBrush8}" />
-                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray8}" />
+                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                         </Trigger>
                         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsPressed}" Value="True">
-                            <Setter TargetName="BtnArrowBackground" Property="Background" Value="{DynamicResource GrayBrush3}" />
-                            <Setter TargetName="ToggleButtonRootGrid" Property="Background" Value="{DynamicResource GrayBrush7}" />
+                            <Setter TargetName="BtnArrowBackground" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray3}" />
+                            <Setter TargetName="ToggleButtonRootGrid" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray7}" />
                         </DataTrigger>
                         <Trigger SourceName="PART_ClearText" Property="IsPressed" Value="True">
-                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource BlackBrush}" />
-                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource WhiteBrush}" />
-                            <Setter TargetName="ToggleButtonRootGrid" Property="Background" Value="{DynamicResource GrayBrush7}" />
+                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource MahApps.Brushes.Black}" />
+                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource MahApps.Brushes.White}" />
+                            <Setter TargetName="ToggleButtonRootGrid" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray7}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -264,16 +264,16 @@
     </Style>
 
     <Style x:Key="MetroComboBox" TargetType="{x:Type ComboBox}">
-        <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="{DynamicResource ComboBoxBorderThemeThickness}" />
-        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource ComboBoxMouseOverInnerBorderBrush}" />
-        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource TextBoxMouseOverBorderBrush}" />
+        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.ComboBox.MouseOverInnerBorder}" />
+        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
         <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource ClearTextButtonFontSize}" />
         <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="24" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
         <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="MinHeight" Value="26" />
         <Setter Property="Padding" Value="2" />
@@ -455,8 +455,8 @@
 
                         <Border x:Name="DisabledVisualElement"
                                 Grid.ColumnSpan="3"
-                                Background="{DynamicResource ControlsDisabledBrush}"
-                                BorderBrush="{DynamicResource ControlsDisabledBrush}"
+                                Background="{DynamicResource MahApps.Brushes.Controls.Disabled}"
+                                BorderBrush="{DynamicResource MahApps.Brushes.Controls.Disabled}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.CornerRadius), Mode=OneWay}"
                                 IsHitTestVisible="False"
@@ -475,8 +475,8 @@
                                 <Border x:Name="PopupBorder"
                                         Height="Auto"
                                         HorizontalAlignment="Stretch"
-                                        Background="{DynamicResource WhiteBrush}"
-                                        BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}"
+                                        Background="{DynamicResource MahApps.Brushes.White}"
+                                        BorderBrush="{DynamicResource MahApps.Brushes.ComboBox.PopupBorder}"
                                         BorderThickness="{DynamicResource ComboBoxPopupBorderThemeThickness}"
                                         SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
                                     <ScrollViewer Padding="{DynamicResource ComboBoxPopupBorderThemePadding}" BorderThickness="0">
@@ -579,7 +579,7 @@
                                 <Condition Property="IsEditable" Value="False" />
                                 <Condition Property="IsMouseOver" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter Property="Background" Value="{DynamicResource GrayBrush9}" />
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Gray9}" />
                         </MultiTrigger>
                         <Trigger Property="IsMouseOver" Value="True">
                             <Setter TargetName="Border" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.MouseOverBorderBrush)}" />
@@ -590,7 +590,7 @@
                         </Trigger>
                         <Trigger Property="IsFocused" Value="True">
                             <Setter TargetName="Border" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
-                            <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                             <Setter TargetName="PART_FloatingMessage" Property="Opacity" Value="1" />
                         </Trigger>
                         <Trigger Property="IsKeyboardFocusWithin" Value="True">
@@ -640,18 +640,18 @@
     </Style>
 
     <Style x:Key="MetroComboBoxItem" TargetType="ComboBoxItem">
-        <Setter Property="Background" Value="{DynamicResource WhiteBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Controls:ItemHelper.ActiveSelectionBackgroundBrush" Value="{DynamicResource AccentColorBrush}" />
-        <Setter Property="Controls:ItemHelper.ActiveSelectionForegroundBrush" Value="{DynamicResource AccentSelectedColorBrush}" />
-        <Setter Property="Controls:ItemHelper.DisabledForegroundBrush" Value="{DynamicResource GrayNormalBrush}" />
-        <Setter Property="Controls:ItemHelper.DisabledSelectedBackgroundBrush" Value="{DynamicResource GrayBrush7}" />
-        <Setter Property="Controls:ItemHelper.DisabledSelectedForegroundBrush" Value="{DynamicResource AccentSelectedColorBrush}" />
-        <Setter Property="Controls:ItemHelper.HoverBackgroundBrush" Value="{DynamicResource AccentColorBrush3}" />
-        <Setter Property="Controls:ItemHelper.HoverSelectedBackgroundBrush" Value="{DynamicResource AccentColorBrush}" />
-        <Setter Property="Controls:ItemHelper.SelectedBackgroundBrush" Value="{DynamicResource AccentColorBrush2}" />
-        <Setter Property="Controls:ItemHelper.SelectedForegroundBrush" Value="{DynamicResource AccentSelectedColorBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
+        <Setter Property="Controls:ItemHelper.ActiveSelectionBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="Controls:ItemHelper.ActiveSelectionForegroundBrush" Value="{DynamicResource MahApps.Brushes.AccentSelectedColor}" />
+        <Setter Property="Controls:ItemHelper.DisabledForegroundBrush" Value="{DynamicResource MahApps.Brushes.GrayNormal}" />
+        <Setter Property="Controls:ItemHelper.DisabledSelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Gray7}" />
+        <Setter Property="Controls:ItemHelper.DisabledSelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.AccentSelectedColor}" />
+        <Setter Property="Controls:ItemHelper.HoverBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent3}" />
+        <Setter Property="Controls:ItemHelper.HoverSelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="Controls:ItemHelper.SelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent2}" />
+        <Setter Property="Controls:ItemHelper.SelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.AccentSelectedColor}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="MinHeight" Value="22" />
         <Setter Property="Padding" Value="2" />
diff --git a/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml b/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml
index 97d52c2cfa..4cf346d6cd 100644
--- a/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml
@@ -10,7 +10,7 @@
     <Geometry x:Key="UpArrow">M 0,4 L 3.5,0 L 7,4 Z</Geometry>
 
     <Style x:Key="{x:Static MenuItem.SeparatorStyleKey}" TargetType="{x:Type Separator}">
-        <Setter Property="Background" Value="{DynamicResource MenuBackgroundBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Menu.Background}" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="Margin" Value="6 2 6 2" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -20,12 +20,12 @@
                     <Grid Margin="0 6 0 4" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
                         <Rectangle Height="1"
                                    Margin="20 0 1 1"
-                                   Fill="{DynamicResource GrayBrush7}"
+                                   Fill="{DynamicResource MahApps.Brushes.Gray7}"
                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
                                    UseLayoutRounding="True" />
                         <Rectangle Height="1"
                                    Margin="20 1 1 0"
-                                   Fill="{DynamicResource WhiteBrush}"
+                                   Fill="{DynamicResource MahApps.Brushes.White}"
                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
                                    UseLayoutRounding="True" />
                     </Grid>
@@ -35,7 +35,7 @@
     </Style>
 
     <Style x:Key="MetroMenu" TargetType="{x:Type Menu}">
-        <Setter Property="Background" Value="{DynamicResource MenuBackgroundBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Menu.Background}" />
         <Setter Property="FontFamily" Value="{DynamicResource {x:Static SystemFonts.MenuFontFamilyKey}}" />
         <Setter Property="FontSize" Value="{DynamicResource MenuFontSize}" />
         <Setter Property="FontStyle" Value="{DynamicResource {x:Static SystemFonts.MenuFontStyleKey}}" />
@@ -60,9 +60,9 @@
     </Style>
 
     <Style x:Key="MetroContextMenu" TargetType="{x:Type ContextMenu}">
-        <Setter Property="Background" Value="{DynamicResource ContextMenuBackgroundBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ContextMenu.Background}" />
         <Setter Property="Block.TextAlignment" Value="Left" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ContextMenuBorderBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ContextMenu.Border}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="FontFamily" Value="{DynamicResource {x:Static SystemFonts.MenuFontFamilyKey}}" />
         <Setter Property="FontSize" Value="{DynamicResource ContextMenuFontSize}" />
@@ -122,7 +122,7 @@
     </Style>
 
     <Style x:Key="MetroMenuItem" TargetType="{x:Type MenuItem}">
-        <Setter Property="Background" Value="{DynamicResource MenuItemBackgroundBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.MenuItem.Background}" />
         <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
         <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
         <Setter Property="ScrollViewer.PanningMode" Value="Both" />
@@ -285,8 +285,8 @@
     </Style>
 
     <ControlTemplate x:Key="{ComponentResourceKey ResourceId=SubmenuContent, TypeInTargetAssembly={x:Type FrameworkElement}}" TargetType="{x:Type ContentControl}">
-        <Border Background="{DynamicResource SubMenuBackgroundBrush}"
-                BorderBrush="{DynamicResource SubMenuBorderBrush}"
+        <Border Background="{DynamicResource MahApps.Brushes.SubMenu.Background}"
+                BorderBrush="{DynamicResource MahApps.Brushes.SubMenu.Border}"
                 BorderThickness="1">
             <ContentPresenter />
         </Border>
@@ -310,7 +310,7 @@
                       HorizontalAlignment="Center"
                       VerticalAlignment="Center"
                       Data="{StaticResource Checkmark}"
-                      Fill="{DynamicResource CheckmarkFill}"
+                      Fill="{DynamicResource MahApps.Brushes.CheckmarkFill}"
                       FlowDirection="LeftToRight"
                       Visibility="Collapsed" />
                 <ContentPresenter Margin="{TemplateBinding Padding}"
@@ -370,19 +370,19 @@
                 <Setter TargetName="SubMenuBorder" Property="Margin" Value="0 0 6 6" />
             </Trigger>
             <Trigger Property="IsHighlighted" Value="True">
-                <Setter TargetName="Bg" Property="Stroke" Value="{DynamicResource TopMenuItemSelectionStroke}" />
+                <Setter TargetName="Bg" Property="Stroke" Value="{DynamicResource MahApps.Brushes.TopMenuItem.SelectionStroke}" />
             </Trigger>
             <Trigger Property="IsKeyboardFocused" Value="True">
-                <Setter TargetName="Bg" Property="Fill" Value="{DynamicResource TopMenuItemPressedFill}" />
-                <Setter TargetName="Bg" Property="Stroke" Value="{DynamicResource TopMenuItemPressedStroke}" />
+                <Setter TargetName="Bg" Property="Fill" Value="{DynamicResource MahApps.Brushes.TopMenuItem.PressedFill}" />
+                <Setter TargetName="Bg" Property="Stroke" Value="{DynamicResource MahApps.Brushes.TopMenuItem.PressedStroke}" />
             </Trigger>
             <Trigger Property="IsSubmenuOpen" Value="True">
-                <Setter TargetName="Bg" Property="Fill" Value="{DynamicResource TopMenuItemPressedFill}" />
-                <Setter TargetName="Bg" Property="Stroke" Value="{DynamicResource TopMenuItemPressedStroke}" />
+                <Setter TargetName="Bg" Property="Fill" Value="{DynamicResource MahApps.Brushes.TopMenuItem.PressedFill}" />
+                <Setter TargetName="Bg" Property="Stroke" Value="{DynamicResource MahApps.Brushes.TopMenuItem.PressedStroke}" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
-                <Setter Property="Foreground" Value="{DynamicResource DisabledMenuItemForeground}" />
-                <Setter TargetName="GlyphPanel" Property="Fill" Value="{DynamicResource DisabledMenuItemGlyphPanel}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.MenuItem.DisabledForeground}" />
+                <Setter TargetName="GlyphPanel" Property="Fill" Value="{DynamicResource MahApps.Brushes.MenuItem.DisabledGlyphPanel}" />
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
@@ -405,7 +405,7 @@
                       HorizontalAlignment="Center"
                       VerticalAlignment="Center"
                       Data="{StaticResource Checkmark}"
-                      Fill="{DynamicResource CheckmarkFill}"
+                      Fill="{DynamicResource MahApps.Brushes.CheckmarkFill}"
                       FlowDirection="LeftToRight"
                       Visibility="Collapsed" />
                 <ContentPresenter Margin="{TemplateBinding Padding}"
@@ -423,15 +423,15 @@
                 <Setter TargetName="Icon" Property="Visibility" Value="Collapsed" />
             </Trigger>
             <Trigger Property="IsHighlighted" Value="True">
-                <Setter TargetName="Bg" Property="Stroke" Value="{DynamicResource TopMenuItemSelectionStroke}" />
+                <Setter TargetName="Bg" Property="Stroke" Value="{DynamicResource MahApps.Brushes.TopMenuItem.SelectionStroke}" />
             </Trigger>
             <Trigger Property="IsKeyboardFocused" Value="True">
-                <Setter TargetName="Bg" Property="Fill" Value="{DynamicResource TopMenuItemPressedFill}" />
-                <Setter TargetName="Bg" Property="Stroke" Value="{DynamicResource TopMenuItemPressedStroke}" />
+                <Setter TargetName="Bg" Property="Fill" Value="{DynamicResource MahApps.Brushes.TopMenuItem.PressedFill}" />
+                <Setter TargetName="Bg" Property="Stroke" Value="{DynamicResource MahApps.Brushes.TopMenuItem.PressedStroke}" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
-                <Setter Property="Foreground" Value="{DynamicResource DisabledMenuItemForeground}" />
-                <Setter TargetName="GlyphPanel" Property="Fill" Value="{DynamicResource DisabledMenuItemGlyphPanel}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.MenuItem.DisabledForeground}" />
+                <Setter TargetName="GlyphPanel" Property="Fill" Value="{DynamicResource MahApps.Brushes.MenuItem.DisabledGlyphPanel}" />
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
@@ -463,7 +463,7 @@
                       HorizontalAlignment="Center"
                       VerticalAlignment="Center"
                       Data="{StaticResource Checkmark}"
-                      Fill="{DynamicResource CheckmarkFill}"
+                      Fill="{DynamicResource MahApps.Brushes.CheckmarkFill}"
                       FlowDirection="LeftToRight"
                       Visibility="Collapsed" />
                 <ContentPresenter Grid.Column="2"
@@ -479,7 +479,7 @@
                       Margin="4 0 0 0"
                       VerticalAlignment="Center"
                       Data="{StaticResource RightArrow}"
-                      Fill="{DynamicResource RightArrowFill}" />
+                      Fill="{DynamicResource MahApps.Brushes.RightArrowFill}" />
             </Grid>
             <Popup x:Name="PART_Popup"
                    AllowsTransparency="True"
@@ -533,12 +533,12 @@
                 <Setter TargetName="SubMenuBorder" Property="Margin" Value="0 0 6 6" />
             </Trigger>
             <Trigger Property="IsHighlighted" Value="True">
-                <Setter TargetName="Bg" Property="Fill" Value="{DynamicResource MenuItemSelectionFill}" />
-                <Setter TargetName="Bg" Property="Stroke" Value="{DynamicResource MenuItemSelectionStroke}" />
+                <Setter TargetName="Bg" Property="Fill" Value="{DynamicResource MahApps.Brushes.MenuItem.SelectionFill}" />
+                <Setter TargetName="Bg" Property="Stroke" Value="{DynamicResource MahApps.Brushes.MenuItem.SelectionStroke}" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
-                <Setter Property="Foreground" Value="{DynamicResource DisabledMenuItemForeground}" />
-                <Setter TargetName="GlyphPanel" Property="Fill" Value="{DynamicResource DisabledMenuItemGlyphPanel}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.MenuItem.DisabledForeground}" />
+                <Setter TargetName="GlyphPanel" Property="Fill" Value="{DynamicResource MahApps.Brushes.MenuItem.DisabledGlyphPanel}" />
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
@@ -570,7 +570,7 @@
                       HorizontalAlignment="Center"
                       VerticalAlignment="Center"
                       Data="{StaticResource Checkmark}"
-                      Fill="{DynamicResource CheckmarkFill}"
+                      Fill="{DynamicResource MahApps.Brushes.CheckmarkFill}"
                       FlowDirection="LeftToRight"
                       Visibility="Collapsed" />
                 <ContentPresenter Grid.Column="2"
@@ -592,12 +592,12 @@
                 <Setter TargetName="Icon" Property="Visibility" Value="Collapsed" />
             </Trigger>
             <Trigger Property="IsHighlighted" Value="True">
-                <Setter TargetName="Bg" Property="Fill" Value="{DynamicResource MenuItemSelectionFill}" />
-                <Setter TargetName="Bg" Property="Stroke" Value="{DynamicResource MenuItemSelectionStroke}" />
+                <Setter TargetName="Bg" Property="Fill" Value="{DynamicResource MahApps.Brushes.MenuItem.SelectionFill}" />
+                <Setter TargetName="Bg" Property="Stroke" Value="{DynamicResource MahApps.Brushes.MenuItem.SelectionStroke}" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
-                <Setter Property="Foreground" Value="{DynamicResource DisabledMenuItemForeground}" />
-                <Setter TargetName="GlyphPanel" Property="Fill" Value="{DynamicResource DisabledMenuItemGlyphPanel}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.MenuItem.DisabledForeground}" />
+                <Setter TargetName="GlyphPanel" Property="Fill" Value="{DynamicResource MahApps.Brushes.MenuItem.DisabledGlyphPanel}" />
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
diff --git a/src/MahApps.Metro/Styles/Controls.DataGrid.xaml b/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
index c0dada1df6..b801b42dbd 100644
--- a/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
+++ b/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
@@ -41,7 +41,7 @@
     <Style x:Key="MahApps.Metro.Styles.DataGrid.NumericUpDownColumnEditingStyle"
            BasedOn="{StaticResource MahApps.Metro.Styles.DataGrid.NumericUpDownColumnStyle}"
            TargetType="{x:Type Controls:NumericUpDown}">
-        <Setter Property="Background" Value="{DynamicResource WhiteBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="HideUpDownButtons" Value="False" />
     </Style>
 
@@ -50,19 +50,19 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Button}">
                     <Grid>
-                        <Rectangle x:Name="Border" Fill="{DynamicResource GrayBrush7}" />
+                        <Rectangle x:Name="Border" Fill="{DynamicResource MahApps.Brushes.Gray7}" />
                         <Polygon x:Name="Arrow"
                                  Margin="8 8 3 3"
                                  HorizontalAlignment="Right"
                                  VerticalAlignment="Bottom"
-                                 Fill="{DynamicResource GrayBrush1}"
+                                 Fill="{DynamicResource MahApps.Brushes.Gray1}"
                                  Opacity="0.15"
                                  Points="0,10 10,10 10,0"
                                  Stretch="Uniform" />
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter TargetName="Border" Property="Fill" Value="{DynamicResource AccentColorBrush2}" />
+                            <Setter TargetName="Border" Property="Fill" Value="{DynamicResource MahApps.Brushes.Accent2}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter TargetName="Arrow" Property="Visibility" Value="Collapsed" />
@@ -74,7 +74,7 @@
     </Style>
 
     <Style x:Key="MetroColumnHeaderGripperStyle" TargetType="{x:Type Thumb}">
-        <Setter Property="Background" Value="{DynamicResource GrayBrush5}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Gray5}" />
         <Setter Property="Cursor" Value="SizeWE" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
@@ -92,7 +92,7 @@
     </Style>
 
     <Style x:Key="MetroRowHeaderGripperStyle" TargetType="{x:Type Thumb}">
-        <Setter Property="Background" Value="{DynamicResource GrayBrush5}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Gray5}" />
         <Setter Property="Cursor" Value="SizeNS" />
         <Setter Property="Height" Value="6" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -110,13 +110,13 @@
     </Style>
 
     <Style x:Key="MetroDataGridColumnHeader" TargetType="{x:Type DataGridColumnHeader}">
-        <Setter Property="Background" Value="{DynamicResource WhiteBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource GrayBrush5}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray5}" />
         <Setter Property="BorderThickness" Value="0 0 0 3" />
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Upper" />
         <Setter Property="Cursor" Value="Hand" />
         <Setter Property="FontWeight" Value="SemiBold" />
-        <Setter Property="Foreground" Value="{DynamicResource BlackBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="Margin" Value="0" />
         <Setter Property="MinHeight" Value="25" />
@@ -156,7 +156,7 @@
                               Height="10"
                               Margin="0 0 8 2"
                               VerticalAlignment="Center"
-                              Fill="{DynamicResource GrayBrush2}"
+                              Fill="{DynamicResource MahApps.Brushes.Gray2}"
                               RenderTransformOrigin="0.5,0.5"
                               Stretch="Fill"
                               Visibility="Collapsed" />
@@ -195,7 +195,7 @@
                     <Condition Property="IsMouseOver" Value="True" />
                     <Condition Property="SortDirection" Value="{x:Null}" />
                 </MultiTrigger.Conditions>
-                <Setter Property="Background" Value="{DynamicResource GrayBrush8}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Gray8}" />
             </MultiTrigger>
             <Trigger Property="IsEnabled" Value="False">
                 <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
@@ -205,7 +205,7 @@
 
     <Style x:Key="MetroDataGridRowHeader" TargetType="{x:Type DataGridRowHeader}">
         <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderBrush" Value="{DynamicResource GrayBrush5}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray5}" />
         <Setter Property="BorderThickness" Value="0 0 1 0" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="Margin" Value="0" />
@@ -249,7 +249,7 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="{DynamicResource AccentColorBrush3}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Accent3}" />
             </Trigger>
         </Style.Triggers>
     </Style>
@@ -284,15 +284,15 @@
         <Style.Triggers>
             <!--  IsSelected  -->
             <Trigger Property="IsSelected" Value="True">
-                <Setter Property="Foreground" Value="{DynamicResource MetroDataGrid.HighlightTextBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGrid.HighlightText}" />
             </Trigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
                     <Condition Property="Controls:DataGridCellHelper.IsCellOrRowHeader" Value="True" />
                     <Condition Property="IsSelected" Value="True" />
                 </MultiTrigger.Conditions>
-                <Setter Property="Background" Value="{DynamicResource MetroDataGrid.HighlightBrush}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource MetroDataGrid.HighlightBrush}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGrid.Highlight}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.DataGrid.Highlight}" />
             </MultiTrigger>
 
             <!--  IsKeyboardFocusWithin  -->
@@ -301,7 +301,7 @@
                     <Condition Property="Controls:DataGridCellHelper.IsCellOrRowHeader" Value="True" />
                     <Condition Property="IsKeyboardFocusWithin" Value="True" />
                 </MultiTrigger.Conditions>
-                <Setter Property="BorderBrush" Value="{DynamicResource MetroDataGrid.FocusBorderBrush}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.DataGrid.FocusBorder}" />
             </MultiTrigger>
 
             <!--  IsSelected and Selector.IsSelectionActive  -->
@@ -310,7 +310,7 @@
                     <Condition Property="IsSelected" Value="True" />
                     <Condition Property="Selector.IsSelectionActive" Value="False" />
                 </MultiTrigger.Conditions>
-                <Setter Property="Foreground" Value="{DynamicResource MetroDataGrid.InactiveSelectionHighlightTextBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGrid.InactiveSelectionHighlightText}" />
             </MultiTrigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
@@ -318,8 +318,8 @@
                     <Condition Property="IsSelected" Value="True" />
                     <Condition Property="Selector.IsSelectionActive" Value="False" />
                 </MultiTrigger.Conditions>
-                <Setter Property="Background" Value="{DynamicResource MetroDataGrid.InactiveSelectionHighlightBrush}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource MetroDataGrid.InactiveSelectionHighlightBrush}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGrid.InactiveSelectionHighlight}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.DataGrid.InactiveSelectionHighlight}" />
             </MultiTrigger>
 
             <!--  IsMouseOver  -->
@@ -328,8 +328,8 @@
                     <Condition Property="Controls:DataGridCellHelper.IsCellOrRowHeader" Value="True" />
                     <Condition Property="IsMouseOver" Value="True" />
                 </MultiTrigger.Conditions>
-                <Setter Property="Background" Value="{DynamicResource MetroDataGrid.MouseOverHighlightBrush}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource MetroDataGrid.MouseOverHighlightBrush}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGrid.MouseOverHighlight}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.DataGrid.MouseOverHighlight}" />
             </MultiTrigger>
 
             <!--  IsEnabled  -->
@@ -343,7 +343,7 @@
                     <Condition Property="IsEnabled" Value="False" />
                     <Condition Property="IsSelected" Value="True" />
                 </MultiTrigger.Conditions>
-                <Setter Property="Foreground" Value="{DynamicResource MetroDataGrid.HighlightTextBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGrid.HighlightText}" />
             </MultiTrigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
@@ -351,8 +351,8 @@
                     <Condition Property="IsEnabled" Value="False" />
                     <Condition Property="IsSelected" Value="True" />
                 </MultiTrigger.Conditions>
-                <Setter Property="Background" Value="{DynamicResource MetroDataGrid.DisabledHighlightBrush}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource MetroDataGrid.DisabledHighlightBrush}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGrid.DisabledHighlight}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.DataGrid.DisabledHighlight}" />
             </MultiTrigger>
 
         </Style.Triggers>
@@ -366,14 +366,14 @@
             <Path Width="20"
                   Height="20"
                   Data="m 31.630585,39.233818 24.6309,-24.6308 c 0.6183,-0.6184 1.6208,-0.6184 2.2392,0 l 24.6308,24.6308 c 0.6184,0.6184 0.6184,1.6209 0,2.2392 l -24.6308,24.6309 c -0.6183,0.6183 -1.6209,0.6183 -2.2392,0 l -24.6309,-24.6309 c -0.6183,-0.6183 -0.6183,-1.6208 0,-2.2392 z"
-                  Fill="{DynamicResource ControlsValidationBrush}"
+                  Fill="{DynamicResource MahApps.Brushes.Controls.Validation}"
                   Stretch="Uniform" />
             <Path Width="10"
                   Height="10"
                   HorizontalAlignment="Center"
                   VerticalAlignment="Center"
                   Data="m 53.781741,31.196677 c -2.237724,0 -4.0625,1.824776 -4.0625,4.0625 0,2.237724 1.824776,4.0625 4.0625,4.0625 2.237724,0 4.0625,-1.824776 4.0625,-4.0625 0,-2.237724 -1.824776,-4.0625 -4.0625,-4.0625 z m -4.09375,-21.375 0.03125,0.53125 1.21875,19.46875 5.6875,0 1.25,-20 -8.1875,0 z"
-                  Fill="{DynamicResource ValidationTextBrush}"
+                  Fill="{DynamicResource MahApps.Brushes.Text.Validation}"
                   Stretch="Uniform" />
         </Grid>
     </ControlTemplate>
@@ -392,9 +392,9 @@
                     <Condition Property="Controls:DataGridRowHelper.SelectionUnit" Value="FullRow" />
                     <Condition Property="IsSelected" Value="True" />
                 </MultiTrigger.Conditions>
-                <Setter Property="Background" Value="{DynamicResource MetroDataGrid.HighlightBrush}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource MetroDataGrid.HighlightBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource MetroDataGrid.HighlightTextBrush}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGrid.Highlight}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.DataGrid.Highlight}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGrid.HighlightText}" />
             </MultiTrigger>
 
             <!--  IsSelected and Selector.IsSelectionActive  -->
@@ -404,9 +404,9 @@
                     <Condition Property="IsSelected" Value="True" />
                     <Condition Property="Selector.IsSelectionActive" Value="False" />
                 </MultiTrigger.Conditions>
-                <Setter Property="Background" Value="{DynamicResource MetroDataGrid.InactiveSelectionHighlightBrush}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource MetroDataGrid.InactiveSelectionHighlightBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource MetroDataGrid.InactiveSelectionHighlightTextBrush}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGrid.InactiveSelectionHighlight}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.DataGrid.InactiveSelectionHighlight}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGrid.InactiveSelectionHighlightText}" />
             </MultiTrigger>
 
             <!--  IsMouseOver  -->
@@ -415,8 +415,8 @@
                     <Condition Property="Controls:DataGridRowHelper.SelectionUnit" Value="FullRow" />
                     <Condition Property="IsMouseOver" Value="True" />
                 </MultiTrigger.Conditions>
-                <Setter Property="Background" Value="{DynamicResource MetroDataGrid.MouseOverHighlightBrush}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource MetroDataGrid.MouseOverHighlightBrush}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGrid.MouseOverHighlight}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.DataGrid.MouseOverHighlight}" />
             </MultiTrigger>
 
             <!--  IsEnabled  -->
@@ -435,24 +435,24 @@
                     <Condition Property="IsEnabled" Value="False" />
                     <Condition Property="IsSelected" Value="True" />
                 </MultiTrigger.Conditions>
-                <Setter Property="Background" Value="{DynamicResource MetroDataGrid.DisabledHighlightBrush}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource MetroDataGrid.DisabledHighlightBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource MetroDataGrid.HighlightTextBrush}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.DataGrid.DisabledHighlight}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.DataGrid.DisabledHighlight}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.DataGrid.HighlightText}" />
             </MultiTrigger>
 
         </Style.Triggers>
     </Style>
 
     <Style x:Key="MetroDataGrid" TargetType="{x:Type DataGrid}">
-        <Setter Property="Background" Value="{DynamicResource WhiteBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource AccentColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="BorderThickness" Value="0 0 0 0" />
         <Setter Property="CellStyle" Value="{StaticResource MetroDataGridCell}" />
         <Setter Property="ColumnHeaderStyle" Value="{StaticResource MetroDataGridColumnHeader}" />
         <Setter Property="DropLocationIndicatorStyle">
             <Setter.Value>
                 <Style TargetType="Separator">
-                    <Setter Property="Background" Value="{DynamicResource GrayBrush7}" />
+                    <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Gray7}" />
                     <Setter Property="Template">
                         <Setter.Value>
                             <ControlTemplate TargetType="Separator">
@@ -468,7 +468,7 @@
         </Setter>
         <Setter Property="GridLinesVisibility" Value="None" />
         <Setter Property="HeadersVisibility" Value="Column" />
-        <Setter Property="HorizontalGridLinesBrush" Value="{DynamicResource GrayBrush7}" />
+        <Setter Property="HorizontalGridLinesBrush" Value="{DynamicResource MahApps.Brushes.Gray7}" />
         <Setter Property="MinRowHeight" Value="25" />
         <Setter Property="RowHeaderStyle" Value="{StaticResource MetroDataGridRowHeader}" />
         <Setter Property="RowStyle" Value="{StaticResource MetroDataGridRow}" />
@@ -538,7 +538,7 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-        <Setter Property="VerticalGridLinesBrush" Value="{DynamicResource GrayBrush7}" />
+        <Setter Property="VerticalGridLinesBrush" Value="{DynamicResource MahApps.Brushes.Gray7}" />
         <Style.Triggers>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
@@ -587,14 +587,14 @@
         </Setter>
         <Style.Triggers>
             <DataTrigger Binding="{Binding RelativeSource={x:Static RelativeSource.Self}, Path=Column.DisplayIndex}" Value="0">
-                <Setter Property="Background" Value="{DynamicResource AccentColorBrush4}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Accent4}" />
             </DataTrigger>
             <MultiDataTrigger>
                 <MultiDataTrigger.Conditions>
                     <Condition Binding="{Binding RelativeSource={x:Static RelativeSource.Self}, Path=Column.DisplayIndex}" Value="0" />
                     <Condition Binding="{Binding RelativeSource={x:Static RelativeSource.Self}, Path=IsSelected}" Value="True" />
                 </MultiDataTrigger.Conditions>
-                <Setter Property="Background" Value="{DynamicResource AccentColorBrush2}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Accent2}" />
             </MultiDataTrigger>
         </Style.Triggers>
     </Style>
diff --git a/src/MahApps.Metro/Styles/Controls.DatePicker.xaml b/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
index 76e2ea923b..75468317e2 100644
--- a/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
+++ b/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
@@ -10,18 +10,18 @@
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="MetroDatePicker" TargetType="{x:Type DatePicker}">
-        <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="CalendarStyle" Value="{DynamicResource MahApps.Metro.Styles.BaseMetroCalendar}" />
         <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
-        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
-        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource TextBoxMouseOverBorderBrush}" />
+        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
+        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
         <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="22" />
         <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
         <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="IsTodayHighlighted" Value="True" />
         <Setter Property="MinHeight" Value="26" />
         <Setter Property="Padding" Value="2" />
@@ -68,12 +68,12 @@
                                                Controls:TextBoxHelper.Watermark="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.Watermark), Mode=OneWay}"
                                                Controls:TextBoxHelper.WatermarkAlignment="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.WatermarkAlignment), Mode=OneWay}"
                                                Controls:TextBoxHelper.WatermarkTrimming="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.WatermarkTrimming), Mode=OneWay}"
-                                               CaretBrush="{DynamicResource BlackBrush}"
+                                               CaretBrush="{DynamicResource MahApps.Brushes.Black}"
                                                ContextMenu="{TemplateBinding ContextMenu}"
                                                Focusable="{TemplateBinding Focusable}"
                                                FontSize="{TemplateBinding FontSize}"
                                                Foreground="{TemplateBinding Foreground}"
-                                               SelectionBrush="{DynamicResource HighlightBrush}">
+                                               SelectionBrush="{DynamicResource MahApps.Brushes.Highlight}">
                                 <i:Interaction.Behaviors>
                                     <behaviors:DatePickerTextBoxBehavior />
                                 </i:Interaction.Behaviors>
@@ -127,8 +127,8 @@
                                    StaysOpen="False" />
                         </Grid>
                         <Border x:Name="DisabledVisualElement"
-                                Background="{DynamicResource ControlsDisabledBrush}"
-                                BorderBrush="{DynamicResource ControlsDisabledBrush}"
+                                Background="{DynamicResource MahApps.Brushes.Controls.Disabled}"
+                                BorderBrush="{DynamicResource MahApps.Brushes.Controls.Disabled}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 IsHitTestVisible="False"
                                 Opacity="0"
@@ -145,7 +145,7 @@
                         </Trigger>
                         <Trigger SourceName="PART_TextBox" Property="IsFocused" Value="True">
                             <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
-                            <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                             <Setter TargetName="PART_FloatingMessage" Property="Opacity" Value="1" />
                         </Trigger>
                         <Trigger Property="IsKeyboardFocusWithin" Value="True">
@@ -155,12 +155,12 @@
                             <Setter TargetName="DisabledVisualElement" Property="Opacity" Value="0.6" />
                         </Trigger>
                         <Trigger SourceName="PART_Button" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="PART_Button" Property="Background" Value="{DynamicResource GrayBrush8}" />
-                            <Setter TargetName="PART_Button" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_Button" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray8}" />
+                            <Setter TargetName="PART_Button" Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                         </Trigger>
                         <Trigger SourceName="PART_Button" Property="IsPressed" Value="True">
-                            <Setter TargetName="PART_Button" Property="Background" Value="{DynamicResource BlackBrush}" />
-                            <Setter TargetName="PART_Button" Property="Foreground" Value="{DynamicResource WhiteBrush}" />
+                            <Setter TargetName="PART_Button" Property="Background" Value="{DynamicResource MahApps.Brushes.Black}" />
+                            <Setter TargetName="PART_Button" Property="Foreground" Value="{DynamicResource MahApps.Brushes.White}" />
                         </Trigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
@@ -183,13 +183,13 @@
     </Style>
 
     <Style x:Key="MetroDatePickerTextBox" TargetType="{x:Type DatePickerTextBox}">
-        <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
         <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
         <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
         <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
         <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
         <Setter Property="Template">
diff --git a/src/MahApps.Metro/Styles/Controls.Expander.xaml b/src/MahApps.Metro/Styles/Controls.Expander.xaml
index 2578e51061..6b894fd79a 100644
--- a/src/MahApps.Metro/Styles/Controls.Expander.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Expander.xaml
@@ -79,12 +79,12 @@
                             <Setter TargetName="Arrow" Property="Data" Value="M 1,4.5  L 4.5,1  L 8,4.5" />
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="true">
-                            <Setter TargetName="Arrow" Property="Stroke" Value="{DynamicResource GrayBrush2}" />
-                            <Setter TargetName="Circle" Property="Stroke" Value="{DynamicResource GrayBrush2}" />
+                            <Setter TargetName="Arrow" Property="Stroke" Value="{DynamicResource MahApps.Brushes.Gray2}" />
+                            <Setter TargetName="Circle" Property="Stroke" Value="{DynamicResource MahApps.Brushes.Gray2}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="true">
-                            <Setter TargetName="Arrow" Property="Stroke" Value="{DynamicResource BlackColorBrush}" />
-                            <Setter TargetName="Circle" Property="Stroke" Value="{DynamicResource BlackColorBrush}" />
+                            <Setter TargetName="Arrow" Property="Stroke" Value="{DynamicResource MahApps.Brushes.BlackColor}" />
+                            <Setter TargetName="Circle" Property="Stroke" Value="{DynamicResource MahApps.Brushes.BlackColor}" />
                             <Setter TargetName="Circle" Property="StrokeThickness" Value="2" />
                         </Trigger>
                     </ControlTemplate.Triggers>
@@ -153,12 +153,12 @@
                             <Setter TargetName="Arrow" Property="Data" Value="M 1,4.5  L 4.5,1  L 8,4.5" />
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="true">
-                            <Setter TargetName="Arrow" Property="Stroke" Value="{DynamicResource GrayBrush2}" />
-                            <Setter TargetName="Circle" Property="Stroke" Value="{DynamicResource GrayBrush2}" />
+                            <Setter TargetName="Arrow" Property="Stroke" Value="{DynamicResource MahApps.Brushes.Gray2}" />
+                            <Setter TargetName="Circle" Property="Stroke" Value="{DynamicResource MahApps.Brushes.Gray2}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="true">
-                            <Setter TargetName="Arrow" Property="Stroke" Value="{DynamicResource BlackColorBrush}" />
-                            <Setter TargetName="Circle" Property="Stroke" Value="{DynamicResource BlackColorBrush}" />
+                            <Setter TargetName="Arrow" Property="Stroke" Value="{DynamicResource MahApps.Brushes.BlackColor}" />
+                            <Setter TargetName="Circle" Property="Stroke" Value="{DynamicResource MahApps.Brushes.BlackColor}" />
                             <Setter TargetName="Circle" Property="StrokeThickness" Value="2" />
                         </Trigger>
                     </ControlTemplate.Triggers>
@@ -226,12 +226,12 @@
                             <Setter TargetName="Arrow" Property="Data" Value="M 1,4.5  L 4.5,1  L 8,4.5" />
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="true">
-                            <Setter TargetName="Arrow" Property="Stroke" Value="{DynamicResource GrayBrush2}" />
-                            <Setter TargetName="Circle" Property="Stroke" Value="{DynamicResource GrayBrush2}" />
+                            <Setter TargetName="Arrow" Property="Stroke" Value="{DynamicResource MahApps.Brushes.Gray2}" />
+                            <Setter TargetName="Circle" Property="Stroke" Value="{DynamicResource MahApps.Brushes.Gray2}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="true">
-                            <Setter TargetName="Arrow" Property="Stroke" Value="{DynamicResource BlackColorBrush}" />
-                            <Setter TargetName="Circle" Property="Stroke" Value="{DynamicResource BlackColorBrush}" />
+                            <Setter TargetName="Arrow" Property="Stroke" Value="{DynamicResource MahApps.Brushes.BlackColor}" />
+                            <Setter TargetName="Circle" Property="Stroke" Value="{DynamicResource MahApps.Brushes.BlackColor}" />
                             <Setter TargetName="Circle" Property="StrokeThickness" Value="2" />
                         </Trigger>
                     </ControlTemplate.Triggers>
@@ -289,12 +289,12 @@
                             <Setter TargetName="Arrow" Property="Data" Value="M 1,4.5  L 4.5,1  L 8,4.5" />
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="true">
-                            <Setter TargetName="Arrow" Property="Stroke" Value="{DynamicResource GrayBrush2}" />
-                            <Setter TargetName="Circle" Property="Stroke" Value="{DynamicResource GrayBrush2}" />
+                            <Setter TargetName="Arrow" Property="Stroke" Value="{DynamicResource MahApps.Brushes.Gray2}" />
+                            <Setter TargetName="Circle" Property="Stroke" Value="{DynamicResource MahApps.Brushes.Gray2}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="true">
-                            <Setter TargetName="Arrow" Property="Stroke" Value="{DynamicResource BlackColorBrush}" />
-                            <Setter TargetName="Circle" Property="Stroke" Value="{DynamicResource BlackColorBrush}" />
+                            <Setter TargetName="Arrow" Property="Stroke" Value="{DynamicResource MahApps.Brushes.BlackColor}" />
+                            <Setter TargetName="Circle" Property="Stroke" Value="{DynamicResource MahApps.Brushes.BlackColor}" />
                             <Setter TargetName="Circle" Property="StrokeThickness" Value="2" />
                         </Trigger>
                     </ControlTemplate.Triggers>
@@ -324,8 +324,8 @@
     </Storyboard>
 
     <Style x:Key="MetroExpander" TargetType="{x:Type Expander}">
-        <Setter Property="Background" Value="{DynamicResource AccentColorBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource AccentColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Upper" />
         <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource ContentFontSize}" />
@@ -334,7 +334,7 @@
         <Setter Property="Controls:ExpanderHelper.HeaderRightStyle" Value="{StaticResource ExpanderRightHeaderStyle}" />
         <Setter Property="Controls:ExpanderHelper.HeaderUpStyle" Value="{StaticResource ExpanderUpHeaderStyle}" />
         <Setter Property="Controls:GroupBoxHelper.HeaderForeground" Value="{x:Null}" />
-        <Setter Property="Foreground" Value="{DynamicResource BlackBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="Padding" Value="4" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
@@ -342,7 +342,7 @@
                 <ControlTemplate TargetType="{x:Type Expander}">
                     <Grid>
                         <Rectangle x:Name="DisabledVisualElement"
-                                   Fill="{DynamicResource ControlsDisabledBrush}"
+                                   Fill="{DynamicResource MahApps.Brushes.Controls.Disabled}"
                                    IsHitTestVisible="false"
                                    Opacity="0" />
                         <DockPanel x:Name="ExpanderRoot">
diff --git a/src/MahApps.Metro/Styles/Controls.GroupBox.xaml b/src/MahApps.Metro/Styles/Controls.GroupBox.xaml
index b003c5b4fb..574265cc01 100644
--- a/src/MahApps.Metro/Styles/Controls.GroupBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.GroupBox.xaml
@@ -8,13 +8,13 @@
     <Thickness x:Key="GroupBoxHeaderThemePadding">4</Thickness>
 
     <Style x:Key="MetroGroupBox" TargetType="{x:Type GroupBox}">
-        <Setter Property="Background" Value="{DynamicResource AccentColorBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource AccentColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Upper" />
         <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource ContentFontSize}" />
         <Setter Property="Controls:GroupBoxHelper.HeaderForeground" Value="{x:Null}" />
-        <Setter Property="Foreground" Value="{DynamicResource BlackBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="Padding" Value="4" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
diff --git a/src/MahApps.Metro/Styles/Controls.Label.xaml b/src/MahApps.Metro/Styles/Controls.Label.xaml
index bcb675807e..5230805832 100644
--- a/src/MahApps.Metro/Styles/Controls.Label.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Label.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <Style x:Key="MetroLabel" TargetType="{x:Type Label}">
-        <Setter Property="Foreground" Value="{DynamicResource LabelTextBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Label.Text}" />
     </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Controls.ListBox.xaml b/src/MahApps.Metro/Styles/Controls.ListBox.xaml
index 2e9f73ac3f..31f79ef725 100644
--- a/src/MahApps.Metro/Styles/Controls.ListBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ListBox.xaml
@@ -3,8 +3,8 @@
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
     <Style x:Key="MetroListBox" TargetType="{x:Type ListBox}">
-        <Setter Property="Background" Value="{DynamicResource WhiteBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource BlackBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
         <!--  default to 0  -->
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
@@ -46,7 +46,7 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Style.Triggers>
             <Trigger Property="IsEnabled" Value="False">
-                <Setter Property="BorderBrush" Value="{DynamicResource GrayBrush9}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray9}" />
             </Trigger>
             <Trigger Property="VirtualizingStackPanel.IsVirtualizing" Value="True">
                 <Setter Property="ItemsPanel">
@@ -73,18 +73,18 @@
     </Style>
 
     <Style x:Key="MetroListBoxItem" TargetType="{x:Type ListBoxItem}">
-        <Setter Property="Background" Value="{DynamicResource WhiteBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Controls:ItemHelper.ActiveSelectionBackgroundBrush" Value="{DynamicResource AccentColorBrush}" />
-        <Setter Property="Controls:ItemHelper.ActiveSelectionForegroundBrush" Value="{DynamicResource AccentSelectedColorBrush}" />
-        <Setter Property="Controls:ItemHelper.DisabledForegroundBrush" Value="{DynamicResource GrayNormalBrush}" />
-        <Setter Property="Controls:ItemHelper.DisabledSelectedBackgroundBrush" Value="{DynamicResource GrayBrush7}" />
-        <Setter Property="Controls:ItemHelper.DisabledSelectedForegroundBrush" Value="{DynamicResource AccentSelectedColorBrush}" />
-        <Setter Property="Controls:ItemHelper.HoverBackgroundBrush" Value="{DynamicResource AccentColorBrush3}" />
-        <Setter Property="Controls:ItemHelper.HoverSelectedBackgroundBrush" Value="{DynamicResource AccentColorBrush}" />
-        <Setter Property="Controls:ItemHelper.SelectedBackgroundBrush" Value="{DynamicResource AccentColorBrush2}" />
-        <Setter Property="Controls:ItemHelper.SelectedForegroundBrush" Value="{DynamicResource AccentSelectedColorBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
+        <Setter Property="Controls:ItemHelper.ActiveSelectionBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="Controls:ItemHelper.ActiveSelectionForegroundBrush" Value="{DynamicResource MahApps.Brushes.AccentSelectedColor}" />
+        <Setter Property="Controls:ItemHelper.DisabledForegroundBrush" Value="{DynamicResource MahApps.Brushes.GrayNormal}" />
+        <Setter Property="Controls:ItemHelper.DisabledSelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Gray7}" />
+        <Setter Property="Controls:ItemHelper.DisabledSelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.AccentSelectedColor}" />
+        <Setter Property="Controls:ItemHelper.HoverBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent3}" />
+        <Setter Property="Controls:ItemHelper.HoverSelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="Controls:ItemHelper.SelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent2}" />
+        <Setter Property="Controls:ItemHelper.SelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.AccentSelectedColor}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, Mode=OneWay, FallbackValue=Stretch, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
         <Setter Property="Margin" Value="0" />
         <Setter Property="MinHeight" Value="25" />
diff --git a/src/MahApps.Metro/Styles/Controls.ListView.xaml b/src/MahApps.Metro/Styles/Controls.ListView.xaml
index 553fe84e87..3375dd8384 100644
--- a/src/MahApps.Metro/Styles/Controls.ListView.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ListView.xaml
@@ -95,8 +95,8 @@
     -->
     <Style x:Key="MetroListView" TargetType="{x:Type ListView}">
         <Setter Property="AlternationCount" Value="2" />
-        <Setter Property="Background" Value="{DynamicResource WhiteBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource BlackBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="OverridesDefaultStyle" Value="True" />
         <Setter Property="ScrollViewer.CanContentScroll" Value="False" />
@@ -130,7 +130,7 @@
                             <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
                         </MultiTrigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource GrayBrush9}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray9}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -150,18 +150,18 @@
     </Style>
 
     <Style x:Key="MetroListViewItem" TargetType="{x:Type ListViewItem}">
-        <Setter Property="Background" Value="{DynamicResource WhiteBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Controls:ItemHelper.ActiveSelectionBackgroundBrush" Value="{DynamicResource AccentColorBrush}" />
-        <Setter Property="Controls:ItemHelper.ActiveSelectionForegroundBrush" Value="{DynamicResource AccentSelectedColorBrush}" />
-        <Setter Property="Controls:ItemHelper.DisabledForegroundBrush" Value="{DynamicResource GrayNormalBrush}" />
-        <Setter Property="Controls:ItemHelper.DisabledSelectedBackgroundBrush" Value="{DynamicResource GrayBrush7}" />
-        <Setter Property="Controls:ItemHelper.DisabledSelectedForegroundBrush" Value="{DynamicResource AccentSelectedColorBrush}" />
-        <Setter Property="Controls:ItemHelper.HoverBackgroundBrush" Value="{DynamicResource AccentColorBrush3}" />
-        <Setter Property="Controls:ItemHelper.HoverSelectedBackgroundBrush" Value="{DynamicResource AccentColorBrush}" />
-        <Setter Property="Controls:ItemHelper.SelectedBackgroundBrush" Value="{DynamicResource AccentColorBrush2}" />
-        <Setter Property="Controls:ItemHelper.SelectedForegroundBrush" Value="{DynamicResource AccentSelectedColorBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
+        <Setter Property="Controls:ItemHelper.ActiveSelectionBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="Controls:ItemHelper.ActiveSelectionForegroundBrush" Value="{DynamicResource MahApps.Brushes.AccentSelectedColor}" />
+        <Setter Property="Controls:ItemHelper.DisabledForegroundBrush" Value="{DynamicResource MahApps.Brushes.GrayNormal}" />
+        <Setter Property="Controls:ItemHelper.DisabledSelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Gray7}" />
+        <Setter Property="Controls:ItemHelper.DisabledSelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.AccentSelectedColor}" />
+        <Setter Property="Controls:ItemHelper.HoverBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent3}" />
+        <Setter Property="Controls:ItemHelper.HoverSelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="Controls:ItemHelper.SelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent2}" />
+        <Setter Property="Controls:ItemHelper.SelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.AccentSelectedColor}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="Margin" Value="0" />
         <Setter Property="MinHeight" Value="25" />
@@ -195,7 +195,7 @@
                         <Trigger Property="IsSelected" Value="True">
                             <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:ItemHelper.SelectedForegroundBrush), Mode=OneWay}" />
                             <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.SelectedBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource HighlightBrush}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Highlight}" />
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
@@ -204,7 +204,7 @@
                             </MultiTrigger.Conditions>
                             <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:ItemHelper.ActiveSelectionForegroundBrush), Mode=OneWay}" />
                             <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.ActiveSelectionBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource HighlightBrush}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Highlight}" />
                         </MultiTrigger>
 
                         <MultiTrigger>
@@ -234,7 +234,7 @@
                             <MultiTrigger.Setters>
                                 <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:ItemHelper.DisabledSelectedForegroundBrush), Mode=OneWay}" />
                                 <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:ItemHelper.DisabledSelectedBackgroundBrush), Mode=OneWay}" />
-                                <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource GrayBrush7}" />
+                                <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray7}" />
                             </MultiTrigger.Setters>
                         </MultiTrigger>
                     </ControlTemplate.Triggers>
@@ -246,8 +246,8 @@
 
     <!--  Gives the impression that items cannot be selected on the ListView  -->
     <Style x:Key="NonSelectableListViewContainerStyle" TargetType="{x:Type ListViewItem}">
-        <Setter Property="BorderBrush" Value="{DynamicResource GrayBrush1}" />
-        <Setter Property="Foreground" Value="{DynamicResource BlackBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray1}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="Margin" Value="0" />
@@ -303,7 +303,7 @@
     <Style x:Key="MetroGridViewColumnHeader" TargetType="GridViewColumnHeader">
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Upper" />
         <Setter Property="FontWeight" Value="SemiBold" />
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="Padding" Value="4 2 4 2" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -333,7 +333,7 @@
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter TargetName="HeaderBorder" Property="Background" Value="{DynamicResource GrayBrush8}" />
+                            <Setter TargetName="HeaderBorder" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray8}" />
                             <Setter TargetName="HeaderContent" Property="Margin" Value="1 1 0 0" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
@@ -353,7 +353,7 @@
                             <Canvas Name="PART_FloatingHeaderCanvas">
                                 <Rectangle Width="{TemplateBinding ActualWidth}"
                                            Height="{TemplateBinding ActualHeight}"
-                                           Fill="{DynamicResource AccentColorBrush3}" />
+                                           Fill="{DynamicResource MahApps.Brushes.Accent3}" />
                                 <!--  Fill="#60000000" />  -->
                             </Canvas>
                         </ControlTemplate>
diff --git a/src/MahApps.Metro/Styles/Controls.Page.xaml b/src/MahApps.Metro/Styles/Controls.Page.xaml
index 637824c51a..a8b7f19571 100644
--- a/src/MahApps.Metro/Styles/Controls.Page.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Page.xaml
@@ -2,8 +2,8 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <Style x:Key="MetroPage" TargetType="{x:Type Page}">
-        <Setter Property="Background" Value="{DynamicResource WhiteBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource BlackBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="TextElement.FontSize" Value="{DynamicResource ContentFontSize}" />
     </Style>
 
diff --git a/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml b/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
index 09966d1283..e63cfdb5d0 100644
--- a/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
@@ -56,7 +56,7 @@
           Width="16"
           Height="16"
           x:Shared="False"
-          Background="{DynamicResource BlackBrush}"
+          Background="{DynamicResource MahApps.Brushes.Black}"
           Opacity="0.8">
         <Grid.OpacityMask>
             <VisualBrush>
@@ -71,7 +71,7 @@
 
     <!--  PasswordBox Style  -->
     <Style x:Key="MetroPasswordBox" TargetType="{x:Type PasswordBox}">
-        <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
         <Setter Property="Behaviors:StylizedBehaviors.Behaviors">
             <Setter.Value>
                 <Behaviors:StylizedBehaviorCollection>
@@ -79,22 +79,22 @@
                 </Behaviors:StylizedBehaviorCollection>
             </Setter.Value>
         </Setter>
-        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="CaretBrush" Value="{DynamicResource BlackBrush}" />
+        <Setter Property="CaretBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
-        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
-        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource TextBoxMouseOverBorderBrush}" />
+        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
+        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
         <Setter Property="Controls:PasswordBoxHelper.CapsLockIcon" Value="{StaticResource DefaultCapsLockIcon}" />
         <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource ClearTextButtonFontSize}" />
         <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="22" />
         <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
         <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="MinHeight" Value="26" />
         <Setter Property="Padding" Value="0" />
-        <Setter Property="SelectionBrush" Value="{DynamicResource HighlightBrush}" />
+        <Setter Property="SelectionBrush" Value="{DynamicResource MahApps.Brushes.Highlight}" />
         <!--  change SnapsToDevicePixels to true to view a better border and validation error  -->
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
@@ -218,7 +218,7 @@
                                               HorizontalAlignment="Right"
                                               VerticalAlignment="Center"
                                               Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:PasswordBoxHelper.CapsLockIcon), Mode=TwoWay}"
-                                              TextBlock.Foreground="{DynamicResource ControlsValidationBrush}"
+                                              TextBlock.Foreground="{DynamicResource MahApps.Brushes.Controls.Validation}"
                                               ToolTip="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:PasswordBoxHelper.CapsLockWarningToolTip), Mode=OneWay}"
                                               Visibility="Collapsed" />
                             <Button x:Name="PART_ClearText"
@@ -238,8 +238,8 @@
                                     Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ClearTextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
                         </Grid>
                         <Border x:Name="DisabledVisualElement"
-                                Background="{DynamicResource ControlsDisabledBrush}"
-                                BorderBrush="{DynamicResource ControlsDisabledBrush}"
+                                Background="{DynamicResource MahApps.Brushes.Controls.Disabled}"
+                                BorderBrush="{DynamicResource MahApps.Brushes.Controls.Disabled}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 IsHitTestVisible="False"
                                 Opacity="0"
@@ -282,16 +282,16 @@
                         </Trigger>
                         <Trigger Property="IsFocused" Value="True">
                             <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
-                            <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                             <Setter TargetName="PART_FloatingMessage" Property="Opacity" Value="1" />
                         </Trigger>
                         <Trigger SourceName="PART_ClearText" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource GrayBrush8}" />
-                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray8}" />
+                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                         </Trigger>
                         <Trigger SourceName="PART_ClearText" Property="IsPressed" Value="True">
-                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource BlackBrush}" />
-                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource WhiteBrush}" />
+                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource MahApps.Brushes.Black}" />
+                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource MahApps.Brushes.White}" />
                         </Trigger>
 
                         <MultiTrigger>
@@ -464,7 +464,7 @@
                                               HorizontalAlignment="Right"
                                               VerticalAlignment="Center"
                                               Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:PasswordBoxHelper.CapsLockIcon), Mode=TwoWay}"
-                                              TextBlock.Foreground="{DynamicResource ControlsValidationBrush}"
+                                              TextBlock.Foreground="{DynamicResource MahApps.Brushes.Controls.Validation}"
                                               ToolTip="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:PasswordBoxHelper.CapsLockWarningToolTip), Mode=OneWay}"
                                               Visibility="Collapsed" />
                             <Button x:Name="PART_ClearText"
@@ -485,8 +485,8 @@
                                     Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.TextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
                         </Grid>
                         <Border x:Name="DisabledVisualElement"
-                                Background="{DynamicResource ControlsDisabledBrush}"
-                                BorderBrush="{DynamicResource ControlsDisabledBrush}"
+                                Background="{DynamicResource MahApps.Brushes.Controls.Disabled}"
+                                BorderBrush="{DynamicResource MahApps.Brushes.Controls.Disabled}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 IsHitTestVisible="False"
                                 Opacity="0"
@@ -529,16 +529,16 @@
                         </Trigger>
                         <Trigger Property="IsFocused" Value="True">
                             <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
-                            <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                             <Setter TargetName="PART_FloatingMessage" Property="Opacity" Value="1" />
                         </Trigger>
                         <Trigger SourceName="PART_ClearText" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource GrayBrush8}" />
-                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray8}" />
+                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                         </Trigger>
                         <Trigger SourceName="PART_ClearText" Property="IsPressed" Value="True">
-                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource BlackBrush}" />
-                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource WhiteBrush}" />
+                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource MahApps.Brushes.Black}" />
+                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource MahApps.Brushes.White}" />
                         </Trigger>
 
                         <MultiTrigger>
@@ -745,7 +745,7 @@
                                               HorizontalAlignment="Right"
                                               VerticalAlignment="Center"
                                               Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:PasswordBoxHelper.CapsLockIcon), Mode=TwoWay}"
-                                              TextBlock.Foreground="{DynamicResource ControlsValidationBrush}"
+                                              TextBlock.Foreground="{DynamicResource MahApps.Brushes.Controls.Validation}"
                                               ToolTip="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:PasswordBoxHelper.CapsLockWarningToolTip), Mode=OneWay}"
                                               Visibility="Collapsed" />
                             <Button x:Name="PART_RevealButton"
@@ -778,8 +778,8 @@
                                     Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ClearTextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
                         </Grid>
                         <Border x:Name="DisabledVisualElement"
-                                Background="{DynamicResource ControlsDisabledBrush}"
-                                BorderBrush="{DynamicResource ControlsDisabledBrush}"
+                                Background="{DynamicResource MahApps.Brushes.Controls.Disabled}"
+                                BorderBrush="{DynamicResource MahApps.Brushes.Controls.Disabled}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 IsHitTestVisible="False"
                                 Opacity="0"
@@ -825,26 +825,26 @@
                         </Trigger>
                         <Trigger Property="IsFocused" Value="True">
                             <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
-                            <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                             <Setter TargetName="PART_FloatingMessage" Property="Opacity" Value="1" />
                         </Trigger>
                         <Trigger SourceName="PART_RevealButton" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="PART_RevealButton" Property="Background" Value="{DynamicResource GrayBrush8}" />
-                            <Setter TargetName="PART_RevealButton" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_RevealButton" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray8}" />
+                            <Setter TargetName="PART_RevealButton" Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                         </Trigger>
                         <Trigger SourceName="PART_RevealButton" Property="IsPressed" Value="True">
                             <Setter TargetName="PART_ContentHost" Property="Visibility" Value="Hidden" />
-                            <Setter TargetName="PART_RevealButton" Property="Background" Value="{DynamicResource BlackBrush}" />
-                            <Setter TargetName="PART_RevealButton" Property="Foreground" Value="{DynamicResource WhiteBrush}" />
+                            <Setter TargetName="PART_RevealButton" Property="Background" Value="{DynamicResource MahApps.Brushes.Black}" />
+                            <Setter TargetName="PART_RevealButton" Property="Foreground" Value="{DynamicResource MahApps.Brushes.White}" />
                             <Setter TargetName="RevealedPassword" Property="Visibility" Value="Visible" />
                         </Trigger>
                         <Trigger SourceName="PART_ClearText" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource GrayBrush8}" />
-                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray8}" />
+                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                         </Trigger>
                         <Trigger SourceName="PART_ClearText" Property="IsPressed" Value="True">
-                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource BlackBrush}" />
-                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource WhiteBrush}" />
+                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource MahApps.Brushes.Black}" />
+                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource MahApps.Brushes.White}" />
                         </Trigger>
 
                         <MultiTrigger>
diff --git a/src/MahApps.Metro/Styles/Controls.ProgressBar.xaml b/src/MahApps.Metro/Styles/Controls.ProgressBar.xaml
index 168e21fa9b..278fb05e7b 100644
--- a/src/MahApps.Metro/Styles/Controls.ProgressBar.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ProgressBar.xaml
@@ -3,10 +3,10 @@
 
     <!--  ProgressBar Style  -->
     <Style x:Key="MahApps.Metro.Styles.ProgressBar" TargetType="ProgressBar">
-        <Setter Property="Background" Value="{DynamicResource GrayBrush5}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource ControlBorderBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Gray5}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Controls.Border}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Foreground" Value="{DynamicResource HighlightBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Highlight}" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="Maximum" Value="100" />
         <Setter Property="MinHeight" Value="10" />
@@ -23,7 +23,7 @@
                             <Grid x:Name="IndeterminateRoot" Visibility="Collapsed">
                                 <Rectangle x:Name="IndeterminateSolidFill"
                                            Margin="{TemplateBinding BorderThickness}"
-                                           Fill="{DynamicResource ProgressBrush}"
+                                           Fill="{DynamicResource MahApps.Brushes.Progress}"
                                            Opacity="1"
                                            RenderTransformOrigin="0.5,0.5"
                                            StrokeThickness="0" />
@@ -51,7 +51,7 @@
                                 <Border x:Name="PART_Indicator"
                                         Margin="-1"
                                         HorizontalAlignment="Left"
-                                        Background="{DynamicResource ProgressBrush}">
+                                        Background="{DynamicResource MahApps.Brushes.Progress}">
                                     <Rectangle x:Name="GradientFill"
                                                Opacity="0.7"
                                                Visibility="Collapsed">
diff --git a/src/MahApps.Metro/Styles/Controls.RadioButton.xaml b/src/MahApps.Metro/Styles/Controls.RadioButton.xaml
index bc3c40f2ed..97179ca49a 100644
--- a/src/MahApps.Metro/Styles/Controls.RadioButton.xaml
+++ b/src/MahApps.Metro/Styles/Controls.RadioButton.xaml
@@ -6,14 +6,14 @@
     <!--  ********************************** RadioButton Style **********************************  -->
     <!--  adapted from http://brianlagunas.com/free-metro-light-and-dark-themes-for-wpf-and-silverlight-microsoft-controls/  -->
     <Style x:Key="MetroRadioButton" TargetType="RadioButton">
-        <Setter Property="Background" Value="{DynamicResource WhiteBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource CheckBoxBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.CheckBox}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource HighlightBrush}" />
-        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource CheckBoxMouseOverBrush}" />
+        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.Highlight}" />
+        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.CheckBox.MouseOver}" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
         <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
-        <Setter Property="Foreground" Value="{DynamicResource LabelTextBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Label.Text}" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="Padding" Value="6 0 0 0" />
         <Setter Property="Template">
@@ -27,7 +27,7 @@
                         <Grid x:Name="PART_CHECKBOX"
                               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                               VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                            <Rectangle Margin="-6 0" Fill="{DynamicResource TransparentWhiteBrush}" />
+                            <Rectangle Margin="-6 0" Fill="{DynamicResource MahApps.Brushes.TransparentWhite}" />
                             <Ellipse x:Name="normal"
                                      Width="18"
                                      Height="18"
@@ -37,12 +37,12 @@
                             <Ellipse x:Name="Checked1"
                                      Width="10"
                                      Height="10"
-                                     Fill="{DynamicResource HighlightBrush}"
+                                     Fill="{DynamicResource MahApps.Brushes.Highlight}"
                                      Opacity="0" />
                             <Ellipse x:Name="disabled"
                                      Width="18"
                                      Height="18"
-                                     Fill="{DynamicResource SemiTransparentWhiteBrush}"
+                                     Fill="{DynamicResource MahApps.Brushes.SemiTransparentWhite}"
                                      Opacity="0"
                                      StrokeThickness="{TemplateBinding BorderThickness}" />
                         </Grid>
@@ -91,7 +91,7 @@
                             <Setter TargetName="normal" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.MouseOverBorderBrush)}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter TargetName="normal" Property="Stroke" Value="{DynamicResource HighlightBrush}" />
+                            <Setter TargetName="normal" Property="Stroke" Value="{DynamicResource MahApps.Brushes.Highlight}" />
                         </Trigger>
                         <Trigger Property="IsFocused" Value="True">
                             <Setter TargetName="normal" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
diff --git a/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml b/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
index c1fda66bcf..8b69b42679 100644
--- a/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
@@ -42,7 +42,7 @@
                                   HorizontalAlignment="Center"
                                   VerticalAlignment="Center"
                                   Data="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content, Mode=OneWay}"
-                                  Fill="{DynamicResource GrayBrush3}"
+                                  Fill="{DynamicResource MahApps.Brushes.Gray3}"
                                   Stretch="Uniform" />
                         </Viewbox>
                     </Grid>
@@ -51,10 +51,10 @@
                             <Setter TargetName="ArrowBox" Property="Opacity" Value="0.5" />
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Arrow" Property="Fill" Value="{DynamicResource GrayBrush1}" />
+                            <Setter TargetName="Arrow" Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray1}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter TargetName="Arrow" Property="Fill" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="Arrow" Property="Fill" Value="{DynamicResource MahApps.Brushes.Accent}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -82,7 +82,7 @@
     </Style>
 
     <Style x:Key="MetroScrollBarThumbStyle" TargetType="{x:Type Thumb}">
-        <Setter Property="Background" Value="{DynamicResource ThumbBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Thumb}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="OverridesDefaultStyle" Value="True" />
@@ -95,12 +95,12 @@
                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
                                    StrokeThickness="{TemplateBinding BorderThickness}" />
                         <Rectangle x:Name="MouseOverRectangle"
-                                   Fill="{DynamicResource BlackBrush}"
+                                   Fill="{DynamicResource MahApps.Brushes.Black}"
                                    Opacity="0"
                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
                                    StrokeThickness="{TemplateBinding BorderThickness}" />
                         <Rectangle x:Name="PressedRectangle"
-                                   Fill="{DynamicResource BlackBrush}"
+                                   Fill="{DynamicResource MahApps.Brushes.Black}"
                                    Opacity="0"
                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
                                    StrokeThickness="{TemplateBinding BorderThickness}" />
diff --git a/src/MahApps.Metro/Styles/Controls.Slider.xaml b/src/MahApps.Metro/Styles/Controls.Slider.xaml
index b32494f871..3ca342e321 100644
--- a/src/MahApps.Metro/Styles/Controls.Slider.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Slider.xaml
@@ -257,21 +257,21 @@
 
     <!--  Slider Style  -->
     <Style x:Key="MahApps.Metro.Styles.Slider" TargetType="{x:Type Slider}">
-        <Setter Property="BorderBrush" Value="{DynamicResource ControlBorderBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Controls.Border}" />
         <Setter Property="BorderThickness" Value="2" />
-        <Setter Property="Controls:SliderHelper.ThumbFillBrush" Value="{DynamicResource GrayBrush2}" />
-        <Setter Property="Controls:SliderHelper.ThumbFillDisabledBrush" Value="{DynamicResource GrayBrush6}" />
-        <Setter Property="Controls:SliderHelper.ThumbFillHoverBrush" Value="{DynamicResource GrayBrush5}" />
-        <Setter Property="Controls:SliderHelper.ThumbFillPressedBrush" Value="{DynamicResource GrayBrush2}" />
-        <Setter Property="Controls:SliderHelper.TrackFillBrush" Value="{DynamicResource GrayBrush3}" />
-        <Setter Property="Controls:SliderHelper.TrackFillDisabledBrush" Value="{DynamicResource GrayBrush6}" />
-        <Setter Property="Controls:SliderHelper.TrackFillHoverBrush" Value="{DynamicResource GrayBrush3}" />
-        <Setter Property="Controls:SliderHelper.TrackFillPressedBrush" Value="{DynamicResource GrayBrush3}" />
-        <Setter Property="Controls:SliderHelper.TrackValueFillBrush" Value="{DynamicResource AccentColorBrush}" />
-        <Setter Property="Controls:SliderHelper.TrackValueFillDisabledBrush" Value="{DynamicResource GrayBrush6}" />
-        <Setter Property="Controls:SliderHelper.TrackValueFillHoverBrush" Value="{DynamicResource AccentColorBrush}" />
-        <Setter Property="Controls:SliderHelper.TrackValueFillPressedBrush" Value="{DynamicResource AccentColorBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource GrayBrush1}" />
+        <Setter Property="Controls:SliderHelper.ThumbFillBrush" Value="{DynamicResource MahApps.Brushes.Gray2}" />
+        <Setter Property="Controls:SliderHelper.ThumbFillDisabledBrush" Value="{DynamicResource MahApps.Brushes.Gray6}" />
+        <Setter Property="Controls:SliderHelper.ThumbFillHoverBrush" Value="{DynamicResource MahApps.Brushes.Gray5}" />
+        <Setter Property="Controls:SliderHelper.ThumbFillPressedBrush" Value="{DynamicResource MahApps.Brushes.Gray2}" />
+        <Setter Property="Controls:SliderHelper.TrackFillBrush" Value="{DynamicResource MahApps.Brushes.Gray3}" />
+        <Setter Property="Controls:SliderHelper.TrackFillDisabledBrush" Value="{DynamicResource MahApps.Brushes.Gray6}" />
+        <Setter Property="Controls:SliderHelper.TrackFillHoverBrush" Value="{DynamicResource MahApps.Brushes.Gray3}" />
+        <Setter Property="Controls:SliderHelper.TrackFillPressedBrush" Value="{DynamicResource MahApps.Brushes.Gray3}" />
+        <Setter Property="Controls:SliderHelper.TrackValueFillBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="Controls:SliderHelper.TrackValueFillDisabledBrush" Value="{DynamicResource MahApps.Brushes.Gray6}" />
+        <Setter Property="Controls:SliderHelper.TrackValueFillHoverBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="Controls:SliderHelper.TrackValueFillPressedBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Gray1}" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="Maximum" Value="100" />
         <Setter Property="Minimum" Value="0" />
@@ -510,21 +510,21 @@
 
     <!--  Slider Win10 Style  -->
     <Style x:Key="MahApps.Metro.Styles.Slider.Win10" TargetType="{x:Type Slider}">
-        <Setter Property="BorderBrush" Value="{DynamicResource ControlBorderBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Controls.Border}" />
         <Setter Property="BorderThickness" Value="2" />
-        <Setter Property="Controls:SliderHelper.ThumbFillBrush" Value="{DynamicResource AccentBaseColorBrush}" />
-        <Setter Property="Controls:SliderHelper.ThumbFillDisabledBrush" Value="{DynamicResource GrayBrush6}" />
-        <Setter Property="Controls:SliderHelper.ThumbFillHoverBrush" Value="{DynamicResource GrayBrush1}" />
-        <Setter Property="Controls:SliderHelper.ThumbFillPressedBrush" Value="{DynamicResource GrayBrush6}" />
-        <Setter Property="Controls:SliderHelper.TrackFillBrush" Value="{DynamicResource GrayBrush3}" />
-        <Setter Property="Controls:SliderHelper.TrackFillDisabledBrush" Value="{DynamicResource GrayBrush6}" />
-        <Setter Property="Controls:SliderHelper.TrackFillHoverBrush" Value="{DynamicResource GrayBrush2}" />
-        <Setter Property="Controls:SliderHelper.TrackFillPressedBrush" Value="{DynamicResource GrayBrush3}" />
-        <Setter Property="Controls:SliderHelper.TrackValueFillBrush" Value="{DynamicResource AccentBaseColorBrush}" />
-        <Setter Property="Controls:SliderHelper.TrackValueFillDisabledBrush" Value="{DynamicResource GrayBrush6}" />
-        <Setter Property="Controls:SliderHelper.TrackValueFillHoverBrush" Value="{DynamicResource AccentBaseColorBrush}" />
-        <Setter Property="Controls:SliderHelper.TrackValueFillPressedBrush" Value="{DynamicResource AccentBaseColorBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource GrayBrush2}" />
+        <Setter Property="Controls:SliderHelper.ThumbFillBrush" Value="{DynamicResource MahApps.Brushes.AccentBase}" />
+        <Setter Property="Controls:SliderHelper.ThumbFillDisabledBrush" Value="{DynamicResource MahApps.Brushes.Gray6}" />
+        <Setter Property="Controls:SliderHelper.ThumbFillHoverBrush" Value="{DynamicResource MahApps.Brushes.Gray1}" />
+        <Setter Property="Controls:SliderHelper.ThumbFillPressedBrush" Value="{DynamicResource MahApps.Brushes.Gray6}" />
+        <Setter Property="Controls:SliderHelper.TrackFillBrush" Value="{DynamicResource MahApps.Brushes.Gray3}" />
+        <Setter Property="Controls:SliderHelper.TrackFillDisabledBrush" Value="{DynamicResource MahApps.Brushes.Gray6}" />
+        <Setter Property="Controls:SliderHelper.TrackFillHoverBrush" Value="{DynamicResource MahApps.Brushes.Gray2}" />
+        <Setter Property="Controls:SliderHelper.TrackFillPressedBrush" Value="{DynamicResource MahApps.Brushes.Gray3}" />
+        <Setter Property="Controls:SliderHelper.TrackValueFillBrush" Value="{DynamicResource MahApps.Brushes.AccentBase}" />
+        <Setter Property="Controls:SliderHelper.TrackValueFillDisabledBrush" Value="{DynamicResource MahApps.Brushes.Gray6}" />
+        <Setter Property="Controls:SliderHelper.TrackValueFillHoverBrush" Value="{DynamicResource MahApps.Brushes.AccentBase}" />
+        <Setter Property="Controls:SliderHelper.TrackValueFillPressedBrush" Value="{DynamicResource MahApps.Brushes.AccentBase}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Gray2}" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="IsMoveToPointEnabled" Value="True" />
         <Setter Property="Maximum" Value="100" />
diff --git a/src/MahApps.Metro/Styles/Controls.StatusBar.xaml b/src/MahApps.Metro/Styles/Controls.StatusBar.xaml
index fa92c42536..2367f9e05f 100644
--- a/src/MahApps.Metro/Styles/Controls.StatusBar.xaml
+++ b/src/MahApps.Metro/Styles/Controls.StatusBar.xaml
@@ -3,7 +3,7 @@
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
     <Style x:Key="MetroStatusBarItem" TargetType="{x:Type StatusBarItem}">
-        <Setter Property="BorderBrush" Value="{DynamicResource IdealForegroundColorBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.IdealForeground}" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="Padding" Value="3" />
         <Setter Property="Template">
@@ -20,7 +20,7 @@
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Foreground" Value="{DynamicResource GrayBrush2}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Gray2}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -30,7 +30,7 @@
     </Style>
 
     <Style x:Key="MetroStatusBarSeparator" TargetType="{x:Type Separator}">
-        <Setter Property="Background" Value="{DynamicResource IdealForegroundColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.IdealForeground}" />
         <Setter Property="MinHeight" Value="1" />
         <Setter Property="MinWidth" Value="1" />
         <Setter Property="Opacity" Value="0.75" />
@@ -53,7 +53,7 @@
         <Setter Property="FontSize" Value="{DynamicResource StatusBarFontSize}" />
         <Setter Property="FontStyle" Value="{DynamicResource {x:Static SystemFonts.StatusFontStyleKey}}" />
         <Setter Property="FontWeight" Value="{DynamicResource {x:Static SystemFonts.StatusFontWeightKey}}" />
-        <Setter Property="Foreground" Value="{DynamicResource IdealForegroundColorBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.IdealForeground}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type StatusBar}">
@@ -84,7 +84,7 @@
                 <Setter Property="Background" Value="{Binding Path=NonActiveWindowTitleBrush, Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:MetroWindow}}}" />
             </MultiDataTrigger>
             <Trigger Property="IsEnabled" Value="False">
-                <Setter Property="BorderBrush" Value="{DynamicResource GrayBrush9}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray9}" />
             </Trigger>
         </Style.Triggers>
     </Style>
diff --git a/src/MahApps.Metro/Styles/Controls.TabControl.xaml b/src/MahApps.Metro/Styles/Controls.TabControl.xaml
index 53198fe585..1a00432cb8 100644
--- a/src/MahApps.Metro/Styles/Controls.TabControl.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TabControl.xaml
@@ -6,14 +6,14 @@
     <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
 
     <Style x:Key="MetroTabControl" TargetType="{x:Type TabControl}">
-        <Setter Property="Background" Value="{DynamicResource WhiteBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderBrush" Value="{x:Null}" />
         <!--  special property for header font size  -->
         <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource TabItemFontSize}" />
-        <Setter Property="Controls:TabControlHelper.UnderlineBrush" Value="{DynamicResource GrayNormalBrush}" />
-        <Setter Property="Controls:TabControlHelper.UnderlineMouseOverBrush" Value="{DynamicResource GrayHoverBrush}" />
-        <Setter Property="Controls:TabControlHelper.UnderlineMouseOverSelectedBrush" Value="{DynamicResource HighlightBrush}" />
-        <Setter Property="Controls:TabControlHelper.UnderlineSelectedBrush" Value="{DynamicResource AccentColorBrush}" />
+        <Setter Property="Controls:TabControlHelper.UnderlineBrush" Value="{DynamicResource MahApps.Brushes.GrayNormal}" />
+        <Setter Property="Controls:TabControlHelper.UnderlineMouseOverBrush" Value="{DynamicResource MahApps.Brushes.GrayHover}" />
+        <Setter Property="Controls:TabControlHelper.UnderlineMouseOverSelectedBrush" Value="{DynamicResource MahApps.Brushes.Highlight}" />
+        <Setter Property="Controls:TabControlHelper.UnderlineSelectedBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
@@ -102,7 +102,7 @@
 
     <Style x:Key="MetroTabItem" TargetType="TabItem">
         <Setter Property="Background" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=Background, Mode=OneWay, FallbackValue=Transparent}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource AccentColorBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="Controls:ControlsHelper.HeaderFontFamily" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:ControlsHelper.HeaderFontFamily), Mode=OneWay}" />
         <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:ControlsHelper.HeaderFontSize), Mode=OneWay}" />
@@ -114,7 +114,7 @@
         <Setter Property="Controls:TabControlHelper.UnderlinePlacement" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.UnderlinePlacement), Mode=OneWay}" />
         <Setter Property="Controls:TabControlHelper.UnderlineSelectedBrush" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.UnderlineSelectedBrush), Mode=OneWay}" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="MinHeight" Value="5" />
@@ -218,11 +218,11 @@
                         </DataTrigger>
 
                         <Trigger Property="IsSelected" Value="true">
-                            <Setter TargetName="ContentSite" Property="TextElement.Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="ContentSite" Property="TextElement.Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                             <Setter TargetName="Underline" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TabControlHelper.UnderlineSelectedBrush), Mode=OneWay}" />
                         </Trigger>
                         <Trigger Property="IsSelected" Value="false">
-                            <Setter TargetName="ContentSite" Property="TextElement.Foreground" Value="{DynamicResource GrayNormalBrush}" />
+                            <Setter TargetName="ContentSite" Property="TextElement.Foreground" Value="{DynamicResource MahApps.Brushes.GrayNormal}" />
                         </Trigger>
 
                         <MultiDataTrigger>
@@ -241,7 +241,7 @@
                         </MultiDataTrigger>
 
                         <Trigger SourceName="Border" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="ContentSite" Property="TextElement.Foreground" Value="{DynamicResource GrayHoverBrush}" />
+                            <Setter TargetName="ContentSite" Property="TextElement.Foreground" Value="{DynamicResource MahApps.Brushes.GrayHover}" />
                             <Setter TargetName="Underline" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TabControlHelper.UnderlineMouseOverBrush), Mode=OneWay}" />
                         </Trigger>
 
@@ -267,7 +267,7 @@
                                 <Condition SourceName="Border" Property="IsMouseOver" Value="True" />
                                 <Condition Property="IsSelected" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="ContentSite" Property="TextElement.Foreground" Value="{DynamicResource HighlightBrush}" />
+                            <Setter TargetName="ContentSite" Property="TextElement.Foreground" Value="{DynamicResource MahApps.Brushes.Highlight}" />
                             <Setter TargetName="Underline" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TabControlHelper.UnderlineMouseOverSelectedBrush), Mode=OneWay}" />
                         </MultiTrigger>
 
diff --git a/src/MahApps.Metro/Styles/Controls.TextBox.xaml b/src/MahApps.Metro/Styles/Controls.TextBox.xaml
index 49e95e3ad2..24a38b66df 100644
--- a/src/MahApps.Metro/Styles/Controls.TextBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TextBox.xaml
@@ -11,13 +11,13 @@
 
     <!--  TextBox Style  -->
     <Style x:Key="MetroTextBox" TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="CaretBrush" Value="{DynamicResource BlackBrush}" />
+        <Setter Property="CaretBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
-        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
-        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource TextBoxMouseOverBorderBrush}" />
+        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
+        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
         <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource ClearTextButtonFontSize}" />
         <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="22" />
         <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True" />
@@ -25,10 +25,10 @@
         <Setter Property="Controls:TextBoxHelper.WatermarkWrapping" Value="{Binding RelativeSource={RelativeSource Self}, Path=TextWrapping, Mode=OneWay}" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
         <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="MinHeight" Value="26" />
         <Setter Property="Padding" Value="0" />
-        <Setter Property="SelectionBrush" Value="{DynamicResource HighlightBrush}" />
+        <Setter Property="SelectionBrush" Value="{DynamicResource MahApps.Brushes.Highlight}" />
         <!--  change SnapsToDevicePixels to True to view a better border and validation error  -->
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
@@ -161,8 +161,8 @@
                                     Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ClearTextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
                         </Grid>
                         <Border x:Name="DisabledVisualElement"
-                                Background="{DynamicResource ControlsDisabledBrush}"
-                                BorderBrush="{DynamicResource ControlsDisabledBrush}"
+                                Background="{DynamicResource MahApps.Brushes.Controls.Disabled}"
+                                BorderBrush="{DynamicResource MahApps.Brushes.Controls.Disabled}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 IsHitTestVisible="False"
                                 Opacity="0"
@@ -216,16 +216,16 @@
                         </Trigger>
                         <Trigger Property="IsFocused" Value="True">
                             <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
-                            <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                             <Setter TargetName="PART_FloatingMessage" Property="Opacity" Value="1" />
                         </Trigger>
                         <Trigger SourceName="PART_ClearText" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource GrayBrush8}" />
-                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray8}" />
+                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                         </Trigger>
                         <Trigger SourceName="PART_ClearText" Property="IsPressed" Value="True">
-                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource BlackBrush}" />
-                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource WhiteBrush}" />
+                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource MahApps.Brushes.Black}" />
+                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource MahApps.Brushes.White}" />
                         </Trigger>
 
                         <MultiTrigger>
@@ -407,8 +407,8 @@
                                     Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.TextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
                         </Grid>
                         <Border x:Name="DisabledVisualElement"
-                                Background="{DynamicResource ControlsDisabledBrush}"
-                                BorderBrush="{DynamicResource ControlsDisabledBrush}"
+                                Background="{DynamicResource MahApps.Brushes.Controls.Disabled}"
+                                BorderBrush="{DynamicResource MahApps.Brushes.Controls.Disabled}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 IsHitTestVisible="False"
                                 Opacity="0"
@@ -466,16 +466,16 @@
                         </MultiTrigger>
                         <Trigger Property="IsFocused" Value="True">
                             <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
-                            <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                             <Setter TargetName="PART_FloatingMessage" Property="Opacity" Value="1" />
                         </Trigger>
                         <Trigger SourceName="PART_ClearText" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource GrayBrush8}" />
-                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray8}" />
+                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                         </Trigger>
                         <Trigger SourceName="PART_ClearText" Property="IsPressed" Value="True">
-                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource BlackBrush}" />
-                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource WhiteBrush}" />
+                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource MahApps.Brushes.Black}" />
+                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource MahApps.Brushes.White}" />
                         </Trigger>
 
                         <MultiTrigger>
@@ -544,11 +544,11 @@
                                  Duration="0:0:0.2" />
             </Storyboard>
             <Style BasedOn="{StaticResource {x:Type Hyperlink}}" TargetType="{x:Type Hyperlink}">
-                <Setter Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                 <Setter Property="TextDecorations" Value="Underline" />
                 <Style.Triggers>
                     <Trigger Property="IsMouseOver" Value="True">
-                        <Setter Property="Foreground" Value="{DynamicResource HighlightBrush}" />
+                        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Highlight}" />
                     </Trigger>
                     <Trigger Property="IsEnabled" Value="False">
                         <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
@@ -561,13 +561,13 @@
             </Style>
         </Style.Resources>
         <Setter Property="AllowDrop" Value="True" />
-        <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="CaretBrush" Value="{DynamicResource BlackBrush}" />
+        <Setter Property="CaretBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
-        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
-        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource TextBoxMouseOverBorderBrush}" />
+        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
+        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
         <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource ClearTextButtonFontSize}" />
         <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="22" />
         <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True" />
@@ -575,14 +575,14 @@
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
         <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="MinHeight" Value="26" />
         <Setter Property="MinWidth" Value="10" />
         <Setter Property="Padding" Value="2" />
         <Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False" />
         <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-        <Setter Property="SelectionBrush" Value="{DynamicResource HighlightBrush}" />
+        <Setter Property="SelectionBrush" Value="{DynamicResource MahApps.Brushes.Highlight}" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
         <Setter Property="Template">
@@ -689,7 +689,7 @@
                         </Grid>
 
                         <Border x:Name="DisabledVisualElement"
-                                Background="{DynamicResource ControlsDisabledBrush}"
+                                Background="{DynamicResource MahApps.Brushes.Controls.Disabled}"
                                 IsHitTestVisible="False"
                                 Opacity="0"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
@@ -742,16 +742,16 @@
                         </Trigger>
                         <Trigger Property="IsFocused" Value="True">
                             <Setter TargetName="BorderElement" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
-                            <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                             <Setter TargetName="PART_FloatingMessage" Property="Opacity" Value="1" />
                         </Trigger>
                         <Trigger SourceName="PART_ClearText" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource GrayBrush8}" />
-                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray8}" />
+                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                         </Trigger>
                         <Trigger SourceName="PART_ClearText" Property="IsPressed" Value="True">
-                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource BlackBrush}" />
-                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource WhiteBrush}" />
+                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource MahApps.Brushes.Black}" />
+                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource MahApps.Brushes.White}" />
                         </Trigger>
 
                         <MultiTrigger>
@@ -894,7 +894,7 @@
                         </Grid>
 
                         <Border x:Name="DisabledVisualElement"
-                                Background="{DynamicResource ControlsDisabledBrush}"
+                                Background="{DynamicResource MahApps.Brushes.Controls.Disabled}"
                                 IsHitTestVisible="False"
                                 Opacity="0"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
@@ -942,16 +942,16 @@
                         </MultiTrigger>
                         <Trigger Property="IsFocused" Value="True">
                             <Setter TargetName="BorderElement" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
-                            <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                             <Setter TargetName="PART_FloatingMessage" Property="Opacity" Value="1" />
                         </Trigger>
                         <Trigger SourceName="PART_ClearText" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource GrayBrush8}" />
-                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray8}" />
+                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                         </Trigger>
                         <Trigger SourceName="PART_ClearText" Property="IsPressed" Value="True">
-                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource BlackBrush}" />
-                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource WhiteBrush}" />
+                            <Setter TargetName="PART_ClearText" Property="Background" Value="{DynamicResource MahApps.Brushes.Black}" />
+                            <Setter TargetName="PART_ClearText" Property="Foreground" Value="{DynamicResource MahApps.Brushes.White}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/src/MahApps.Metro/Styles/Controls.Toolbar.xaml b/src/MahApps.Metro/Styles/Controls.Toolbar.xaml
index 61cd654975..3ada9633ea 100644
--- a/src/MahApps.Metro/Styles/Controls.Toolbar.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Toolbar.xaml
@@ -24,8 +24,8 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ButtonBase}">
                     <Border x:Name="Border"
-                            Background="{DynamicResource TransparentWhiteBrush}"
-                            BorderBrush="{DynamicResource TransparentWhiteBrush}"
+                            Background="{DynamicResource MahApps.Brushes.TransparentWhite}"
+                            BorderBrush="{DynamicResource MahApps.Brushes.TransparentWhite}"
                             BorderThickness="1">
                         <ContentPresenter Margin="2"
                                           HorizontalAlignment="Center"
@@ -34,23 +34,23 @@
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsKeyboardFocused" Value="true">
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource GrayBrush7}" />
-                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource GrayBrush7}" />
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray7}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray7}" />
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="true">
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource GrayBrush7}" />
-                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource GrayBrush7}" />
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray7}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray7}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="true">
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource AccentColorBrush}" />
-                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource MahApps.Brushes.Accent}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
                         </Trigger>
                         <Trigger Property="CheckBox.IsChecked" Value="true">
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource AccentColorBrush}" />
-                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource MahApps.Brushes.Accent}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Foreground" Value="{DynamicResource GrayBrush3}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Gray3}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -100,7 +100,7 @@
                                               Viewport="0,0,5,4"
                                               ViewportUnits="Absolute">
                                     <DrawingBrush.Drawing>
-                                        <GeometryDrawing Brush="{DynamicResource GrayBrush3}">
+                                        <GeometryDrawing Brush="{DynamicResource MahApps.Brushes.Gray3}">
                                             <GeometryDrawing.Geometry>
                                                 <GeometryGroup>
                                                     <GeometryGroup.Children>
@@ -137,34 +137,34 @@
                                        Height="1"
                                        Margin="2 8"
                                        VerticalAlignment="Bottom"
-                                       Fill="{DynamicResource BlackBrush}" />
+                                       Fill="{DynamicResource MahApps.Brushes.Black}" />
                             <Path Name="Arrow"
                                   Margin="2 3"
                                   VerticalAlignment="Bottom"
                                   Data="M 0 0 L 6 0 3 3 Z"
-                                  Fill="{DynamicResource BlackBrush}" />
+                                  Fill="{DynamicResource MahApps.Brushes.Black}" />
                             <ContentPresenter />
                         </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="true">
-                            <Setter TargetName="Arrow" Property="Fill" Value="{DynamicResource AccentColorBrush}" />
-                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource GrayBrush7}" />
-                            <Setter TargetName="Rectangle" Property="Fill" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="Arrow" Property="Fill" Value="{DynamicResource MahApps.Brushes.Accent}" />
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray7}" />
+                            <Setter TargetName="Rectangle" Property="Fill" Value="{DynamicResource MahApps.Brushes.Accent}" />
                         </Trigger>
                         <Trigger Property="IsKeyboardFocused" Value="true">
-                            <Setter TargetName="Arrow" Property="Fill" Value="{DynamicResource AccentColorBrush}" />
-                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource GrayBrush7}" />
-                            <Setter TargetName="Rectangle" Property="Fill" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="Arrow" Property="Fill" Value="{DynamicResource MahApps.Brushes.Accent}" />
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray7}" />
+                            <Setter TargetName="Rectangle" Property="Fill" Value="{DynamicResource MahApps.Brushes.Accent}" />
                         </Trigger>
                         <Trigger Property="IsChecked" Value="true">
-                            <Setter TargetName="Arrow" Property="Fill" Value="{DynamicResource BlackBrush}" />
-                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource AccentColorBrush}" />
-                            <Setter TargetName="Rectangle" Property="Fill" Value="{DynamicResource BlackBrush}" />
+                            <Setter TargetName="Arrow" Property="Fill" Value="{DynamicResource MahApps.Brushes.Black}" />
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource MahApps.Brushes.Accent}" />
+                            <Setter TargetName="Rectangle" Property="Fill" Value="{DynamicResource MahApps.Brushes.Black}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="false">
-                            <Setter TargetName="Arrow" Property="Fill" Value="{DynamicResource TransparentWhiteBrush}" />
-                            <Setter TargetName="Rectangle" Property="Fill" Value="{DynamicResource TransparentWhiteBrush}" />
+                            <Setter TargetName="Arrow" Property="Fill" Value="{DynamicResource MahApps.Brushes.TransparentWhite}" />
+                            <Setter TargetName="Rectangle" Property="Fill" Value="{DynamicResource MahApps.Brushes.TransparentWhite}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -180,8 +180,8 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ToolBar}">
                     <Border x:Name="Border"
-                            Background="{DynamicResource TransparentWhiteBrush}"
-                            BorderBrush="{DynamicResource TransparentWhiteBrush}"
+                            Background="{DynamicResource MahApps.Brushes.TransparentWhite}"
+                            BorderBrush="{DynamicResource MahApps.Brushes.TransparentWhite}"
                             BorderThickness="1"
                             CornerRadius="2">
                         <DockPanel>
@@ -198,8 +198,8 @@
                                        PopupAnimation="Slide"
                                        StaysOpen="false">
                                     <Border x:Name="DropDownBorder"
-                                            Background="{DynamicResource ControlBackgroundBrush}"
-                                            BorderBrush="{DynamicResource ControlBorderBrush}"
+                                            Background="{DynamicResource MahApps.Brushes.Control.Background}"
+                                            BorderBrush="{DynamicResource MahApps.Brushes.Controls.Border}"
                                             BorderThickness="1">
                                         <ToolBarOverflowPanel x:Name="PART_ToolBarOverflowPanel"
                                                               Margin="2"
@@ -236,7 +236,7 @@
 
     <!--  Style the toolbar tray  -->
     <Style x:Key="{x:Type ToolBarTray}" TargetType="{x:Type ToolBarTray}">
-        <Setter Property="Background" Value="{DynamicResource WindowBackgroundBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Window.Background}" />
     </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Controls.Tooltip.xaml b/src/MahApps.Metro/Styles/Controls.Tooltip.xaml
index 12ef7c5554..7cf8dbec5b 100644
--- a/src/MahApps.Metro/Styles/Controls.Tooltip.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Tooltip.xaml
@@ -4,11 +4,11 @@
 
     <!--  Tooltip Style  -->
     <Style x:Key="MetroToolTip" TargetType="ToolTip">
-        <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource GrayBrush7}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray7}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="FontSize" Value="{DynamicResource TooltipFontSize}" />
-        <Setter Property="Foreground" Value="{DynamicResource BlackBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="Padding" Value="6 3" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
diff --git a/src/MahApps.Metro/Styles/Controls.TreeView.xaml b/src/MahApps.Metro/Styles/Controls.TreeView.xaml
index 8ac8652613..e9348d5e1d 100644
--- a/src/MahApps.Metro/Styles/Controls.TreeView.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TreeView.xaml
@@ -12,7 +12,7 @@
     <Style x:Key="ExpandCollapseToggleStyle" TargetType="{x:Type ToggleButton}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Focusable" Value="False" />
-        <Setter Property="Foreground" Value="{DynamicResource BlackBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="Height" Value="16" />
         <Setter Property="Margin" Value="1" />
         <Setter Property="Template">
@@ -35,7 +35,7 @@
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsChecked" Value="True">
-                            <Setter TargetName="ExpandPath" Property="Fill" Value="{DynamicResource GrayBrush1}" />
+                            <Setter TargetName="ExpandPath" Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray1}" />
                             <Setter TargetName="ExpandPath" Property="RenderTransform">
                                 <Setter.Value>
                                     <RotateTransform Angle="180" CenterX="3" CenterY="3" />
@@ -43,19 +43,19 @@
                             </Setter>
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="ExpandPath" Property="Stroke" Value="{DynamicResource GrayBrush5}" />
+                            <Setter TargetName="ExpandPath" Property="Stroke" Value="{DynamicResource MahApps.Brushes.Gray5}" />
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsEnabled" Value="False" />
                                 <Condition Property="IsChecked" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="ExpandPath" Property="Fill" Value="{DynamicResource GrayBrush5}" />
-                            <Setter TargetName="ExpandPath" Property="Stroke" Value="{DynamicResource GrayBrush5}" />
+                            <Setter TargetName="ExpandPath" Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray5}" />
+                            <Setter TargetName="ExpandPath" Property="Stroke" Value="{DynamicResource MahApps.Brushes.Gray5}" />
                         </MultiTrigger>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="ExpandPath" Property="Fill" Value="{DynamicResource AccentColorBrush}" />
-                            <Setter TargetName="ExpandPath" Property="Stroke" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="ExpandPath" Property="Fill" Value="{DynamicResource MahApps.Brushes.Accent}" />
+                            <Setter TargetName="ExpandPath" Property="Stroke" Value="{DynamicResource MahApps.Brushes.Accent}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -67,18 +67,18 @@
     <Converters:TreeViewMarginConverter x:Key="LengthConverter" Length="12" />
 
     <Style x:Key="MetroTreeViewItem" TargetType="{x:Type TreeViewItem}">
-        <Setter Property="Background" Value="{DynamicResource WhiteBrush}" />
-        <Setter Property="Controls:ItemHelper.ActiveSelectionBackgroundBrush" Value="{DynamicResource AccentColorBrush}" />
-        <Setter Property="Controls:ItemHelper.ActiveSelectionForegroundBrush" Value="{DynamicResource AccentSelectedColorBrush}" />
-        <Setter Property="Controls:ItemHelper.DisabledForegroundBrush" Value="{DynamicResource GrayNormalBrush}" />
-        <Setter Property="Controls:ItemHelper.DisabledSelectedBackgroundBrush" Value="{DynamicResource GrayBrush7}" />
-        <Setter Property="Controls:ItemHelper.DisabledSelectedForegroundBrush" Value="{DynamicResource AccentSelectedColorBrush}" />
-        <Setter Property="Controls:ItemHelper.HoverBackgroundBrush" Value="{DynamicResource AccentColorBrush3}" />
-        <Setter Property="Controls:ItemHelper.HoverSelectedBackgroundBrush" Value="{DynamicResource AccentColorBrush}" />
-        <Setter Property="Controls:ItemHelper.SelectedBackgroundBrush" Value="{DynamicResource AccentColorBrush2}" />
-        <Setter Property="Controls:ItemHelper.SelectedForegroundBrush" Value="{DynamicResource AccentSelectedColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
+        <Setter Property="Controls:ItemHelper.ActiveSelectionBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="Controls:ItemHelper.ActiveSelectionForegroundBrush" Value="{DynamicResource MahApps.Brushes.AccentSelectedColor}" />
+        <Setter Property="Controls:ItemHelper.DisabledForegroundBrush" Value="{DynamicResource MahApps.Brushes.GrayNormal}" />
+        <Setter Property="Controls:ItemHelper.DisabledSelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Gray7}" />
+        <Setter Property="Controls:ItemHelper.DisabledSelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.AccentSelectedColor}" />
+        <Setter Property="Controls:ItemHelper.HoverBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent3}" />
+        <Setter Property="Controls:ItemHelper.HoverSelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="Controls:ItemHelper.SelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent2}" />
+        <Setter Property="Controls:ItemHelper.SelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.AccentSelectedColor}" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, Mode=OneWay, FallbackValue=Stretch, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
         <Setter Property="MinHeight" Value="25" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -183,8 +183,8 @@
     </Style>
 
     <Style x:Key="MetroTreeView" TargetType="{x:Type TreeView}">
-        <Setter Property="Background" Value="{DynamicResource WhiteBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource BlackBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
         <!--  default to 0  -->
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
@@ -224,7 +224,7 @@
                 <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
-                <Setter Property="BorderBrush" Value="{DynamicResource GrayBrush9}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray9}" />
             </Trigger>
         </Style.Triggers>
     </Style>
diff --git a/src/MahApps.Metro/Styles/FlatSlider.xaml b/src/MahApps.Metro/Styles/FlatSlider.xaml
index 4688f83503..3584c1617c 100644
--- a/src/MahApps.Metro/Styles/FlatSlider.xaml
+++ b/src/MahApps.Metro/Styles/FlatSlider.xaml
@@ -29,7 +29,7 @@
     </Style>
 
     <Style x:Key="MahApps.Metro.Styles.FlatSlider.TickBar" TargetType="TickBar">
-        <Setter Property="Fill" Value="{DynamicResource SliderThumbDisabled}" />
+        <Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.SliderThumb.Disabled}" />
         <Setter Property="Visibility" Value="Collapsed" />
         <Style.Triggers>
             <Trigger Property="Placement" Value="Top">
@@ -147,9 +147,9 @@
     </ControlTemplate>
 
     <Style x:Key="MahApps.Metro.Styles.FlatSlider" TargetType="{x:Type Slider}">
-        <Setter Property="Background" Value="{DynamicResource SliderTrackNormal}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource BlackBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.SliderTrack.Normal}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="Maximum" Value="100" />
         <Setter Property="Minimum" Value="0" />
@@ -160,13 +160,13 @@
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
         <Style.Triggers>
             <Trigger Property="IsEnabled" Value="False">
-                <Setter Property="Background" Value="{DynamicResource SliderTrackDisabled}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource SliderThumbDisabled}" />
-                <Setter Property="Foreground" Value="{DynamicResource SliderValueDisabled}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.SliderTrack.Disabled}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.SliderThumb.Disabled}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.SliderValue.Disabled}" />
             </Trigger>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="{DynamicResource SliderTrackHover}" />
-                <Setter Property="Foreground" Value="{DynamicResource AccentColorBrush2}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.SliderTrack.Hover}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent2}" />
             </Trigger>
             <Trigger Property="Orientation" Value="Horizontal">
                 <Setter Property="MinHeight" Value="12" />
diff --git a/src/MahApps.Metro/Styles/Themes/GeneratorParameters.json b/src/MahApps.Metro/Styles/Themes/GeneratorParameters.json
index 66f65c7da0..b1b4d33023 100644
--- a/src/MahApps.Metro/Styles/Themes/GeneratorParameters.json
+++ b/src/MahApps.Metro/Styles/Themes/GeneratorParameters.json
@@ -25,28 +25,28 @@
         "MahApps.Colors.GrayHover": "#FFAAAAAA",
         "MahApps.Colors.Flyout": "#FF2B2B2B",
         "MahApps.Colors.MenuShadow": "#FFFFFFFF",
-        "DisabledMenuItemForeground": "{StaticResource MahApps.Colors.Gray7}",
-        "SliderValueDisabled": "#FF535353",
-        "SliderTrackDisabled": "#FF383838",
-        "SliderThumbDisabled": "#FF7E7E7E",
-        "SliderTrackHover": "#FF737373",
-        "SliderTrackNormal": "#FF6C6C6C",
-        "FlatButtonPressedBackgroundBrush": "#444444",
-        "MenuItemSelectionFill": "#313131",
-        "MenuItemSelectionStroke": "#313131",
-        "TopMenuItemPressedFill": "#313131",
-        "TopMenuItemPressedStroke": "#E0717070",
-        "TopMenuItemSelectionStroke": "#90717070",
-        "MahApps.Metro.Brushes.ToggleSwitchButton.PressedBrush.Win10": "#FF999999",
-        "MahApps.Metro.Brushes.ToggleSwitchButton.OffBorderBrush.Win10": "#FFCCCCCC",
-        "MahApps.Metro.Brushes.ToggleSwitchButton.OffMouseOverBorderBrush.Win10": "#FFFFFFFF",
-        "MahApps.Metro.Brushes.ToggleSwitchButton.OffDisabledBorderBrush.Win10": "#FF666666",
-        "MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchDisabledBrush.Win10": "#FF444444",
-        "MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorBrush.Win10": "#FFCCCCCC",
-        "MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorMouseOverBrush.Win10": "#FFFFFFFF",
-        "MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorPressedBrush.Win10": "#FFFFFFFF",
-        "MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorDisabledBrush.Win10": "#FF666666",
-        "MahApps.Metro.Brushes.Badged.DisabledBackgroundBrush": "#FF666666"
+        "MahApps.Brushes.MenuItem.DisabledForeground": "{StaticResource MahApps.Colors.Gray7}",
+        "MahApps.Brushes.SliderValue.Disabled": "#FF535353",
+        "MahApps.Brushes.SliderTrack.Disabled": "#FF383838",
+        "MahApps.Brushes.SliderThumb.Disabled": "#FF7E7E7E",
+        "MahApps.Brushes.SliderTrack.Hover": "#FF737373",
+        "MahApps.Brushes.SliderTrack.Normal": "#FF6C6C6C",
+        "MahApps.Brushes.FlatButton.PressedBackground": "#444444",
+        "MahApps.Brushes.MenuItem.SelectionFill": "#313131",
+        "MahApps.Brushes.MenuItem.SelectionStroke": "#313131",
+        "MahApps.Brushes.TopMenuItem.PressedFill": "#313131",
+        "MahApps.Brushes.TopMenuItem.PressedStroke": "#E0717070",
+        "MahApps.Brushes.TopMenuItem.SelectionStroke": "#90717070",
+        "MahApps.Brushes.ToggleSwitchButton.Pressed.Win10": "#FF999999",
+        "MahApps.Brushes.ToggleSwitchButton.OffBorder.Win10": "#FFCCCCCC",
+        "MahApps.Brushes.ToggleSwitchButton.OffMouseOverBorder.Win10": "#FFFFFFFF",
+        "MahApps.Brushes.ToggleSwitchButton.OffDisabledBorder.Win10": "#FF666666",
+        "MahApps.Brushes.ToggleSwitchButton.OnSwitchDisabled.Win10": "#FF444444",
+        "MahApps.Brushes.ToggleSwitchButton.ThumbIndicator.Win10": "#FFCCCCCC",
+        "MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorMouseOver.Win10": "#FFFFFFFF",
+        "MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorPressed.Win10": "#FFFFFFFF",
+        "MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorDisabled.Win10": "#FF666666",
+        "MahApps.Brushes.Badged.DisabledBackground": "#FF666666"
       }
     },
     {
@@ -70,28 +70,28 @@
         "MahApps.Colors.GrayHover": "#FF333333",
         "MahApps.Colors.Flyout": "#FFFFFFFF",
         "MahApps.Colors.MenuShadow": "#FF000000",
-        "DisabledMenuItemForeground": "{StaticResource MahApps.Colors.Gray2}",
-        "SliderValueDisabled": "#FFBABABA",
-        "SliderTrackDisabled": "#FFDBDBDB",
-        "SliderThumbDisabled": "#FFA0A0A0",
-        "SliderTrackHover": "#FFD0D0D0",
-        "SliderTrackNormal": "#FFC6C6C6",
-        "FlatButtonPressedBackgroundBrush": "#222222",
-        "MenuItemSelectionFill": "#DEDEDE",
-        "MenuItemSelectionStroke": "#DEDEDE",
-        "TopMenuItemPressedFill": "#DEDEDE",
-        "TopMenuItemPressedStroke": "#E0717070",
-        "TopMenuItemSelectionStroke": "#90717070",
-        "MahApps.Metro.Brushes.ToggleSwitchButton.PressedBrush.Win10": "#FF666666",
-        "MahApps.Metro.Brushes.ToggleSwitchButton.OffBorderBrush.Win10": "#FF333333",
-        "MahApps.Metro.Brushes.ToggleSwitchButton.OffMouseOverBorderBrush.Win10": "#FF000000",
-        "MahApps.Metro.Brushes.ToggleSwitchButton.OffDisabledBorderBrush.Win10": "#FF999999",
-        "MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchDisabledBrush.Win10": "#FFCCCCCC",
-        "MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorBrush.Win10": "#FF333333",
-        "MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorMouseOverBrush.Win10": "#FF000000",
-        "MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorPressedBrush.Win10": "#FFFFFFFF",
-        "MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorDisabledBrush.Win10": "#FF999999",
-        "MahApps.Metro.Brushes.Badged.DisabledBackgroundBrush": "#FF999999"
+        "MahApps.Brushes.MenuItem.DisabledForeground": "{StaticResource MahApps.Colors.Gray2}",
+        "MahApps.Brushes.SliderValue.Disabled": "#FFBABABA",
+        "MahApps.Brushes.SliderTrack.Disabled": "#FFDBDBDB",
+        "MahApps.Brushes.SliderThumb.Disabled": "#FFA0A0A0",
+        "MahApps.Brushes.SliderTrack.Hover": "#FFD0D0D0",
+        "MahApps.Brushes.SliderTrack.Normal": "#FFC6C6C6",
+        "MahApps.Brushes.FlatButton.PressedBackground": "#222222",
+        "MahApps.Brushes.MenuItem.SelectionFill": "#DEDEDE",
+        "MahApps.Brushes.MenuItem.SelectionStroke": "#DEDEDE",
+        "MahApps.Brushes.TopMenuItem.PressedFill": "#DEDEDE",
+        "MahApps.Brushes.TopMenuItem.PressedStroke": "#E0717070",
+        "MahApps.Brushes.TopMenuItem.SelectionStroke": "#90717070",
+        "MahApps.Brushes.ToggleSwitchButton.Pressed.Win10": "#FF666666",
+        "MahApps.Brushes.ToggleSwitchButton.OffBorder.Win10": "#FF333333",
+        "MahApps.Brushes.ToggleSwitchButton.OffMouseOverBorder.Win10": "#FF000000",
+        "MahApps.Brushes.ToggleSwitchButton.OffDisabledBorder.Win10": "#FF999999",
+        "MahApps.Brushes.ToggleSwitchButton.OnSwitchDisabled.Win10": "#FFCCCCCC",
+        "MahApps.Brushes.ToggleSwitchButton.ThumbIndicator.Win10": "#FF333333",
+        "MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorMouseOver.Win10": "#FF000000",
+        "MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorPressed.Win10": "#FFFFFFFF",
+        "MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorDisabled.Win10": "#FF999999",
+        "MahApps.Brushes.Badged.DisabledBackground": "#FF999999"
       }
     }
   ],
diff --git a/src/MahApps.Metro/Styles/Themes/Theme.Template.xaml b/src/MahApps.Metro/Styles/Themes/Theme.Template.xaml
index 6df2a88b28..6d6990f4a2 100644
--- a/src/MahApps.Metro/Styles/Themes/Theme.Template.xaml
+++ b/src/MahApps.Metro/Styles/Themes/Theme.Template.xaml
@@ -57,177 +57,177 @@
     <!--  PROJECT TEMPLATE BRUSHES  -->
 
     <!--  UNIVERSAL CONTROL BRUSHES  -->
-    <SolidColorBrush x:Key="ControlBackgroundBrush" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
-    <SolidColorBrush x:Key="WhiteBrush" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
-    <SolidColorBrush x:Key="BlackBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
-    <SolidColorBrush x:Key="TextBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
-    <SolidColorBrush x:Key="LabelTextBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
-    <SolidColorBrush x:Key="WhiteColorBrush" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
-    <SolidColorBrush x:Key="BlackColorBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
-
-    <SolidColorBrush x:Key="WindowTitleColorBrush" Color="{StaticResource MahApps.Colors.Accent}" options:Freeze="True" />
-    <SolidColorBrush x:Key="NonActiveWindowTitleColorBrush" Color="#808080" options:Freeze="True" />
-    <SolidColorBrush x:Key="NonActiveBorderColorBrush" Color="#808080" options:Freeze="True" />
-
-    <SolidColorBrush x:Key="HighlightBrush" Color="{StaticResource MahApps.Colors.Highlight}" options:Freeze="True" />
-    <SolidColorBrush x:Key="DisabledWhiteBrush" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
-
-    <SolidColorBrush x:Key="TransparentWhiteBrush" Color="#00FFFFFF" options:Freeze="True" />
-    <SolidColorBrush x:Key="SemiTransparentWhiteBrush" Color="#55FFFFFF" options:Freeze="True" />
-    <SolidColorBrush x:Key="SemiTransparentGreyBrush" Color="#40808080" options:Freeze="True" />
-    <SolidColorBrush x:Key="ControlsDisabledBrush" Color="#A5FFFFFF" options:Freeze="True" />
-
-    <SolidColorBrush x:Key="AccentBaseColorBrush" Color="{StaticResource MahApps.Colors.AccentBase}" options:Freeze="True" />
-    <SolidColorBrush x:Key="AccentColorBrush" Color="{StaticResource MahApps.Colors.Accent}" options:Freeze="True" />
-    <SolidColorBrush x:Key="AccentColorBrush2" Color="{StaticResource MahApps.Colors.Accent2}" options:Freeze="True" />
-    <SolidColorBrush x:Key="AccentColorBrush3" Color="{StaticResource MahApps.Colors.Accent3}" options:Freeze="True" />
-    <SolidColorBrush x:Key="AccentColorBrush4" Color="{StaticResource MahApps.Colors.Accent4}" options:Freeze="True" />
-
-    <SolidColorBrush x:Key="GrayBrush1" Color="{StaticResource MahApps.Colors.Gray1}" options:Freeze="True" />
-    <SolidColorBrush x:Key="GrayBrush2" Color="{StaticResource MahApps.Colors.Gray2}" options:Freeze="True" />
-    <SolidColorBrush x:Key="GrayBrush3" Color="{StaticResource MahApps.Colors.Gray3}" options:Freeze="True" />
-    <SolidColorBrush x:Key="GrayBrush4" Color="{StaticResource MahApps.Colors.Gray4}" options:Freeze="True" />
-    <SolidColorBrush x:Key="GrayBrush5" Color="{StaticResource MahApps.Colors.Gray5}" options:Freeze="True" />
-    <SolidColorBrush x:Key="GrayBrush6" Color="{StaticResource MahApps.Colors.Gray6}" options:Freeze="True" />
-    <SolidColorBrush x:Key="GrayBrush7" Color="{StaticResource MahApps.Colors.Gray7}" options:Freeze="True" />
-    <SolidColorBrush x:Key="GrayBrush8" Color="{StaticResource MahApps.Colors.Gray8}" options:Freeze="True" />
-    <SolidColorBrush x:Key="GrayBrush9" Color="{StaticResource MahApps.Colors.Gray9}" options:Freeze="True" />
-    <SolidColorBrush x:Key="GrayBrush10" Color="{StaticResource MahApps.Colors.Gray10}" options:Freeze="True" />
-
-    <SolidColorBrush x:Key="GrayNormalBrush" Color="{StaticResource MahApps.Colors.GrayNormal}" options:Freeze="True" />
-    <SolidColorBrush x:Key="GrayHoverBrush" Color="{StaticResource MahApps.Colors.GrayHover}" options:Freeze="True" />
-
-    <SolidColorBrush x:Key="TextBoxBorderBrush" Color="{StaticResource MahApps.Colors.Gray6}" options:Freeze="True" />
-    <SolidColorBrush x:Key="ControlBorderBrush" Color="{StaticResource MahApps.Colors.Gray6}" options:Freeze="True" />
-    <SolidColorBrush x:Key="TextBoxMouseOverInnerBorderBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
-    <SolidColorBrush x:Key="TextBoxFocusBorderBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
-    <SolidColorBrush x:Key="TextBoxMouseOverBorderBrush" Color="{StaticResource MahApps.Colors.Gray2}" options:Freeze="True" />
-
-    <SolidColorBrush x:Key="ButtonMouseOverBorderBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
-    <SolidColorBrush x:Key="ButtonMouseOverInnerBorderBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
-    <SolidColorBrush x:Key="ComboBoxMouseOverBorderBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
-    <SolidColorBrush x:Key="ComboBoxMouseOverInnerBorderBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
-    <SolidColorBrush x:Key="ComboBoxPopupBorderBrush" Color="{StaticResource MahApps.Colors.Gray4}" options:Freeze="True" />
-
-    <SolidColorBrush x:Key="CheckBoxBrush" Color="{StaticResource MahApps.Colors.Gray6}" options:Freeze="True" />
-    <SolidColorBrush x:Key="CheckBoxMouseOverBrush" Color="{StaticResource MahApps.Colors.Gray2}" options:Freeze="True" />
-    <LinearGradientBrush x:Key="CheckBoxBackgroundBrush" StartPoint="0.5,0" EndPoint="0.5,1" options:Freeze="True">
+    <SolidColorBrush x:Key="MahApps.Brushes.Control.Background" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.White" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Black" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Text" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Label.Text" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.WhiteColor" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.BlackColor" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Brushes.WindowTitle" Color="{StaticResource MahApps.Colors.Accent}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.WindowTitle.NonActive" Color="#808080" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Border.NonActive" Color="#808080" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Brushes.Highlight" Color="{StaticResource MahApps.Colors.Highlight}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.DisabledWhite" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Brushes.TransparentWhite" Color="#00FFFFFF" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SemiTransparentWhite" Color="#55FFFFFF" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SemiTransparentGrey" Color="#40808080" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Controls.Disabled" Color="#A5FFFFFF" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Brushes.AccentBase" Color="{StaticResource MahApps.Colors.AccentBase}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Accent" Color="{StaticResource MahApps.Colors.Accent}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Accent2" Color="{StaticResource MahApps.Colors.Accent2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Accent3" Color="{StaticResource MahApps.Colors.Accent3}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Accent4" Color="{StaticResource MahApps.Colors.Accent4}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Brushes.Gray1" Color="{StaticResource MahApps.Colors.Gray1}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Gray2" Color="{StaticResource MahApps.Colors.Gray2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Gray3" Color="{StaticResource MahApps.Colors.Gray3}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Gray4" Color="{StaticResource MahApps.Colors.Gray4}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Gray5" Color="{StaticResource MahApps.Colors.Gray5}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Gray6" Color="{StaticResource MahApps.Colors.Gray6}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Gray7" Color="{StaticResource MahApps.Colors.Gray7}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Gray8" Color="{StaticResource MahApps.Colors.Gray8}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Gray9" Color="{StaticResource MahApps.Colors.Gray9}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Gray10" Color="{StaticResource MahApps.Colors.Gray10}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Brushes.GrayNormal" Color="{StaticResource MahApps.Colors.GrayNormal}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.GrayHover" Color="{StaticResource MahApps.Colors.GrayHover}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Brushes.TextBox.Border" Color="{StaticResource MahApps.Colors.Gray6}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Controls.Border" Color="{StaticResource MahApps.Colors.Gray6}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.TextBox.MouseOverInnerBorder" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.TextBox.FocusBorder" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.TextBox.MouseOverBorder" Color="{StaticResource MahApps.Colors.Gray2}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Brushes.Button.MouseOverBorder" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Button.MouseOverInnerBorder" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ComboBox.MouseOverBorder" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ComboBox.MouseOverInnerBorder" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ComboBox.PopupBorder" Color="{StaticResource MahApps.Colors.Gray4}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Brushes.CheckBox" Color="{StaticResource MahApps.Colors.Gray6}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.CheckBox.MouseOver" Color="{StaticResource MahApps.Colors.Gray2}" options:Freeze="True" />
+    <LinearGradientBrush x:Key="MahApps.Brushes.CheckBox.Background" StartPoint="0.5,0" EndPoint="0.5,1" options:Freeze="True">
         <GradientStop Offset="0" Color="{StaticResource MahApps.Colors.Gray7}" />
         <GradientStop Offset="1" Color="{StaticResource MahApps.Colors.White}" />
     </LinearGradientBrush>
 
-    <SolidColorBrush x:Key="ThumbBrush" Color="{StaticResource MahApps.Colors.Gray5}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Thumb" Color="{StaticResource MahApps.Colors.Gray5}" options:Freeze="True" />
 
-    <LinearGradientBrush x:Key="ProgressBrush" StartPoint="1.002,0.5" EndPoint="0.001,0.5" options:Freeze="True">
+    <LinearGradientBrush x:Key="MahApps.Brushes.Progress" StartPoint="1.002,0.5" EndPoint="0.001,0.5" options:Freeze="True">
         <GradientStop Offset="0" Color="{StaticResource MahApps.Colors.Highlight}" />
         <GradientStop Offset="1" Color="{StaticResource MahApps.Colors.Accent3}" />
     </LinearGradientBrush>
 
-    <SolidColorBrush x:Key="SliderValueDisabled" Color="{{SliderValueDisabled}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="SliderTrackDisabled" Color="{{SliderTrackDisabled}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="SliderThumbDisabled" Color="{{SliderThumbDisabled}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="SliderTrackHover" Color="{{SliderTrackHover}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="SliderTrackNormal" Color="{{SliderTrackNormal}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SliderValue.Disabled" Color="{{MahApps.Brushes.SliderValue.Disabled}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SliderTrack.Disabled" Color="{{MahApps.Brushes.SliderTrack.Disabled}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SliderThumb.Disabled" Color="{{MahApps.Brushes.SliderThumb.Disabled}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SliderTrack.Hover" Color="{{MahApps.Brushes.SliderTrack.Hover}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SliderTrack.Normal" Color="{{MahApps.Brushes.SliderTrack.Normal}}" options:Freeze="True" />
 
-    <SolidColorBrush x:Key="FlyoutBackgroundBrush" Color="{StaticResource MahApps.Colors.Flyout}" options:Freeze="True" />
-    <SolidColorBrush x:Key="FlyoutForegroundBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Flyout.Background" Color="{StaticResource MahApps.Colors.Flyout}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Flyout.Foreground" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
 
-    <SolidColorBrush x:Key="WindowBackgroundBrush" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
-    <SolidColorBrush x:Key="SeperatorBrush" Color="#FFC4C4C5" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Window.Background" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Separator" Color="#FFC4C4C5" options:Freeze="True" />
 
-    <SolidColorBrush x:Key="FlatButtonBackgroundBrush" Color="#D5D5D5" options:Freeze="True" />
-    <SolidColorBrush x:Key="FlatButtonForegroundBrush" Color="#222222" options:Freeze="True" />
-    <SolidColorBrush x:Key="FlatButtonPressedBackgroundBrush" Color="{{FlatButtonPressedBackgroundBrush}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="FlatButtonPressedForegroundBrush" Color="White" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.FlatButton.Background" Color="#D5D5D5" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.FlatButton.Foreground" Color="#222222" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.FlatButton.PressedBackground" Color="{{MahApps.Brushes.FlatButton.PressedBackground}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.FlatButton.PressedForeground" Color="White" options:Freeze="True" />
 
-    <SolidColorBrush x:Key="DarkIdealForegroundDisabledBrush" Color="#ADADAD" options:Freeze="True" />
-    <SolidColorBrush x:Key="CleanWindowCloseButtonBackgroundBrush" Color="#EB2F2F" options:Freeze="True" />
-    <SolidColorBrush x:Key="CleanWindowCloseButtonPressedBackgroundBrush" Color="#7C0000" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.DarkIdealForegroundDisabled" Color="#ADADAD" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.CleanWindowCloseButton.Background" Color="#EB2F2F" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.CleanWindowCloseButton.PressedBackground" Color="#7C0000" options:Freeze="True" />
 
     <!--  CONTROL VALIDATION BRUSHES  -->
-    <SolidColorBrush x:Key="ControlsValidationBrush" Color="#FFDB000C" options:Freeze="True" />
-    <SolidColorBrush x:Key="ValidationBrush1" Color="#052A2E31" options:Freeze="True" />
-    <SolidColorBrush x:Key="ValidationBrush2" Color="#152A2E31" options:Freeze="True" />
-    <SolidColorBrush x:Key="ValidationBrush3" Color="#252A2E31" options:Freeze="True" />
-    <SolidColorBrush x:Key="ValidationBrush4" Color="#352A2E31" options:Freeze="True" />
-    <SolidColorBrush x:Key="ValidationBrush5" Color="#FFDC000C" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Controls.Validation" Color="#FFDB000C" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Validation1" Color="#052A2E31" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Validation2" Color="#152A2E31" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Validation3" Color="#252A2E31" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Validation4" Color="#352A2E31" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Validation5" Color="#FFDC000C" options:Freeze="True" />
     <!--  unused  -->
-    <SolidColorBrush x:Key="ValidationSummaryColor1" Color="#FFDC020D" options:Freeze="True" />
-    <SolidColorBrush x:Key="ValidationSummaryColor2" Color="#FFCA000C" options:Freeze="True" />
-    <SolidColorBrush x:Key="ValidationSummaryColor3" Color="#FFFF9298" options:Freeze="True" />
-    <SolidColorBrush x:Key="ValidationSummaryColor4" Color="#FFFDC8C8" options:Freeze="True" />
-    <SolidColorBrush x:Key="ValidationSummaryColor5" Color="#DDD43940" options:Freeze="True" />
-    <SolidColorBrush x:Key="ValidationSummaryFillColor1" Color="#59F7D8DB" options:Freeze="True" />
-    <SolidColorBrush x:Key="ValidationSummaryFillColor2" Color="#FFF7D8DB" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ValidationSummary1" Color="#FFDC020D" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ValidationSummary2" Color="#FFCA000C" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ValidationSummary3" Color="#FFFF9298" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ValidationSummary4" Color="#FFFDC8C8" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ValidationSummary5" Color="#DDD43940" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ValidationSummaryFill1" Color="#59F7D8DB" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ValidationSummaryFill2" Color="#FFF7D8DB" options:Freeze="True" />
     <!--  validation text foreground always white  -->
-    <SolidColorBrush x:Key="ValidationTextBrush" Color="White" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Text.Validation" Color="White" options:Freeze="True" />
 
     <!--  WPF default colors  -->
     <SolidColorBrush x:Key="{x:Static SystemColors.WindowBrushKey}" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
     <SolidColorBrush x:Key="{x:Static SystemColors.ControlTextBrushKey}" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
 
     <!--  menu default colors  -->
-    <SolidColorBrush x:Key="MenuBackgroundBrush" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
-    <SolidColorBrush x:Key="ContextMenuBackgroundBrush" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
-    <SolidColorBrush x:Key="SubMenuBackgroundBrush" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MenuItemBackgroundBrush" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Menu.Background" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ContextMenu.Background" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SubMenu.Background" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.MenuItem.Background" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
 
-    <SolidColorBrush x:Key="ContextMenuBorderBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
-    <SolidColorBrush x:Key="SubMenuBorderBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ContextMenu.Border" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SubMenu.Border" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
 
-    <SolidColorBrush x:Key="MenuItemSelectionFill" Color="{{MenuItemSelectionFill}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MenuItemSelectionStroke" Color="{{MenuItemSelectionStroke}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.MenuItem.SelectionFill" Color="{{MahApps.Brushes.MenuItem.SelectionFill}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.MenuItem.SelectionStroke" Color="{{MahApps.Brushes.MenuItem.SelectionStroke}}" options:Freeze="True" />
 
-    <SolidColorBrush x:Key="TopMenuItemPressedFill" Color="{{TopMenuItemPressedFill}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="TopMenuItemPressedStroke" Color="{{TopMenuItemPressedStroke}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="TopMenuItemSelectionStroke" Color="{{TopMenuItemSelectionStroke}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.TopMenuItem.PressedFill" Color="{{MahApps.Brushes.TopMenuItem.PressedFill}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.TopMenuItem.PressedStroke" Color="{{MahApps.Brushes.TopMenuItem.PressedStroke}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.TopMenuItem.SelectionStroke" Color="{{MahApps.Brushes.TopMenuItem.SelectionStroke}}" options:Freeze="True" />
 
     <!--  original #FF9A9A9A"  -->
-    <SolidColorBrush x:Key="DisabledMenuItemForeground" Color="{{DisabledMenuItemForeground}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="DisabledMenuItemGlyphPanel" Color="#848589" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.MenuItem.DisabledForeground" Color="{{MahApps.Brushes.MenuItem.DisabledForeground}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.MenuItem.DisabledGlyphPanel" Color="#848589" options:Freeze="True" />
 
-    <SolidColorBrush x:Key="{x:Static SystemColors.MenuTextBrushKey}" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+     <SolidColorBrush x:Key="{x:Static SystemColors.MenuTextBrushKey}" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
 
-    <SolidColorBrush x:Key="CheckmarkFill" Color="{StaticResource MahApps.Colors.Accent}" options:Freeze="True" />
-    <SolidColorBrush x:Key="RightArrowFill" Color="{StaticResource MahApps.Colors.Accent}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.CheckmarkFill" Color="{StaticResource MahApps.Colors.Accent}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.RightArrowFill" Color="{StaticResource MahApps.Colors.Accent}" options:Freeze="True" />
 
     <Color x:Key="MahApps.Colors.MenuShadow">{{MahApps.Colors.MenuShadow}}</Color>
 
     <Color x:Key="MahApps.Colors.IdealForeground">{{MahApps.Colors.IdealForeground}}</Color>
 
-    <SolidColorBrush x:Key="IdealForegroundColorBrush" Color="{StaticResource MahApps.Colors.IdealForeground}" options:Freeze="True" />
-    <SolidColorBrush x:Key="IdealForegroundDisabledBrush" Opacity="0.4" Color="{StaticResource MahApps.Colors.IdealForeground}" options:Freeze="True" />
-    <SolidColorBrush x:Key="AccentSelectedColorBrush" Color="{StaticResource MahApps.Colors.IdealForeground}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.IdealForeground" Color="{StaticResource MahApps.Colors.IdealForeground}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.IdealForegroundDisabled" Opacity="0.4" Color="{StaticResource MahApps.Colors.IdealForeground}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.AccentSelectedColor" Color="{StaticResource MahApps.Colors.IdealForeground}" options:Freeze="True" />
 
     <!--  DataGrid brushes  -->
 
-    <SolidColorBrush x:Key="MetroDataGrid.HighlightBrush" Color="{StaticResource MahApps.Colors.Accent}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MetroDataGrid.DisabledHighlightBrush" Color="{StaticResource MahApps.Colors.Gray7}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MetroDataGrid.HighlightTextBrush" Color="{StaticResource MahApps.Colors.IdealForeground}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MetroDataGrid.MouseOverHighlightBrush" Color="{StaticResource MahApps.Colors.Accent3}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MetroDataGrid.FocusBorderBrush" Color="{StaticResource MahApps.Colors.Accent}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightBrush" Color="{StaticResource MahApps.Colors.Accent2}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MetroDataGrid.InactiveSelectionHighlightTextBrush" Color="{StaticResource MahApps.Colors.IdealForeground}" options:Freeze="True" />
-
-    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.PressedBrush.Win10" Color="{{MahApps.Metro.Brushes.ToggleSwitchButton.PressedBrush.Win10}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OffBorderBrush.Win10" Color="{{MahApps.Metro.Brushes.ToggleSwitchButton.OffBorderBrush.Win10}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OffMouseOverBorderBrush.Win10" Color="{{MahApps.Metro.Brushes.ToggleSwitchButton.OffMouseOverBorderBrush.Win10}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OffDisabledBorderBrush.Win10" Color="{{MahApps.Metro.Brushes.ToggleSwitchButton.OffDisabledBorderBrush.Win10}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OffSwitchBrush.Win10" Color="Transparent" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10" Color="{StaticResource MahApps.Colors.Accent}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchDisabledBrush.Win10" Color="{{MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchDisabledBrush.Win10}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchMouseOverBrush.Win10" Color="{StaticResource MahApps.Colors.Accent2}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorBrush.Win10" Color="{{MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorBrush.Win10}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorMouseOverBrush.Win10" Color="{{MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorMouseOverBrush.Win10}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorCheckedBrush.Win10" Color="{StaticResource MahApps.Colors.IdealForeground}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorPressedBrush.Win10" Color="{{MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorPressedBrush.Win10}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorDisabledBrush.Win10" Color="{{MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorDisabledBrush.Win10}}" options:Freeze="True" />
-
-    <SolidColorBrush x:Key="MahApps.Metro.Brushes.Badged.DisabledBackgroundBrush" Color="{{MahApps.Metro.Brushes.Badged.DisabledBackgroundBrush}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.DataGrid.Highlight" Color="{StaticResource MahApps.Colors.Accent}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.DataGrid.DisabledHighlight" Color="{StaticResource MahApps.Colors.Gray7}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.DataGrid.HighlightText" Color="{StaticResource MahApps.Colors.IdealForeground}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.DataGrid.MouseOverHighlight" Color="{StaticResource MahApps.Colors.Accent3}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.DataGrid.FocusBorder" Color="{StaticResource MahApps.Colors.Accent}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.DataGrid.InactiveSelectionHighlight" Color="{StaticResource MahApps.Colors.Accent2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.DataGrid.InactiveSelectionHighlightText" Color="{StaticResource MahApps.Colors.IdealForeground}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.Pressed.Win10" Color="{{MahApps.Brushes.ToggleSwitchButton.Pressed.Win10}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.OffBorder.Win10" Color="{{MahApps.Brushes.ToggleSwitchButton.OffBorder.Win10}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.OffMouseOverBorder.Win10" Color="{{MahApps.Brushes.ToggleSwitchButton.OffMouseOverBorder.Win10}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.OffDisabledBorder.Win10" Color="{{MahApps.Brushes.ToggleSwitchButton.OffDisabledBorder.Win10}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.OffSwitch.Win10" Color="Transparent" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.OnSwitch.Win10" Color="{StaticResource MahApps.Colors.Accent}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.OnSwitchDisabled.Win10" Color="{{MahApps.Brushes.ToggleSwitchButton.OnSwitchDisabled.Win10}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.OnSwitchMouseOver.Win10" Color="{StaticResource MahApps.Colors.Accent2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.ThumbIndicator.Win10" Color="{{MahApps.Brushes.ToggleSwitchButton.ThumbIndicator.Win10}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorMouseOver.Win10" Color="{{MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorMouseOver.Win10}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorChecked.Win10" Color="{StaticResource MahApps.Colors.IdealForeground}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorPressed.Win10" Color="{{MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorPressed.Win10}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorDisabled.Win10" Color="{{MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorDisabled.Win10}}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Brushes.Badged.DisabledBackground" Color="{{MahApps.Brushes.Badged.DisabledBackground}}" options:Freeze="True" />
 
     <!--  HamburgerMenu  -->
 
-    <SolidColorBrush x:Key="MahApps.Metro.HamburgerMenu.PaneBackgroundBrush" Color="#FF444444" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Metro.HamburgerMenu.PaneForegroundBrush" Color="#FFFFFFFF" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.HamburgerMenu.PaneBackground" Color="#FF444444" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.HamburgerMenu.PaneForeground" Color="#FFFFFFFF" options:Freeze="True" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/VS/Button.xaml b/src/MahApps.Metro/Styles/VS/Button.xaml
index f54118260a..1b20b4e5f4 100644
--- a/src/MahApps.Metro/Styles/VS/Button.xaml
+++ b/src/MahApps.Metro/Styles/VS/Button.xaml
@@ -2,8 +2,8 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <Style x:Key="StandardButton" TargetType="Button">
-        <Setter Property="Background" Value="{DynamicResource BackgroundNormal}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrushNormal}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Background.Normal}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Normal}" />
         <Setter Property="Foreground" Value="{DynamicResource Foreground}" />
         <Setter Property="Template">
             <Setter.Value>
@@ -19,11 +19,11 @@
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
                             <Setter Property="Background" Value="{DynamicResource BackgroundHighlighted}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource BorderBrushHighlighted}" />
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Highlighted}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
                             <Setter Property="Background" Value="{DynamicResource BackgroundSelected}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource BorderBrushSelected}" />
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Selected}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter Property="Background" Value="Transparent" />
@@ -36,7 +36,7 @@
 
     <Style x:Key="LinkButton" TargetType="Button">
         <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="Foreground" Value="{DynamicResource LinkButtonForeground}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.LinkButton.Foreground}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Button">
@@ -48,7 +48,7 @@
         </Setter>
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="true">
-                <Setter Property="Foreground" Value="{DynamicResource LinkButtonForegroundHighlighted}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.LinkButton.ForegroundHighlighted}" />
             </Trigger>
         </Style.Triggers>
     </Style>
diff --git a/src/MahApps.Metro/Styles/VS/Colors.xaml b/src/MahApps.Metro/Styles/VS/Colors.xaml
index 9509476ba5..a57115132a 100644
--- a/src/MahApps.Metro/Styles/VS/Colors.xaml
+++ b/src/MahApps.Metro/Styles/VS/Colors.xaml
@@ -5,97 +5,97 @@
                     mc:Ignorable="options">
 
     <!--  Background  -->
-    <SolidColorBrush x:Key="Background" Color="#1C1C1C" options:Freeze="True" />
-    <SolidColorBrush x:Key="LightBackground" Color="#2D2D30" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Background" Color="#1C1C1C" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.LightBackground" Color="#2D2D30" options:Freeze="True" />
 
     <Color x:Key="MahApps.Colors.Accent">#2D2D30</Color>
     <Color x:Key="MahApps.Colors.Black">#FFFFFFFF</Color>
     <Color x:Key="MahApps.Colors.White">#2D2D30</Color>
 
     <!--  re-set brushes too  -->
-    <SolidColorBrush x:Key="HighlightBrush" Color="{StaticResource MahApps.Colors.Highlight}" options:Freeze="True" />
-    <SolidColorBrush x:Key="AccentColorBrush" Color="{StaticResource MahApps.Colors.Accent}" options:Freeze="True" />
-    <SolidColorBrush x:Key="AccentColorBrush2" Color="{StaticResource MahApps.Colors.Accent2}" options:Freeze="True" />
-    <SolidColorBrush x:Key="AccentColorBrush3" Color="{StaticResource MahApps.Colors.Accent3}" options:Freeze="True" />
-    <SolidColorBrush x:Key="AccentColorBrush4" Color="{StaticResource MahApps.Colors.Accent4}" options:Freeze="True" />
-
-    <SolidColorBrush x:Key="WindowTitleColorBrush" Color="{StaticResource MahApps.Colors.Accent}" options:Freeze="True" />
-    <SolidColorBrush x:Key="NonActiveWindowTitleColorBrush" Color="#808080" options:Freeze="True" />
-    <SolidColorBrush x:Key="NonActiveBorderColorBrush" Color="#808080" options:Freeze="True" />
-
-    <SolidColorBrush x:Key="BlackBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
-    <SolidColorBrush x:Key="TextBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
-    <SolidColorBrush x:Key="LabelTextBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
-    <SolidColorBrush x:Key="BlackColorBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
-    <SolidColorBrush x:Key="TextBoxMouseOverInnerBorderBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
-    <SolidColorBrush x:Key="TextBoxFocusBorderBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
-    <SolidColorBrush x:Key="ButtonMouseOverBorderBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
-    <SolidColorBrush x:Key="ButtonMouseOverInnerBorderBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
-    <SolidColorBrush x:Key="ComboBoxMouseOverBorderBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
-    <SolidColorBrush x:Key="ComboBoxMouseOverInnerBorderBrush" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
-
-    <SolidColorBrush x:Key="ControlBackgroundBrush" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
-    <SolidColorBrush x:Key="WhiteBrush" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
-    <SolidColorBrush x:Key="WhiteColorBrush" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
-    <SolidColorBrush x:Key="DisabledWhiteBrush" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
-    <SolidColorBrush x:Key="WindowBackgroundBrush" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Highlight" Color="{StaticResource MahApps.Colors.Highlight}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Accent" Color="{StaticResource MahApps.Colors.Accent}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Accent2" Color="{StaticResource MahApps.Colors.Accent2}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Accent3" Color="{StaticResource MahApps.Colors.Accent3}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Accent4" Color="{StaticResource MahApps.Colors.Accent4}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Brushes.WindowTitle" Color="{StaticResource MahApps.Colors.Accent}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.WindowTitle.NonActive" Color="#808080" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Border.NonActive" Color="#808080" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Brushes.Black" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Text" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Label.Text" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.BlackColor" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.TextBox.MouseOverInnerBorder" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.TextBox.FocusBorder" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Button.MouseOverBorder" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Button.MouseOverInnerBorder" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ComboBox.MouseOverBorder" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ComboBox.MouseOverInnerBorder" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
+
+    <SolidColorBrush x:Key="MahApps.Brushes.Control.Background" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.White" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.WhiteColor" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.DisabledWhite" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Window.Background" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
 
     <SolidColorBrush x:Key="{x:Static SystemColors.WindowBrushKey}" Color="{StaticResource MahApps.Colors.White}" options:Freeze="True" />
     <SolidColorBrush x:Key="{x:Static SystemColors.ControlTextBrushKey}" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
 
-    <LinearGradientBrush x:Key="CheckBoxBackgroundBrush" StartPoint="0.5,0" EndPoint="0.5,1" options:Freeze="True">
+    <LinearGradientBrush x:Key="MahApps.Brushes.CheckBox.Background" StartPoint="0.5,0" EndPoint="0.5,1" options:Freeze="True">
         <GradientStop Offset="0" Color="{StaticResource MahApps.Colors.Gray7}" />
         <GradientStop Offset="1" Color="{StaticResource MahApps.Colors.White}" />
     </LinearGradientBrush>
 
     <!--  Foreground  -->
-    <SolidColorBrush x:Key="Foreground" Color="#FFFFFF" options:Freeze="True" />
-    <SolidColorBrush x:Key="WindowTitleForeground" Color="#999988" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Foreground" Color="#FFFFFF" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.WindowTitle.Foreground" Color="#999988" options:Freeze="True" />
 
     <!--  General  -->
-    <SolidColorBrush x:Key="BackgroundHighlighted" Color="#54545C" options:Freeze="True" />
-    <SolidColorBrush x:Key="BorderBrushHighlighted" Color="#6A6A75" options:Freeze="True" />
-    <SolidColorBrush x:Key="BackgroundSelected" Color="#007ACC" options:Freeze="True" />
-    <SolidColorBrush x:Key="BorderBrushSelected" Color="#1C97EA" options:Freeze="True" />
-    <SolidColorBrush x:Key="BackgroundNormal" Color="#3F3F46" options:Freeze="True" />
-    <SolidColorBrush x:Key="BorderBrushNormal" Color="#54545C" options:Freeze="True" />
-    <SolidColorBrush x:Key="WindowGlowBrush" Color="#017ACC" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.BackgroundHighlighted" Color="#54545C" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Border.Highlighted" Color="#6A6A75" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.BackgroundSelected" Color="#007ACC" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Border.Selected" Color="#1C97EA" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Background.Normal" Color="#3F3F46" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Border.Normal" Color="#54545C" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Window.Glow" Color="#017ACC" options:Freeze="True" />
 
     <!--  Text Box  -->
-    <SolidColorBrush x:Key="TextBoxBackground" Color="#333337" options:Freeze="True" />
-    <SolidColorBrush x:Key="TextBoxBackgroundSelected" Color="#3F3F46" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.TextBox.Background" Color="#333337" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.TextBox.BackgroundSelected" Color="#3F3F46" options:Freeze="True" />
 
     <!--  Search Text Box  -->
-    <SolidColorBrush x:Key="SearchTextForeground" Color="#999999" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SearchTextBox.Foreground" Color="#999999" options:Freeze="True" />
 
     <!--  Link Button  -->
-    <SolidColorBrush x:Key="LinkButtonForeground" Color="#1297FB" options:Freeze="True" />
-    <SolidColorBrush x:Key="LinkButtonForegroundHighlighted" Color="#55AAFF" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.LinkButton.Foreground" Color="#1297FB" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.LinkButton.ForegroundHighlighted" Color="#55AAFF" options:Freeze="True" />
 
     <!--  Close Button  -->
-    <SolidColorBrush x:Key="CloseButtonBackgroundHighlighted" Color="#39ADFB" options:Freeze="True" />
-    <SolidColorBrush x:Key="CloseButtonBackgroundPressed" Color="#084E7D" options:Freeze="True" />
-    <SolidColorBrush x:Key="CloseButtonStroke" Color="#AAFFFFFF" options:Freeze="True" />
-    <SolidColorBrush x:Key="CloseButtonStrokeHighlighted" Color="#FFFFFF" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.CloseButton.BackgroundHighlighted" Color="#39ADFB" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.CloseButton.BackgroundPressed" Color="#084E7D" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.CloseButton.Stroke" Color="#AAFFFFFF" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.CloseButton.StrokeHighlighted" Color="#FFFFFF" options:Freeze="True" />
 
     <!--  Menu  -->
-    <SolidColorBrush x:Key="MenuSeparatorBorderBrush" Color="#333337" options:Freeze="True" />
-    <SolidColorBrush x:Key="MenuItemHighlightedBackground" Color="#3E3E40" options:Freeze="True" />
-    <SolidColorBrush x:Key="SubmenuItemBackground" Color="#1B1B1C" options:Freeze="True" />
-    <SolidColorBrush x:Key="SubmenuItemBackgroundHighlighted" Color="#333334" options:Freeze="True" />
-    <SolidColorBrush x:Key="MenuDisabledForeground" Color="#656565" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.MenuSeparator.Border" Color="#333337" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.MenuItem.BackgroundHighlighted" Color="#3E3E40" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SubmenuItem.Background" Color="#1B1B1C" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SubmenuItem.BackgroundHighlighted" Color="#333334" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Menu.ForegroundDisabled" Color="#656565" options:Freeze="True" />
 
     <!--  Scroll Bar  -->
-    <SolidColorBrush x:Key="ScrollBarPageButtonBackgroundHighlighted" Color="#05FFFFFF" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ScrollBar.PageButtonBackgroundHighlighted" Color="#05FFFFFF" options:Freeze="True" />
 
     <!--  Notification Button  -->
-    <SolidColorBrush x:Key="NotificationButtonForegroundBrush" Color="#000000" />
-    <SolidColorBrush x:Key="NotificationButtonBackgroundBrush" Color="#FFCC00" />
-    <SolidColorBrush x:Key="NotificationButtonBackgroundOverBrush" Color="#FFDF66" />
-    <SolidColorBrush x:Key="NotificationButtonBackgroundPressedBrush" Color="#C59E00" />
+    <SolidColorBrush x:Key="MahApps.Brushes.NotificationButton.Foreground" Color="#000000" />
+    <SolidColorBrush x:Key="MahApps.Brushes.NotificationButton.Background" Color="#FFCC00" />
+    <SolidColorBrush x:Key="MahApps.Brushes.NotificationButton.BackgroundOver" Color="#FFDF66" />
+    <SolidColorBrush x:Key="MahApps.Brushes.NotificationButton.BackgroundPressed" Color="#C59E00" />
 
     <!--  Quick Launch TextBox  -->
-    <SolidColorBrush x:Key="QuickLaunchTextBoxBorderBrush" Color="#3F3F46" />
-    <SolidColorBrush x:Key="QuickLaunchTextBoxFocusedBorderBrush" Color="#007ACC" />
+    <SolidColorBrush x:Key="MahApps.Brushes.QuickLaunchTextBox.Border" Color="#3F3F46" />
+    <SolidColorBrush x:Key="MahApps.Brushes.QuickLaunchTextBox.FocusedBorder" Color="#007ACC" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/VS/Expander.xaml b/src/MahApps.Metro/Styles/VS/Expander.xaml
index 71b2536bd0..2ff696760e 100644
--- a/src/MahApps.Metro/Styles/VS/Expander.xaml
+++ b/src/MahApps.Metro/Styles/VS/Expander.xaml
@@ -61,7 +61,7 @@
                                       Data="M 1,1.5 L 4.5,5 L 8,1.5"
                                       IsHitTestVisible="False"
                                       SnapsToDevicePixels="False"
-                                      Stroke="{DynamicResource BorderBrushNormal}"
+                                      Stroke="{DynamicResource MahApps.Brushes.Border.Normal}"
                                       StrokeThickness="2" />
                             </Grid>
                             <Controls:ContentControlEx Grid.Row="1"
@@ -146,7 +146,7 @@
                                       VerticalAlignment="Center"
                                       Data="M 1,1.5 L 4.5,5 L 8,1.5"
                                       SnapsToDevicePixels="False"
-                                      Stroke="{DynamicResource BorderBrushNormal}"
+                                      Stroke="{DynamicResource MahApps.Brushes.Border.Normal}"
                                       StrokeThickness="2" />
                             </Grid>
                         </Grid>
@@ -207,7 +207,7 @@
                                       VerticalAlignment="Center"
                                       Data="M 1,1.5 L 4.5,5 L 8,1.5"
                                       SnapsToDevicePixels="False"
-                                      Stroke="{DynamicResource BorderBrushNormal}"
+                                      Stroke="{DynamicResource MahApps.Brushes.Border.Normal}"
                                       StrokeThickness="2" />
                             </Grid>
                             <Controls:ContentControlEx Grid.Row="1"
@@ -281,7 +281,7 @@
                                       VerticalAlignment="Center"
                                       Data="M 1,1.5 L 4.5,5 L 8,1.5"
                                       SnapsToDevicePixels="False"
-                                      Stroke="{DynamicResource BorderBrushNormal}"
+                                      Stroke="{DynamicResource MahApps.Brushes.Border.Normal}"
                                       StrokeThickness="2" />
                             </Grid>
                         </Grid>
@@ -325,7 +325,7 @@
 
     <Style x:Key="StandardExpander" TargetType="{x:Type Expander}">
         <Setter Property="Background" Value="{x:Null}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrushNormal}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Normal}" />
         <Setter Property="BorderThickness" Value="2" />
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Normal" />
         <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource ExpanderHeaderThemeFontSize}" />
@@ -341,7 +341,7 @@
                 <ControlTemplate TargetType="{x:Type Expander}">
                     <Grid>
                         <Rectangle x:Name="DisabledVisualElement"
-                                   Fill="{DynamicResource ControlsDisabledBrush}"
+                                   Fill="{DynamicResource MahApps.Brushes.Controls.Disabled}"
                                    IsHitTestVisible="False"
                                    Opacity="0" />
                         <DockPanel x:Name="ExpanderRoot">
diff --git a/src/MahApps.Metro/Styles/VS/GroupBox.xaml b/src/MahApps.Metro/Styles/VS/GroupBox.xaml
index 2b751ff7f4..50f53ff505 100644
--- a/src/MahApps.Metro/Styles/VS/GroupBox.xaml
+++ b/src/MahApps.Metro/Styles/VS/GroupBox.xaml
@@ -8,7 +8,7 @@
 
     <Style x:Key="StandardGroupBox" TargetType="{x:Type GroupBox}">
         <Setter Property="Background" Value="{x:Null}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrushNormal}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Normal}" />
         <Setter Property="BorderThickness" Value="2" />
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Normal" />
         <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource GroupBoxHeaderThemeFontSize}" />
diff --git a/src/MahApps.Metro/Styles/VS/ListBox.xaml b/src/MahApps.Metro/Styles/VS/ListBox.xaml
index 734d4b1041..7ea604d567 100644
--- a/src/MahApps.Metro/Styles/VS/ListBox.xaml
+++ b/src/MahApps.Metro/Styles/VS/ListBox.xaml
@@ -6,7 +6,7 @@
         <Setter Property="BorderThickness" Value="0" />
         <Style.Resources>
             <Style TargetType="{x:Type ListBoxItem}">
-                <Setter Property="Background" Value="{DynamicResource BackgroundNormal}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Background.Normal}" />
                 <Setter Property="BorderBrush" Value="Transparent" />
                 <Setter Property="FocusVisualStyle" Value="{x:Null}" />
                 <Setter Property="Template">
@@ -26,11 +26,11 @@
                                         <Condition Property="IsSelected" Value="False" />
                                     </MultiTrigger.Conditions>
                                     <Setter Property="Background" Value="{DynamicResource BackgroundHighlighted}" />
-                                    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrushHighlighted}" />
+                                    <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Highlighted}" />
                                 </MultiTrigger>
                                 <Trigger Property="IsSelected" Value="True">
                                     <Setter Property="Background" Value="{DynamicResource BackgroundSelected}" />
-                                    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrushSelected}" />
+                                    <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Selected}" />
                                 </Trigger>
                             </ControlTemplate.Triggers>
                         </ControlTemplate>
diff --git a/src/MahApps.Metro/Styles/VS/Menu.xaml b/src/MahApps.Metro/Styles/VS/Menu.xaml
index fd6a817b35..4bf1ae02a4 100644
--- a/src/MahApps.Metro/Styles/VS/Menu.xaml
+++ b/src/MahApps.Metro/Styles/VS/Menu.xaml
@@ -7,7 +7,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="Separator">
                     <Border Margin="25 0 0 0"
-                            BorderBrush="{DynamicResource MenuSeparatorBorderBrush}"
+                            BorderBrush="{DynamicResource MahApps.Brushes.MenuSeparator.Border}"
                             BorderThickness="1" />
                 </ControlTemplate>
             </Setter.Value>
@@ -75,8 +75,8 @@
                                 <Grid Margin="0 0 5 5">
                                     <!--  Border 2  -->
                                     <Border x:Name="SubMenuBorder"
-                                            Background="{DynamicResource SubmenuItemBackground}"
-                                            BorderBrush="{DynamicResource MenuSeparatorBorderBrush}"
+                                            Background="{DynamicResource MahApps.Brushes.SubmenuItem.Background}"
+                                            BorderBrush="{DynamicResource MahApps.Brushes.MenuSeparator.Border}"
                                             BorderThickness="1"
                                             SnapsToDevicePixels="True">
                                         <Grid x:Name="SubMenu"
@@ -95,8 +95,8 @@
                                             Margin="1 0 0 0"
                                             HorizontalAlignment="Left"
                                             VerticalAlignment="Top"
-                                            Background="{DynamicResource SubmenuItemBackground}"
-                                            BorderBrush="{DynamicResource SubmenuItemBackground}"
+                                            Background="{DynamicResource MahApps.Brushes.SubmenuItem.Background}"
+                                            BorderBrush="{DynamicResource MahApps.Brushes.SubmenuItem.Background}"
                                             BorderThickness="1"
                                             SnapsToDevicePixels="False" />
                                 </Grid>
@@ -127,14 +127,14 @@
                         <Trigger Property="Role" Value="SubmenuHeader">
                             <Setter Property="DockPanel.Dock" Value="Top" />
                             <Setter Property="Padding" Value="10 3 0 3" />
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource SubmenuItemBackground}" />
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource MahApps.Brushes.SubmenuItem.Background}" />
                             <Setter TargetName="Border" Property="MinHeight" Value="22" />
                         </Trigger>
                         <Trigger Property="Role" Value="SubmenuItem">
                             <Setter Property="DockPanel.Dock" Value="Top" />
                             <Setter Property="Padding" Value="10 3 0 3" />
                             <Setter TargetName="ArrowPanel" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource SubmenuItemBackground}" />
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource MahApps.Brushes.SubmenuItem.Background}" />
                             <Setter TargetName="Border" Property="MinHeight" Value="22" />
                         </Trigger>
                         <MultiTrigger>
@@ -142,36 +142,36 @@
                                 <Condition Property="IsHighlighted" Value="true" />
                                 <Condition Property="Role" Value="TopLevelHeader" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource MenuItemHighlightedBackground}" />
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource MahApps.Brushes.MenuItem.BackgroundHighlighted}" />
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsHighlighted" Value="true" />
                                 <Condition Property="Role" Value="TopLevelItem" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource MenuItemHighlightedBackground}" />
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource MahApps.Brushes.MenuItem.BackgroundHighlighted}" />
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsHighlighted" Value="true" />
                                 <Condition Property="Role" Value="SubmenuHeader" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource SubmenuItemBackgroundHighlighted}" />
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource MahApps.Brushes.SubmenuItem.BackgroundHighlighted}" />
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsHighlighted" Value="true" />
                                 <Condition Property="Role" Value="SubmenuItem" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource SubmenuItemBackgroundHighlighted}" />
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource MahApps.Brushes.SubmenuItem.BackgroundHighlighted}" />
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsSubmenuOpen" Value="true" />
                                 <Condition Property="Role" Value="TopLevelHeader" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource SubmenuItemBackground}" />
-                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource MenuSeparatorBorderBrush}" />
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource MahApps.Brushes.SubmenuItem.Background}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.MenuSeparator.Border}" />
                             <Setter TargetName="Border" Property="BorderThickness" Value="1 1 1 0" />
                         </MultiTrigger>
                         <Trigger Property="IsSubmenuOpen" Value="true">
@@ -184,7 +184,7 @@
                             <Setter TargetName="Icon" Property="Visibility" Value="Collapsed" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Foreground" Value="{DynamicResource MenuDisabledForeground}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Menu.ForegroundDisabled}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/src/MahApps.Metro/Styles/VS/ScrollBar.xaml b/src/MahApps.Metro/Styles/VS/ScrollBar.xaml
index 09c392cbce..73896ab959 100644
--- a/src/MahApps.Metro/Styles/VS/ScrollBar.xaml
+++ b/src/MahApps.Metro/Styles/VS/ScrollBar.xaml
@@ -3,8 +3,8 @@
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
     <Style x:Key="ScrollBarLineButton" TargetType="{x:Type RepeatButton}">
-        <Setter Property="Background" Value="{DynamicResource BackgroundNormal}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrushNormal}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Background.Normal}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Normal}" />
         <Setter Property="Focusable" Value="false" />
         <Setter Property="SnapsToDevicePixels" Value="true" />
         <Setter Property="Template">
@@ -21,11 +21,11 @@
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
                             <Setter Property="Background" Value="{DynamicResource BackgroundHighlighted}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource BorderBrushHighlighted}" />
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Highlighted}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="true">
                             <Setter Property="Background" Value="{DynamicResource BackgroundSelected}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource BorderBrushSelected}" />
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Selected}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -45,14 +45,14 @@
         </Setter>
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="{DynamicResource ScrollBarPageButtonBackgroundHighlighted}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ScrollBar.PageButtonBackgroundHighlighted}" />
             </Trigger>
         </Style.Triggers>
     </Style>
 
     <Style x:Key="ScrollBarThumb" TargetType="{x:Type Thumb}">
-        <Setter Property="Background" Value="{DynamicResource BackgroundNormal}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrushNormal}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Background.Normal}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Normal}" />
         <Setter Property="Focusable" Value="false" />
         <Setter Property="IsTabStop" Value="false" />
         <Setter Property="SnapsToDevicePixels" Value="true" />
@@ -65,11 +65,11 @@
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
                             <Setter Property="Background" Value="{DynamicResource BackgroundHighlighted}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource BorderBrushHighlighted}" />
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Highlighted}" />
                         </Trigger>
                         <Trigger Property="IsDragging" Value="True">
                             <Setter Property="Background" Value="{DynamicResource BackgroundSelected}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource BorderBrushSelected}" />
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Selected}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/src/MahApps.Metro/Styles/VS/TabControl.xaml b/src/MahApps.Metro/Styles/VS/TabControl.xaml
index 381dda373e..e8ebee7ebe 100644
--- a/src/MahApps.Metro/Styles/VS/TabControl.xaml
+++ b/src/MahApps.Metro/Styles/VS/TabControl.xaml
@@ -115,7 +115,7 @@
                               VerticalAlignment="Center"
                               Data="M0,0 L1,1 M0,1 L1,0"
                               Stretch="Uniform"
-                              Stroke="{DynamicResource CloseButtonStroke}"
+                              Stroke="{DynamicResource MahApps.Brushes.CloseButton.Stroke}"
                               StrokeEndLineCap="Flat"
                               StrokeStartLineCap="Flat"
                               StrokeThickness="2" />
@@ -125,12 +125,12 @@
                             <Setter Property="Visibility" Value="Hidden" />
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource CloseButtonBackgroundHighlighted}" />
-                            <Setter TargetName="ButtonPath" Property="Stroke" Value="{DynamicResource CloseButtonStrokeHighlighted}" />
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.CloseButton.BackgroundHighlighted}" />
+                            <Setter TargetName="ButtonPath" Property="Stroke" Value="{DynamicResource MahApps.Brushes.CloseButton.StrokeHighlighted}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="true">
-                            <Setter Property="Background" Value="{DynamicResource CloseButtonBackgroundPressed}" />
-                            <Setter TargetName="ButtonPath" Property="Stroke" Value="{DynamicResource CloseButtonStroke}" />
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.CloseButton.BackgroundPressed}" />
+                            <Setter TargetName="ButtonPath" Property="Stroke" Value="{DynamicResource MahApps.Brushes.CloseButton.Stroke}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -142,7 +142,7 @@
     <Style x:Key="StandardTabItem"
            BasedOn="{StaticResource MetroTabItem}"
            TargetType="{x:Type TabItem}">
-        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrushNormal}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Normal}" />
         <Setter Property="Controls:TabControlHelper.CloseButtonEnabled" Value="True" />
         <Setter Property="Padding" Value="12 5 12 5" />
         <Setter Property="Template">
@@ -213,11 +213,11 @@
                         </Trigger>
                         <Trigger Property="IsSelected" Value="true">
                             <Setter Property="Background" Value="{DynamicResource BackgroundSelected}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource BorderBrushSelected}" />
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Selected}" />
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="True">
                             <Setter Property="Background" Value="{DynamicResource BackgroundHighlighted}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource BorderBrushHighlighted}" />
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Highlighted}" />
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
@@ -233,7 +233,7 @@
                                 <Condition Property="IsSelected" Value="True" />
                             </MultiTrigger.Conditions>
                             <Setter Property="Background" Value="{DynamicResource BackgroundSelected}" />
-                            <Setter Property="BorderBrush" Value="{DynamicResource BorderBrushSelected}" />
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Selected}" />
                         </MultiTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/src/MahApps.Metro/Styles/VS/TextBox.xaml b/src/MahApps.Metro/Styles/VS/TextBox.xaml
index 2e8d51bf7e..0e81651644 100644
--- a/src/MahApps.Metro/Styles/VS/TextBox.xaml
+++ b/src/MahApps.Metro/Styles/VS/TextBox.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <Style x:Key="StandardTextBox" TargetType="{x:Type TextBox}">
-        <Setter Property="Background" Value="{DynamicResource TextBoxBackground}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TextBox.Background}" />
         <Setter Property="CaretBrush" Value="{DynamicResource Foreground}" />
         <Setter Property="Foreground" Value="{DynamicResource Foreground}" />
         <Setter Property="Padding" Value="1" />
@@ -15,10 +15,10 @@
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="true">
-                            <Setter Property="Background" Value="{DynamicResource TextBoxBackgroundSelected}" />
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TextBox.BackgroundSelected}" />
                         </Trigger>
                         <Trigger Property="IsFocused" Value="true">
-                            <Setter Property="Background" Value="{DynamicResource TextBoxBackgroundSelected}" />
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TextBox.BackgroundSelected}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -37,7 +37,7 @@
                         <TextBlock Name="search"
                                    Margin="5 0 0 0"
                                    VerticalAlignment="Center"
-                                   Foreground="{DynamicResource SearchTextForeground}"
+                                   Foreground="{DynamicResource MahApps.Brushes.SearchTextBox.Foreground}"
                                    Text="Search ..."
                                    Visibility="Hidden" />
                         <ScrollViewer x:Name="PART_ContentHost" Margin="{TemplateBinding Padding}" />
@@ -50,11 +50,11 @@
                             <Setter TargetName="search" Property="Visibility" Value="Visible" />
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="true">
-                            <Setter Property="Background" Value="{DynamicResource TextBoxBackgroundSelected}" />
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TextBox.BackgroundSelected}" />
                             <Setter TargetName="search" Property="Foreground" Value="{DynamicResource Foreground}" />
                         </Trigger>
                         <Trigger Property="IsFocused" Value="true">
-                            <Setter Property="Background" Value="{DynamicResource TextBoxBackgroundSelected}" />
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TextBox.BackgroundSelected}" />
                             <Setter TargetName="search" Property="Visibility" Value="Hidden" />
                         </Trigger>
                     </ControlTemplate.Triggers>
diff --git a/src/MahApps.Metro/Styles/VS/Window.xaml b/src/MahApps.Metro/Styles/VS/Window.xaml
index d35f7d65bd..a33708e170 100644
--- a/src/MahApps.Metro/Styles/VS/Window.xaml
+++ b/src/MahApps.Metro/Styles/VS/Window.xaml
@@ -7,10 +7,10 @@
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="VSWindowStyleKey" TargetType="{x:Type Controls:MetroWindow}">
-        <Setter Property="GlowBrush" Value="{DynamicResource WindowGlowBrush}" />
-        <Setter Property="NonActiveWindowTitleBrush" Value="{DynamicResource AccentColorBrush}" />
+        <Setter Property="GlowBrush" Value="{DynamicResource MahApps.Brushes.Window.Glow}" />
+        <Setter Property="NonActiveWindowTitleBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="ShowTitleBar" Value="True" />
-        <Setter Property="TitleForeground" Value="{DynamicResource WindowTitleForeground}" />
+        <Setter Property="TitleForeground" Value="{DynamicResource MahApps.Brushes.WindowTitle.Foreground}" />
     </Style>
 
     <Style x:Key="VSWindowButtonStyle"
@@ -19,7 +19,7 @@
         <Style.Triggers>
             <Trigger Property="IsPressed" Value="True">
                 <Setter Property="Background" Value="{DynamicResource BackgroundSelected}" />
-                <Setter Property="Foreground" Value="{DynamicResource BlackColorBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.BlackColor}" />
             </Trigger>
         </Style.Triggers>
     </Style>
@@ -36,17 +36,17 @@
     <Style x:Key="VSWindowNotificationButtonStyle"
            BasedOn="{StaticResource MetroFlatButton}"
            TargetType="{x:Type Button}">
-        <Setter Property="Background" Value="{DynamicResource NotificationButtonBackgroundBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource NotificationButtonForegroundBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.NotificationButton.Background}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.NotificationButton.Foreground}" />
         <Setter Property="Margin" Value="0 0 12 0" />
         <Setter Property="Padding" Value="9 5 9 5" />
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="{DynamicResource NotificationButtonBackgroundOverBrush}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.NotificationButton.BackgroundOver}" />
             </Trigger>
             <Trigger Property="IsPressed" Value="True">
-                <Setter Property="Background" Value="{DynamicResource NotificationButtonBackgroundPressedBrush}" />
-                <Setter Property="Foreground" Value="{DynamicResource NotificationButtonForegroundBrush}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.NotificationButton.BackgroundPressed}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.NotificationButton.Foreground}" />
             </Trigger>
         </Style.Triggers>
     </Style>
@@ -54,9 +54,9 @@
     <Style x:Key="VSWindowQuickLaunchTextBoxStyle"
            BasedOn="{StaticResource MetroButtonTextBox}"
            TargetType="{x:Type TextBox}">
-        <Setter Property="BorderBrush" Value="{DynamicResource QuickLaunchTextBoxBorderBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.QuickLaunchTextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource QuickLaunchTextBoxFocusedBorderBrush}" />
+        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.QuickLaunchTextBox.FocusedBorder}" />
         <Setter Property="FontSize" Value="12" />
         <Setter Property="Margin" Value="0 2" />
         <Setter Property="MaxWidth" Value="300" />
@@ -65,7 +65,7 @@
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Style.Triggers>
             <Trigger Property="IsFocused" Value="True">
-                <Setter Property="Background" Value="{DynamicResource QuickLaunchTextBoxBorderBrush}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.QuickLaunchTextBox.Border}" />
             </Trigger>
         </Style.Triggers>
     </Style>
diff --git a/src/MahApps.Metro/Styles/ValidationErrorTemplate.xaml b/src/MahApps.Metro/Styles/ValidationErrorTemplate.xaml
index 1ef9789af6..0e51584955 100644
--- a/src/MahApps.Metro/Styles/ValidationErrorTemplate.xaml
+++ b/src/MahApps.Metro/Styles/ValidationErrorTemplate.xaml
@@ -18,7 +18,7 @@
                            DataContext="{Binding ElementName=placeholder}"
                            StrokeThickness="0" />
                 <Border x:Name="ValidationErrorElement"
-                        BorderBrush="{DynamicResource ControlsValidationBrush}"
+                        BorderBrush="{DynamicResource MahApps.Brushes.Controls.Validation}"
                         BorderThickness="1"
                         DataContext="{Binding ElementName=placeholder}">
 
@@ -31,10 +31,10 @@
                           Background="Transparent">
                         <Path Margin="1 3 0 0"
                               Data="M 1,0 L6,0 A 2,2 90 0 1 8,2 L8,7 z"
-                              Fill="{DynamicResource ValidationBrush5}" />
+                              Fill="{DynamicResource MahApps.Brushes.Validation5}" />
                         <Path Margin="1 3 0 0"
                               Data="M 0,0 L2,0 L 8,6 L8,8"
-                              Fill="{DynamicResource WhiteColorBrush}" />
+                              Fill="{DynamicResource MahApps.Brushes.WhiteColor}" />
                     </Grid>
                 </Border>
 
@@ -70,18 +70,18 @@
                             </Style>
                         </Grid.Resources>
                         <Border Margin="4 4 -4 -4"
-                                Background="{DynamicResource ValidationBrush1}"
+                                Background="{DynamicResource MahApps.Brushes.Validation1}"
                                 CornerRadius="5" />
                         <Border Margin="3 3 -3 -3"
-                                Background="{DynamicResource ValidationBrush2}"
+                                Background="{DynamicResource MahApps.Brushes.Validation2}"
                                 CornerRadius="4" />
                         <Border Margin="2 2 -2 -2"
-                                Background="{DynamicResource ValidationBrush3}"
+                                Background="{DynamicResource MahApps.Brushes.Validation3}"
                                 CornerRadius="3" />
                         <Border Margin="1 1 -1 -1"
-                                Background="{DynamicResource ValidationBrush4}"
+                                Background="{DynamicResource MahApps.Brushes.Validation4}"
                                 CornerRadius="2" />
-                        <Border Background="{DynamicResource ValidationBrush5}" CornerRadius="2">
+                        <Border Background="{DynamicResource MahApps.Brushes.Validation5}" CornerRadius="2">
                             <!--
                                 from Josh Smith
 
@@ -105,7 +105,7 @@
                                 <DataTemplate DataType="{x:Type ValidationError}">
                                     <TextBlock MaxWidth="250"
                                                Margin="8 4 8 4"
-                                               Foreground="{DynamicResource ValidationTextBrush}"
+                                               Foreground="{DynamicResource MahApps.Brushes.Text.Validation}"
                                                Text="{Binding ErrorContent}"
                                                TextWrapping="Wrap"
                                                UseLayoutRounding="False" />
diff --git a/src/MahApps.Metro/ThemeManager/ThemeManager.StyleKeys.cs b/src/MahApps.Metro/ThemeManager/ThemeManager.StyleKeys.cs
index d23f03bf3f..af5e6fb839 100644
--- a/src/MahApps.Metro/ThemeManager/ThemeManager.StyleKeys.cs
+++ b/src/MahApps.Metro/ThemeManager/ThemeManager.StyleKeys.cs
@@ -13,8 +13,8 @@ public static partial class ThemeManager
                                                                           {
                                                                               "MahApps.Colors.Highlight",
                                                                               "MahApps.Colors.AccentBase",
-                                                                              "HighlightBrush",
-                                                                              "AccentBaseColorBrush"
+                                                                              "MahApps.Brushes.Highlight",
+                                                                              "MahApps.Brushes.AccentBase"
                                                                           });
     }
 }
\ No newline at end of file
diff --git a/src/MahApps.Metro/Themes/Badged.xaml b/src/MahApps.Metro/Themes/Badged.xaml
index 183c20512a..3568633999 100644
--- a/src/MahApps.Metro/Themes/Badged.xaml
+++ b/src/MahApps.Metro/Themes/Badged.xaml
@@ -20,9 +20,9 @@
     </Storyboard>
 
     <Style TargetType="{x:Type controls:Badged}">
-        <Setter Property="BadgeBackground" Value="{DynamicResource AccentBaseColorBrush}" />
+        <Setter Property="BadgeBackground" Value="{DynamicResource MahApps.Brushes.AccentBase}" />
         <Setter Property="BadgeChangedStoryboard" Value="{StaticResource BadgeChangedStoryboard}" />
-        <Setter Property="BadgeForeground" Value="{DynamicResource IdealForegroundColorBrush}" />
+        <Setter Property="BadgeForeground" Value="{DynamicResource MahApps.Brushes.IdealForeground}" />
         <Setter Property="BadgePlacementMode" Value="TopRight" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="IsTabStop" Value="False" />
@@ -100,7 +100,7 @@
                             <Setter TargetName="PART_BadgeContainer" Property="VerticalAlignment" Value="Center" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="PART_BadgeContainer" Property="Background" Value="{DynamicResource ResourceKey=MahApps.Metro.Brushes.Badged.DisabledBackgroundBrush}" />
+                            <Setter TargetName="PART_BadgeContainer" Property="Background" Value="{DynamicResource ResourceKey=MahApps.Brushes.Badged.DisabledBackground}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/src/MahApps.Metro/Themes/DateTimePicker.xaml b/src/MahApps.Metro/Themes/DateTimePicker.xaml
index 8af71021a9..bb3e95c88e 100644
--- a/src/MahApps.Metro/Themes/DateTimePicker.xaml
+++ b/src/MahApps.Metro/Themes/DateTimePicker.xaml
@@ -24,7 +24,7 @@
             <Rectangle Width="2"
                        Height="10"
                        Margin="0 -49 0 0"
-                       Fill="{DynamicResource AccentColorBrush3}" />
+                       Fill="{DynamicResource MahApps.Brushes.Accent3}" />
         </StackPanel>
     </DataTemplate>
 
@@ -38,7 +38,7 @@
             <Rectangle Width="1"
                        Height="5"
                        Margin="0 -49.75 0 0"
-                       Fill="{DynamicResource AccentColorBrush4}" />
+                       Fill="{DynamicResource MahApps.Brushes.Accent4}" />
         </StackPanel>
     </DataTemplate>
 
@@ -109,17 +109,17 @@
     </x:Array>
 
     <Style x:Key="TimePartPickerBase" TargetType="{x:Type Controls:TimePickerBase}">
-        <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
-        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
-        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource TextBoxMouseOverBorderBrush}" />
+        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
+        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
         <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="22" />
         <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
         <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="HandVisibility" Value="HourMinute" />
         <Setter Property="MinHeight" Value="26" />
         <Setter Property="Padding" Value="2" />
@@ -151,14 +151,14 @@
                                                Controls:TextBoxHelper.Watermark="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.Watermark), Mode=OneWay}"
                                                Controls:TextBoxHelper.WatermarkAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                                Controls:TextBoxHelper.WatermarkTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
-                                               CaretBrush="{DynamicResource BlackBrush}"
+                                               CaretBrush="{DynamicResource MahApps.Brushes.Black}"
                                                ContextMenu="{TemplateBinding ContextMenu}"
                                                Focusable="{TemplateBinding Focusable}"
                                                FontFamily="{TemplateBinding FontFamily}"
                                                FontSize="{TemplateBinding FontSize}"
                                                Foreground="{TemplateBinding Foreground}"
                                                IsReadOnly="{Binding Path=IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
-                                               SelectionBrush="{DynamicResource HighlightBrush}">
+                                               SelectionBrush="{DynamicResource MahApps.Brushes.Highlight}">
                                 <i:Interaction.Behaviors>
                                     <Behaviors:DatePickerTextBoxBehavior />
                                 </i:Interaction.Behaviors>
@@ -220,8 +220,8 @@
                                     Grid.RowSpan="2"
                                     Grid.Column="0"
                                     Grid.ColumnSpan="2"
-                                    Background="{DynamicResource ControlsDisabledBrush}"
-                                    BorderBrush="{DynamicResource ControlsDisabledBrush}"
+                                    Background="{DynamicResource MahApps.Brushes.Controls.Disabled}"
+                                    BorderBrush="{DynamicResource MahApps.Brushes.Controls.Disabled}"
                                     BorderThickness="{TemplateBinding BorderThickness}"
                                     IsHitTestVisible="False"
                                     Opacity="0"
@@ -237,9 +237,9 @@
                                    PopupAnimation="Fade"
                                    StaysOpen="False">
                                 <Border x:Name="PART_PopupContainer"
-                                        BorderBrush="{DynamicResource ControlBorderBrush}"
+                                        BorderBrush="{DynamicResource MahApps.Brushes.Controls.Border}"
                                         BorderThickness="1">
-                                    <StackPanel x:Name="StackPanel" Background="{DynamicResource ControlBackgroundBrush}">
+                                    <StackPanel x:Name="StackPanel" Background="{DynamicResource MahApps.Brushes.Control.Background}">
                                         <Calendar x:Name="PART_Calendar"
                                                   Margin="2 0"
                                                   BorderBrush="Transparent"
@@ -258,7 +258,7 @@
                                                     Height="120"
                                                     Margin="0 5 5 0"
                                                     HorizontalAlignment="Center"
-                                                    BorderBrush="{DynamicResource AccentColorBrush}"
+                                                    BorderBrush="{DynamicResource MahApps.Brushes.Accent}"
                                                     BorderThickness="2"
                                                     CornerRadius="75">
                                                 <Canvas HorizontalAlignment="Center">
@@ -281,7 +281,7 @@
                                                                Width="2"
                                                                Height="51"
                                                                HorizontalAlignment="Center"
-                                                               Fill="{DynamicResource BlackColorBrush}"
+                                                               Fill="{DynamicResource MahApps.Brushes.BlackColor}"
                                                                RenderTransformOrigin=".5,1">
                                                         <Rectangle.RenderTransform>
                                                             <RotateTransform Angle="{Binding Path=SelectedDateTime, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ClockDegreeConverter}, ConverterParameter='m', Mode=OneWay}" />
@@ -293,7 +293,7 @@
                                                                Width="2"
                                                                Height="30"
                                                                HorizontalAlignment="Center"
-                                                               Fill="{DynamicResource BlackColorBrush}"
+                                                               Fill="{DynamicResource MahApps.Brushes.BlackColor}"
                                                                RenderTransformOrigin=".5,1">
                                                         <Rectangle.RenderTransform>
                                                             <RotateTransform Angle="{Binding Path=SelectedDateTime, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource HourDegreeConverter}, ConverterParameter='h', Mode=OneWay}" />
@@ -303,7 +303,7 @@
                                                              Canvas.Top="54"
                                                              Width="6"
                                                              Height="6"
-                                                             Fill="{DynamicResource BlackColorBrush}" />
+                                                             Fill="{DynamicResource MahApps.Brushes.BlackColor}" />
                                                     <Rectangle x:Name="PART_SecondHand"
                                                                Canvas.Left="0.75"
                                                                Canvas.Top="6"
@@ -311,7 +311,7 @@
                                                                Height="61"
                                                                Margin="0 5 0 0"
                                                                HorizontalAlignment="Center"
-                                                               Fill="{DynamicResource BlackColorBrush}"
+                                                               Fill="{DynamicResource MahApps.Brushes.BlackColor}"
                                                                Opacity=".25"
                                                                RenderTransformOrigin=".5,.75">
                                                         <Rectangle.RenderTransform>
@@ -376,7 +376,7 @@
                         </Trigger>
                         <Trigger SourceName="PART_TextBox" Property="IsFocused" Value="True">
                             <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
-                            <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                             <Setter TargetName="PART_FloatingMessage" Property="Opacity" Value="1" />
                         </Trigger>
                         <Trigger Property="IsKeyboardFocusWithin" Value="True">
@@ -390,12 +390,12 @@
                             <Setter TargetName="PART_ClockPartSelectorsHolder" Property="IsHitTestVisible" Value="False" />
                         </Trigger>
                         <Trigger SourceName="PART_Button" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="PART_Button" Property="Background" Value="{DynamicResource GrayBrush8}" />
-                            <Setter TargetName="PART_Button" Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_Button" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray8}" />
+                            <Setter TargetName="PART_Button" Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                         </Trigger>
                         <Trigger SourceName="PART_Button" Property="IsPressed" Value="True">
-                            <Setter TargetName="PART_Button" Property="Background" Value="{DynamicResource BlackBrush}" />
-                            <Setter TargetName="PART_Button" Property="Foreground" Value="{DynamicResource WhiteBrush}" />
+                            <Setter TargetName="PART_Button" Property="Background" Value="{DynamicResource MahApps.Brushes.Black}" />
+                            <Setter TargetName="PART_Button" Property="Foreground" Value="{DynamicResource MahApps.Brushes.White}" />
                         </Trigger>
                         <Trigger Property="IsClockVisible" Value="False">
                             <Setter TargetName="PART_Clock" Property="Visibility" Value="Collapsed" />
diff --git a/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml b/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml
index beee02df53..b8b2acb876 100644
--- a/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml
+++ b/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml
@@ -109,11 +109,11 @@
     </ControlTemplate>
 
     <Style x:Key="MahApps.Metro.Styles.MetroDialog" TargetType="{x:Type Dialogs:BaseMetroDialog}">
-        <Setter Property="Background" Value="{DynamicResource WhiteColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.WhiteColor}" />
         <Setter Property="DialogMessageFontSize" Value="{DynamicResource DialogMessageFontSize}" />
         <Setter Property="DialogTitleFontSize" Value="{DynamicResource DialogTitleFontSize}" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="Foreground" Value="{DynamicResource BlackBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="KeyboardNavigation.ControlTabNavigation" Value="Cycle" />
diff --git a/src/MahApps.Metro/Themes/DropDownButton.xaml b/src/MahApps.Metro/Themes/DropDownButton.xaml
index b7a9692819..9847748e7b 100644
--- a/src/MahApps.Metro/Themes/DropDownButton.xaml
+++ b/src/MahApps.Metro/Themes/DropDownButton.xaml
@@ -17,18 +17,18 @@
     </Style>
 
     <Style TargetType="{x:Type Controls:DropDownButton}">
-        <Setter Property="ArrowBrush" Value="{DynamicResource BlackColorBrush}" />
-        <Setter Property="ArrowMouseOverBrush" Value="{DynamicResource AccentColorBrush}" />
-        <Setter Property="ArrowPressedBrush" Value="{DynamicResource BlackColorBrush}" />
-        <Setter Property="Background" Value="{DynamicResource WhiteColorBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource BlackColorBrush}" />
+        <Setter Property="ArrowBrush" Value="{DynamicResource MahApps.Brushes.BlackColor}" />
+        <Setter Property="ArrowMouseOverBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="ArrowPressedBrush" Value="{DynamicResource MahApps.Brushes.BlackColor}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.WhiteColor}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.BlackColor}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="ButtonStyle" Value="{DynamicResource ButtonDropDownStyle}" />
         <Setter Property="FocusVisualStyle" Value="{StaticResource ButtonDropDownFocusVisual}" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
         <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
-        <Setter Property="Foreground" Value="{DynamicResource BlackColorBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.BlackColor}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="MenuStyle" Value="{DynamicResource MetroContextMenu}" />
         <Setter Property="MinHeight" Value="26" />
@@ -154,10 +154,10 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Style.Triggers>
             <Trigger Property="IsFocused" Value="True">
-                <Setter Property="BorderBrush" Value="{DynamicResource AccentColorBrush}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
             </Trigger>
             <Trigger Property="IsKeyboardFocusWithin" Value="True">
-                <Setter Property="BorderBrush" Value="{DynamicResource AccentColorBrush}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
                 <Setter Property="Opacity" Value=".55" />
diff --git a/src/MahApps.Metro/Themes/FlipView.xaml b/src/MahApps.Metro/Themes/FlipView.xaml
index e3185f0ec9..becc4398a0 100644
--- a/src/MahApps.Metro/Themes/FlipView.xaml
+++ b/src/MahApps.Metro/Themes/FlipView.xaml
@@ -36,7 +36,7 @@
                                   Width="16"
                                   Height="18"
                                   Data="F1 M 22.6563,23.75L 24.6563,25.75L 31.9063,32.75L 25.4063,32.75L 15.9063,23.75L 25.4063,14.75L 31.9063,14.75L 24.6563,21.75L 22.6563,23.75 Z "
-                                  Fill="{DynamicResource BlackBrush}"
+                                  Fill="{DynamicResource MahApps.Brushes.Black}"
                                   Stretch="Fill" />
                         </Button>
                         <Button x:Name="PART_ForwardButton"
@@ -51,7 +51,7 @@
                                   Width="16"
                                   Height="18"
                                   Data="F1 M 25.1563,23.75L 23.1563,21.75L 15.9063,14.75L 22.4063,14.75L 31.9063,23.75L 22.4063,32.75L 15.9063,32.75L 23.1563,25.75L 25.1563,23.75 Z "
-                                  Fill="{DynamicResource BlackBrush}"
+                                  Fill="{DynamicResource MahApps.Brushes.Black}"
                                   Stretch="Fill" />
                         </Button>
 
@@ -67,7 +67,7 @@
                                   Width="16"
                                   Height="18"
                                   Data="F1 M 23.9063,22.5L 21.9063,24.5L 14.9063,31.75L 14.9063,25.25L 23.9063,15.75L 32.9063,25.25L 32.9063,31.75L 25.9063,24.5L 23.9063,22.5 Z "
-                                  Fill="{DynamicResource BlackBrush}"
+                                  Fill="{DynamicResource MahApps.Brushes.Black}"
                                   Stretch="Fill" />
                         </Button>
                         <Button x:Name="PART_DownButton"
@@ -82,7 +82,7 @@
                                   Width="16"
                                   Height="18"
                                   Data="F1 M 23.9063,25L 25.9063,23L 32.9063,15.75L 32.9063,22.25L 23.9062,31.75L 14.9063,22.25L 14.9063,15.75L 21.9063,23L 23.9063,25 Z "
-                                  Fill="{DynamicResource BlackBrush}"
+                                  Fill="{DynamicResource MahApps.Brushes.Black}"
                                   Stretch="Fill" />
                         </Button>
 
@@ -92,12 +92,12 @@
                               Height="0"
                               VerticalAlignment="Bottom"
                               Panel.ZIndex="5"
-                              Background="{DynamicResource BlackBrush}"
+                              Background="{DynamicResource MahApps.Brushes.Black}"
                               Opacity="0.85">
                             <Label x:Name="PART_BannerLabel"
                                    FontFamily="{TemplateBinding FontFamily}"
                                    FontSize="{TemplateBinding FontSize}"
-                                   Foreground="{DynamicResource WhiteBrush}"
+                                   Foreground="{DynamicResource MahApps.Brushes.White}"
                                    IsTabStop="False" />
                         </Grid>
 
@@ -128,10 +128,10 @@
             </Trigger>
 
             <Trigger Property="NavigationButtonsPosition" Value="Inside">
-                <Setter TargetName="PART_BackButton" Property="Background" Value="{DynamicResource WhiteBrush}" />
-                <Setter TargetName="PART_DownButton" Property="Background" Value="{DynamicResource WhiteBrush}" />
-                <Setter TargetName="PART_ForwardButton" Property="Background" Value="{DynamicResource WhiteBrush}" />
-                <Setter TargetName="PART_UpButton" Property="Background" Value="{DynamicResource WhiteBrush}" />
+                <Setter TargetName="PART_BackButton" Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
+                <Setter TargetName="PART_DownButton" Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
+                <Setter TargetName="PART_ForwardButton" Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
+                <Setter TargetName="PART_UpButton" Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
             </Trigger>
 
             <MultiTrigger>
@@ -163,7 +163,7 @@
                 <Setter Property="Background" Value="Transparent" />
                 <Setter Property="BorderBrush" Value="Transparent" />
                 <Setter Property="Focusable" Value="True" />
-                <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
                 <Setter Property="Height" Value="30" />
                 <Setter Property="HorizontalContentAlignment" Value="Center" />
                 <Setter Property="IsTabStop" Value="True" />
diff --git a/src/MahApps.Metro/Themes/Flyout.xaml b/src/MahApps.Metro/Themes/Flyout.xaml
index 515b4d7691..a963f33bda 100644
--- a/src/MahApps.Metro/Themes/Flyout.xaml
+++ b/src/MahApps.Metro/Themes/Flyout.xaml
@@ -220,12 +220,12 @@
     </ControlTemplate>
 
     <Style TargetType="{x:Type Controls:Flyout}">
-        <Setter Property="Background" Value="{DynamicResource FlyoutBackgroundBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Flyout.Background}" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource FlyoutHeaderFontSize}" />
         <Setter Property="Controls:ControlsHelper.HeaderMargin" Value="10" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="Foreground" Value="{DynamicResource FlyoutForegroundBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Flyout.Foreground}" />
         <Setter Property="HeaderTemplate" Value="{StaticResource HeaderTemplate}" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="KeyboardNavigation.ControlTabNavigation" Value="Cycle" />
diff --git a/src/MahApps.Metro/Themes/HamburgerMenu.xaml b/src/MahApps.Metro/Themes/HamburgerMenu.xaml
index 49c1eadfa7..b6e0548d57 100644
--- a/src/MahApps.Metro/Themes/HamburgerMenu.xaml
+++ b/src/MahApps.Metro/Themes/HamburgerMenu.xaml
@@ -27,8 +27,8 @@
         <Setter Property="KeyboardNavigation.DirectionalNavigation" Value="Local" />
         <Setter Property="KeyboardNavigation.TabNavigation" Value="Local" />
         <Setter Property="OptionsItemContainerStyle" Value="{StaticResource HamburgerMenuItemStyle}" />
-        <Setter Property="PaneBackground" Value="{DynamicResource MahApps.Metro.HamburgerMenu.PaneBackgroundBrush}" />
-        <Setter Property="PaneForeground" Value="{DynamicResource MahApps.Metro.HamburgerMenu.PaneForegroundBrush}" />
+        <Setter Property="PaneBackground" Value="{DynamicResource MahApps.HamburgerMenu.PaneBackground}" />
+        <Setter Property="PaneForeground" Value="{DynamicResource MahApps.HamburgerMenu.PaneForeground}" />
         <Setter Property="PaneHeaderMargin" Value="0 0 0 8" />
         <Setter Property="PaneMargin" Value="0 0 0 8" />
         <Setter Property="SeparatorItemContainerStyle" Value="{StaticResource HamburgerMenuSeparatorItemStyle}" />
diff --git a/src/MahApps.Metro/Themes/HamburgerMenuTemplate.xaml b/src/MahApps.Metro/Themes/HamburgerMenuTemplate.xaml
index e6549b3839..9a1d40d518 100644
--- a/src/MahApps.Metro/Themes/HamburgerMenuTemplate.xaml
+++ b/src/MahApps.Metro/Themes/HamburgerMenuTemplate.xaml
@@ -22,7 +22,7 @@
     <Style x:Key="HamburgerButtonStyle"
            BasedOn="{StaticResource ChromelessButtonStyle}"
            TargetType="{x:Type Button}">
-        <Setter Property="Background" Value="{DynamicResource BlackBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="Margin" Value="0" />
         <Setter Property="Padding" Value="0" />
@@ -195,7 +195,7 @@
     <Style x:Key="HamburgerMenuItemStyle"
            BasedOn="{StaticResource HamburgerMenuItemBaseStyle}"
            TargetType="{x:Type ListBoxItem}">
-        <Setter Property="Controls:ItemHelper.SelectedBackgroundBrush" Value="{DynamicResource AccentColorBrush}" />
+        <Setter Property="Controls:ItemHelper.SelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="FocusVisualStyle" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:HamburgerMenu}}, Path=ItemFocusVisualStyle, Mode=OneWay, FallbackValue={x:Null}}" />
         <Setter Property="IsEnabled" Value="{Binding IsEnabled, Mode=OneWay, FallbackValue=true}" />
         <Setter Property="IsTabStop" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:HamburgerMenu}}, Path=IsTabStop, Mode=OneWay, FallbackValue=True}" />
diff --git a/src/MahApps.Metro/Themes/HotKeyBox.xaml b/src/MahApps.Metro/Themes/HotKeyBox.xaml
index 7add509ad9..a00bcfcada 100644
--- a/src/MahApps.Metro/Themes/HotKeyBox.xaml
+++ b/src/MahApps.Metro/Themes/HotKeyBox.xaml
@@ -4,17 +4,17 @@
                     xmlns:Converters="clr-namespace:MahApps.Metro.Converters">
 
     <Style TargetType="{x:Type Controls:HotKeyBox}">
-        <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Upper" />
-        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
-        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource TextBoxMouseOverBorderBrush}" />
+        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
+        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
         <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource ClearTextButtonFontSize}" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
         <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="MinHeight" Value="26" />
         <Setter Property="Padding" Value="0" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
diff --git a/src/MahApps.Metro/Themes/MetroProgressBar.xaml b/src/MahApps.Metro/Themes/MetroProgressBar.xaml
index 0f1b0a994b..c140d95248 100644
--- a/src/MahApps.Metro/Themes/MetroProgressBar.xaml
+++ b/src/MahApps.Metro/Themes/MetroProgressBar.xaml
@@ -9,7 +9,7 @@
         <Setter Property="Background" Value="#1FFFFFFF" />
         <Setter Property="BorderBrush" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Foreground" Value="{DynamicResource HighlightBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Highlight}" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="Maximum" Value="100" />
         <Setter Property="MinHeight" Value="{StaticResource ProgressBarMinHeight}" />
diff --git a/src/MahApps.Metro/Themes/MetroTabItem.xaml b/src/MahApps.Metro/Themes/MetroTabItem.xaml
index f6208c8792..0a7d285141 100644
--- a/src/MahApps.Metro/Themes/MetroTabItem.xaml
+++ b/src/MahApps.Metro/Themes/MetroTabItem.xaml
@@ -62,7 +62,7 @@
                                         Height="{Binding RelativeSource={RelativeSource Self}, Path=Width, Mode=OneWay}"
                                         Margin="{TemplateBinding CloseButtonMargin}"
                                         VerticalAlignment="Top"
-                                        Background="{DynamicResource GrayNormalBrush}"
+                                        Background="{DynamicResource MahApps.Brushes.GrayNormal}"
                                         IsTabStop="False"
                                         Style="{DynamicResource ChromelessButtonStyle}"
                                         Visibility="Collapsed">
@@ -81,7 +81,7 @@
                                                   Width="31.6666"
                                                   Height="31.6667"
                                                   Data="F1 M 26.9166,22.1667L 37.9999,33.25L 49.0832,22.1668L 53.8332,26.9168L 42.7499,38L 53.8332,49.0834L 49.0833,53.8334L 37.9999,42.75L 26.9166,53.8334L 22.1666,49.0833L 33.25,38L 22.1667,26.9167L 26.9166,22.1667 Z "
-                                                  Fill="{DynamicResource BlackBrush}"
+                                                  Fill="{DynamicResource MahApps.Brushes.Black}"
                                                   Stretch="Fill" />
                                         </Canvas>
                                     </Button.Resources>
@@ -168,11 +168,11 @@
                         </MultiTrigger>
 
                         <Trigger Property="IsSelected" Value="true">
-                            <Setter TargetName="ContentSite" Property="TextElement.Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="ContentSite" Property="TextElement.Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                             <Setter TargetName="Underline" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TabControlHelper.UnderlineSelectedBrush), Mode=OneWay}" />
                         </Trigger>
                         <Trigger Property="IsSelected" Value="false">
-                            <Setter TargetName="ContentSite" Property="TextElement.Foreground" Value="{DynamicResource GrayNormalBrush}" />
+                            <Setter TargetName="ContentSite" Property="TextElement.Foreground" Value="{DynamicResource MahApps.Brushes.GrayNormal}" />
                         </Trigger>
 
                         <MultiDataTrigger>
@@ -191,7 +191,7 @@
                         </MultiDataTrigger>
 
                         <Trigger SourceName="Border" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="ContentSite" Property="TextElement.Foreground" Value="{DynamicResource GrayHoverBrush}" />
+                            <Setter TargetName="ContentSite" Property="TextElement.Foreground" Value="{DynamicResource MahApps.Brushes.GrayHover}" />
                             <Setter TargetName="Underline" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TabControlHelper.UnderlineMouseOverBrush), Mode=OneWay}" />
                         </Trigger>
                         <MultiTrigger>
@@ -199,10 +199,10 @@
                                 <Condition SourceName="Border" Property="IsMouseOver" Value="True" />
                                 <Condition SourceName="PART_CloseButton" Property="IsEnabled" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="PART_CloseButton" Property="Background" Value="{DynamicResource GrayHoverBrush}" />
+                            <Setter TargetName="PART_CloseButton" Property="Background" Value="{DynamicResource MahApps.Brushes.GrayHover}" />
                         </MultiTrigger>
                         <Trigger SourceName="PART_CloseButton" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="PART_CloseButton" Property="Background" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_CloseButton" Property="Background" Value="{DynamicResource MahApps.Brushes.Accent}" />
                         </Trigger>
 
                         <MultiDataTrigger>
@@ -227,7 +227,7 @@
                                 <Condition SourceName="ContentSite" Property="IsMouseOver" Value="True" />
                                 <Condition Property="IsSelected" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="ContentSite" Property="TextElement.Foreground" Value="{DynamicResource HighlightBrush}" />
+                            <Setter TargetName="ContentSite" Property="TextElement.Foreground" Value="{DynamicResource MahApps.Brushes.Highlight}" />
                             <Setter TargetName="Underline" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TabControlHelper.UnderlineMouseOverSelectedBrush), Mode=OneWay}" />
                         </MultiTrigger>
 
@@ -249,7 +249,7 @@
                         </MultiDataTrigger>
 
                         <Trigger SourceName="Border" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="ContentSite" Property="TextElement.Foreground" Value="{DynamicResource GrayHoverBrush}" />
+                            <Setter TargetName="ContentSite" Property="TextElement.Foreground" Value="{DynamicResource MahApps.Brushes.GrayHover}" />
                             <Setter TargetName="Underline" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.UnderlineMouseOverBrush), Mode=OneWay}" />
                         </Trigger>
 
@@ -275,7 +275,7 @@
                                 <Condition SourceName="Border" Property="IsMouseOver" Value="True" />
                                 <Condition Property="IsSelected" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="ContentSite" Property="TextElement.Foreground" Value="{DynamicResource HighlightBrush}" />
+                            <Setter TargetName="ContentSite" Property="TextElement.Foreground" Value="{DynamicResource MahApps.Brushes.Highlight}" />
                             <Setter TargetName="Underline" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.UnderlineMouseOverSelectedBrush), Mode=OneWay}" />
                         </MultiTrigger>
 
diff --git a/src/MahApps.Metro/Themes/MetroWindow.xaml b/src/MahApps.Metro/Themes/MetroWindow.xaml
index 66ac7bce55..335dca9116 100644
--- a/src/MahApps.Metro/Themes/MetroWindow.xaml
+++ b/src/MahApps.Metro/Themes/MetroWindow.xaml
@@ -556,25 +556,25 @@
     </Storyboard>
 
     <Style TargetType="{x:Type mah:MetroWindow}">
-        <Setter Property="Background" Value="{DynamicResource WhiteBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource AccentColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="FlyoutOverlayBrush">
             <Setter.Value>
                 <SolidColorBrush Opacity="0.5" Color="{DynamicResource MahApps.Colors.Black}" />
             </Setter.Value>
         </Setter>
-        <Setter Property="Foreground" Value="{DynamicResource BlackBrush}" />
-        <Setter Property="NonActiveBorderBrush" Value="{DynamicResource NonActiveBorderColorBrush}" />
-        <Setter Property="NonActiveGlowBrush" Value="{DynamicResource BlackColorBrush}" />
-        <Setter Property="NonActiveWindowTitleBrush" Value="{DynamicResource NonActiveWindowTitleColorBrush}" />
-        <Setter Property="OverlayBrush" Value="{DynamicResource BlackColorBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
+        <Setter Property="NonActiveBorderBrush" Value="{DynamicResource MahApps.Brushes.Border.NonActive}" />
+        <Setter Property="NonActiveGlowBrush" Value="{DynamicResource MahApps.Brushes.BlackColor}" />
+        <Setter Property="NonActiveWindowTitleBrush" Value="{DynamicResource MahApps.Brushes.WindowTitle.NonActive}" />
+        <Setter Property="OverlayBrush" Value="{DynamicResource MahApps.Brushes.BlackColor}" />
         <Setter Property="OverlayFadeIn" Value="{StaticResource OverlayFastSemiFadeIn}" />
         <Setter Property="OverlayFadeOut" Value="{StaticResource OverlayFastSemiFadeOut}" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template" Value="{StaticResource WindowTemplateKey}" />
         <Setter Property="TextElement.FontSize" Value="{DynamicResource ContentFontSize}" />
-        <Setter Property="TitleForeground" Value="{DynamicResource IdealForegroundColorBrush}" />
+        <Setter Property="TitleForeground" Value="{DynamicResource MahApps.Brushes.IdealForeground}" />
         <Setter Property="TitleTemplate">
             <Setter.Value>
                 <DataTemplate>
@@ -587,7 +587,7 @@
                 </DataTemplate>
             </Setter.Value>
         </Setter>
-        <Setter Property="WindowTitleBrush" Value="{DynamicResource WindowTitleColorBrush}" />
+        <Setter Property="WindowTitleBrush" Value="{DynamicResource MahApps.Brushes.WindowTitle}" />
         <Style.Triggers>
             <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Icon, Mode=OneWay, Converter={x:Static converters:IsNullConverter.Instance}}" Value="False">
                 <Setter Property="IconTemplate">
diff --git a/src/MahApps.Metro/Themes/NumericUpDown.xaml b/src/MahApps.Metro/Themes/NumericUpDown.xaml
index 2b2d660c04..fd7e8ce1dd 100644
--- a/src/MahApps.Metro/Themes/NumericUpDown.xaml
+++ b/src/MahApps.Metro/Themes/NumericUpDown.xaml
@@ -10,19 +10,19 @@
     <Converters:ThicknessBindingConverter x:Key="ThicknessBindingConverter" />
 
     <Style TargetType="{x:Type Controls:NumericUpDown}">
-        <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
-        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource TextBoxFocusBorderBrush}" />
-        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource TextBoxMouseOverBorderBrush}" />
+        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
+        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
         <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource ClearTextButtonFontSize}" />
         <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="22" />
         <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
         <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="HorizontalContentAlignment" Value="Right" />
         <Setter Property="MinHeight" Value="26" />
         <Setter Property="MinWidth" Value="62" />
@@ -96,7 +96,7 @@
                                       Width="14"
                                       Height="14"
                                       Data="F1 M 35,19L 41,19L 41,35L 57,35L 57,41L 41,41L 41,57L 35,57L 35,41L 19,41L 19,35L 35,35L 35,19 Z "
-                                      Fill="{DynamicResource GrayBrush1}"
+                                      Fill="{DynamicResource MahApps.Brushes.Gray1}"
                                       Stretch="Fill" />
                             </RepeatButton>
                             <RepeatButton x:Name="PART_NumericDown"
@@ -113,13 +113,13 @@
                                       Width="14"
                                       Height="3"
                                       Data="F1 M 19,38L 57,38L 57,44L 19,44L 19,38 Z "
-                                      Fill="{DynamicResource GrayBrush1}"
+                                      Fill="{DynamicResource MahApps.Brushes.Gray1}"
                                       Stretch="Fill" />
                             </RepeatButton>
                         </Grid>
                         <Border x:Name="DisabledVisualElement"
-                                Background="{DynamicResource ControlsDisabledBrush}"
-                                BorderBrush="{DynamicResource ControlsDisabledBrush}"
+                                Background="{DynamicResource MahApps.Brushes.Controls.Disabled}"
+                                BorderBrush="{DynamicResource MahApps.Brushes.Controls.Disabled}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
                                 IsHitTestVisible="False"
@@ -226,20 +226,20 @@
                             <Setter TargetName="PART_TextBox" Property="IsReadOnly" Value="True" />
                         </MultiTrigger>
                         <Trigger SourceName="PART_NumericUp" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="PART_NumericUp" Property="Background" Value="{DynamicResource GrayBrush8}" />
-                            <Setter TargetName="PolygonUp" Property="Fill" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_NumericUp" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray8}" />
+                            <Setter TargetName="PolygonUp" Property="Fill" Value="{DynamicResource MahApps.Brushes.Accent}" />
                         </Trigger>
                         <Trigger SourceName="PART_NumericUp" Property="IsPressed" Value="True">
-                            <Setter TargetName="PART_NumericUp" Property="Background" Value="{DynamicResource BlackBrush}" />
-                            <Setter TargetName="PolygonUp" Property="Fill" Value="{DynamicResource WhiteBrush}" />
+                            <Setter TargetName="PART_NumericUp" Property="Background" Value="{DynamicResource MahApps.Brushes.Black}" />
+                            <Setter TargetName="PolygonUp" Property="Fill" Value="{DynamicResource MahApps.Brushes.White}" />
                         </Trigger>
                         <Trigger SourceName="PART_NumericDown" Property="IsMouseOver" Value="True">
-                            <Setter TargetName="PART_NumericDown" Property="Background" Value="{DynamicResource GrayBrush8}" />
-                            <Setter TargetName="PolygonDown" Property="Fill" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter TargetName="PART_NumericDown" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray8}" />
+                            <Setter TargetName="PolygonDown" Property="Fill" Value="{DynamicResource MahApps.Brushes.Accent}" />
                         </Trigger>
                         <Trigger SourceName="PART_NumericDown" Property="IsPressed" Value="True">
-                            <Setter TargetName="PART_NumericDown" Property="Background" Value="{DynamicResource BlackBrush}" />
-                            <Setter TargetName="PolygonDown" Property="Fill" Value="{DynamicResource WhiteBrush}" />
+                            <Setter TargetName="PART_NumericDown" Property="Background" Value="{DynamicResource MahApps.Brushes.Black}" />
+                            <Setter TargetName="PolygonDown" Property="Fill" Value="{DynamicResource MahApps.Brushes.White}" />
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="true">
                             <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.MouseOverBorderBrush)}" />
diff --git a/src/MahApps.Metro/Themes/Pivot.xaml b/src/MahApps.Metro/Themes/Pivot.xaml
index 9b3a9968bb..f21bcac206 100644
--- a/src/MahApps.Metro/Themes/Pivot.xaml
+++ b/src/MahApps.Metro/Themes/Pivot.xaml
@@ -9,8 +9,8 @@
     </DataTemplate>
 
     <Style x:Key="PivotListViewItem" TargetType="{x:Type ListViewItem}">
-        <Setter Property="Border.BorderBrush" Value="{DynamicResource GrayBrush1}" />
-        <Setter Property="Foreground" Value="{DynamicResource BlackBrush}" />
+        <Setter Property="Border.BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray1}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="Margin" Value="0" />
         <Setter Property="MinHeight" Value="25" />
diff --git a/src/MahApps.Metro/Themes/ProgressRing.xaml b/src/MahApps.Metro/Themes/ProgressRing.xaml
index acd04094fd..48700975e6 100644
--- a/src/MahApps.Metro/Themes/ProgressRing.xaml
+++ b/src/MahApps.Metro/Themes/ProgressRing.xaml
@@ -3,7 +3,7 @@
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
     <Style TargetType="Controls:ProgressRing">
-        <Setter Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="Height" Value="60" />
         <Setter Property="HorizontalAlignment" Value="Center" />
         <Setter Property="IsTabStop" Value="False" />
diff --git a/src/MahApps.Metro/Themes/RangeSlider.xaml b/src/MahApps.Metro/Themes/RangeSlider.xaml
index 4a1fda46c4..860392aafd 100644
--- a/src/MahApps.Metro/Themes/RangeSlider.xaml
+++ b/src/MahApps.Metro/Themes/RangeSlider.xaml
@@ -274,19 +274,19 @@
 
     <Style x:Key="MahApps.Metro.Styles.RangeSlider" TargetType="{x:Type Controls:RangeSlider}">
         <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Controls:SliderHelper.ThumbFillBrush" Value="{DynamicResource GrayBrush2}" />
-        <Setter Property="Controls:SliderHelper.ThumbFillDisabledBrush" Value="{DynamicResource GrayBrush6}" />
-        <Setter Property="Controls:SliderHelper.ThumbFillHoverBrush" Value="{DynamicResource GrayBrush5}" />
-        <Setter Property="Controls:SliderHelper.ThumbFillPressedBrush" Value="{DynamicResource GrayBrush2}" />
-        <Setter Property="Controls:SliderHelper.TrackFillBrush" Value="{DynamicResource GrayBrush3}" />
-        <Setter Property="Controls:SliderHelper.TrackFillDisabledBrush" Value="{DynamicResource GrayBrush6}" />
-        <Setter Property="Controls:SliderHelper.TrackFillHoverBrush" Value="{DynamicResource GrayBrush3}" />
-        <Setter Property="Controls:SliderHelper.TrackFillPressedBrush" Value="{DynamicResource GrayBrush3}" />
-        <Setter Property="Controls:SliderHelper.TrackValueFillBrush" Value="{DynamicResource AccentColorBrush}" />
-        <Setter Property="Controls:SliderHelper.TrackValueFillDisabledBrush" Value="{DynamicResource GrayBrush6}" />
-        <Setter Property="Controls:SliderHelper.TrackValueFillHoverBrush" Value="{DynamicResource AccentColorBrush}" />
-        <Setter Property="Controls:SliderHelper.TrackValueFillPressedBrush" Value="{DynamicResource AccentColorBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource GrayBrush1}" />
+        <Setter Property="Controls:SliderHelper.ThumbFillBrush" Value="{DynamicResource MahApps.Brushes.Gray2}" />
+        <Setter Property="Controls:SliderHelper.ThumbFillDisabledBrush" Value="{DynamicResource MahApps.Brushes.Gray6}" />
+        <Setter Property="Controls:SliderHelper.ThumbFillHoverBrush" Value="{DynamicResource MahApps.Brushes.Gray5}" />
+        <Setter Property="Controls:SliderHelper.ThumbFillPressedBrush" Value="{DynamicResource MahApps.Brushes.Gray2}" />
+        <Setter Property="Controls:SliderHelper.TrackFillBrush" Value="{DynamicResource MahApps.Brushes.Gray3}" />
+        <Setter Property="Controls:SliderHelper.TrackFillDisabledBrush" Value="{DynamicResource MahApps.Brushes.Gray6}" />
+        <Setter Property="Controls:SliderHelper.TrackFillHoverBrush" Value="{DynamicResource MahApps.Brushes.Gray3}" />
+        <Setter Property="Controls:SliderHelper.TrackFillPressedBrush" Value="{DynamicResource MahApps.Brushes.Gray3}" />
+        <Setter Property="Controls:SliderHelper.TrackValueFillBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="Controls:SliderHelper.TrackValueFillDisabledBrush" Value="{DynamicResource MahApps.Brushes.Gray6}" />
+        <Setter Property="Controls:SliderHelper.TrackValueFillHoverBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="Controls:SliderHelper.TrackValueFillPressedBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Gray1}" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="Template" Value="{StaticResource MahApps.Metro.Styles.RangeSlider.HorizontalTemplate}" />
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
@@ -601,19 +601,19 @@
 
     <Style x:Key="MahApps.Metro.Styles.RangeSlider.Win10" TargetType="{x:Type Controls:RangeSlider}">
         <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Controls:SliderHelper.ThumbFillBrush" Value="{DynamicResource AccentBaseColorBrush}" />
-        <Setter Property="Controls:SliderHelper.ThumbFillDisabledBrush" Value="{DynamicResource GrayBrush6}" />
-        <Setter Property="Controls:SliderHelper.ThumbFillHoverBrush" Value="{DynamicResource GrayBrush1}" />
-        <Setter Property="Controls:SliderHelper.ThumbFillPressedBrush" Value="{DynamicResource GrayBrush6}" />
-        <Setter Property="Controls:SliderHelper.TrackFillBrush" Value="{DynamicResource GrayBrush3}" />
-        <Setter Property="Controls:SliderHelper.TrackFillDisabledBrush" Value="{DynamicResource GrayBrush6}" />
-        <Setter Property="Controls:SliderHelper.TrackFillHoverBrush" Value="{DynamicResource GrayBrush2}" />
-        <Setter Property="Controls:SliderHelper.TrackFillPressedBrush" Value="{DynamicResource GrayBrush3}" />
-        <Setter Property="Controls:SliderHelper.TrackValueFillBrush" Value="{DynamicResource AccentBaseColorBrush}" />
-        <Setter Property="Controls:SliderHelper.TrackValueFillDisabledBrush" Value="{DynamicResource GrayBrush6}" />
-        <Setter Property="Controls:SliderHelper.TrackValueFillHoverBrush" Value="{DynamicResource AccentBaseColorBrush}" />
-        <Setter Property="Controls:SliderHelper.TrackValueFillPressedBrush" Value="{DynamicResource AccentBaseColorBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource GrayBrush2}" />
+        <Setter Property="Controls:SliderHelper.ThumbFillBrush" Value="{DynamicResource MahApps.Brushes.AccentBase}" />
+        <Setter Property="Controls:SliderHelper.ThumbFillDisabledBrush" Value="{DynamicResource MahApps.Brushes.Gray6}" />
+        <Setter Property="Controls:SliderHelper.ThumbFillHoverBrush" Value="{DynamicResource MahApps.Brushes.Gray1}" />
+        <Setter Property="Controls:SliderHelper.ThumbFillPressedBrush" Value="{DynamicResource MahApps.Brushes.Gray6}" />
+        <Setter Property="Controls:SliderHelper.TrackFillBrush" Value="{DynamicResource MahApps.Brushes.Gray3}" />
+        <Setter Property="Controls:SliderHelper.TrackFillDisabledBrush" Value="{DynamicResource MahApps.Brushes.Gray6}" />
+        <Setter Property="Controls:SliderHelper.TrackFillHoverBrush" Value="{DynamicResource MahApps.Brushes.Gray2}" />
+        <Setter Property="Controls:SliderHelper.TrackFillPressedBrush" Value="{DynamicResource MahApps.Brushes.Gray3}" />
+        <Setter Property="Controls:SliderHelper.TrackValueFillBrush" Value="{DynamicResource MahApps.Brushes.AccentBase}" />
+        <Setter Property="Controls:SliderHelper.TrackValueFillDisabledBrush" Value="{DynamicResource MahApps.Brushes.Gray6}" />
+        <Setter Property="Controls:SliderHelper.TrackValueFillHoverBrush" Value="{DynamicResource MahApps.Brushes.AccentBase}" />
+        <Setter Property="Controls:SliderHelper.TrackValueFillPressedBrush" Value="{DynamicResource MahApps.Brushes.AccentBase}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Gray2}" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="IsMoveToPointEnabled" Value="True" />
         <Setter Property="Template" Value="{StaticResource MahApps.Metro.Styles.RangeSlider.HorizontalTemplate.Win10}" />
diff --git a/src/MahApps.Metro/Themes/SplitButton.xaml b/src/MahApps.Metro/Themes/SplitButton.xaml
index a785699a2f..36c13d98a9 100644
--- a/src/MahApps.Metro/Themes/SplitButton.xaml
+++ b/src/MahApps.Metro/Themes/SplitButton.xaml
@@ -273,11 +273,11 @@
     </Style>
 
     <Style TargetType="{x:Type Controls:SplitButton}">
-        <Setter Property="ArrowBrush" Value="{DynamicResource BlackColorBrush}" />
-        <Setter Property="ArrowMouseOverBrush" Value="{DynamicResource AccentColorBrush}" />
-        <Setter Property="ArrowPressedBrush" Value="{DynamicResource BlackColorBrush}" />
-        <Setter Property="Background" Value="{DynamicResource WhiteColorBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource BlackColorBrush}" />
+        <Setter Property="ArrowBrush" Value="{DynamicResource MahApps.Brushes.BlackColor}" />
+        <Setter Property="ArrowMouseOverBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="ArrowPressedBrush" Value="{DynamicResource MahApps.Brushes.BlackColor}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.WhiteColor}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.BlackColor}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="ButtonArrowStyle" Value="{DynamicResource ButtonSplitArrowStyle}" />
         <Setter Property="ButtonStyle" Value="{DynamicResource ButtonSplitStyle}" />
@@ -285,7 +285,7 @@
         <Setter Property="Focusable" Value="False" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
         <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
-        <Setter Property="Foreground" Value="{DynamicResource BlackColorBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.BlackColor}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="ListBoxStyle" Value="{DynamicResource VirtualisedMetroListBox}" />
         <Setter Property="MinHeight" Value="26" />
@@ -298,10 +298,10 @@
                 <Setter Property="Template" Value="{StaticResource SplitButtonVertical}" />
             </Trigger>
             <Trigger Property="IsFocused" Value="True">
-                <Setter Property="BorderBrush" Value="{DynamicResource AccentColorBrush}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
             </Trigger>
             <Trigger Property="IsKeyboardFocusWithin" Value="True">
-                <Setter Property="BorderBrush" Value="{DynamicResource AccentColorBrush}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
                 <Setter Property="Opacity" Value=".55" />
diff --git a/src/MahApps.Metro/Themes/SplitView.xaml b/src/MahApps.Metro/Themes/SplitView.xaml
index 2468d2a477..17cedbeb12 100644
--- a/src/MahApps.Metro/Themes/SplitView.xaml
+++ b/src/MahApps.Metro/Themes/SplitView.xaml
@@ -7,7 +7,7 @@
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="OpenPaneLength" Value="320" />
         <Setter Property="PaneBackground" Value="{DynamicResource {x:Static SystemColors.ControlLightBrushKey}}" />
-        <Setter Property="PaneForeground" Value="{DynamicResource TextBrush}" />
+        <Setter Property="PaneForeground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type local:SplitView}">
diff --git a/src/MahApps.Metro/Themes/Tile.xaml b/src/MahApps.Metro/Themes/Tile.xaml
index cacca0935b..b4798bbd77 100644
--- a/src/MahApps.Metro/Themes/Tile.xaml
+++ b/src/MahApps.Metro/Themes/Tile.xaml
@@ -4,10 +4,10 @@
                     xmlns:converters="clr-namespace:MahApps.Metro.Converters">
 
     <Style TargetType="Controls:Tile">
-        <Setter Property="Background" Value="{DynamicResource AccentColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{x:Null}" />
         <Setter Property="CountFontSize" Value="28" />
-        <Setter Property="Foreground" Value="{DynamicResource IdealForegroundColorBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.IdealForeground}" />
         <Setter Property="Height" Value="140" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="Margin" Value="3" />
diff --git a/src/MahApps.Metro/Themes/ToggleSwitch.xaml b/src/MahApps.Metro/Themes/ToggleSwitch.xaml
index 6b5b753a72..8d43cca3d2 100644
--- a/src/MahApps.Metro/Themes/ToggleSwitch.xaml
+++ b/src/MahApps.Metro/Themes/ToggleSwitch.xaml
@@ -3,12 +3,12 @@
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
     <Style x:Key="MahApps.Metro.Styles.ToggleSwitchButton" TargetType="{x:Type Controls:ToggleSwitchButton}">
-        <Setter Property="BorderBrush" Value="{DynamicResource GrayBrush4}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray4}" />
         <Setter Property="BorderThickness" Value="2" />
         <Setter Property="Height" Value="35" />
         <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="OffSwitchBrush" Value="{DynamicResource GrayBrush4}" />
-        <Setter Property="OnSwitchBrush" Value="{DynamicResource AccentColorBrush}" />
+        <Setter Property="OffSwitchBrush" Value="{DynamicResource MahApps.Brushes.Gray4}" />
+        <Setter Property="OnSwitchBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="Padding" Value="2" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
@@ -27,7 +27,7 @@
                                         </Rectangle.RenderTransform>
                                     </Rectangle>
                                     <Rectangle x:Name="PART_BackgroundOverlay"
-                                               Fill="{DynamicResource WhiteBrush}"
+                                               Fill="{DynamicResource MahApps.Brushes.White}"
                                                Opacity="0" />
                                 </Grid>
                             </Border>
@@ -82,8 +82,8 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-        <Setter Property="ThumbIndicatorBrush" Value="{DynamicResource BlackBrush}" />
-        <Setter Property="ThumbIndicatorDisabledBrush" Value="{DynamicResource GrayBrush4}" />
+        <Setter Property="ThumbIndicatorBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
+        <Setter Property="ThumbIndicatorDisabledBrush" Value="{DynamicResource MahApps.Brushes.Gray4}" />
         <Setter Property="ThumbIndicatorWidth" Value="13" />
         <Setter Property="Width" Value="70" />
     </Style>
@@ -94,12 +94,12 @@
         <Setter Property="Controls:ControlsHelper.HeaderMargin" Value="0 0 0 5" />
         <Setter Property="FontFamily" Value="{DynamicResource ToggleSwitchFontFamily}" />
         <Setter Property="FontSize" Value="{DynamicResource ToggleSwitchFontSize}" />
-        <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="HeaderFontFamily" Value="{DynamicResource ToggleSwitchHeaderFontFamily}" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="IsTabStop" Value="True" />
-        <Setter Property="OffSwitchBrush" Value="{DynamicResource GrayBrush4}" />
-        <Setter Property="OnSwitchBrush" Value="{DynamicResource AccentColorBrush}" />
+        <Setter Property="OffSwitchBrush" Value="{DynamicResource MahApps.Brushes.Gray4}" />
+        <Setter Property="OnSwitchBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="Padding" Value="0" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
@@ -219,8 +219,8 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-        <Setter Property="ThumbIndicatorBrush" Value="{DynamicResource BlackBrush}" />
-        <Setter Property="ThumbIndicatorDisabledBrush" Value="{DynamicResource GrayBrush4}" />
+        <Setter Property="ThumbIndicatorBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
+        <Setter Property="ThumbIndicatorDisabledBrush" Value="{DynamicResource MahApps.Brushes.Gray4}" />
         <Setter Property="ThumbIndicatorWidth" Value="13" />
         <Setter Property="ToggleSwitchButtonStyle" Value="{DynamicResource MahApps.Metro.Styles.ToggleSwitchButton}" />
         <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource ValidationErrorTemplate}" />
diff --git a/src/MahApps.Metro/Themes/Underline.xaml b/src/MahApps.Metro/Themes/Underline.xaml
index f6c3a8b915..6049549ba5 100644
--- a/src/MahApps.Metro/Themes/Underline.xaml
+++ b/src/MahApps.Metro/Themes/Underline.xaml
@@ -3,7 +3,7 @@
                     xmlns:controls="clr-namespace:MahApps.Metro.Controls">
 
     <Style TargetType="{x:Type controls:Underline}">
-        <Setter Property="BorderBrush" Value="{DynamicResource GrayNormalBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.GrayNormal}" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="IsTabStop" Value="False" />
diff --git a/src/MahApps.Metro/Themes/WindowButtonCommands.xaml b/src/MahApps.Metro/Themes/WindowButtonCommands.xaml
index 736dd2fe6e..3a9f88f99c 100644
--- a/src/MahApps.Metro/Themes/WindowButtonCommands.xaml
+++ b/src/MahApps.Metro/Themes/WindowButtonCommands.xaml
@@ -223,12 +223,12 @@
     </ControlTemplate>
 
     <Style x:Key="MahApps.Metro.Styles.WindowButtonCommands" TargetType="{x:Type Controls:WindowButtonCommands}">
-        <Setter Property="Background" Value="{DynamicResource TransparentWhiteBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TransparentWhite}" />
         <Setter Property="DarkCloseButtonStyle" Value="{DynamicResource DarkMetroWindowButtonStyle}" />
         <Setter Property="DarkMaxButtonStyle" Value="{DynamicResource DarkMetroWindowButtonStyle}" />
         <Setter Property="DarkMinButtonStyle" Value="{DynamicResource DarkMetroWindowButtonStyle}" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="Foreground" Value="{DynamicResource BlackBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="LightCloseButtonStyle" Value="{DynamicResource LightMetroWindowButtonStyle}" />
         <Setter Property="LightMaxButtonStyle" Value="{DynamicResource LightMetroWindowButtonStyle}" />
@@ -237,7 +237,7 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Style.Triggers>
             <DataTrigger Binding="{Binding ParentWindow.ShowTitleBar, RelativeSource={RelativeSource Self}}" Value="True">
-                <Setter Property="Foreground" Value="{DynamicResource IdealForegroundColorBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.IdealForeground}" />
             </DataTrigger>
         </Style.Triggers>
     </Style>
diff --git a/src/MahApps.Metro/Themes/WindowCommands.xaml b/src/MahApps.Metro/Themes/WindowCommands.xaml
index f133a2a22f..81b3d3fd06 100644
--- a/src/MahApps.Metro/Themes/WindowCommands.xaml
+++ b/src/MahApps.Metro/Themes/WindowCommands.xaml
@@ -50,20 +50,20 @@
     </ControlTemplate>
 
     <Style x:Key="WindowCommandsControlStyle" TargetType="{x:Type Control}">
-        <Setter Property="Background" Value="{DynamicResource TransparentWhiteBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TransparentWhite}" />
         <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground), Mode=OneWay}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="Padding" Value="8 0" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Style.Triggers>
             <Trigger Property="IsEnabled" Value="False">
-                <Setter Property="Foreground" Value="{DynamicResource GrayBrush4}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Gray4}" />
             </Trigger>
         </Style.Triggers>
     </Style>
 
     <Style x:Key="ToolBarOverflowButtonStyle" TargetType="{x:Type ToggleButton}">
-        <Setter Property="Background" Value="{DynamicResource TransparentWhiteBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TransparentWhite}" />
         <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground), Mode=OneWay}" />
         <Setter Property="OverridesDefaultStyle" Value="true" />
         <Setter Property="SnapsToDevicePixels" Value="true" />
@@ -83,18 +83,18 @@
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="true">
                             <Setter TargetName="Arrow" Property="Fill" Value="White" />
-                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource GrayBrush2}" />
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray2}" />
                         </Trigger>
                         <Trigger Property="IsKeyboardFocused" Value="true">
                             <Setter TargetName="Arrow" Property="Fill" Value="White" />
-                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource GrayBrush2}" />
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray2}" />
                         </Trigger>
                         <Trigger Property="IsChecked" Value="true">
                             <Setter TargetName="Arrow" Property="Fill" Value="White" />
-                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource GrayBrush2}" />
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray2}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="false">
-                            <Setter TargetName="Arrow" Property="Fill" Value="{DynamicResource DarkIdealForegroundDisabledBrush}" />
+                            <Setter TargetName="Arrow" Property="Fill" Value="{DynamicResource MahApps.Brushes.DarkIdealForegroundDisabled}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -213,7 +213,7 @@
                     <Setter Property="Template" Value="{StaticResource WindowCommandsButtonTemplate}" />
                     <Style.Triggers>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                         </Trigger>
                     </Style.Triggers>
                 </Style>
@@ -221,7 +221,7 @@
                     <Setter Property="Template" Value="{StaticResource WindowCommandsToggleButtonTemplate}" />
                     <Style.Triggers>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                         </Trigger>
                     </Style.Triggers>
                 </Style>
@@ -232,7 +232,7 @@
                     <Setter Property="Template" Value="{StaticResource WindowCommandsButtonTemplate}" />
                     <Style.Triggers>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                         </Trigger>
                     </Style.Triggers>
                 </Style>
@@ -242,7 +242,7 @@
                     <Setter Property="Template" Value="{StaticResource WindowCommandsToggleButtonTemplate}" />
                     <Style.Triggers>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
+                            <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                         </Trigger>
                     </Style.Triggers>
                 </Style>
@@ -288,11 +288,11 @@
     </Style>
 
     <Style x:Key="MahApps.Metro.Styles.WindowCommands" TargetType="{x:Type Controls:WindowCommands}">
-        <Setter Property="Background" Value="{DynamicResource TransparentWhiteBrush}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TransparentWhite}" />
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Normal" />
         <Setter Property="DarkTemplate" Value="{StaticResource DarkWindowCommandsTemplate}" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="Foreground" Value="{DynamicResource BlackBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="LightTemplate" Value="{StaticResource LightWindowCommandsTemplate}" />
@@ -300,7 +300,7 @@
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
         <Style.Triggers>
             <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentWindow.ShowTitleBar}" Value="True">
-                <Setter Property="Foreground" Value="{DynamicResource IdealForegroundColorBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.IdealForeground}" />
             </DataTrigger>
         </Style.Triggers>
     </Style>
diff --git a/src/Mahapps.Metro.Tests/Tests/CleanWindowTest.cs b/src/Mahapps.Metro.Tests/Tests/CleanWindowTest.cs
index 218279a43a..0ac7588caa 100644
--- a/src/Mahapps.Metro.Tests/Tests/CleanWindowTest.cs
+++ b/src/Mahapps.Metro.Tests/Tests/CleanWindowTest.cs
@@ -15,7 +15,7 @@ public async Task DefaultWindowCommandColorIsBlack()
 
             var window = await WindowHelpers.CreateInvisibleWindowAsync<CleanWindow>();
 
-            var blackBrushColor = ((SolidColorBrush)ThemeManager.GetTheme("Light.Blue").Resources["BlackBrush"]).Color;
+            var blackBrushColor = ((SolidColorBrush)ThemeManager.GetTheme("Light.Blue").Resources["MahApps.Brushes.Black"]).Color;
 
             window.AssertWindowCommandsColor(blackBrushColor);
         }
diff --git a/src/Mahapps.Metro.Tests/Tests/FlyoutTest.cs b/src/Mahapps.Metro.Tests/Tests/FlyoutTest.cs
index 439b61b56a..14a1b58e52 100644
--- a/src/Mahapps.Metro.Tests/Tests/FlyoutTest.cs
+++ b/src/Mahapps.Metro.Tests/Tests/FlyoutTest.cs
@@ -27,7 +27,7 @@ public async Task AdaptsWindowCommandsToDarkFlyout()
 
             flyout.IsOpen = true;
 
-            Color expectedColor = ((SolidColorBrush)ThemeManager.GetTheme("Dark.Blue").Resources["BlackBrush"]).Color;
+            Color expectedColor = ((SolidColorBrush)ThemeManager.GetTheme("Dark.Blue").Resources["MahApps.Brushes.Black"]).Color;
 
             window.AssertWindowCommandsColor(expectedColor);
         }

From 6cde528c360ba80a536aed8d7bbaffa32c775c53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Thu, 11 Jul 2019 14:30:31 +0200
Subject: [PATCH 06/46] Update control template names

---
 .../HamburgerMenu/HamburgerMenu.Properties.cs |  2 +-
 .../Controls.AnimatedSingleRowTabControl.xaml | 32 +++++++++----------
 .../Styles/Controls.Buttons.xaml              |  4 +--
 .../Styles/Controls.Calendar.xaml             | 12 +++----
 .../Styles/Controls.ComboBox.xaml             |  2 +-
 .../Styles/Controls.DataGrid.xaml             |  4 +--
 .../Styles/Controls.DatePicker.xaml           |  2 +-
 .../Styles/Controls.PasswordBox.xaml          |  6 ++--
 .../Styles/Controls.Scrollbars.xaml           | 14 ++++----
 src/MahApps.Metro/Styles/Controls.Slider.xaml | 16 +++++-----
 .../Styles/Controls.TextBox.xaml              |  8 ++---
 src/MahApps.Metro/Styles/FlatSlider.xaml      |  8 ++---
 src/MahApps.Metro/Styles/VS/ScrollBar.xaml    |  8 ++---
 src/MahApps.Metro/Styles/VS/TextBox.xaml      |  2 +-
 .../Styles/ValidationErrorTemplate.xaml       |  2 +-
 src/MahApps.Metro/Themes/DateTimePicker.xaml  |  2 +-
 .../Themes/Dialogs/BaseMetroDialog.xaml       |  4 +--
 src/MahApps.Metro/Themes/FlipView.xaml        |  4 +--
 src/MahApps.Metro/Themes/Flyout.xaml          |  4 +--
 src/MahApps.Metro/Themes/HamburgerMenu.xaml   |  2 +-
 .../Themes/HamburgerMenuTemplate.xaml         |  4 +--
 src/MahApps.Metro/Themes/HotKeyBox.xaml       |  2 +-
 .../MetroAnimatedSingleRowTabControl.xaml     | 14 ++++----
 src/MahApps.Metro/Themes/MetroTabControl.xaml |  8 ++---
 src/MahApps.Metro/Themes/MetroWindow.xaml     |  8 ++---
 src/MahApps.Metro/Themes/NumericUpDown.xaml   |  2 +-
 src/MahApps.Metro/Themes/RangeSlider.xaml     | 16 +++++-----
 src/MahApps.Metro/Themes/SplitButton.xaml     |  8 ++---
 src/MahApps.Metro/Themes/ToggleSwitch.xaml    |  2 +-
 .../Themes/WindowButtonCommands.xaml          |  8 ++---
 src/MahApps.Metro/Themes/WindowCommands.xaml  | 30 ++++++++---------
 31 files changed, 119 insertions(+), 121 deletions(-)

diff --git a/src/MahApps.Metro/Controls/HamburgerMenu/HamburgerMenu.Properties.cs b/src/MahApps.Metro/Controls/HamburgerMenu/HamburgerMenu.Properties.cs
index 513e60d057..50f3bbef51 100644
--- a/src/MahApps.Metro/Controls/HamburgerMenu/HamburgerMenu.Properties.cs
+++ b/src/MahApps.Metro/Controls/HamburgerMenu/HamburgerMenu.Properties.cs
@@ -379,7 +379,7 @@ public void RaiseItemCommand()
 
         private void ChangeItemFocusVisualStyle()
         {
-            _defaultItemFocusVisualTemplate = _defaultItemFocusVisualTemplate ?? TryFindResource("HamburgerMenuItemFocusVisualTemplate") as ControlTemplate;
+            _defaultItemFocusVisualTemplate = _defaultItemFocusVisualTemplate ?? TryFindResource("MahApps.Templates.HamburgerMenuItem.FocusVisual") as ControlTemplate;
             if (_defaultItemFocusVisualTemplate != null)
             {
                 var focusVisualStyle = new Style(typeof(Control));
diff --git a/src/MahApps.Metro/Styles/Controls.AnimatedSingleRowTabControl.xaml b/src/MahApps.Metro/Styles/Controls.AnimatedSingleRowTabControl.xaml
index 872bd833e1..2674870577 100644
--- a/src/MahApps.Metro/Styles/Controls.AnimatedSingleRowTabControl.xaml
+++ b/src/MahApps.Metro/Styles/Controls.AnimatedSingleRowTabControl.xaml
@@ -46,7 +46,7 @@
         </Setter>
     </Style>
 
-    <ControlTemplate x:Key="HorizontalScrollBarTemplate" TargetType="{x:Type ScrollBar}">
+    <ControlTemplate x:Key="MahApps.Templates.ScrollBar.Horizontal" TargetType="{x:Type ScrollBar}">
         <Grid>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
@@ -66,7 +66,7 @@
         </Grid>
     </ControlTemplate>
 
-    <ControlTemplate x:Key="VerticalScrollBarTemplate" TargetType="{x:Type ScrollBar}">
+    <ControlTemplate x:Key="MahApps.Templates.ScrollBar.Vertical" TargetType="{x:Type ScrollBar}">
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
@@ -86,27 +86,27 @@
         </Grid>
     </ControlTemplate>
 
-    <ControlTemplate x:Key="ScrollViewerTemplate" TargetType="{x:Type ScrollViewer}">
+    <ControlTemplate x:Key="MahApps.Templates.ScrollViewer" TargetType="{x:Type ScrollViewer}">
         <Grid>
             <ScrollBar x:Name="PART_HorizontalScrollBar"
                        Height="Auto"
-                       AutomationProperties.AutomationId="HorizontalScrollBar"
+                       AutomationProperties.AutomationId="MahApps.Templates.ScrollBar.Horizontal"
                        Cursor="Arrow"
                        Maximum="{TemplateBinding ScrollableWidth}"
                        Minimum="0"
                        Orientation="Horizontal"
-                       Template="{DynamicResource HorizontalScrollBarTemplate}"
+                       Template="{DynamicResource MahApps.Templates.ScrollBar.Horizontal}"
                        ViewportSize="{TemplateBinding ViewportWidth}"
                        Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"
                        Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" />
             <ScrollBar x:Name="PART_VerticalScrollBar"
                        Width="Auto"
-                       AutomationProperties.AutomationId="VerticalScrollBar"
+                       AutomationProperties.AutomationId="MahApps.Templates.ScrollBar.Vertical"
                        Cursor="Arrow"
                        Maximum="{TemplateBinding ScrollableHeight}"
                        Minimum="0"
                        Orientation="Vertical"
-                       Template="{DynamicResource VerticalScrollBarTemplate}"
+                       Template="{DynamicResource MahApps.Templates.ScrollBar.Vertical}"
                        ViewportSize="{TemplateBinding ViewportHeight}"
                        Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"
                        Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" />
@@ -150,7 +150,7 @@
         </Grid>
     </ControlTemplate>
 
-    <ControlTemplate x:Key="HorizontalAnimatedSingleRowTabControl" TargetType="{x:Type TabControl}">
+    <ControlTemplate x:Key="MahApps.Templates.TabControl.HorizontalAnimatedSingleRow" TargetType="{x:Type TabControl}">
         <Grid KeyboardNavigation.TabNavigation="Local">
             <Grid.RowDefinitions>
                 <RowDefinition x:Name="RowDefinition0" Height="Auto" />
@@ -161,7 +161,7 @@
                           Panel.ZIndex="1"
                           Controls:ScrollViewerHelper.IsHorizontalScrollWheelEnabled="{TemplateBinding Controls:ScrollViewerHelper.IsHorizontalScrollWheelEnabled}"
                           HorizontalScrollBarVisibility="Auto"
-                          Template="{StaticResource ScrollViewerTemplate}"
+                          Template="{StaticResource MahApps.Templates.ScrollViewer}"
                           VerticalScrollBarVisibility="Disabled">
                 <Grid x:Name="HeaderPanelGrid">
                     <Controls:Underline x:Name="Underline"
@@ -212,7 +212,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <ControlTemplate x:Key="VerticalAnimatedSingleRowTabControl" TargetType="{x:Type TabControl}">
+    <ControlTemplate x:Key="MahApps.Templates.TabControl.VerticalAnimatedSingleRow" TargetType="{x:Type TabControl}">
         <Grid KeyboardNavigation.TabNavigation="Local">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition x:Name="ColumnDefinition0" Width="*" />
@@ -222,7 +222,7 @@
                           Grid.Column="1"
                           Panel.ZIndex="1"
                           HorizontalScrollBarVisibility="Disabled"
-                          Template="{StaticResource ScrollViewerTemplate}"
+                          Template="{StaticResource MahApps.Templates.ScrollViewer}"
                           VerticalScrollBarVisibility="Auto">
                 <Grid x:Name="HeaderPanelGrid">
                     <Controls:Underline x:Name="Underline"
@@ -276,19 +276,19 @@
     <Style BasedOn="{StaticResource MetroTabControl}" TargetType="{x:Type TabControl}">
         <Setter Property="Controls:ScrollViewerHelper.IsHorizontalScrollWheelEnabled" Value="True" />
         <Setter Property="Controls:TabControlHelper.Transition" Value="Left" />
-        <Setter Property="Template" Value="{StaticResource HorizontalAnimatedSingleRowTabControl}" />
+        <Setter Property="Template" Value="{StaticResource MahApps.Templates.TabControl.HorizontalAnimatedSingleRow}" />
         <Style.Triggers>
             <Trigger Property="TabStripPlacement" Value="Top">
-                <Setter Property="Template" Value="{StaticResource HorizontalAnimatedSingleRowTabControl}" />
+                <Setter Property="Template" Value="{StaticResource MahApps.Templates.TabControl.HorizontalAnimatedSingleRow}" />
             </Trigger>
             <Trigger Property="TabStripPlacement" Value="Bottom">
-                <Setter Property="Template" Value="{StaticResource HorizontalAnimatedSingleRowTabControl}" />
+                <Setter Property="Template" Value="{StaticResource MahApps.Templates.TabControl.HorizontalAnimatedSingleRow}" />
             </Trigger>
             <Trigger Property="TabStripPlacement" Value="Left">
-                <Setter Property="Template" Value="{StaticResource VerticalAnimatedSingleRowTabControl}" />
+                <Setter Property="Template" Value="{StaticResource MahApps.Templates.TabControl.VerticalAnimatedSingleRow}" />
             </Trigger>
             <Trigger Property="TabStripPlacement" Value="Right">
-                <Setter Property="Template" Value="{StaticResource VerticalAnimatedSingleRowTabControl}" />
+                <Setter Property="Template" Value="{StaticResource MahApps.Templates.TabControl.VerticalAnimatedSingleRow}" />
             </Trigger>
 
         </Style.Triggers>
diff --git a/src/MahApps.Metro/Styles/Controls.Buttons.xaml b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
index 35bb0a70d5..72549bfd3a 100644
--- a/src/MahApps.Metro/Styles/Controls.Buttons.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
@@ -229,7 +229,7 @@
     </Style>
 
     <!--  "Chromeless" style for buttons  -->
-    <ControlTemplate x:Key="ChromelessButtonTemplate" TargetType="{x:Type ButtonBase}">
+    <ControlTemplate x:Key="MahApps.Templates.ButtonBase.Chromeless" TargetType="{x:Type ButtonBase}">
         <Grid Background="{TemplateBinding Background}">
             <ContentPresenter x:Name="PART_ContentPresenter"
                               Margin="{TemplateBinding Padding}"
@@ -257,7 +257,7 @@
         <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="Padding" Value="0" />
-        <Setter Property="Template" Value="{StaticResource ChromelessButtonTemplate}" />
+        <Setter Property="Template" Value="{StaticResource MahApps.Templates.ButtonBase.Chromeless}" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
diff --git a/src/MahApps.Metro/Styles/Controls.Calendar.xaml b/src/MahApps.Metro/Styles/Controls.Calendar.xaml
index 86d219fa6a..a81ccc4a21 100644
--- a/src/MahApps.Metro/Styles/Controls.Calendar.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Calendar.xaml
@@ -171,7 +171,7 @@
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
                             <Grid Margin="{TemplateBinding Padding}">
                                 <Grid.Resources>
-                                    <ControlTemplate x:Key="PreviousButtonTemplate" TargetType="{x:Type Button}">
+                                    <ControlTemplate x:Key="MahApps.Templates.Button.Previous" TargetType="{x:Type Button}">
                                         <Grid Cursor="Hand">
                                             <Rectangle Fill="{DynamicResource MahApps.Brushes.Accent}"
                                                        Opacity="0.1"
@@ -209,7 +209,7 @@
                                             </VisualStateManager.VisualStateGroups>
                                         </Grid>
                                     </ControlTemplate>
-                                    <ControlTemplate x:Key="NextButtonTemplate" TargetType="{x:Type Button}">
+                                    <ControlTemplate x:Key="MahApps.Templates.Button.Next" TargetType="{x:Type Button}">
                                         <Grid Cursor="Hand">
                                             <Rectangle Fill="{DynamicResource MahApps.Brushes.Accent}"
                                                        Opacity="0.1"
@@ -247,7 +247,7 @@
                                             </VisualStateManager.VisualStateGroups>
                                         </Grid>
                                     </ControlTemplate>
-                                    <ControlTemplate x:Key="HeaderButtonTemplate" TargetType="{x:Type Button}">
+                                    <ControlTemplate x:Key="MahApps.Templates.Button.Header" TargetType="{x:Type Button}">
                                         <Grid Cursor="Hand">
                                             <ContentPresenter x:Name="buttonContent"
                                                               Margin="1 4 1 9"
@@ -281,13 +281,13 @@
                                     </ControlTemplate>
 
                                     <Style x:Key="PreviousCalendarButtonStyle" TargetType="{x:Type Button}">
-                                        <Setter Property="Template" Value="{StaticResource PreviousButtonTemplate}" />
+                                        <Setter Property="Template" Value="{StaticResource MahApps.Templates.Button.Previous}" />
                                     </Style>
                                     <Style x:Key="NextCalendarButtonStyle" TargetType="{x:Type Button}">
-                                        <Setter Property="Template" Value="{StaticResource NextButtonTemplate}" />
+                                        <Setter Property="Template" Value="{StaticResource MahApps.Templates.Button.Next}" />
                                     </Style>
                                     <Style x:Key="HeaderCalendarButtonStyle" TargetType="{x:Type Button}">
-                                        <Setter Property="Template" Value="{StaticResource HeaderButtonTemplate}" />
+                                        <Setter Property="Template" Value="{StaticResource MahApps.Templates.Button.Header}" />
                                     </Style>
                                 </Grid.Resources>
 
diff --git a/src/MahApps.Metro/Styles/Controls.ComboBox.xaml b/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
index 200440b5b5..f609d07e16 100644
--- a/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
@@ -612,7 +612,7 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-        <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource ValidationErrorTemplate}" />
+        <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource MahApps.Templates.ValidationError}" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Style.Triggers>
             <Trigger Property="VirtualizingStackPanel.IsVirtualizing" Value="True">
diff --git a/src/MahApps.Metro/Styles/Controls.DataGrid.xaml b/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
index b801b42dbd..b1fdd52610 100644
--- a/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
+++ b/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
@@ -231,7 +231,7 @@
                                 <Control Grid.Column="1"
                                          Focusable="False"
                                          SnapsToDevicePixels="False"
-                                         Template="{Binding ValidationErrorTemplate, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}}"
+                                         Template="{Binding MahApps.Templates.ValidationError, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}}"
                                          Visibility="{Binding (Validation.HasError), Converter={StaticResource BooleanToVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}}" />
                             </Grid>
                         </Border>
@@ -358,7 +358,7 @@
         </Style.Triggers>
     </Style>
 
-    <ControlTemplate x:Key="DefaultRowValidationErrorTemplate">
+    <ControlTemplate x:Key="DefaultRowMahApps.Templates.ValidationError">
         <Grid Margin="2 0 2 0"
               VerticalAlignment="Center"
               DataContext="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type DataGridRow}}, Path=(Validation.Errors).CurrentItem}"
diff --git a/src/MahApps.Metro/Styles/Controls.DatePicker.xaml b/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
index 75468317e2..c4fd723d70 100644
--- a/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
+++ b/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
@@ -179,7 +179,7 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-        <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource ValidationErrorTemplate}" />
+        <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource MahApps.Templates.ValidationError}" />
     </Style>
 
     <Style x:Key="MetroDatePickerTextBox" TargetType="{x:Type DatePickerTextBox}">
diff --git a/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml b/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
index e63cfdb5d0..db43d065cd 100644
--- a/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
@@ -334,14 +334,14 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-        <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource ValidationErrorTemplate}" />
+        <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource MahApps.Templates.ValidationError}" />
     </Style>
 
     <!--  Button Command PasswordBox Style  -->
     <Style x:Key="MetroButtonPasswordBox"
            BasedOn="{StaticResource MetroPasswordBox}"
            TargetType="{x:Type PasswordBox}">
-        <Setter Property="Controls:TextBoxHelper.ButtonTemplate" Value="{DynamicResource ChromelessButtonTemplate}" />
+        <Setter Property="Controls:TextBoxHelper.ButtonTemplate" Value="{DynamicResource MahApps.Templates.ButtonBase.Chromeless}" />
         <Setter Property="Controls:TextBoxHelper.TextButton" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
@@ -603,7 +603,7 @@
            BasedOn="{StaticResource MetroPasswordBox}"
            TargetType="{x:Type PasswordBox}">
         <Setter Property="Controls:PasswordBoxHelper.RevealButtonContent" Value="{DynamicResource DefaultRevealButtonIcon}" />
-        <Setter Property="Controls:TextBoxHelper.ButtonTemplate" Value="{DynamicResource ChromelessButtonTemplate}" />
+        <Setter Property="Controls:TextBoxHelper.ButtonTemplate" Value="{DynamicResource MahApps.Templates.ButtonBase.Chromeless}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type PasswordBox}">
diff --git a/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml b/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
index 8b69b42679..bcef0d8453 100644
--- a/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
@@ -19,7 +19,7 @@
     <Style x:Key="MetroScrollBarRepeatButtonSmallStyle" TargetType="{x:Type RepeatButton}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Focusable" Value="False" />
-        <Setter Property="Height" Value="{DynamicResource VerticalScrollBarRepeatButtonHeight}" />
+        <Setter Property="Height" Value="{DynamicResource MahApps.Templates.ScrollBar.VerticalRepeatButtonHeight}" />
         <Setter Property="HorizontalAlignment" Value="Center" />
         <Setter Property="Interval" Value="50" />
         <Setter Property="IsTabStop" Value="False" />
@@ -61,7 +61,7 @@
             </Setter.Value>
         </Setter>
         <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="Width" Value="{DynamicResource HorizontalScrollBarRepeatButtonWidth}" />
+        <Setter Property="Width" Value="{DynamicResource MahApps.Templates.ScrollBar.HorizontalRepeatButtonWidth}" />
     </Style>
 
     <Style x:Key="MetroScrollBarRepeatButtonLargeStyle" TargetType="{x:Type RepeatButton}">
@@ -124,7 +124,7 @@
     </Style>
 
     <!--  fugging Scrollbars  -->
-    <ControlTemplate x:Key="HorizontalScrollBar" TargetType="{x:Type ScrollBar}">
+    <ControlTemplate x:Key="MahApps.Templates.ScrollBar.Horizontal" TargetType="{x:Type ScrollBar}">
         <Grid x:Name="HorizontalRoot" Height="{TemplateBinding Height}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
@@ -166,7 +166,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <ControlTemplate x:Key="VerticalScrollBar" TargetType="{x:Type ScrollBar}">
+    <ControlTemplate x:Key="MahApps.Templates.ScrollBar.Vertical" TargetType="{x:Type ScrollBar}">
         <Grid x:Name="VerticalRoot" Width="{TemplateBinding Width}">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
@@ -218,12 +218,12 @@
         <Style.Triggers>
             <Trigger Property="Orientation" Value="Horizontal">
                 <Setter Property="Height" Value="{DynamicResource MetroScrollBarHeight}" />
-                <Setter Property="Template" Value="{DynamicResource HorizontalScrollBar}" />
+                <Setter Property="Template" Value="{DynamicResource MahApps.Templates.ScrollBar.Horizontal}" />
                 <Setter Property="Width" Value="Auto" />
             </Trigger>
             <Trigger Property="Orientation" Value="Vertical">
                 <Setter Property="Height" Value="Auto" />
-                <Setter Property="Template" Value="{DynamicResource VerticalScrollBar}" />
+                <Setter Property="Template" Value="{DynamicResource MahApps.Templates.ScrollBar.Vertical}" />
                 <Setter Property="Width" Value="{DynamicResource MetroScrollBarWidth}" />
             </Trigger>
         </Style.Triggers>
@@ -255,7 +255,6 @@
                         <ScrollBar x:Name="PART_VerticalScrollBar"
                                    Grid.Row="0"
                                    Grid.Column="1"
-                                   AutomationProperties.AutomationId="VerticalScrollBar"
                                    Cursor="Arrow"
                                    Maximum="{TemplateBinding ScrollableHeight}"
                                    Minimum="0"
@@ -265,7 +264,6 @@
                         <ScrollBar x:Name="PART_HorizontalScrollBar"
                                    Grid.Row="1"
                                    Grid.Column="0"
-                                   AutomationProperties.AutomationId="HorizontalScrollBar"
                                    Cursor="Arrow"
                                    Maximum="{TemplateBinding ScrollableWidth}"
                                    Minimum="0"
diff --git a/src/MahApps.Metro/Styles/Controls.Slider.xaml b/src/MahApps.Metro/Styles/Controls.Slider.xaml
index 3ca342e321..bca05eaa68 100644
--- a/src/MahApps.Metro/Styles/Controls.Slider.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Slider.xaml
@@ -84,7 +84,7 @@
     </Style>
 
     <!--  HorizontalSlider  -->
-    <ControlTemplate x:Key="MahApps.Metro.Styles.Slider.HorizontalTemplate" TargetType="{x:Type Slider}">
+    <ControlTemplate x:Key="MahApps.Templates.Slider.Horizontal" TargetType="{x:Type Slider}">
         <Grid x:Name="HorizontalTemplate"
               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
               Background="{TemplateBinding Background}">
@@ -170,7 +170,7 @@
     </ControlTemplate>
 
     <!--  VerticalSlider  -->
-    <ControlTemplate x:Key="MahApps.Metro.Styles.Slider.VerticalTemplate" TargetType="{x:Type Slider}">
+    <ControlTemplate x:Key="MahApps.Templates.Slider.Vertical" TargetType="{x:Type Slider}">
         <Grid x:Name="HorizontalTemplate"
               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
               Background="{TemplateBinding Background}">
@@ -275,12 +275,12 @@
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="Maximum" Value="100" />
         <Setter Property="Minimum" Value="0" />
-        <Setter Property="Template" Value="{DynamicResource MahApps.Metro.Styles.Slider.HorizontalTemplate}" />
+        <Setter Property="Template" Value="{DynamicResource MahApps.Templates.Slider.Horizontal}" />
         <Setter Property="Value" Value="0" />
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
         <Style.Triggers>
             <Trigger Property="Orientation" Value="Vertical">
-                <Setter Property="Template" Value="{DynamicResource MahApps.Metro.Styles.Slider.VerticalTemplate}" />
+                <Setter Property="Template" Value="{DynamicResource MahApps.Templates.Slider.Vertical}" />
             </Trigger>
         </Style.Triggers>
     </Style>
@@ -335,7 +335,7 @@
     </Style>
 
     <!--  HorizontalSlider  -->
-    <ControlTemplate x:Key="MahApps.Metro.Styles.Slider.HorizontalTemplate.Win10" TargetType="{x:Type Slider}">
+    <ControlTemplate x:Key="MahApps.Templates.Slider.Horizontal.Win10" TargetType="{x:Type Slider}">
         <Grid x:Name="HorizontalTemplate"
               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
               Background="{TemplateBinding Background}">
@@ -422,7 +422,7 @@
     </ControlTemplate>
 
     <!--  VerticalSlider  -->
-    <ControlTemplate x:Key="MahApps.Metro.Styles.Slider.VerticalTemplate.Win10" TargetType="{x:Type Slider}">
+    <ControlTemplate x:Key="MahApps.Templates.Slider.Vertical.Win10" TargetType="{x:Type Slider}">
         <Grid x:Name="HorizontalTemplate"
               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
               Background="{TemplateBinding Background}">
@@ -529,12 +529,12 @@
         <Setter Property="IsMoveToPointEnabled" Value="True" />
         <Setter Property="Maximum" Value="100" />
         <Setter Property="Minimum" Value="0" />
-        <Setter Property="Template" Value="{DynamicResource MahApps.Metro.Styles.Slider.HorizontalTemplate.Win10}" />
+        <Setter Property="Template" Value="{DynamicResource MahApps.Templates.Slider.Horizontal.Win10}" />
         <Setter Property="Value" Value="0" />
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
         <Style.Triggers>
             <Trigger Property="Orientation" Value="Vertical">
-                <Setter Property="Template" Value="{DynamicResource MahApps.Metro.Styles.Slider.VerticalTemplate.Win10}" />
+                <Setter Property="Template" Value="{DynamicResource MahApps.Templates.Slider.Vertical.Win10}" />
             </Trigger>
         </Style.Triggers>
     </Style>
diff --git a/src/MahApps.Metro/Styles/Controls.TextBox.xaml b/src/MahApps.Metro/Styles/Controls.TextBox.xaml
index 24a38b66df..f237b581e2 100644
--- a/src/MahApps.Metro/Styles/Controls.TextBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TextBox.xaml
@@ -267,13 +267,13 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-        <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource ValidationErrorTemplate}" />
+        <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource MahApps.Templates.ValidationError}" />
     </Style>
 
     <Style x:Key="MetroButtonTextBox"
            BasedOn="{StaticResource MetroTextBox}"
            TargetType="{x:Type TextBox}">
-        <Setter Property="Controls:TextBoxHelper.ButtonTemplate" Value="{DynamicResource ChromelessButtonTemplate}" />
+        <Setter Property="Controls:TextBoxHelper.ButtonTemplate" Value="{DynamicResource MahApps.Templates.ButtonBase.Chromeless}" />
         <Setter Property="Controls:TextBoxHelper.TextButton" Value="True" />
         <!--  change SnapsToDevicePixels to True to view a better border and validation error  -->
         <Setter Property="Template">
@@ -779,14 +779,14 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-        <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource ValidationErrorTemplate}" />
+        <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource MahApps.Templates.ValidationError}" />
     </Style>
 
     <Style x:Key="MahApps.Metro.Styles.ButtonRichTextBox"
            BasedOn="{StaticResource MetroRichTextBox}"
            TargetType="{x:Type RichTextBox}">
         <Setter Property="Controls:TextBoxHelper.ButtonCommandParameter" Value="{Binding RelativeSource={RelativeSource Self}}" />
-        <Setter Property="Controls:TextBoxHelper.ButtonTemplate" Value="{DynamicResource ChromelessButtonTemplate}" />
+        <Setter Property="Controls:TextBoxHelper.ButtonTemplate" Value="{DynamicResource MahApps.Templates.ButtonBase.Chromeless}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TextBoxBase}">
diff --git a/src/MahApps.Metro/Styles/FlatSlider.xaml b/src/MahApps.Metro/Styles/FlatSlider.xaml
index 3584c1617c..0851b9c045 100644
--- a/src/MahApps.Metro/Styles/FlatSlider.xaml
+++ b/src/MahApps.Metro/Styles/FlatSlider.xaml
@@ -52,7 +52,7 @@
         </Style.Triggers>
     </Style>
 
-    <ControlTemplate x:Key="MahApps.Metro.Styles.FlatSlider.HorizontalTemplate" TargetType="{x:Type Slider}">
+    <ControlTemplate x:Key="MahApps.Templates.Slider.FlatHorizontal" TargetType="{x:Type Slider}">
         <Grid VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
@@ -99,7 +99,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <ControlTemplate x:Key="MahApps.Metro.Styles.FlatSlider.VerticalTemplate" TargetType="{x:Type Slider}">
+    <ControlTemplate x:Key="MahApps.Templates.Slider.FlatVertical" TargetType="{x:Type Slider}">
         <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
@@ -171,12 +171,12 @@
             <Trigger Property="Orientation" Value="Horizontal">
                 <Setter Property="MinHeight" Value="12" />
                 <Setter Property="MinWidth" Value="0" />
-                <Setter Property="Template" Value="{DynamicResource MahApps.Metro.Styles.FlatSlider.HorizontalTemplate}" />
+                <Setter Property="Template" Value="{DynamicResource MahApps.Templates.Slider.FlatHorizontal}" />
             </Trigger>
             <Trigger Property="Orientation" Value="Vertical">
                 <Setter Property="MinHeight" Value="0" />
                 <Setter Property="MinWidth" Value="12" />
-                <Setter Property="Template" Value="{DynamicResource MahApps.Metro.Styles.FlatSlider.VerticalTemplate}" />
+                <Setter Property="Template" Value="{DynamicResource MahApps.Templates.Slider.FlatVertical}" />
             </Trigger>
         </Style.Triggers>
     </Style>
diff --git a/src/MahApps.Metro/Styles/VS/ScrollBar.xaml b/src/MahApps.Metro/Styles/VS/ScrollBar.xaml
index 73896ab959..071158452f 100644
--- a/src/MahApps.Metro/Styles/VS/ScrollBar.xaml
+++ b/src/MahApps.Metro/Styles/VS/ScrollBar.xaml
@@ -77,7 +77,7 @@
         </Setter>
     </Style>
 
-    <ControlTemplate x:Key="HorizontalScrollBar" TargetType="{x:Type ScrollBar}">
+    <ControlTemplate x:Key="MahApps.Templates.ScrollBar.Horizontal" TargetType="{x:Type ScrollBar}">
         <Grid>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="18" />
@@ -106,7 +106,7 @@
         </Grid>
     </ControlTemplate>
 
-    <ControlTemplate x:Key="VerticalScrollBar" TargetType="{x:Type ScrollBar}">
+    <ControlTemplate x:Key="MahApps.Templates.ScrollBar.Vertical" TargetType="{x:Type ScrollBar}">
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="18" />
@@ -143,12 +143,12 @@
         <Style.Triggers>
             <Trigger Property="Orientation" Value="Vertical">
                 <Setter Property="Height" Value="Auto" />
-                <Setter Property="Template" Value="{StaticResource VerticalScrollBar}" />
+                <Setter Property="Template" Value="{StaticResource MahApps.Templates.ScrollBar.Vertical}" />
                 <Setter Property="Width" Value="18" />
             </Trigger>
             <Trigger Property="Orientation" Value="Horizontal">
                 <Setter Property="Height" Value="18" />
-                <Setter Property="Template" Value="{StaticResource HorizontalScrollBar}" />
+                <Setter Property="Template" Value="{StaticResource MahApps.Templates.ScrollBar.Horizontal}" />
                 <Setter Property="Width" Value="Auto" />
             </Trigger>
         </Style.Triggers>
diff --git a/src/MahApps.Metro/Styles/VS/TextBox.xaml b/src/MahApps.Metro/Styles/VS/TextBox.xaml
index 0e81651644..d7e0238750 100644
--- a/src/MahApps.Metro/Styles/VS/TextBox.xaml
+++ b/src/MahApps.Metro/Styles/VS/TextBox.xaml
@@ -24,7 +24,7 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-        <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource ValidationErrorTemplate}" />
+        <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource MahApps.Templates.ValidationError}" />
     </Style>
 
     <Style x:Key="SearchTextBox"
diff --git a/src/MahApps.Metro/Styles/ValidationErrorTemplate.xaml b/src/MahApps.Metro/Styles/ValidationErrorTemplate.xaml
index 0e51584955..1d15345e71 100644
--- a/src/MahApps.Metro/Styles/ValidationErrorTemplate.xaml
+++ b/src/MahApps.Metro/Styles/ValidationErrorTemplate.xaml
@@ -10,7 +10,7 @@
         <Setter Property="VerticalOffset" Value="0" />
     </Style>
 
-    <ControlTemplate x:Key="ValidationErrorTemplate">
+    <ControlTemplate x:Key="MahApps.Templates.ValidationError">
         <AdornedElementPlaceholder x:Name="placeholder">
             <Grid SnapsToDevicePixels="True">
                 <Rectangle x:Name="PopupTargetElement"
diff --git a/src/MahApps.Metro/Themes/DateTimePicker.xaml b/src/MahApps.Metro/Themes/DateTimePicker.xaml
index bb3e95c88e..e36982a1ad 100644
--- a/src/MahApps.Metro/Themes/DateTimePicker.xaml
+++ b/src/MahApps.Metro/Themes/DateTimePicker.xaml
@@ -428,7 +428,7 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-        <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource ValidationErrorTemplate}" />
+        <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource MahApps.Templates.ValidationError}" />
     </Style>
 
     <Style BasedOn="{StaticResource TimePartPickerBase}" TargetType="{x:Type Controls:DateTimePicker}">
diff --git a/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml b/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml
index b8b2acb876..28a0f9f270 100644
--- a/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml
+++ b/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml
@@ -50,7 +50,7 @@
                          Duration="0:0:0.2" />
     </Storyboard>
 
-    <ControlTemplate x:Key="MetroDialogTemplate" TargetType="{x:Type Dialogs:BaseMetroDialog}">
+    <ControlTemplate x:Key="MahApps.Templates.BaseMetroDialog" TargetType="{x:Type Dialogs:BaseMetroDialog}">
         <Grid Background="{TemplateBinding Background}">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
@@ -121,7 +121,7 @@
         <Setter Property="KeyboardNavigation.TabNavigation" Value="Cycle" />
         <Setter Property="Opacity" Value="0" />
         <Setter Property="Padding" Value="0 10 0 0" />
-        <Setter Property="Template" Value="{StaticResource MetroDialogTemplate}" />
+        <Setter Property="Template" Value="{StaticResource MahApps.Templates.BaseMetroDialog}" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
     </Style>
diff --git a/src/MahApps.Metro/Themes/FlipView.xaml b/src/MahApps.Metro/Themes/FlipView.xaml
index becc4398a0..d175f0f20c 100644
--- a/src/MahApps.Metro/Themes/FlipView.xaml
+++ b/src/MahApps.Metro/Themes/FlipView.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
-    <ControlTemplate x:Key="FlipViewTemplate" TargetType="{x:Type Controls:FlipView}">
+    <ControlTemplate x:Key="MahApps.Templates.FlipView" TargetType="{x:Type Controls:FlipView}">
         <Border Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}"
@@ -229,6 +229,6 @@
         <Setter Property="MinHeight" Value="100" />
         <Setter Property="MinWidth" Value="100" />
         <Setter Property="Selector.IsSynchronizedWithCurrentItem" Value="True" />
-        <Setter Property="Template" Value="{StaticResource FlipViewTemplate}" />
+        <Setter Property="Template" Value="{StaticResource MahApps.Templates.FlipView}" />
     </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Themes/Flyout.xaml b/src/MahApps.Metro/Themes/Flyout.xaml
index a963f33bda..0e18a2eb64 100644
--- a/src/MahApps.Metro/Themes/Flyout.xaml
+++ b/src/MahApps.Metro/Themes/Flyout.xaml
@@ -65,7 +65,7 @@
         </DataTemplate.Triggers>
     </DataTemplate>
 
-    <ControlTemplate x:Key="FlyoutTemplate" TargetType="{x:Type Controls:Flyout}">
+    <ControlTemplate x:Key="MahApps.Templates.Flyout" TargetType="{x:Type Controls:Flyout}">
         <Border x:Name="PART_Root"
                 Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
@@ -231,7 +231,7 @@
         <Setter Property="KeyboardNavigation.ControlTabNavigation" Value="Cycle" />
         <Setter Property="KeyboardNavigation.DirectionalNavigation" Value="Cycle" />
         <Setter Property="KeyboardNavigation.TabNavigation" Value="Cycle" />
-        <Setter Property="Template" Value="{StaticResource FlyoutTemplate}" />
+        <Setter Property="Template" Value="{StaticResource MahApps.Templates.Flyout}" />
         <Setter Property="VerticalAlignment" Value="Stretch" />
         <Setter Property="Visibility" Value="Hidden" />
         <Style.Triggers>
diff --git a/src/MahApps.Metro/Themes/HamburgerMenu.xaml b/src/MahApps.Metro/Themes/HamburgerMenu.xaml
index b6e0548d57..170a90bf65 100644
--- a/src/MahApps.Metro/Themes/HamburgerMenu.xaml
+++ b/src/MahApps.Metro/Themes/HamburgerMenu.xaml
@@ -32,7 +32,7 @@
         <Setter Property="PaneHeaderMargin" Value="0 0 0 8" />
         <Setter Property="PaneMargin" Value="0 0 0 8" />
         <Setter Property="SeparatorItemContainerStyle" Value="{StaticResource HamburgerMenuSeparatorItemStyle}" />
-        <Setter Property="Template" Value="{DynamicResource HamburgerMenuTemplate}" />
+        <Setter Property="Template" Value="{DynamicResource MahApps.Templates.HamburgerMenu}" />
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
     </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Themes/HamburgerMenuTemplate.xaml b/src/MahApps.Metro/Themes/HamburgerMenuTemplate.xaml
index 9a1d40d518..a16d324d8d 100644
--- a/src/MahApps.Metro/Themes/HamburgerMenuTemplate.xaml
+++ b/src/MahApps.Metro/Themes/HamburgerMenuTemplate.xaml
@@ -172,7 +172,7 @@
         </Setter>
     </Style>
 
-    <ControlTemplate x:Key="HamburgerMenuItemFocusVisualTemplate">
+    <ControlTemplate x:Key="MahApps.Templates.HamburgerMenuItem.FocusVisual">
         <Rectangle SnapsToDevicePixels="True"
                    Stroke="Black"
                    StrokeThickness="2"
@@ -337,7 +337,7 @@
         <Setter Property="VirtualizingStackPanel.IsVirtualizing" Value="False" />
     </Style>
 
-    <ControlTemplate x:Key="HamburgerMenuTemplate" TargetType="{x:Type Controls:HamburgerMenu}">
+    <ControlTemplate x:Key="MahApps.Templates.HamburgerMenu" TargetType="{x:Type Controls:HamburgerMenu}">
         <Grid>
             <Controls:SplitView x:Name="MainSplitView"
                                 CompactPaneLength="{TemplateBinding CompactPaneLength}"
diff --git a/src/MahApps.Metro/Themes/HotKeyBox.xaml b/src/MahApps.Metro/Themes/HotKeyBox.xaml
index a00bcfcada..ead51c38a8 100644
--- a/src/MahApps.Metro/Themes/HotKeyBox.xaml
+++ b/src/MahApps.Metro/Themes/HotKeyBox.xaml
@@ -71,6 +71,6 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-        <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource ValidationErrorTemplate}" />
+        <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource MahApps.Templates.ValidationError}" />
     </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Themes/MetroAnimatedSingleRowTabControl.xaml b/src/MahApps.Metro/Themes/MetroAnimatedSingleRowTabControl.xaml
index db38cbb6fc..e648e79dec 100644
--- a/src/MahApps.Metro/Themes/MetroAnimatedSingleRowTabControl.xaml
+++ b/src/MahApps.Metro/Themes/MetroAnimatedSingleRowTabControl.xaml
@@ -9,7 +9,7 @@
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.Scrollbars.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <ControlTemplate x:Key="HorizontalMetroAnimatedSingleRowTabControl" TargetType="{x:Type Controls:MetroAnimatedSingleRowTabControl}">
+    <ControlTemplate x:Key="MahApps.Templates.MetroAnimatedSingleRowTabControl.Horizontal" TargetType="{x:Type Controls:MetroAnimatedSingleRowTabControl}">
         <Grid KeyboardNavigation.TabNavigation="Local">
             <Grid.RowDefinitions>
                 <RowDefinition x:Name="RowDefinition0" Height="Auto" />
@@ -70,7 +70,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <ControlTemplate x:Key="VerticalMetroAnimatedSingleRowTabControl" TargetType="{x:Type Controls:MetroAnimatedSingleRowTabControl}">
+    <ControlTemplate x:Key="MahApps.Templates.MetroAnimatedSingleRowTabControl.Vertical" TargetType="{x:Type Controls:MetroAnimatedSingleRowTabControl}">
         <Grid KeyboardNavigation.TabNavigation="Local">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition x:Name="ColumnDefinition0" Width="*" />
@@ -133,19 +133,19 @@
     <Style BasedOn="{StaticResource MetroTabControl}" TargetType="{x:Type Controls:MetroAnimatedSingleRowTabControl}">
         <Setter Property="Controls:ScrollViewerHelper.IsHorizontalScrollWheelEnabled" Value="True" />
         <Setter Property="Controls:TabControlHelper.Transition" Value="Left" />
-        <Setter Property="Template" Value="{StaticResource HorizontalMetroAnimatedSingleRowTabControl}" />
+        <Setter Property="Template" Value="{StaticResource MahApps.Templates.MetroAnimatedSingleRowTabControl.Horizontal}" />
         <Style.Triggers>
             <Trigger Property="TabStripPlacement" Value="Top">
-                <Setter Property="Template" Value="{StaticResource HorizontalMetroAnimatedSingleRowTabControl}" />
+                <Setter Property="Template" Value="{StaticResource MahApps.Templates.MetroAnimatedSingleRowTabControl.Horizontal}" />
             </Trigger>
             <Trigger Property="TabStripPlacement" Value="Bottom">
-                <Setter Property="Template" Value="{StaticResource HorizontalMetroAnimatedSingleRowTabControl}" />
+                <Setter Property="Template" Value="{StaticResource MahApps.Templates.MetroAnimatedSingleRowTabControl.Horizontal}" />
             </Trigger>
             <Trigger Property="TabStripPlacement" Value="Left">
-                <Setter Property="Template" Value="{StaticResource VerticalMetroAnimatedSingleRowTabControl}" />
+                <Setter Property="Template" Value="{StaticResource MahApps.Templates.MetroAnimatedSingleRowTabControl.Vertical}" />
             </Trigger>
             <Trigger Property="TabStripPlacement" Value="Right">
-                <Setter Property="Template" Value="{StaticResource VerticalMetroAnimatedSingleRowTabControl}" />
+                <Setter Property="Template" Value="{StaticResource MahApps.Templates.MetroAnimatedSingleRowTabControl.Vertical}" />
             </Trigger>
         </Style.Triggers>
     </Style>
diff --git a/src/MahApps.Metro/Themes/MetroTabControl.xaml b/src/MahApps.Metro/Themes/MetroTabControl.xaml
index 9b3daaa1e0..548f7e94fc 100644
--- a/src/MahApps.Metro/Themes/MetroTabControl.xaml
+++ b/src/MahApps.Metro/Themes/MetroTabControl.xaml
@@ -6,7 +6,7 @@
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.TabControl.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <ControlTemplate x:Key="MahApps.Metro.Templates.MetroTabControl.KeepVisualTreeInMemoryWhenChangingTabs" TargetType="{x:Type Controls:MetroTabControl}">
+    <ControlTemplate x:Key="MahApps.Templates.MetroTabControl.KeepVisualTreeInMemoryWhenChangingTabs" TargetType="{x:Type Controls:MetroTabControl}">
         <Grid>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition x:Name="ColumnDefinition0" />
@@ -82,7 +82,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <ControlTemplate x:Key="MahApps.Metro.Templates.MetroTabControl.DoNotKeepVisualTreeInMemoryWhenChangingTabs" TargetType="{x:Type Controls:MetroTabControl}">
+    <ControlTemplate x:Key="MahApps.Templates.MetroTabControl.DoNotKeepVisualTreeInMemoryWhenChangingTabs" TargetType="{x:Type Controls:MetroTabControl}">
         <Grid>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition x:Name="ColumnDefinition0" />
@@ -162,10 +162,10 @@
     <Style x:Key="{x:Type Controls:MetroTabControl}"
            BasedOn="{StaticResource MetroTabControl}"
            TargetType="{x:Type Controls:MetroTabControl}">
-        <Setter Property="Template" Value="{StaticResource MahApps.Metro.Templates.MetroTabControl.DoNotKeepVisualTreeInMemoryWhenChangingTabs}" />
+        <Setter Property="Template" Value="{StaticResource MahApps.Templates.MetroTabControl.DoNotKeepVisualTreeInMemoryWhenChangingTabs}" />
         <Style.Triggers>
             <Trigger Property="KeepVisualTreeInMemoryWhenChangingTabs" Value="True">
-                <Setter Property="Template" Value="{StaticResource MahApps.Metro.Templates.MetroTabControl.KeepVisualTreeInMemoryWhenChangingTabs}" />
+                <Setter Property="Template" Value="{StaticResource MahApps.Templates.MetroTabControl.KeepVisualTreeInMemoryWhenChangingTabs}" />
             </Trigger>
         </Style.Triggers>
     </Style>
diff --git a/src/MahApps.Metro/Themes/MetroWindow.xaml b/src/MahApps.Metro/Themes/MetroWindow.xaml
index 335dca9116..0184a0365f 100644
--- a/src/MahApps.Metro/Themes/MetroWindow.xaml
+++ b/src/MahApps.Metro/Themes/MetroWindow.xaml
@@ -13,7 +13,7 @@
     <converters:ThicknessBindingConverter x:Key="ThicknessBindingConverter" />
     <converters:ThicknessToDoubleConverter x:Key="ThicknessToDoubleConverter" />
 
-    <ControlTemplate x:Key="WindowTemplateKey" TargetType="{x:Type mah:MetroWindow}">
+    <ControlTemplate x:Key="MahApps.Templates.MetroWindow" TargetType="{x:Type mah:MetroWindow}">
         <Grid Background="{TemplateBinding Background}"
               LayoutTransform="{Binding LayoutTransform, RelativeSource={RelativeSource TemplatedParent}}"
               RenderTransform="{Binding RenderTransform, RelativeSource={RelativeSource TemplatedParent}}"
@@ -267,7 +267,7 @@
 
     </ControlTemplate>
 
-    <ControlTemplate x:Key="CenterWindowTemplateKey" TargetType="{x:Type mah:MetroWindow}">
+    <ControlTemplate x:Key="MahApps.Templates.MetroWindow.Center" TargetType="{x:Type mah:MetroWindow}">
         <Grid Background="{TemplateBinding Background}"
               LayoutTransform="{Binding LayoutTransform, RelativeSource={RelativeSource TemplatedParent}}"
               RenderTransform="{Binding RenderTransform, RelativeSource={RelativeSource TemplatedParent}}"
@@ -572,7 +572,7 @@
         <Setter Property="OverlayFadeIn" Value="{StaticResource OverlayFastSemiFadeIn}" />
         <Setter Property="OverlayFadeOut" Value="{StaticResource OverlayFastSemiFadeOut}" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="Template" Value="{StaticResource WindowTemplateKey}" />
+        <Setter Property="Template" Value="{StaticResource MahApps.Templates.MetroWindow}" />
         <Setter Property="TextElement.FontSize" Value="{DynamicResource ContentFontSize}" />
         <Setter Property="TitleForeground" Value="{DynamicResource MahApps.Brushes.IdealForeground}" />
         <Setter Property="TitleTemplate">
@@ -604,7 +604,7 @@
                 </Setter>
             </DataTrigger>
             <Trigger Property="TitleAlignment" Value="Center">
-                <Setter Property="Template" Value="{StaticResource CenterWindowTemplateKey}" />
+                <Setter Property="Template" Value="{StaticResource MahApps.Templates.MetroWindow.Center}" />
             </Trigger>
         </Style.Triggers>
     </Style>
diff --git a/src/MahApps.Metro/Themes/NumericUpDown.xaml b/src/MahApps.Metro/Themes/NumericUpDown.xaml
index fd7e8ce1dd..7196921d09 100644
--- a/src/MahApps.Metro/Themes/NumericUpDown.xaml
+++ b/src/MahApps.Metro/Themes/NumericUpDown.xaml
@@ -256,6 +256,6 @@
             </Setter.Value>
         </Setter>
         <Setter Property="UpDownButtonsWidth" Value="22" />
-        <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource ValidationErrorTemplate}" />
+        <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource MahApps.Templates.ValidationError}" />
     </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Themes/RangeSlider.xaml b/src/MahApps.Metro/Themes/RangeSlider.xaml
index 860392aafd..a55b8c39ee 100644
--- a/src/MahApps.Metro/Themes/RangeSlider.xaml
+++ b/src/MahApps.Metro/Themes/RangeSlider.xaml
@@ -32,7 +32,7 @@
         </Setter>
     </Style>
 
-    <ControlTemplate x:Key="MahApps.Metro.Styles.RangeSlider.HorizontalTemplate" TargetType="{x:Type Controls:RangeSlider}">
+    <ControlTemplate x:Key="MahApps.Templates.RangeSlider.Horizontal" TargetType="{x:Type Controls:RangeSlider}">
         <Grid x:Name="PART_Container"
               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
               Background="{TemplateBinding Background}">
@@ -152,7 +152,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <ControlTemplate x:Key="MahApps.Metro.Styles.RangeSlider.VerticalTemplate" TargetType="{x:Type Controls:RangeSlider}">
+    <ControlTemplate x:Key="MahApps.Templates.RangeSlider.Vertical" TargetType="{x:Type Controls:RangeSlider}">
         <Grid x:Name="PART_Container"
               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
               Background="{TemplateBinding Background}">
@@ -288,11 +288,11 @@
         <Setter Property="Controls:SliderHelper.TrackValueFillPressedBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Gray1}" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="Template" Value="{StaticResource MahApps.Metro.Styles.RangeSlider.HorizontalTemplate}" />
+        <Setter Property="Template" Value="{StaticResource MahApps.Templates.RangeSlider.Horizontal}" />
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
         <Style.Triggers>
             <Trigger Property="Orientation" Value="Vertical">
-                <Setter Property="Template" Value="{StaticResource MahApps.Metro.Styles.RangeSlider.VerticalTemplate}" />
+                <Setter Property="Template" Value="{StaticResource MahApps.Templates.RangeSlider.Vertical}" />
             </Trigger>
         </Style.Triggers>
     </Style>
@@ -329,7 +329,7 @@
         </Setter>
     </Style>
 
-    <ControlTemplate x:Key="MahApps.Metro.Styles.RangeSlider.HorizontalTemplate.Win10" TargetType="{x:Type Controls:RangeSlider}">
+    <ControlTemplate x:Key="MahApps.Templates.RangeSlider.Horizontal.Win10" TargetType="{x:Type Controls:RangeSlider}">
         <Grid x:Name="PART_Container"
               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
               Background="{TemplateBinding Background}">
@@ -464,7 +464,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <ControlTemplate x:Key="MahApps.Metro.Styles.RangeSlider.VerticalTemplate.Win10" TargetType="{x:Type Controls:RangeSlider}">
+    <ControlTemplate x:Key="MahApps.Templates.RangeSlider.Vertical.Win10" TargetType="{x:Type Controls:RangeSlider}">
         <Grid x:Name="PART_Container"
               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
               Background="{TemplateBinding Background}">
@@ -616,11 +616,11 @@
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Gray2}" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="IsMoveToPointEnabled" Value="True" />
-        <Setter Property="Template" Value="{StaticResource MahApps.Metro.Styles.RangeSlider.HorizontalTemplate.Win10}" />
+        <Setter Property="Template" Value="{StaticResource MahApps.Templates.RangeSlider.Horizontal.Win10}" />
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
         <Style.Triggers>
             <Trigger Property="Orientation" Value="Vertical">
-                <Setter Property="Template" Value="{StaticResource MahApps.Metro.Styles.RangeSlider.VerticalTemplate.Win10}" />
+                <Setter Property="Template" Value="{StaticResource MahApps.Templates.RangeSlider.Vertical.Win10}" />
             </Trigger>
         </Style.Triggers>
     </Style>
diff --git a/src/MahApps.Metro/Themes/SplitButton.xaml b/src/MahApps.Metro/Themes/SplitButton.xaml
index 36c13d98a9..6f2d7334ff 100644
--- a/src/MahApps.Metro/Themes/SplitButton.xaml
+++ b/src/MahApps.Metro/Themes/SplitButton.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
-    <ControlTemplate x:Key="SplitButtonHorizontal" TargetType="{x:Type Controls:SplitButton}">
+    <ControlTemplate x:Key="MahApps.Templates.SplitButton.Horizontal" TargetType="{x:Type Controls:SplitButton}">
         <Grid UseLayoutRounding="True">
             <Border x:Name="PART_Border"
                     Background="Transparent"
@@ -130,7 +130,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <ControlTemplate x:Key="SplitButtonVertical" TargetType="{x:Type Controls:SplitButton}">
+    <ControlTemplate x:Key="MahApps.Templates.SplitButton.Vertical" TargetType="{x:Type Controls:SplitButton}">
         <Grid UseLayoutRounding="True">
             <Border x:Name="PART_Border"
                     Background="Transparent"
@@ -291,11 +291,11 @@
         <Setter Property="MinHeight" Value="26" />
         <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="Template" Value="{StaticResource SplitButtonHorizontal}" />
+        <Setter Property="Template" Value="{StaticResource MahApps.Templates.SplitButton.Horizontal}" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Style.Triggers>
             <Trigger Property="Orientation" Value="Vertical">
-                <Setter Property="Template" Value="{StaticResource SplitButtonVertical}" />
+                <Setter Property="Template" Value="{StaticResource MahApps.Templates.SplitButton.Vertical}" />
             </Trigger>
             <Trigger Property="IsFocused" Value="True">
                 <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
diff --git a/src/MahApps.Metro/Themes/ToggleSwitch.xaml b/src/MahApps.Metro/Themes/ToggleSwitch.xaml
index 8d43cca3d2..f2392c518c 100644
--- a/src/MahApps.Metro/Themes/ToggleSwitch.xaml
+++ b/src/MahApps.Metro/Themes/ToggleSwitch.xaml
@@ -223,7 +223,7 @@
         <Setter Property="ThumbIndicatorDisabledBrush" Value="{DynamicResource MahApps.Brushes.Gray4}" />
         <Setter Property="ThumbIndicatorWidth" Value="13" />
         <Setter Property="ToggleSwitchButtonStyle" Value="{DynamicResource MahApps.Metro.Styles.ToggleSwitchButton}" />
-        <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource ValidationErrorTemplate}" />
+        <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource MahApps.Templates.ValidationError}" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 </ResourceDictionary>
diff --git a/src/MahApps.Metro/Themes/WindowButtonCommands.xaml b/src/MahApps.Metro/Themes/WindowButtonCommands.xaml
index 3a9f88f99c..9613034cbb 100644
--- a/src/MahApps.Metro/Themes/WindowButtonCommands.xaml
+++ b/src/MahApps.Metro/Themes/WindowButtonCommands.xaml
@@ -5,7 +5,7 @@
 
     <!--  WindowButtonCommands control templates  -->
 
-    <ControlTemplate x:Key="WindowButtonCommandsTemplate" TargetType="{x:Type Controls:WindowButtonCommands}">
+    <ControlTemplate x:Key="MahApps.Templates.WindowButtonCommands" TargetType="{x:Type Controls:WindowButtonCommands}">
         <StackPanel Orientation="Horizontal">
             <Button x:Name="PART_Min"
                     Focusable="False"
@@ -99,7 +99,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <ControlTemplate x:Key="MahApps.Metro.Templates.WindowButtonCommands.Win10" TargetType="{x:Type Controls:WindowButtonCommands}">
+    <ControlTemplate x:Key="MahApps.Templates.WindowButtonCommands.Win10" TargetType="{x:Type Controls:WindowButtonCommands}">
         <StackPanel Orientation="Horizontal">
             <Button x:Name="PART_Min"
                     Width="46"
@@ -233,7 +233,7 @@
         <Setter Property="LightCloseButtonStyle" Value="{DynamicResource LightMetroWindowButtonStyle}" />
         <Setter Property="LightMaxButtonStyle" Value="{DynamicResource LightMetroWindowButtonStyle}" />
         <Setter Property="LightMinButtonStyle" Value="{DynamicResource LightMetroWindowButtonStyle}" />
-        <Setter Property="Template" Value="{StaticResource WindowButtonCommandsTemplate}" />
+        <Setter Property="Template" Value="{StaticResource MahApps.Templates.WindowButtonCommands}" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Style.Triggers>
             <DataTrigger Binding="{Binding ParentWindow.ShowTitleBar, RelativeSource={RelativeSource Self}}" Value="True">
@@ -247,7 +247,7 @@
            TargetType="{x:Type Controls:WindowButtonCommands}">
         <Setter Property="DarkCloseButtonStyle" Value="{DynamicResource MahApps.Metro.Styles.WindowButton.Close.Dark.Win10}" />
         <Setter Property="LightCloseButtonStyle" Value="{DynamicResource MahApps.Metro.Styles.WindowButton.Close.Light.Win10}" />
-        <Setter Property="Template" Value="{StaticResource MahApps.Metro.Templates.WindowButtonCommands.Win10}" />
+        <Setter Property="Template" Value="{StaticResource MahApps.Templates.WindowButtonCommands.Win10}" />
     </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Themes/WindowCommands.xaml b/src/MahApps.Metro/Themes/WindowCommands.xaml
index 81b3d3fd06..15a88038a9 100644
--- a/src/MahApps.Metro/Themes/WindowCommands.xaml
+++ b/src/MahApps.Metro/Themes/WindowCommands.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
-    <ControlTemplate x:Key="WindowCommandsButtonTemplate" TargetType="{x:Type Button}">
+    <ControlTemplate x:Key="MahApps.Templates.Button.WindowCommands" TargetType="{x:Type Button}">
         <Grid Background="{TemplateBinding Background}">
             <Controls:ContentControlEx x:Name="PART_ContentControlEx"
                                        Padding="{TemplateBinding Padding}"
@@ -24,7 +24,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <ControlTemplate x:Key="WindowCommandsToggleButtonTemplate" TargetType="{x:Type ToggleButton}">
+    <ControlTemplate x:Key="MahApps.Templates.ToggleButton.WindowCommands" TargetType="{x:Type ToggleButton}">
         <Grid Background="{TemplateBinding Background}">
             <Controls:ContentControlEx x:Name="PART_ContentControlEx"
                                        Padding="{TemplateBinding Padding}"
@@ -102,7 +102,7 @@
         </Setter>
     </Style>
 
-    <ControlTemplate x:Key="LightWindowCommandsTemplate" TargetType="Controls:WindowCommands">
+    <ControlTemplate x:Key="MahApps.Templates.WindowCommands.Light" TargetType="Controls:WindowCommands">
         <DockPanel>
             <ToggleButton x:Name="PART_ToggleButton"
                           ClickMode="Press"
@@ -146,27 +146,27 @@
         <ControlTemplate.Resources>
             <ResourceDictionary>
                 <Style BasedOn="{StaticResource WindowCommandsControlStyle}" TargetType="{x:Type Button}">
-                    <Setter Property="Template" Value="{StaticResource WindowCommandsButtonTemplate}" />
+                    <Setter Property="Template" Value="{StaticResource MahApps.Templates.Button.WindowCommands}" />
                 </Style>
                 <Style BasedOn="{StaticResource WindowCommandsControlStyle}" TargetType="{x:Type ToggleButton}">
-                    <Setter Property="Template" Value="{StaticResource WindowCommandsToggleButtonTemplate}" />
+                    <Setter Property="Template" Value="{StaticResource MahApps.Templates.ToggleButton.WindowCommands}" />
                 </Style>
 
                 <Style x:Key="{x:Static ToolBar.ButtonStyleKey}"
                        BasedOn="{StaticResource WindowCommandsControlStyle}"
                        TargetType="{x:Type Button}">
-                    <Setter Property="Template" Value="{StaticResource WindowCommandsButtonTemplate}" />
+                    <Setter Property="Template" Value="{StaticResource MahApps.Templates.Button.WindowCommands}" />
                 </Style>
                 <Style x:Key="{x:Static ToolBar.ToggleButtonStyleKey}"
                        BasedOn="{StaticResource WindowCommandsControlStyle}"
                        TargetType="{x:Type ToggleButton}">
-                    <Setter Property="Template" Value="{StaticResource WindowCommandsToggleButtonTemplate}" />
+                    <Setter Property="Template" Value="{StaticResource MahApps.Templates.ToggleButton.WindowCommands}" />
                 </Style>
             </ResourceDictionary>
         </ControlTemplate.Resources>
     </ControlTemplate>
 
-    <ControlTemplate x:Key="DarkWindowCommandsTemplate" TargetType="Controls:WindowCommands">
+    <ControlTemplate x:Key="MahApps.Templates.WindowCommands.Dark" TargetType="Controls:WindowCommands">
         <DockPanel>
             <ToggleButton x:Name="PART_ToggleButton"
                           ClickMode="Press"
@@ -210,7 +210,7 @@
         <ControlTemplate.Resources>
             <ResourceDictionary>
                 <Style BasedOn="{StaticResource WindowCommandsControlStyle}" TargetType="{x:Type Button}">
-                    <Setter Property="Template" Value="{StaticResource WindowCommandsButtonTemplate}" />
+                    <Setter Property="Template" Value="{StaticResource MahApps.Templates.Button.WindowCommands}" />
                     <Style.Triggers>
                         <Trigger Property="IsPressed" Value="True">
                             <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
@@ -218,7 +218,7 @@
                     </Style.Triggers>
                 </Style>
                 <Style BasedOn="{StaticResource WindowCommandsControlStyle}" TargetType="{x:Type ToggleButton}">
-                    <Setter Property="Template" Value="{StaticResource WindowCommandsToggleButtonTemplate}" />
+                    <Setter Property="Template" Value="{StaticResource MahApps.Templates.ToggleButton.WindowCommands}" />
                     <Style.Triggers>
                         <Trigger Property="IsPressed" Value="True">
                             <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
@@ -229,7 +229,7 @@
                 <Style x:Key="{x:Static ToolBar.ButtonStyleKey}"
                        BasedOn="{StaticResource WindowCommandsControlStyle}"
                        TargetType="{x:Type Button}">
-                    <Setter Property="Template" Value="{StaticResource WindowCommandsButtonTemplate}" />
+                    <Setter Property="Template" Value="{StaticResource MahApps.Templates.Button.WindowCommands}" />
                     <Style.Triggers>
                         <Trigger Property="IsPressed" Value="True">
                             <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
@@ -239,7 +239,7 @@
                 <Style x:Key="{x:Static ToolBar.ToggleButtonStyleKey}"
                        BasedOn="{StaticResource WindowCommandsControlStyle}"
                        TargetType="{x:Type ToggleButton}">
-                    <Setter Property="Template" Value="{StaticResource WindowCommandsToggleButtonTemplate}" />
+                    <Setter Property="Template" Value="{StaticResource MahApps.Templates.ToggleButton.WindowCommands}" />
                     <Style.Triggers>
                         <Trigger Property="IsPressed" Value="True">
                             <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
@@ -290,13 +290,13 @@
     <Style x:Key="MahApps.Metro.Styles.WindowCommands" TargetType="{x:Type Controls:WindowCommands}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TransparentWhite}" />
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Normal" />
-        <Setter Property="DarkTemplate" Value="{StaticResource DarkWindowCommandsTemplate}" />
+        <Setter Property="DarkTemplate" Value="{StaticResource MahApps.Templates.WindowCommands.Dark}" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="LightTemplate" Value="{StaticResource LightWindowCommandsTemplate}" />
-        <Setter Property="Template" Value="{StaticResource LightWindowCommandsTemplate}" />
+        <Setter Property="LightTemplate" Value="{StaticResource MahApps.Templates.WindowCommands.Light}" />
+        <Setter Property="Template" Value="{StaticResource MahApps.Templates.WindowCommands.Light}" />
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
         <Style.Triggers>
             <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentWindow.ShowTitleBar}" Value="True">

From 1013f662d8ff32a309f7a761674e710515c848a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Thu, 11 Jul 2019 15:08:42 +0200
Subject: [PATCH 07/46] Update size names

---
 .../ExampleViews/ColorExample.xaml            |  4 +-
 .../ExampleWindows/FlyoutDemo.xaml            |  2 +-
 .../HamburgerMenuRipple.xaml                  |  2 +-
 .../Controls/Dialogs/LoginDialog.xaml         |  6 +--
 .../Styles/Controls.Buttons.xaml              |  8 +--
 .../Styles/Controls.Calendar.xaml             |  2 +-
 .../Styles/Controls.CheckBox.xaml             |  2 +-
 .../Styles/Controls.ComboBox.xaml             |  4 +-
 .../Styles/Controls.ContextMenu.xaml          |  4 +-
 .../Styles/Controls.DatePicker.xaml           |  4 +-
 .../Styles/Controls.Expander.xaml             |  2 +-
 .../Styles/Controls.GroupBox.xaml             |  2 +-
 src/MahApps.Metro/Styles/Controls.Page.xaml   |  2 +-
 .../Styles/Controls.PasswordBox.xaml          |  4 +-
 .../Styles/Controls.RadioButton.xaml          |  2 +-
 .../Styles/Controls.Scrollbars.xaml           |  4 +-
 src/MahApps.Metro/Styles/Controls.Slider.xaml | 16 +++---
 .../Styles/Controls.StatusBar.xaml            |  2 +-
 .../Styles/Controls.TabControl.xaml           |  2 +-
 .../Styles/Controls.TextBlock.xaml            |  2 +-
 .../Styles/Controls.TextBox.xaml              |  8 +--
 .../Styles/Controls.ToggleSwitch.xaml         |  4 +-
 .../Styles/Controls.Tooltip.xaml              |  2 +-
 src/MahApps.Metro/Styles/Fonts.xaml           | 52 +++++++++----------
 src/MahApps.Metro/Styles/Sizes.xaml           |  8 +--
 src/MahApps.Metro/Styles/VS/GroupBox.xaml     |  4 +-
 src/MahApps.Metro/Styles/VS/TabControl.xaml   |  2 +-
 src/MahApps.Metro/Themes/DateTimePicker.xaml  |  2 +-
 .../Themes/Dialogs/BaseMetroDialog.xaml       |  4 +-
 src/MahApps.Metro/Themes/DropDownButton.xaml  |  2 +-
 src/MahApps.Metro/Themes/Flyout.xaml          |  2 +-
 src/MahApps.Metro/Themes/HotKeyBox.xaml       |  4 +-
 src/MahApps.Metro/Themes/MetroHeader.xaml     |  2 +-
 .../Themes/MetroProgressBar.xaml              |  6 +--
 src/MahApps.Metro/Themes/MetroWindow.xaml     |  4 +-
 src/MahApps.Metro/Themes/NumericUpDown.xaml   |  4 +-
 src/MahApps.Metro/Themes/Pivot.xaml           |  4 +-
 src/MahApps.Metro/Themes/RangeSlider.xaml     |  4 +-
 src/MahApps.Metro/Themes/SplitButton.xaml     |  2 +-
 src/MahApps.Metro/Themes/ToggleSwitch.xaml    |  4 +-
 40 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ColorExample.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ColorExample.xaml
index be9d20484b..5a7f732d59 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ColorExample.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ColorExample.xaml
@@ -36,12 +36,12 @@
                     <TextBlock Grid.Column="1"
                                Margin="10"
                                VerticalAlignment="Center"
-                               FontSize="{DynamicResource NormalFontSize}"
+                               FontSize="{DynamicResource MahApps.Sizes.Font.Normal}"
                                Text="{Binding ElementName=BrushResource, Path=(Shape.Fill)}" />
                     <TextBlock Grid.Column="2"
                                Margin="10"
                                VerticalAlignment="Center"
-                               FontSize="{DynamicResource NormalFontSize}"
+                               FontSize="{DynamicResource MahApps.Sizes.Font.Normal}"
                                Text="{Binding}" />
                 </Grid>
             </DataTemplate>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml
index b0443c7918..ab04fa1a84 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml
@@ -60,7 +60,7 @@
                 <TextBlock Margin="0 -1 8 0"
                            VerticalAlignment="Center"
                            FontFamily="{DynamicResource HeaderFontFamily}"
-                           FontSize="{DynamicResource WindowTitleFontSize}"
+                           FontSize="{DynamicResource MahApps.Sizes.Font.WindowTitle}"
                            Text="{TemplateBinding Content}"
                            TextTrimming="CharacterEllipsis" />
                 <Button Margin="1 0 1 1"
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/HamburgerMenuRipple/HamburgerMenuRipple.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/HamburgerMenuRipple/HamburgerMenuRipple.xaml
index 738f0badab..498231e0ff 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/HamburgerMenuRipple/HamburgerMenuRipple.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/HamburgerMenuRipple/HamburgerMenuRipple.xaml
@@ -295,7 +295,7 @@
                                        Margin="0 15 0 5"
                                        Padding="0"
                                        FontFamily="{DynamicResource HeaderFontFamily}"
-                                       FontSize="{DynamicResource HeaderFontSize}"
+                                       FontSize="{DynamicResource MahApps.Sizes.HeaderFont}"
                                        Text="{Binding Label}" />
                             <ScrollViewer Grid.Row="1"
                                           Focusable="False"
diff --git a/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml b/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml
index 64cc54af8d..fc9c5e737b 100644
--- a/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml
+++ b/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml
@@ -25,7 +25,7 @@
                  Controls:TextBoxHelper.Watermark="{Binding UsernameWatermark, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                  Controls:VisibilityHelper.IsCollapsed="{Binding ShouldHideUsername, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                  CharacterCasing="{Binding UsernameCharacterCasing, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
-                 FontSize="{DynamicResource DialogMessageFontSize}"
+                 FontSize="{DynamicResource MahApps.Sizes.Font.DialogMessage}"
                  Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                  Text="{Binding Username, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                  TextWrapping="Wrap" />
@@ -35,13 +35,13 @@
                      Behaviors:PasswordBoxBindingBehavior.Password="{Binding Password, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                      Controls:TextBoxHelper.SelectAllOnFocus="True"
                      Controls:TextBoxHelper.Watermark="{Binding PasswordWatermark, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
-                     FontSize="{DynamicResource DialogMessageFontSize}"
+                     FontSize="{DynamicResource MahApps.Sizes.Font.DialogMessage}"
                      Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}" />
         <CheckBox x:Name="PART_RememberCheckBox"
                   Grid.Row="3"
                   Margin="0 5 0 0"
                   Content="{Binding RememberCheckBoxText, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
-                  FontSize="{DynamicResource DialogMessageFontSize}"
+                  FontSize="{DynamicResource MahApps.Sizes.Font.DialogMessage}"
                   IsChecked="{Binding RememberCheckBoxChecked, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                   Visibility="{Binding RememberCheckBoxVisibility, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}" />
         <StackPanel Grid.Row="4"
diff --git a/src/MahApps.Metro/Styles/Controls.Buttons.xaml b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
index 72549bfd3a..723ad16508 100644
--- a/src/MahApps.Metro/Styles/Controls.Buttons.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
@@ -24,7 +24,7 @@
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.FlatButton.Background}" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="FocusVisualStyle" Value="{DynamicResource MahApps.Metro.Styles.FlatButtonFocusVisualStyle}" />
-        <Setter Property="FontSize" Value="{DynamicResource FlatButtonFontSize}" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.FlatButton}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.FlatButton.Foreground}" />
         <Setter Property="Padding" Value="10 5 10 5" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -71,7 +71,7 @@
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.FlatButton.Background}" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="FocusVisualStyle" Value="{DynamicResource MahApps.Metro.Styles.FlatButtonFocusVisualStyle}" />
-        <Setter Property="FontSize" Value="{DynamicResource FlatButtonFontSize}" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.FlatButton}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.FlatButton.Foreground}" />
         <Setter Property="Padding" Value="10 5 10 5" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -393,7 +393,7 @@
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.Button.MouseOverBorder}" />
         <Setter Property="Controls:ControlsHelper.FocusBorderThickness" Value="2" />
         <Setter Property="FontFamily" Value="{DynamicResource DefaultFont}" />
-        <Setter Property="FontSize" Value="{DynamicResource UpperCaseContentFontSize}" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.UpperCaseContent}" />
         <Setter Property="FontWeight" Value="Bold" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="MinHeight" Value="25" />
@@ -680,7 +680,7 @@
         <Setter Property="Controls:ControlsHelper.CornerRadius" Value="3" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.Button.MouseOverBorder}" />
         <Setter Property="FontFamily" Value="{DynamicResource DefaultFont}" />
-        <Setter Property="FontSize" Value="{DynamicResource UpperCaseContentFontSize}" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.UpperCaseContent}" />
         <Setter Property="FontWeight" Value="Bold" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="MinHeight" Value="25" />
diff --git a/src/MahApps.Metro/Styles/Controls.Calendar.xaml b/src/MahApps.Metro/Styles/Controls.Calendar.xaml
index a81ccc4a21..ea61601001 100644
--- a/src/MahApps.Metro/Styles/Controls.Calendar.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Calendar.xaml
@@ -564,7 +564,7 @@
            BasedOn="{StaticResource MahApps.Metro.Styles.BaseMetroCalendar}"
            TargetType="{x:Type Calendar}">
         <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
-        <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
     </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Controls.CheckBox.xaml b/src/MahApps.Metro/Styles/Controls.CheckBox.xaml
index 4211fcc18c..48c0891280 100644
--- a/src/MahApps.Metro/Styles/Controls.CheckBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.CheckBox.xaml
@@ -11,7 +11,7 @@
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.Highlight}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.CheckBox.MouseOver}" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
-        <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Label.Text}" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="Padding" Value="6 0 0 0" />
diff --git a/src/MahApps.Metro/Styles/Controls.ComboBox.xaml b/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
index f609d07e16..f06bf0e01e 100644
--- a/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
@@ -269,10 +269,10 @@
         <Setter Property="BorderThickness" Value="{DynamicResource ComboBoxBorderThemeThickness}" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.ComboBox.MouseOverInnerBorder}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
-        <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource ClearTextButtonFontSize}" />
+        <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Sizes.Font.ClearTextButton}" />
         <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="24" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
-        <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="MinHeight" Value="26" />
diff --git a/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml b/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml
index 4cf346d6cd..9c41eabb67 100644
--- a/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml
@@ -37,7 +37,7 @@
     <Style x:Key="MetroMenu" TargetType="{x:Type Menu}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Menu.Background}" />
         <Setter Property="FontFamily" Value="{DynamicResource {x:Static SystemFonts.MenuFontFamilyKey}}" />
-        <Setter Property="FontSize" Value="{DynamicResource MenuFontSize}" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Menu}" />
         <Setter Property="FontStyle" Value="{DynamicResource {x:Static SystemFonts.MenuFontStyleKey}}" />
         <Setter Property="FontWeight" Value="{DynamicResource {x:Static SystemFonts.MenuFontWeightKey}}" />
         <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.MenuTextBrushKey}}" />
@@ -65,7 +65,7 @@
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ContextMenu.Border}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="FontFamily" Value="{DynamicResource {x:Static SystemFonts.MenuFontFamilyKey}}" />
-        <Setter Property="FontSize" Value="{DynamicResource ContextMenuFontSize}" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.ContextMenu}" />
         <Setter Property="FontStyle" Value="{DynamicResource {x:Static SystemFonts.MenuFontStyleKey}}" />
         <Setter Property="FontWeight" Value="{DynamicResource {x:Static SystemFonts.MenuFontWeightKey}}" />
         <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.MenuTextBrushKey}}" />
diff --git a/src/MahApps.Metro/Styles/Controls.DatePicker.xaml b/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
index c4fd723d70..b646b1b30e 100644
--- a/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
+++ b/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
@@ -20,7 +20,7 @@
         <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="22" />
         <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
-        <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="IsTodayHighlighted" Value="True" />
         <Setter Property="MinHeight" Value="26" />
@@ -188,7 +188,7 @@
         <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
-        <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
         <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
diff --git a/src/MahApps.Metro/Styles/Controls.Expander.xaml b/src/MahApps.Metro/Styles/Controls.Expander.xaml
index 6b894fd79a..65d63ad987 100644
--- a/src/MahApps.Metro/Styles/Controls.Expander.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Expander.xaml
@@ -328,7 +328,7 @@
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Upper" />
-        <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource ContentFontSize}" />
+        <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
         <Setter Property="Controls:ExpanderHelper.HeaderDownStyle" Value="{StaticResource ExpanderDownHeaderStyle}" />
         <Setter Property="Controls:ExpanderHelper.HeaderLeftStyle" Value="{StaticResource ExpanderLeftHeaderStyle}" />
         <Setter Property="Controls:ExpanderHelper.HeaderRightStyle" Value="{StaticResource ExpanderRightHeaderStyle}" />
diff --git a/src/MahApps.Metro/Styles/Controls.GroupBox.xaml b/src/MahApps.Metro/Styles/Controls.GroupBox.xaml
index 574265cc01..c9b64b101f 100644
--- a/src/MahApps.Metro/Styles/Controls.GroupBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.GroupBox.xaml
@@ -12,7 +12,7 @@
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Upper" />
-        <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource ContentFontSize}" />
+        <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
         <Setter Property="Controls:GroupBoxHelper.HeaderForeground" Value="{x:Null}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="Padding" Value="4" />
diff --git a/src/MahApps.Metro/Styles/Controls.Page.xaml b/src/MahApps.Metro/Styles/Controls.Page.xaml
index a8b7f19571..8e7e7caa8d 100644
--- a/src/MahApps.Metro/Styles/Controls.Page.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Page.xaml
@@ -4,7 +4,7 @@
     <Style x:Key="MetroPage" TargetType="{x:Type Page}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
-        <Setter Property="TextElement.FontSize" Value="{DynamicResource ContentFontSize}" />
+        <Setter Property="TextElement.FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
     </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml b/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
index db43d065cd..d9fb294a2c 100644
--- a/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
@@ -86,11 +86,11 @@
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
         <Setter Property="Controls:PasswordBoxHelper.CapsLockIcon" Value="{StaticResource DefaultCapsLockIcon}" />
-        <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource ClearTextButtonFontSize}" />
+        <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Sizes.Font.ClearTextButton}" />
         <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="22" />
         <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
-        <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="MinHeight" Value="26" />
         <Setter Property="Padding" Value="0" />
diff --git a/src/MahApps.Metro/Styles/Controls.RadioButton.xaml b/src/MahApps.Metro/Styles/Controls.RadioButton.xaml
index 97179ca49a..9020df9a59 100644
--- a/src/MahApps.Metro/Styles/Controls.RadioButton.xaml
+++ b/src/MahApps.Metro/Styles/Controls.RadioButton.xaml
@@ -12,7 +12,7 @@
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.Highlight}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.CheckBox.MouseOver}" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
-        <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Label.Text}" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="Padding" Value="6 0 0 0" />
diff --git a/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml b/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
index bcef0d8453..c672ebfb00 100644
--- a/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
@@ -217,14 +217,14 @@
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Style.Triggers>
             <Trigger Property="Orientation" Value="Horizontal">
-                <Setter Property="Height" Value="{DynamicResource MetroScrollBarHeight}" />
+                <Setter Property="Height" Value="{DynamicResource MahApps.Sizes.ScrollBar.Height.Metro}" />
                 <Setter Property="Template" Value="{DynamicResource MahApps.Templates.ScrollBar.Horizontal}" />
                 <Setter Property="Width" Value="Auto" />
             </Trigger>
             <Trigger Property="Orientation" Value="Vertical">
                 <Setter Property="Height" Value="Auto" />
                 <Setter Property="Template" Value="{DynamicResource MahApps.Templates.ScrollBar.Vertical}" />
-                <Setter Property="Width" Value="{DynamicResource MetroScrollBarWidth}" />
+                <Setter Property="Width" Value="{DynamicResource MahApps.Sizes.ScrollBar.Width.Metro}" />
             </Trigger>
         </Style.Triggers>
     </Style>
diff --git a/src/MahApps.Metro/Styles/Controls.Slider.xaml b/src/MahApps.Metro/Styles/Controls.Slider.xaml
index bca05eaa68..b91a84112e 100644
--- a/src/MahApps.Metro/Styles/Controls.Slider.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Slider.xaml
@@ -3,10 +3,10 @@
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls"
                     xmlns:System="clr-namespace:System;assembly=mscorlib">
 
-    <System:Double x:Key="HorizontalThumbHeight">16</System:Double>
-    <System:Double x:Key="HorizontalThumbWidth">10</System:Double>
-    <System:Double x:Key="VerticalThumbWidth">16</System:Double>
-    <System:Double x:Key="VerticalThumbHeight">10</System:Double>
+    <System:Double x:Key="MahApps.Sizes.Slider.HorizontalThumbHeight">16</System:Double>
+    <System:Double x:Key="MahApps.Sizes.Slider.HorizontalThumbWidth">10</System:Double>
+    <System:Double x:Key="MahApps.Sizes.Slider.VerticalThumbWidth">16</System:Double>
+    <System:Double x:Key="MahApps.Sizes.Slider.VerticalThumbHeight">10</System:Double>
 
     <Style x:Key="MahApps.Metro.Styles.Slider.Thumb" TargetType="Thumb">
         <Setter Property="BorderThickness" Value="0" />
@@ -120,8 +120,8 @@
                 </Track.IncreaseRepeatButton>
                 <Track.Thumb>
                     <Controls:MetroThumb x:Name="HorizontalThumb"
-                                         Width="{DynamicResource HorizontalThumbWidth}"
-                                         Height="{DynamicResource HorizontalThumbHeight}"
+                                         Width="{DynamicResource MahApps.Sizes.Slider.HorizontalThumbWidth}"
+                                         Height="{DynamicResource MahApps.Sizes.Slider.HorizontalThumbHeight}"
                                          Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillBrush)}"
                                          BorderThickness="1 0"
                                          IsTabStop="True"
@@ -206,8 +206,8 @@
                 </Track.IncreaseRepeatButton>
                 <Track.Thumb>
                     <Controls:MetroThumb x:Name="VerticalThumb"
-                                         Width="{DynamicResource VerticalThumbWidth}"
-                                         Height="{DynamicResource VerticalThumbHeight}"
+                                         Width="{DynamicResource MahApps.Sizes.Slider.VerticalThumbWidth}"
+                                         Height="{DynamicResource MahApps.Sizes.Slider.VerticalThumbHeight}"
                                          Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillBrush)}"
                                          BorderThickness="0 1"
                                          IsTabStop="True"
diff --git a/src/MahApps.Metro/Styles/Controls.StatusBar.xaml b/src/MahApps.Metro/Styles/Controls.StatusBar.xaml
index 2367f9e05f..212d91ad59 100644
--- a/src/MahApps.Metro/Styles/Controls.StatusBar.xaml
+++ b/src/MahApps.Metro/Styles/Controls.StatusBar.xaml
@@ -50,7 +50,7 @@
 
     <Style x:Key="MetroStatusBar" TargetType="{x:Type StatusBar}">
         <Setter Property="FontFamily" Value="{DynamicResource {x:Static SystemFonts.StatusFontFamilyKey}}" />
-        <Setter Property="FontSize" Value="{DynamicResource StatusBarFontSize}" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.StatusBar}" />
         <Setter Property="FontStyle" Value="{DynamicResource {x:Static SystemFonts.StatusFontStyleKey}}" />
         <Setter Property="FontWeight" Value="{DynamicResource {x:Static SystemFonts.StatusFontWeightKey}}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.IdealForeground}" />
diff --git a/src/MahApps.Metro/Styles/Controls.TabControl.xaml b/src/MahApps.Metro/Styles/Controls.TabControl.xaml
index 1a00432cb8..235d2be095 100644
--- a/src/MahApps.Metro/Styles/Controls.TabControl.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TabControl.xaml
@@ -9,7 +9,7 @@
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderBrush" Value="{x:Null}" />
         <!--  special property for header font size  -->
-        <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource TabItemFontSize}" />
+        <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource MahApps.Sizes.Font.TabItem}" />
         <Setter Property="Controls:TabControlHelper.UnderlineBrush" Value="{DynamicResource MahApps.Brushes.GrayNormal}" />
         <Setter Property="Controls:TabControlHelper.UnderlineMouseOverBrush" Value="{DynamicResource MahApps.Brushes.GrayHover}" />
         <Setter Property="Controls:TabControlHelper.UnderlineMouseOverSelectedBrush" Value="{DynamicResource MahApps.Brushes.Highlight}" />
diff --git a/src/MahApps.Metro/Styles/Controls.TextBlock.xaml b/src/MahApps.Metro/Styles/Controls.TextBlock.xaml
index 77f2124f08..a7e7b5b992 100644
--- a/src/MahApps.Metro/Styles/Controls.TextBlock.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TextBlock.xaml
@@ -14,7 +14,7 @@
     <Style x:Key="MetroAutoCollapsingTextBlock"
            BasedOn="{StaticResource MetroTextBlock}"
            TargetType="{x:Type TextBlock}">
-        <Setter Property="FontSize" Value="{DynamicResource FloatingWatermarkFontSize}" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.FloatingWatermark}" />
         <Setter Property="Opacity" Value="0.6" />
         <Style.Triggers>
             <Trigger Property="Text" Value="">
diff --git a/src/MahApps.Metro/Styles/Controls.TextBox.xaml b/src/MahApps.Metro/Styles/Controls.TextBox.xaml
index f237b581e2..adc8516ae2 100644
--- a/src/MahApps.Metro/Styles/Controls.TextBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TextBox.xaml
@@ -18,13 +18,13 @@
         <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
-        <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource ClearTextButtonFontSize}" />
+        <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Sizes.Font.ClearTextButton}" />
         <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="22" />
         <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True" />
         <Setter Property="Controls:TextBoxHelper.IsSpellCheckContextMenuEnabled" Value="{Binding RelativeSource={RelativeSource Self}, Path=(SpellCheck.IsEnabled)}" />
         <Setter Property="Controls:TextBoxHelper.WatermarkWrapping" Value="{Binding RelativeSource={RelativeSource Self}, Path=TextWrapping, Mode=OneWay}" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
-        <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="MinHeight" Value="26" />
         <Setter Property="Padding" Value="0" />
@@ -568,13 +568,13 @@
         <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
-        <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource ClearTextButtonFontSize}" />
+        <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Sizes.Font.ClearTextButton}" />
         <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="22" />
         <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True" />
         <Setter Property="Controls:TextBoxHelper.IsSpellCheckContextMenuEnabled" Value="{Binding RelativeSource={RelativeSource Self}, Path=(SpellCheck.IsEnabled)}" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
-        <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="MinHeight" Value="26" />
         <Setter Property="MinWidth" Value="10" />
diff --git a/src/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml b/src/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
index e4a75e169c..c94eae7edd 100644
--- a/src/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
@@ -140,9 +140,9 @@
            TargetType="{x:Type Controls:ToggleSwitch}">
         <Setter Property="ContentDirection" Value="RightToLeft" />
         <Setter Property="ContentPadding" Value="0 0 10 0" />
-        <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource ToggleSwitchHeaderFontSize.Win10}" />
+        <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource ToggleSwitchMahApps.Sizes.HeaderFont.Win10}" />
         <Setter Property="FontFamily" Value="{DynamicResource ToggleSwitchFontFamily.Win10}" />
-        <Setter Property="FontSize" Value="{DynamicResource ToggleSwitchFontSize.Win10}" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.ToggleSwitch.Win10}" />
         <Setter Property="HeaderFontFamily" Value="{DynamicResource ToggleSwitchHeaderFontFamily.Win10}" />
         <Setter Property="OffSwitchBrush" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.OffSwitchBrush.Win10}" />
         <Setter Property="OnSwitchBrush" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10}" />
diff --git a/src/MahApps.Metro/Styles/Controls.Tooltip.xaml b/src/MahApps.Metro/Styles/Controls.Tooltip.xaml
index 7cf8dbec5b..abed59e993 100644
--- a/src/MahApps.Metro/Styles/Controls.Tooltip.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Tooltip.xaml
@@ -7,7 +7,7 @@
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray7}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="FontSize" Value="{DynamicResource TooltipFontSize}" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Tooltip}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="Padding" Value="6 3" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
diff --git a/src/MahApps.Metro/Styles/Fonts.xaml b/src/MahApps.Metro/Styles/Fonts.xaml
index 7cce58eefa..4675ae1d70 100644
--- a/src/MahApps.Metro/Styles/Fonts.xaml
+++ b/src/MahApps.Metro/Styles/Fonts.xaml
@@ -11,31 +11,31 @@
     <FontFamily x:Key="ToggleSwitchFontFamily.Win10">Segoe UI, Lucida Sans Unicode, Verdana</FontFamily>
     <FontFamily x:Key="ToggleSwitchHeaderFontFamily.Win10">Segoe UI, Lucida Sans Unicode, Verdana</FontFamily>
 
-    <System:Double x:Key="HeaderFontSize">40</System:Double>
-    <System:Double x:Key="SubHeaderFontSize">29.333</System:Double>
-    <System:Double x:Key="WindowTitleFontSize">16</System:Double>
-    <System:Double x:Key="NormalFontSize">14</System:Double>
-    <System:Double x:Key="ContentFontSize">12</System:Double>
-    <System:Double x:Key="FlatButtonFontSize">14</System:Double>
-    <System:Double x:Key="TabItemFontSize">26.67</System:Double>
-    <System:Double x:Key="UpperCaseContentFontSize">10</System:Double>
-    <System:Double x:Key="FloatingWatermarkFontSize">10</System:Double>
-    <System:Double x:Key="ClearTextButtonFontSize">16</System:Double>
-
-    <System:Double x:Key="TooltipFontSize">12</System:Double>
-    <System:Double x:Key="MenuFontSize">14</System:Double>
-    <System:Double x:Key="ContextMenuFontSize">14</System:Double>
-
-    <System:Double x:Key="StatusBarFontSize">12</System:Double>
-
-    <System:Double x:Key="DialogTitleFontSize">26</System:Double>
-    <System:Double x:Key="DialogMessageFontSize">15</System:Double>
-
-    <System:Double x:Key="FlyoutHeaderFontSize">20</System:Double>
-
-    <System:Double x:Key="ToggleSwitchFontSize">14.667</System:Double>
-    <System:Double x:Key="ToggleSwitchHeaderFontSize">16</System:Double>
-    <System:Double x:Key="ToggleSwitchFontSize.Win10">15</System:Double>
-    <System:Double x:Key="ToggleSwitchHeaderFontSize.Win10">15</System:Double>
+    <System:Double x:Key="MahApps.Sizes.Font.Header">40</System:Double>
+    <System:Double x:Key="MahApps.Sizes.Font.SubHeader">29.333</System:Double>
+    <System:Double x:Key="MahApps.Sizes.Font.WindowTitle">16</System:Double>
+    <System:Double x:Key="MahApps.Sizes.Font.Normal">14</System:Double>
+    <System:Double x:Key="MahApps.Sizes.Font.Content">12</System:Double>
+    <System:Double x:Key="MahApps.Sizes.Font.FlatButton">14</System:Double>
+    <System:Double x:Key="MahApps.Sizes.Font.TabItem">26.67</System:Double>
+    <System:Double x:Key="MahApps.Sizes.Font.UpperCaseContent">10</System:Double>
+    <System:Double x:Key="MahApps.Sizes.Font.FloatingWatermark">10</System:Double>
+    <System:Double x:Key="MahApps.Sizes.Font.ClearTextButton">16</System:Double>
+
+    <System:Double x:Key="MahApps.Sizes.Font.Tooltip">12</System:Double>
+    <System:Double x:Key="MahApps.Sizes.Font.Menu">14</System:Double>
+    <System:Double x:Key="MahApps.Sizes.Font.ContextMenu">14</System:Double>
+
+    <System:Double x:Key="MahApps.Sizes.Font.StatusBar">12</System:Double>
+
+    <System:Double x:Key="MahApps.Sizes.Font.DialogTitle">26</System:Double>
+    <System:Double x:Key="MahApps.Sizes.Font.DialogMessage">15</System:Double>
+
+    <System:Double x:Key="MahApps.Sizes.Font.FlyoutHeader">20</System:Double>
+
+    <System:Double x:Key="MahApps.Sizes.Font.ToggleSwitch">14.667</System:Double>
+    <System:Double x:Key="MahApps.Sizes.Font.ToggleSwitchHeader">16</System:Double>
+    <System:Double x:Key="MahApps.Sizes.Font.ToggleSwitch.Win10">15</System:Double>
+    <System:Double x:Key="MahApps.Sizes.Font.ToggleSwitchHeader.Win10">15</System:Double>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Sizes.xaml b/src/MahApps.Metro/Styles/Sizes.xaml
index 98d79d75f2..55eaf5235b 100644
--- a/src/MahApps.Metro/Styles/Sizes.xaml
+++ b/src/MahApps.Metro/Styles/Sizes.xaml
@@ -2,10 +2,10 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:System="clr-namespace:System;assembly=mscorlib">
 
-    <System:Double x:Key="MetroScrollBarHeight">14</System:Double>
-    <System:Double x:Key="MetroScrollBarWidth">14</System:Double>
+    <System:Double x:Key="MahApps.Sizes.ScrollBar.Height.Metro">14</System:Double>
+    <System:Double x:Key="MahApps.Sizes.ScrollBar.Width.Metro">14</System:Double>
 
-    <System:Double x:Key="HorizontalScrollBarRepeatButtonWidth">14</System:Double>
-    <System:Double x:Key="VerticalScrollBarRepeatButtonHeight">14</System:Double>
+    <System:Double x:Key="MahApps.Sizes.ScrollBar.HorizontalRepeatButtonWidth">14</System:Double>
+    <System:Double x:Key="MahApps.Sizes.ScrollBar.VerticalRepeatButtonHeight">14</System:Double>
 
 </ResourceDictionary>
diff --git a/src/MahApps.Metro/Styles/VS/GroupBox.xaml b/src/MahApps.Metro/Styles/VS/GroupBox.xaml
index 50f53ff505..0c56dc4810 100644
--- a/src/MahApps.Metro/Styles/VS/GroupBox.xaml
+++ b/src/MahApps.Metro/Styles/VS/GroupBox.xaml
@@ -4,14 +4,14 @@
                     xmlns:System="clr-namespace:System;assembly=mscorlib">
 
     <Thickness x:Key="GroupBoxHeaderThemePadding">2</Thickness>
-    <System:Double x:Key="GroupBoxHeaderThemeFontSize">16</System:Double>
+    <System:Double x:Key="MahApps.Sizes.GroupBox.HeaderThemeFont">16</System:Double>
 
     <Style x:Key="StandardGroupBox" TargetType="{x:Type GroupBox}">
         <Setter Property="Background" Value="{x:Null}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Normal}" />
         <Setter Property="BorderThickness" Value="2" />
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Normal" />
-        <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource GroupBoxHeaderThemeFontSize}" />
+        <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource MahApps.Sizes.GroupBox.HeaderThemeFont}" />
         <Setter Property="Controls:GroupBoxHelper.HeaderForeground" Value="{DynamicResource Foreground}" />
         <Setter Property="Foreground" Value="{DynamicResource Foreground}" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
diff --git a/src/MahApps.Metro/Styles/VS/TabControl.xaml b/src/MahApps.Metro/Styles/VS/TabControl.xaml
index e8ebee7ebe..e24aeed836 100644
--- a/src/MahApps.Metro/Styles/VS/TabControl.xaml
+++ b/src/MahApps.Metro/Styles/VS/TabControl.xaml
@@ -9,7 +9,7 @@
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.TabControl.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <System:Double x:Key="TabItemFontSize">12</System:Double>
+    <System:Double x:Key="MahApps.Sizes.Font.TabItem">12</System:Double>
 
     <Style x:Key="StandardTabControl"
            BasedOn="{StaticResource MetroTabControl}"
diff --git a/src/MahApps.Metro/Themes/DateTimePicker.xaml b/src/MahApps.Metro/Themes/DateTimePicker.xaml
index e36982a1ad..2c41697afa 100644
--- a/src/MahApps.Metro/Themes/DateTimePicker.xaml
+++ b/src/MahApps.Metro/Themes/DateTimePicker.xaml
@@ -118,7 +118,7 @@
         <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="22" />
         <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
-        <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="HandVisibility" Value="HourMinute" />
         <Setter Property="MinHeight" Value="26" />
diff --git a/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml b/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml
index 28a0f9f270..45083b599f 100644
--- a/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml
+++ b/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml
@@ -110,8 +110,8 @@
 
     <Style x:Key="MahApps.Metro.Styles.MetroDialog" TargetType="{x:Type Dialogs:BaseMetroDialog}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.WhiteColor}" />
-        <Setter Property="DialogMessageFontSize" Value="{DynamicResource DialogMessageFontSize}" />
-        <Setter Property="DialogTitleFontSize" Value="{DynamicResource DialogTitleFontSize}" />
+        <Setter Property="DialogMessageFontSize" Value="{DynamicResource MahApps.Sizes.Font.DialogMessage}" />
+        <Setter Property="DialogTitleFontSize" Value="{DynamicResource MahApps.Sizes.Font.DialogTitle}" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
diff --git a/src/MahApps.Metro/Themes/DropDownButton.xaml b/src/MahApps.Metro/Themes/DropDownButton.xaml
index 9847748e7b..b25f6b7a2d 100644
--- a/src/MahApps.Metro/Themes/DropDownButton.xaml
+++ b/src/MahApps.Metro/Themes/DropDownButton.xaml
@@ -27,7 +27,7 @@
         <Setter Property="FocusVisualStyle" Value="{StaticResource ButtonDropDownFocusVisual}" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
-        <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.BlackColor}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="MenuStyle" Value="{DynamicResource MetroContextMenu}" />
diff --git a/src/MahApps.Metro/Themes/Flyout.xaml b/src/MahApps.Metro/Themes/Flyout.xaml
index 0e18a2eb64..4355f9db98 100644
--- a/src/MahApps.Metro/Themes/Flyout.xaml
+++ b/src/MahApps.Metro/Themes/Flyout.xaml
@@ -222,7 +222,7 @@
     <Style TargetType="{x:Type Controls:Flyout}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Flyout.Background}" />
         <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource FlyoutHeaderFontSize}" />
+        <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource FlyoutMahApps.Sizes.HeaderFont}" />
         <Setter Property="Controls:ControlsHelper.HeaderMargin" Value="10" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Flyout.Foreground}" />
diff --git a/src/MahApps.Metro/Themes/HotKeyBox.xaml b/src/MahApps.Metro/Themes/HotKeyBox.xaml
index ead51c38a8..30ce0058dc 100644
--- a/src/MahApps.Metro/Themes/HotKeyBox.xaml
+++ b/src/MahApps.Metro/Themes/HotKeyBox.xaml
@@ -11,9 +11,9 @@
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Upper" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
-        <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource ClearTextButtonFontSize}" />
+        <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Sizes.Font.ClearTextButton}" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
-        <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="MinHeight" Value="26" />
         <Setter Property="Padding" Value="0" />
diff --git a/src/MahApps.Metro/Themes/MetroHeader.xaml b/src/MahApps.Metro/Themes/MetroHeader.xaml
index 3c37c9bc90..c71b6366e0 100644
--- a/src/MahApps.Metro/Themes/MetroHeader.xaml
+++ b/src/MahApps.Metro/Themes/MetroHeader.xaml
@@ -3,7 +3,7 @@
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
     <Style x:Key="MahApps.Metro.Styles.MetroHeader" TargetType="{x:Type Controls:MetroHeader}">
-        <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource NormalFontSize}" />
+        <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource MahApps.Sizes.Font.Normal}" />
         <Setter Property="Controls:ControlsHelper.HeaderMargin" Value="0 0 0 2" />
         <Setter Property="Controls:GroupBoxHelper.HeaderForeground" Value="{Binding RelativeSource={RelativeSource Self}, Path=Foreground, Mode=OneWay}" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
diff --git a/src/MahApps.Metro/Themes/MetroProgressBar.xaml b/src/MahApps.Metro/Themes/MetroProgressBar.xaml
index c140d95248..ed2f152b9c 100644
--- a/src/MahApps.Metro/Themes/MetroProgressBar.xaml
+++ b/src/MahApps.Metro/Themes/MetroProgressBar.xaml
@@ -3,7 +3,7 @@
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls"
                     xmlns:System="clr-namespace:System;assembly=mscorlib">
 
-    <System:Double x:Key="ProgressBarMinHeight">6</System:Double>
+    <System:Double x:Key="MahApps.Sizes.ProgressBar.MinHeight">6</System:Double>
 
     <Style x:Key="MahApps.Metro.Styles.MetroProgressBar" TargetType="{x:Type Controls:MetroProgressBar}">
         <Setter Property="Background" Value="#1FFFFFFF" />
@@ -12,7 +12,7 @@
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Highlight}" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="Maximum" Value="100" />
-        <Setter Property="MinHeight" Value="{StaticResource ProgressBarMinHeight}" />
+        <Setter Property="MinHeight" Value="{StaticResource MahApps.Sizes.ProgressBar.MinHeight}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Controls:MetroProgressBar}">
@@ -270,7 +270,7 @@
                         </Trigger>
                         <Trigger Property="Orientation" Value="Vertical">
                             <Setter Property="MinHeight" Value="0" />
-                            <Setter Property="MinWidth" Value="{StaticResource ProgressBarMinHeight}" />
+                            <Setter Property="MinWidth" Value="{StaticResource MahApps.Sizes.ProgressBar.MinHeight}" />
                             <Setter Property="UseLayoutRounding" Value="True" />
                             <Setter TargetName="ContainingGrid" Property="LayoutTransform">
                                 <Setter.Value>
diff --git a/src/MahApps.Metro/Themes/MetroWindow.xaml b/src/MahApps.Metro/Themes/MetroWindow.xaml
index 0184a0365f..80889832f7 100644
--- a/src/MahApps.Metro/Themes/MetroWindow.xaml
+++ b/src/MahApps.Metro/Themes/MetroWindow.xaml
@@ -573,7 +573,7 @@
         <Setter Property="OverlayFadeOut" Value="{StaticResource OverlayFastSemiFadeOut}" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template" Value="{StaticResource MahApps.Templates.MetroWindow}" />
-        <Setter Property="TextElement.FontSize" Value="{DynamicResource ContentFontSize}" />
+        <Setter Property="TextElement.FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
         <Setter Property="TitleForeground" Value="{DynamicResource MahApps.Brushes.IdealForeground}" />
         <Setter Property="TitleTemplate">
             <Setter.Value>
@@ -581,7 +581,7 @@
                     <TextBlock Margin="8 -1 1 0"
                                VerticalAlignment="Center"
                                FontFamily="{DynamicResource HeaderFontFamily}"
-                               FontSize="{DynamicResource WindowTitleFontSize}"
+                               FontSize="{DynamicResource MahApps.Sizes.Font.WindowTitle}"
                                Text="{TemplateBinding Content}"
                                TextTrimming="CharacterEllipsis" />
                 </DataTemplate>
diff --git a/src/MahApps.Metro/Themes/NumericUpDown.xaml b/src/MahApps.Metro/Themes/NumericUpDown.xaml
index 7196921d09..4e34129040 100644
--- a/src/MahApps.Metro/Themes/NumericUpDown.xaml
+++ b/src/MahApps.Metro/Themes/NumericUpDown.xaml
@@ -16,12 +16,12 @@
         <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
-        <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource ClearTextButtonFontSize}" />
+        <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Sizes.Font.ClearTextButton}" />
         <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="22" />
         <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
-        <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="HorizontalContentAlignment" Value="Right" />
         <Setter Property="MinHeight" Value="26" />
diff --git a/src/MahApps.Metro/Themes/Pivot.xaml b/src/MahApps.Metro/Themes/Pivot.xaml
index f21bcac206..3c56034610 100644
--- a/src/MahApps.Metro/Themes/Pivot.xaml
+++ b/src/MahApps.Metro/Themes/Pivot.xaml
@@ -4,7 +4,7 @@
 
     <DataTemplate x:Key="PivotHeaderTemplate">
         <TextBlock FontFamily="{DynamicResource HeaderFontFamily}"
-                   FontSize="{DynamicResource HeaderFontSize}"
+                   FontSize="{DynamicResource MahApps.Sizes.HeaderFont}"
                    Text="{Binding}" />
     </DataTemplate>
 
@@ -74,7 +74,7 @@
                                 <DataTemplate DataType="{x:Type Controls:PivotItem}">
                                     <TextBlock Margin="0 0 25 0"
                                                FontFamily="{DynamicResource HeaderFontFamily}"
-                                               FontSize="{DynamicResource SubHeaderFontSize}"
+                                               FontSize="{DynamicResource SubMahApps.Sizes.HeaderFont}"
                                                Text="{Binding Header}" />
                                 </DataTemplate>
                             </ItemsControl.ItemTemplate>
diff --git a/src/MahApps.Metro/Themes/RangeSlider.xaml b/src/MahApps.Metro/Themes/RangeSlider.xaml
index a55b8c39ee..6cf4eea40e 100644
--- a/src/MahApps.Metro/Themes/RangeSlider.xaml
+++ b/src/MahApps.Metro/Themes/RangeSlider.xaml
@@ -79,7 +79,7 @@
 
                 <Controls:MetroThumb x:Name="PART_LeftThumb"
                                      Width="{DynamicResource HorizontalThumbWidth}"
-                                     Height="{DynamicResource HorizontalThumbHeight}"
+                                     Height="{DynamicResource MahApps.Sizes.Slider.HorizontalThumbHeight}"
                                      Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillBrush)}"
                                      BorderThickness="1 0"
                                      Cursor="Arrow"
@@ -91,7 +91,7 @@
                                      Style="{DynamicResource MahApps.Metro.Styles.RangeSlider.HorizontalMiddleThumb}" />
                 <Controls:MetroThumb x:Name="PART_RightThumb"
                                      Width="{DynamicResource HorizontalThumbWidth}"
-                                     Height="{DynamicResource HorizontalThumbHeight}"
+                                     Height="{DynamicResource MahApps.Sizes.Slider.HorizontalThumbHeight}"
                                      Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillBrush)}"
                                      BorderThickness="1 0"
                                      Cursor="Arrow"
diff --git a/src/MahApps.Metro/Themes/SplitButton.xaml b/src/MahApps.Metro/Themes/SplitButton.xaml
index 6f2d7334ff..6c7133c66f 100644
--- a/src/MahApps.Metro/Themes/SplitButton.xaml
+++ b/src/MahApps.Metro/Themes/SplitButton.xaml
@@ -284,7 +284,7 @@
         <Setter Property="FocusVisualStyle" Value="{StaticResource ButtonSplitFocusVisual}" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
-        <Setter Property="FontSize" Value="{DynamicResource ContentFontSize}" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.BlackColor}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="ListBoxStyle" Value="{DynamicResource VirtualisedMetroListBox}" />
diff --git a/src/MahApps.Metro/Themes/ToggleSwitch.xaml b/src/MahApps.Metro/Themes/ToggleSwitch.xaml
index f2392c518c..5004aad1ca 100644
--- a/src/MahApps.Metro/Themes/ToggleSwitch.xaml
+++ b/src/MahApps.Metro/Themes/ToggleSwitch.xaml
@@ -90,10 +90,10 @@
 
     <Style x:Key="MahApps.Metro.Styles.ToggleSwitch" TargetType="{x:Type Controls:ToggleSwitch}">
         <Setter Property="ContentPadding" Value="0 0 4 0" />
-        <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource ToggleSwitchHeaderFontSize}" />
+        <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource ToggleSwitchMahApps.Sizes.HeaderFont}" />
         <Setter Property="Controls:ControlsHelper.HeaderMargin" Value="0 0 0 5" />
         <Setter Property="FontFamily" Value="{DynamicResource ToggleSwitchFontFamily}" />
-        <Setter Property="FontSize" Value="{DynamicResource ToggleSwitchFontSize}" />
+        <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.ToggleSwitch}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="HeaderFontFamily" Value="{DynamicResource ToggleSwitchHeaderFontFamily}" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />

From 6cc4bbf4fec113aca2300b1654dbe4d1506b7593 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Thu, 11 Jul 2019 15:21:16 +0200
Subject: [PATCH 08/46] Update font names

---
 .../ExampleWindows/FlyoutDemo.xaml               |  2 +-
 .../HamburgerMenuRipple/HamburgerMenuRipple.xaml |  2 +-
 src/MahApps.Metro/Styles/Controls.Buttons.xaml   |  8 ++++----
 src/MahApps.Metro/Styles/Controls.Calendar.xaml  |  2 +-
 src/MahApps.Metro/Styles/Controls.CheckBox.xaml  |  2 +-
 src/MahApps.Metro/Styles/Controls.ComboBox.xaml  |  2 +-
 .../Styles/Controls.DatePicker.xaml              |  4 ++--
 .../Styles/Controls.PasswordBox.xaml             |  2 +-
 .../Styles/Controls.RadioButton.xaml             |  2 +-
 src/MahApps.Metro/Styles/Controls.TextBox.xaml   |  4 ++--
 .../Styles/Controls.ToggleSwitch.xaml            |  4 ++--
 src/MahApps.Metro/Styles/Fonts.xaml              | 16 ++++++++--------
 src/MahApps.Metro/Themes/DateTimePicker.xaml     |  2 +-
 src/MahApps.Metro/Themes/DropDownButton.xaml     |  2 +-
 src/MahApps.Metro/Themes/HotKeyBox.xaml          |  2 +-
 src/MahApps.Metro/Themes/MetroWindow.xaml        |  2 +-
 src/MahApps.Metro/Themes/NumericUpDown.xaml      |  2 +-
 src/MahApps.Metro/Themes/Pivot.xaml              |  4 ++--
 src/MahApps.Metro/Themes/SplitButton.xaml        |  2 +-
 src/MahApps.Metro/Themes/ToggleSwitch.xaml       |  4 ++--
 20 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml
index ab04fa1a84..b3feb73099 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml
@@ -59,7 +59,7 @@
             <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
                 <TextBlock Margin="0 -1 8 0"
                            VerticalAlignment="Center"
-                           FontFamily="{DynamicResource HeaderFontFamily}"
+                           FontFamily="{DynamicResource MahApps.Fonts.Header}"
                            FontSize="{DynamicResource MahApps.Sizes.Font.WindowTitle}"
                            Text="{TemplateBinding Content}"
                            TextTrimming="CharacterEllipsis" />
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/HamburgerMenuRipple/HamburgerMenuRipple.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/HamburgerMenuRipple/HamburgerMenuRipple.xaml
index 498231e0ff..6b48eeaf61 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/HamburgerMenuRipple/HamburgerMenuRipple.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/HamburgerMenuRipple/HamburgerMenuRipple.xaml
@@ -294,7 +294,7 @@
                             <TextBlock Grid.Row="0"
                                        Margin="0 15 0 5"
                                        Padding="0"
-                                       FontFamily="{DynamicResource HeaderFontFamily}"
+                                       FontFamily="{DynamicResource MahApps.Fonts.Header}"
                                        FontSize="{DynamicResource MahApps.Sizes.HeaderFont}"
                                        Text="{Binding Label}" />
                             <ScrollViewer Grid.Row="1"
diff --git a/src/MahApps.Metro/Styles/Controls.Buttons.xaml b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
index 723ad16508..ea9c07a4e7 100644
--- a/src/MahApps.Metro/Styles/Controls.Buttons.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
@@ -392,7 +392,7 @@
         <Setter Property="Controls:ControlsHelper.CornerRadius" Value="3" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.Button.MouseOverBorder}" />
         <Setter Property="Controls:ControlsHelper.FocusBorderThickness" Value="2" />
-        <Setter Property="FontFamily" Value="{DynamicResource DefaultFont}" />
+        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Default}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.UpperCaseContent}" />
         <Setter Property="FontWeight" Value="Bold" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
@@ -454,7 +454,7 @@
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="BorderThickness" Value="2" />
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Lower" />
-        <Setter Property="FontFamily" Value="{DynamicResource DefaultFont}" />
+        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Default}" />
         <Setter Property="FontWeight" Value="SemiBold" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="MinHeight" Value="25" />
@@ -679,7 +679,7 @@
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Controls:ControlsHelper.CornerRadius" Value="3" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.Button.MouseOverBorder}" />
-        <Setter Property="FontFamily" Value="{DynamicResource DefaultFont}" />
+        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Default}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.UpperCaseContent}" />
         <Setter Property="FontWeight" Value="Bold" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
@@ -762,7 +762,7 @@
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="BorderThickness" Value="2" />
-        <Setter Property="FontFamily" Value="{DynamicResource DefaultFont}" />
+        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Default}" />
         <Setter Property="FontWeight" Value="SemiBold" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="HorizontalAlignment" Value="Left" />
diff --git a/src/MahApps.Metro/Styles/Controls.Calendar.xaml b/src/MahApps.Metro/Styles/Controls.Calendar.xaml
index ea61601001..3952f4bbf6 100644
--- a/src/MahApps.Metro/Styles/Controls.Calendar.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Calendar.xaml
@@ -563,7 +563,7 @@
     <Style x:Key="MahApps.Metro.Styles.MetroCalendar"
            BasedOn="{StaticResource MahApps.Metro.Styles.BaseMetroCalendar}"
            TargetType="{x:Type Calendar}">
-        <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
+        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Content}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
     </Style>
 
diff --git a/src/MahApps.Metro/Styles/Controls.CheckBox.xaml b/src/MahApps.Metro/Styles/Controls.CheckBox.xaml
index 48c0891280..2d49e66417 100644
--- a/src/MahApps.Metro/Styles/Controls.CheckBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.CheckBox.xaml
@@ -10,7 +10,7 @@
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.Highlight}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.CheckBox.MouseOver}" />
-        <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
+        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Content}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Label.Text}" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
diff --git a/src/MahApps.Metro/Styles/Controls.ComboBox.xaml b/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
index f06bf0e01e..4da401858e 100644
--- a/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
@@ -271,7 +271,7 @@
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
         <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Sizes.Font.ClearTextButton}" />
         <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="24" />
-        <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
+        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Content}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
diff --git a/src/MahApps.Metro/Styles/Controls.DatePicker.xaml b/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
index b646b1b30e..27b15fb976 100644
--- a/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
+++ b/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
@@ -19,7 +19,7 @@
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
         <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="22" />
         <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True" />
-        <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
+        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Content}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="IsTodayHighlighted" Value="True" />
@@ -187,7 +187,7 @@
         <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
         <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
+        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Content}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
diff --git a/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml b/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
index d9fb294a2c..b671a5d843 100644
--- a/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
@@ -89,7 +89,7 @@
         <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Sizes.Font.ClearTextButton}" />
         <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="22" />
         <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True" />
-        <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
+        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Content}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="MinHeight" Value="26" />
diff --git a/src/MahApps.Metro/Styles/Controls.RadioButton.xaml b/src/MahApps.Metro/Styles/Controls.RadioButton.xaml
index 9020df9a59..df12fbcf2a 100644
--- a/src/MahApps.Metro/Styles/Controls.RadioButton.xaml
+++ b/src/MahApps.Metro/Styles/Controls.RadioButton.xaml
@@ -11,7 +11,7 @@
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.Highlight}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.CheckBox.MouseOver}" />
-        <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
+        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Content}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Label.Text}" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
diff --git a/src/MahApps.Metro/Styles/Controls.TextBox.xaml b/src/MahApps.Metro/Styles/Controls.TextBox.xaml
index adc8516ae2..bfe37f2e33 100644
--- a/src/MahApps.Metro/Styles/Controls.TextBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TextBox.xaml
@@ -23,7 +23,7 @@
         <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True" />
         <Setter Property="Controls:TextBoxHelper.IsSpellCheckContextMenuEnabled" Value="{Binding RelativeSource={RelativeSource Self}, Path=(SpellCheck.IsEnabled)}" />
         <Setter Property="Controls:TextBoxHelper.WatermarkWrapping" Value="{Binding RelativeSource={RelativeSource Self}, Path=TextWrapping, Mode=OneWay}" />
-        <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
+        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Content}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="MinHeight" Value="26" />
@@ -573,7 +573,7 @@
         <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True" />
         <Setter Property="Controls:TextBoxHelper.IsSpellCheckContextMenuEnabled" Value="{Binding RelativeSource={RelativeSource Self}, Path=(SpellCheck.IsEnabled)}" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
+        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Content}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="MinHeight" Value="26" />
diff --git a/src/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml b/src/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
index c94eae7edd..a102a138c9 100644
--- a/src/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
@@ -141,9 +141,9 @@
         <Setter Property="ContentDirection" Value="RightToLeft" />
         <Setter Property="ContentPadding" Value="0 0 10 0" />
         <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource ToggleSwitchMahApps.Sizes.HeaderFont.Win10}" />
-        <Setter Property="FontFamily" Value="{DynamicResource ToggleSwitchFontFamily.Win10}" />
+        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.ToggleSwitch.Win10}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.ToggleSwitch.Win10}" />
-        <Setter Property="HeaderFontFamily" Value="{DynamicResource ToggleSwitchHeaderFontFamily.Win10}" />
+        <Setter Property="HeaderFontFamily" Value="{DynamicResource MahApps.Fonts.ToggleSwitch.Header.Win10}" />
         <Setter Property="OffSwitchBrush" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.OffSwitchBrush.Win10}" />
         <Setter Property="OnSwitchBrush" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10}" />
         <Setter Property="ThumbIndicatorBrush" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorBrush.Win10}" />
diff --git a/src/MahApps.Metro/Styles/Fonts.xaml b/src/MahApps.Metro/Styles/Fonts.xaml
index 4675ae1d70..f42e5266ea 100644
--- a/src/MahApps.Metro/Styles/Fonts.xaml
+++ b/src/MahApps.Metro/Styles/Fonts.xaml
@@ -2,14 +2,14 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:System="clr-namespace:System;assembly=mscorlib">
 
-    <FontFamily x:Key="DefaultFont">Segoe UI, Lucida Sans Unicode, Verdana</FontFamily>
-    <FontFamily x:Key="HeaderFontFamily">Segoe UI Light, Lucida Sans Unicode, Verdana</FontFamily>
-    <FontFamily x:Key="ContentFontFamily">Segoe UI, Lucida Sans Unicode, Verdana</FontFamily>
-
-    <FontFamily x:Key="ToggleSwitchFontFamily">Segoe UI Semibold, Segoe UI, Lucida Sans Unicode, Verdana</FontFamily>
-    <FontFamily x:Key="ToggleSwitchHeaderFontFamily">Segoe UI Semibold, Segoe UI, Lucida Sans Unicode, Verdana</FontFamily>
-    <FontFamily x:Key="ToggleSwitchFontFamily.Win10">Segoe UI, Lucida Sans Unicode, Verdana</FontFamily>
-    <FontFamily x:Key="ToggleSwitchHeaderFontFamily.Win10">Segoe UI, Lucida Sans Unicode, Verdana</FontFamily>
+    <FontFamily x:Key="MahApps.Fonts.Default">Segoe UI, Lucida Sans Unicode, Verdana</FontFamily>
+    <FontFamily x:Key="MahApps.Fonts.Header">Segoe UI Light, Lucida Sans Unicode, Verdana</FontFamily>
+    <FontFamily x:Key="MahApps.Fonts.Content">Segoe UI, Lucida Sans Unicode, Verdana</FontFamily>
+
+    <FontFamily x:Key="MahApps.Fonts.ToggleSwitch">Segoe UI Semibold, Segoe UI, Lucida Sans Unicode, Verdana</FontFamily>
+    <FontFamily x:Key="MahApps.Fonts.ToggleSwitch.Header">Segoe UI Semibold, Segoe UI, Lucida Sans Unicode, Verdana</FontFamily>
+    <FontFamily x:Key="MahApps.Fonts.ToggleSwitch.Win10">Segoe UI, Lucida Sans Unicode, Verdana</FontFamily>
+    <FontFamily x:Key="MahApps.Fonts.ToggleSwitch.Header.Win10">Segoe UI, Lucida Sans Unicode, Verdana</FontFamily>
 
     <System:Double x:Key="MahApps.Sizes.Font.Header">40</System:Double>
     <System:Double x:Key="MahApps.Sizes.Font.SubHeader">29.333</System:Double>
diff --git a/src/MahApps.Metro/Themes/DateTimePicker.xaml b/src/MahApps.Metro/Themes/DateTimePicker.xaml
index 2c41697afa..f08f943a06 100644
--- a/src/MahApps.Metro/Themes/DateTimePicker.xaml
+++ b/src/MahApps.Metro/Themes/DateTimePicker.xaml
@@ -117,7 +117,7 @@
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
         <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="22" />
         <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True" />
-        <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
+        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Content}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="HandVisibility" Value="HourMinute" />
diff --git a/src/MahApps.Metro/Themes/DropDownButton.xaml b/src/MahApps.Metro/Themes/DropDownButton.xaml
index b25f6b7a2d..b7dd883cfa 100644
--- a/src/MahApps.Metro/Themes/DropDownButton.xaml
+++ b/src/MahApps.Metro/Themes/DropDownButton.xaml
@@ -26,7 +26,7 @@
         <Setter Property="ButtonStyle" Value="{DynamicResource ButtonDropDownStyle}" />
         <Setter Property="FocusVisualStyle" Value="{StaticResource ButtonDropDownFocusVisual}" />
         <Setter Property="Focusable" Value="False" />
-        <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
+        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Content}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.BlackColor}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
diff --git a/src/MahApps.Metro/Themes/HotKeyBox.xaml b/src/MahApps.Metro/Themes/HotKeyBox.xaml
index 30ce0058dc..c4ff66ade3 100644
--- a/src/MahApps.Metro/Themes/HotKeyBox.xaml
+++ b/src/MahApps.Metro/Themes/HotKeyBox.xaml
@@ -12,7 +12,7 @@
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
         <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Sizes.Font.ClearTextButton}" />
-        <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
+        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Content}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="MinHeight" Value="26" />
diff --git a/src/MahApps.Metro/Themes/MetroWindow.xaml b/src/MahApps.Metro/Themes/MetroWindow.xaml
index 80889832f7..dbfb44c379 100644
--- a/src/MahApps.Metro/Themes/MetroWindow.xaml
+++ b/src/MahApps.Metro/Themes/MetroWindow.xaml
@@ -580,7 +580,7 @@
                 <DataTemplate>
                     <TextBlock Margin="8 -1 1 0"
                                VerticalAlignment="Center"
-                               FontFamily="{DynamicResource HeaderFontFamily}"
+                               FontFamily="{DynamicResource MahApps.Fonts.Header}"
                                FontSize="{DynamicResource MahApps.Sizes.Font.WindowTitle}"
                                Text="{TemplateBinding Content}"
                                TextTrimming="CharacterEllipsis" />
diff --git a/src/MahApps.Metro/Themes/NumericUpDown.xaml b/src/MahApps.Metro/Themes/NumericUpDown.xaml
index 4e34129040..c43f945e92 100644
--- a/src/MahApps.Metro/Themes/NumericUpDown.xaml
+++ b/src/MahApps.Metro/Themes/NumericUpDown.xaml
@@ -20,7 +20,7 @@
         <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="22" />
         <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
+        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Content}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="HorizontalContentAlignment" Value="Right" />
diff --git a/src/MahApps.Metro/Themes/Pivot.xaml b/src/MahApps.Metro/Themes/Pivot.xaml
index 3c56034610..35feafea9f 100644
--- a/src/MahApps.Metro/Themes/Pivot.xaml
+++ b/src/MahApps.Metro/Themes/Pivot.xaml
@@ -3,7 +3,7 @@
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
     <DataTemplate x:Key="PivotHeaderTemplate">
-        <TextBlock FontFamily="{DynamicResource HeaderFontFamily}"
+        <TextBlock FontFamily="{DynamicResource MahApps.Fonts.Header}"
                    FontSize="{DynamicResource MahApps.Sizes.HeaderFont}"
                    Text="{Binding}" />
     </DataTemplate>
@@ -73,7 +73,7 @@
                             <ItemsControl.ItemTemplate>
                                 <DataTemplate DataType="{x:Type Controls:PivotItem}">
                                     <TextBlock Margin="0 0 25 0"
-                                               FontFamily="{DynamicResource HeaderFontFamily}"
+                                               FontFamily="{DynamicResource MahApps.Fonts.Header}"
                                                FontSize="{DynamicResource SubMahApps.Sizes.HeaderFont}"
                                                Text="{Binding Header}" />
                                 </DataTemplate>
diff --git a/src/MahApps.Metro/Themes/SplitButton.xaml b/src/MahApps.Metro/Themes/SplitButton.xaml
index 6c7133c66f..51ff548733 100644
--- a/src/MahApps.Metro/Themes/SplitButton.xaml
+++ b/src/MahApps.Metro/Themes/SplitButton.xaml
@@ -283,7 +283,7 @@
         <Setter Property="ButtonStyle" Value="{DynamicResource ButtonSplitStyle}" />
         <Setter Property="FocusVisualStyle" Value="{StaticResource ButtonSplitFocusVisual}" />
         <Setter Property="Focusable" Value="False" />
-        <Setter Property="FontFamily" Value="{DynamicResource ContentFontFamily}" />
+        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Content}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.BlackColor}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
diff --git a/src/MahApps.Metro/Themes/ToggleSwitch.xaml b/src/MahApps.Metro/Themes/ToggleSwitch.xaml
index 5004aad1ca..a9552f2163 100644
--- a/src/MahApps.Metro/Themes/ToggleSwitch.xaml
+++ b/src/MahApps.Metro/Themes/ToggleSwitch.xaml
@@ -92,10 +92,10 @@
         <Setter Property="ContentPadding" Value="0 0 4 0" />
         <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource ToggleSwitchMahApps.Sizes.HeaderFont}" />
         <Setter Property="Controls:ControlsHelper.HeaderMargin" Value="0 0 0 5" />
-        <Setter Property="FontFamily" Value="{DynamicResource ToggleSwitchFontFamily}" />
+        <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.ToggleSwitch}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.ToggleSwitch}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
-        <Setter Property="HeaderFontFamily" Value="{DynamicResource ToggleSwitchHeaderFontFamily}" />
+        <Setter Property="HeaderFontFamily" Value="{DynamicResource MahApps.Fonts.ToggleSwitch.Header}" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="IsTabStop" Value="True" />
         <Setter Property="OffSwitchBrush" Value="{DynamicResource MahApps.Brushes.Gray4}" />

From 0835c8163e228678e93bdbdc1ee744791d7282b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Thu, 11 Jul 2019 15:28:44 +0200
Subject: [PATCH 09/46] Update data template names

---
 src/MahApps.Metro/Styles/VS/TabControl.xaml  | 6 +++---
 src/MahApps.Metro/Themes/DateTimePicker.xaml | 8 ++++----
 src/MahApps.Metro/Themes/Flyout.xaml         | 4 ++--
 src/MahApps.Metro/Themes/Pivot.xaml          | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/MahApps.Metro/Styles/VS/TabControl.xaml b/src/MahApps.Metro/Styles/VS/TabControl.xaml
index e24aeed836..6b4ca74da5 100644
--- a/src/MahApps.Metro/Styles/VS/TabControl.xaml
+++ b/src/MahApps.Metro/Styles/VS/TabControl.xaml
@@ -241,7 +241,7 @@
         </Setter>
     </Style>
 
-    <DataTemplate x:Key="ClosableTabItemTemplate">
+    <DataTemplate x:Key="MahApps.Templates.TabItem.Closable">
         <DockPanel>
             <ContentPresenter VerticalAlignment="Center" Content="{Binding DisplayName}">
                 <ContentPresenter.Resources>
@@ -255,10 +255,10 @@
     </DataTemplate>
 
     <!--  This template explains how to render the 'Workspace' content area in the main window.  -->
-    <DataTemplate x:Key="WorkspacesTemplate">
+    <DataTemplate x:Key="MahApps.Templates.TabControl.Workspaces">
         <TabControl Margin="0"
                     IsSynchronizedWithCurrentItem="True"
-                    ItemTemplate="{StaticResource ClosableTabItemTemplate}"
+                    ItemTemplate="{StaticResource MahApps.Templates.TabItem.Closable}"
                     ItemsSource="{Binding}"
                     Style="{DynamicResource StandardTabControl}" />
     </DataTemplate>
diff --git a/src/MahApps.Metro/Themes/DateTimePicker.xaml b/src/MahApps.Metro/Themes/DateTimePicker.xaml
index f08f943a06..b61d8f89fb 100644
--- a/src/MahApps.Metro/Themes/DateTimePicker.xaml
+++ b/src/MahApps.Metro/Themes/DateTimePicker.xaml
@@ -14,7 +14,7 @@
     <Converters:ClockDegreeConverter x:Key="HourDegreeConverter" TotalParts="12" />
     <Converters:TimeSpanToStringConverter x:Key="TimeSpanToStringConverter" />
 
-    <DataTemplate x:Key="FiveMinuteIndicator">
+    <DataTemplate x:Key="MahApps.Templates.DateTimePicker.FiveMinuteIndicator">
         <StackPanel Height="57"
                     Orientation="Horizontal"
                     RenderTransformOrigin=".5,1">
@@ -28,7 +28,7 @@
         </StackPanel>
     </DataTemplate>
 
-    <DataTemplate x:Key="MinuteIndicator">
+    <DataTemplate x:Key="MahApps.Templates.DateTimePicker.MinuteIndicator">
         <StackPanel Height="57"
                     Orientation="Horizontal"
                     RenderTransformOrigin=".5,1">
@@ -262,14 +262,14 @@
                                                     BorderThickness="2"
                                                     CornerRadius="75">
                                                 <Canvas HorizontalAlignment="Center">
-                                                    <ItemsControl ItemTemplate="{StaticResource FiveMinuteIndicator}" ItemsSource="{StaticResource FiveMinuteKeys}">
+                                                    <ItemsControl ItemTemplate="{StaticResource MahApps.Templates.DateTimePicker.FiveMinuteIndicator}" ItemsSource="{StaticResource FiveMinuteKeys}">
                                                         <ItemsControl.ItemsPanel>
                                                             <ItemsPanelTemplate>
                                                                 <Canvas IsItemsHost="True" />
                                                             </ItemsPanelTemplate>
                                                         </ItemsControl.ItemsPanel>
                                                     </ItemsControl>
-                                                    <ItemsControl ItemTemplate="{StaticResource MinuteIndicator}" ItemsSource="{StaticResource MinuteKeys}">
+                                                    <ItemsControl ItemTemplate="{StaticResource MahApps.Templates.DateTimePicker.MinuteIndicator}" ItemsSource="{StaticResource MinuteKeys}">
                                                         <ItemsControl.ItemsPanel>
                                                             <ItemsPanelTemplate>
                                                                 <Canvas IsItemsHost="True" />
diff --git a/src/MahApps.Metro/Themes/Flyout.xaml b/src/MahApps.Metro/Themes/Flyout.xaml
index 4355f9db98..d4e1fadc88 100644
--- a/src/MahApps.Metro/Themes/Flyout.xaml
+++ b/src/MahApps.Metro/Themes/Flyout.xaml
@@ -4,7 +4,7 @@
                     xmlns:actions="clr-namespace:MahApps.Metro.Actions"
                     xmlns:i="http://schemas.microsoft.com/xaml/behaviors">
 
-    <DataTemplate x:Key="HeaderTemplate" x:Shared="False">
+    <DataTemplate x:Key="MahApps.Templates.FlyoutHeader" x:Shared="False">
         <DockPanel x:Name="dpHeader"
                    VerticalAlignment="Center"
                    LastChildFill="True">
@@ -226,7 +226,7 @@
         <Setter Property="Controls:ControlsHelper.HeaderMargin" Value="10" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Flyout.Foreground}" />
-        <Setter Property="HeaderTemplate" Value="{StaticResource HeaderTemplate}" />
+        <Setter Property="HeaderTemplate" Value="{StaticResource MahApps.Templates.FlyoutHeader}" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="KeyboardNavigation.ControlTabNavigation" Value="Cycle" />
         <Setter Property="KeyboardNavigation.DirectionalNavigation" Value="Cycle" />
diff --git a/src/MahApps.Metro/Themes/Pivot.xaml b/src/MahApps.Metro/Themes/Pivot.xaml
index 35feafea9f..bfee2553f5 100644
--- a/src/MahApps.Metro/Themes/Pivot.xaml
+++ b/src/MahApps.Metro/Themes/Pivot.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
-    <DataTemplate x:Key="PivotHeaderTemplate">
+    <DataTemplate x:Key="MahApps.Templates.PivotHeader">
         <TextBlock FontFamily="{DynamicResource MahApps.Fonts.Header}"
                    FontSize="{DynamicResource MahApps.Sizes.HeaderFont}"
                    Text="{Binding}" />
@@ -43,7 +43,7 @@
     </Style>
 
     <Style TargetType="{x:Type Controls:Pivot}">
-        <Setter Property="HeaderTemplate" Value="{StaticResource PivotHeaderTemplate}" />
+        <Setter Property="HeaderTemplate" Value="{StaticResource MahApps.Templates.PivotHeader}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Controls:Pivot}">

From 3df2b220a928b582fb90a2db255a3e28a671a25d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Thu, 11 Jul 2019 16:03:57 +0200
Subject: [PATCH 10/46] Update shared names

---
 .../Styles/Controls.ComboBox.xaml             |  8 +++----
 .../Styles/Controls.DatePicker.xaml           |  4 ++--
 .../Styles/Controls.PasswordBox.xaml          |  6 ++---
 .../Styles/Controls.TextBox.xaml              | 24 +++++++++----------
 src/MahApps.Metro/Styles/Shared.xaml          | 14 +++++------
 src/MahApps.Metro/Themes/DateTimePicker.xaml  |  4 ++--
 6 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/MahApps.Metro/Styles/Controls.ComboBox.xaml b/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
index 4da401858e..4d37928559 100644
--- a/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
@@ -143,10 +143,10 @@
                                 <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource ShowFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.ShowFloatingMessage}" />
                             </MultiDataTrigger.EnterActions>
                             <MultiDataTrigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource HideFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.HideFloatingMessage}" />
                             </MultiDataTrigger.ExitActions>
                         </MultiDataTrigger>
 
@@ -554,10 +554,10 @@
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=SelectedItem, Mode=OneWay, Converter={x:Static Converters:IsNullConverter.Instance}}" Value="False" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource ShowFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.ShowFloatingMessage}" />
                             </MultiDataTrigger.EnterActions>
                             <MultiDataTrigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource HideFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.HideFloatingMessage}" />
                             </MultiDataTrigger.ExitActions>
                         </MultiDataTrigger>
 
diff --git a/src/MahApps.Metro/Styles/Controls.DatePicker.xaml b/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
index 27b15fb976..2a32a488b2 100644
--- a/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
+++ b/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
@@ -169,10 +169,10 @@
                                 <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource ShowFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.ShowFloatingMessage}" />
                             </MultiDataTrigger.EnterActions>
                             <MultiDataTrigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource HideFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.HideFloatingMessage}" />
                             </MultiDataTrigger.ExitActions>
                         </MultiDataTrigger>
                     </ControlTemplate.Triggers>
diff --git a/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml b/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
index b671a5d843..e47d90b473 100644
--- a/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
@@ -132,7 +132,7 @@
                                     Background="{TemplateBinding Background}"
                                     BorderBrush="Transparent"
                                     BorderThickness="{TemplateBinding BorderThickness}"
-                                    Effect="{DynamicResource WaitingForDataEffect}"
+                                    Effect="{DynamicResource MahApps.DropShadowEffect.WaitingForData}"
                                     SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </AdornerDecorator>
                         <Border x:Name="Base"
@@ -378,7 +378,7 @@
                                     Background="{TemplateBinding Background}"
                                     BorderBrush="Transparent"
                                     BorderThickness="{TemplateBinding BorderThickness}"
-                                    Effect="{DynamicResource WaitingForDataEffect}"
+                                    Effect="{DynamicResource MahApps.DropShadowEffect.WaitingForData}"
                                     SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </AdornerDecorator>
                         <Border x:Name="Base"
@@ -639,7 +639,7 @@
                                     Background="{TemplateBinding Background}"
                                     BorderBrush="Transparent"
                                     BorderThickness="{TemplateBinding BorderThickness}"
-                                    Effect="{DynamicResource WaitingForDataEffect}"
+                                    Effect="{DynamicResource MahApps.DropShadowEffect.WaitingForData}"
                                     SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </AdornerDecorator>
                         <Border x:Name="Base"
diff --git a/src/MahApps.Metro/Styles/Controls.TextBox.xaml b/src/MahApps.Metro/Styles/Controls.TextBox.xaml
index bfe37f2e33..0d68d15aca 100644
--- a/src/MahApps.Metro/Styles/Controls.TextBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TextBox.xaml
@@ -66,7 +66,7 @@
                                     Background="{TemplateBinding Background}"
                                     BorderBrush="Transparent"
                                     BorderThickness="{TemplateBinding BorderThickness}"
-                                    Effect="{DynamicResource WaitingForDataEffect}"
+                                    Effect="{DynamicResource MahApps.DropShadowEffect.WaitingForData}"
                                     SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </AdornerDecorator>
                         <Border x:Name="Base"
@@ -189,10 +189,10 @@
                                 <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource ShowFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.ShowFloatingMessage}" />
                             </MultiDataTrigger.EnterActions>
                             <MultiDataTrigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource HideFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.HideFloatingMessage}" />
                             </MultiDataTrigger.ExitActions>
                         </MultiDataTrigger>
 
@@ -257,7 +257,7 @@
                             </MultiTrigger.Conditions>
                             <Setter TargetName="PART_WaitingForDataEffectAdornerDecorator" Property="Visibility" Value="Visible" />
                             <MultiTrigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource WaitingForDataStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.WaitingForData}" />
                             </MultiTrigger.EnterActions>
                         </MultiTrigger>
                         <Trigger Property="Controls:TextBoxHelper.IsWaitingForData" Value="False">
@@ -311,7 +311,7 @@
                                     Background="{TemplateBinding Background}"
                                     BorderBrush="Transparent"
                                     BorderThickness="{TemplateBinding BorderThickness}"
-                                    Effect="{DynamicResource WaitingForDataEffect}"
+                                    Effect="{DynamicResource MahApps.DropShadowEffect.WaitingForData}"
                                     SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </AdornerDecorator>
                         <Border x:Name="Base"
@@ -435,10 +435,10 @@
                                 <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource ShowFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.ShowFloatingMessage}" />
                             </MultiDataTrigger.EnterActions>
                             <MultiDataTrigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource HideFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.HideFloatingMessage}" />
                             </MultiDataTrigger.ExitActions>
                         </MultiDataTrigger>
 
@@ -485,7 +485,7 @@
                             </MultiTrigger.Conditions>
                             <Setter TargetName="PART_WaitingForDataEffectAdornerDecorator" Property="Visibility" Value="Visible" />
                             <MultiTrigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource WaitingForDataStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.WaitingForData}" />
                             </MultiTrigger.EnterActions>
                         </MultiTrigger>
                         <Trigger Property="Controls:TextBoxHelper.IsWaitingForData" Value="False">
@@ -715,10 +715,10 @@
                                 <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource ShowFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.ShowFloatingMessage}" />
                             </MultiDataTrigger.EnterActions>
                             <MultiDataTrigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource HideFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.HideFloatingMessage}" />
                             </MultiDataTrigger.ExitActions>
                         </MultiDataTrigger>
 
@@ -920,10 +920,10 @@
                                 <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource ShowFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.ShowFloatingMessage}" />
                             </MultiDataTrigger.EnterActions>
                             <MultiDataTrigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource HideFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.HideFloatingMessage}" />
                             </MultiDataTrigger.ExitActions>
                         </MultiDataTrigger>
 
diff --git a/src/MahApps.Metro/Styles/Shared.xaml b/src/MahApps.Metro/Styles/Shared.xaml
index 3979ecde26..32361108c3 100644
--- a/src/MahApps.Metro/Styles/Shared.xaml
+++ b/src/MahApps.Metro/Styles/Shared.xaml
@@ -2,11 +2,11 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options">
 
-    <ExponentialEase x:Key="ExpoEaseInOut"
+    <ExponentialEase x:Key="MahApps.ExponentialEase.InOut"
                      EasingMode="EaseInOut"
                      Exponent="2" />
 
-    <DropShadowEffect x:Key="WaitingForDataEffect"
+    <DropShadowEffect x:Key="MahApps.DropShadowEffect.WaitingForData"
                       x:Shared="False"
                       BlurRadius="10"
                       Opacity="0"
@@ -14,7 +14,7 @@
                       Color="{DynamicResource MahApps.Colors.Black}"
                       po:Freeze="True" />
 
-    <Storyboard x:Key="WaitingForDataStoryboard" po:Freeze="True">
+    <Storyboard x:Key="MahApps.Storyboard.WaitingForData" po:Freeze="True">
         <DoubleAnimation AutoReverse="True"
                          RepeatBehavior="Forever"
                          Timeline.DesiredFrameRate="30"
@@ -25,8 +25,8 @@
                          Duration="00:00:02" />
     </Storyboard>
 
-    <Storyboard x:Key="HideFloatingMessageStoryboard" po:Freeze="True">
-        <DoubleAnimation EasingFunction="{StaticResource ExpoEaseInOut}"
+    <Storyboard x:Key="MahApps.Storyboard.HideFloatingMessage" po:Freeze="True">
+        <DoubleAnimation EasingFunction="{StaticResource MahApps.ExponentialEase.InOut}"
                          Storyboard.TargetName="PART_FloatingMessageContainer"
                          Storyboard.TargetProperty="Opacity"
                          From="1"
@@ -37,11 +37,11 @@
         </ObjectAnimationUsingKeyFrames>
     </Storyboard>
 
-    <Storyboard x:Key="ShowFloatingMessageStoryboard" po:Freeze="True">
+    <Storyboard x:Key="MahApps.Storyboard.ShowFloatingMessage" po:Freeze="True">
         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_FloatingMessageContainer" Storyboard.TargetProperty="(UIElement.Visibility)">
             <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
         </ObjectAnimationUsingKeyFrames>
-        <DoubleAnimation EasingFunction="{StaticResource ExpoEaseInOut}"
+        <DoubleAnimation EasingFunction="{StaticResource MahApps.ExponentialEase.InOut}"
                          Storyboard.TargetName="PART_FloatingMessageContainer"
                          Storyboard.TargetProperty="Opacity"
                          From="0"
diff --git a/src/MahApps.Metro/Themes/DateTimePicker.xaml b/src/MahApps.Metro/Themes/DateTimePicker.xaml
index b61d8f89fb..5746210abd 100644
--- a/src/MahApps.Metro/Themes/DateTimePicker.xaml
+++ b/src/MahApps.Metro/Themes/DateTimePicker.xaml
@@ -417,10 +417,10 @@
                                 <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource ShowFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.ShowFloatingMessage}" />
                             </MultiDataTrigger.EnterActions>
                             <MultiDataTrigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource HideFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.HideFloatingMessage}" />
                             </MultiDataTrigger.ExitActions>
                         </MultiDataTrigger>
 

From 3f794cb234ab9f01be557b96d1c7c5abe022d99c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Mon, 15 Jul 2019 12:13:48 +0200
Subject: [PATCH 11/46] Update style names

---
 .../Views/Flyouts/Flyout3View.xaml            |  2 +-
 .../Views/Flyouts/FlyoutBottomView.xaml       |  2 +-
 .../Views/Flyouts/FlyoutTopView.xaml          |  2 +-
 .../MahApps.Metro.Demo/App.xaml               |  2 +-
 .../ExampleViews/ButtonsExample.xaml          | 36 ++++----
 .../ExampleViews/CustomDialogExample.xaml     |  2 +-
 .../ExampleViews/DataGridExamples.xaml        | 14 +--
 .../HamburgerMenuCreatorsUpdate.xaml          |  2 +-
 .../ExampleViews/HamburgerMenuSample.xaml     |  4 +-
 .../ExampleViews/ProgressBars.xaml            |  6 +-
 .../ExampleViews/SelectionExamples.xaml       | 20 ++---
 .../ExampleViews/Sliders.xaml                 | 86 +++++++++----------
 .../ExampleViews/TextExamples.xaml            | 26 +++---
 .../ExampleWindows/CleanWindowDemo.xaml       | 16 ++--
 .../ExampleWindows/DynamicFlyout.xaml         |  4 +-
 .../ExampleWindows/FlyoutDemo.xaml            | 26 +++---
 .../ExampleWindows/ShowcaseFlyout.xaml        | 12 +--
 .../ExampleWindows/SizeToContentDemo.xaml     |  2 +-
 .../ExampleWindows/VSDemo.xaml                | 16 ++--
 .../HamburgerMenuRipple.xaml                  |  2 +-
 .../MahApps.Metro.Demo/MainWindow.xaml        | 10 +--
 .../MahApps.Metro.Demo/MainWindow.xaml.cs     |  2 +-
 .../Navigation/HomePage.xaml                  |  2 +-
 .../Navigation/InterestingPage.xaml           |  2 +-
 .../Controls/DataGridNumericUpDownColumn.cs   |  4 +-
 .../Controls/Dialogs/BaseMetroDialog.cs       |  2 +-
 .../Controls/Dialogs/InputDialog.xaml         |  4 +-
 .../Controls/Dialogs/InputDialog.xaml.cs      |  2 +-
 .../Controls/Dialogs/LoginDialog.xaml         |  4 +-
 .../Controls/Dialogs/LoginDialog.xaml.cs      |  4 +-
 .../Controls/Dialogs/MessageDialog.xaml       |  8 +-
 .../Controls/Dialogs/MessageDialog.xaml.cs    |  4 +-
 .../Controls/Dialogs/ProgressDialog.xaml      |  2 +-
 .../Controls/Helper/TextBoxHelper.cs          |  6 +-
 .../Controls/MetroNavigationWindow.xaml       |  8 +-
 src/MahApps.Metro/Styles/Clean/Clean.xaml     | 10 +--
 .../Styles/Clean/CleanGroupBox.xaml           |  2 +-
 .../Styles/Clean/CleanStatusBar.xaml          |  8 +-
 .../Styles/Clean/CleanWindow.xaml             |  2 +-
 .../Clean/CleanWindowButtonCommands.xaml      |  6 +-
 .../Styles/Clean/CleanWindowButtons.xaml      |  8 +-
 .../Styles/Clean/CleanWindowCommands.xaml     |  2 +-
 .../Controls.AnimatedSingleRowTabControl.xaml | 14 +--
 .../Styles/Controls.AnimatedTabControl.xaml   |  2 +-
 .../Styles/Controls.Buttons.xaml              | 72 ++++++++--------
 .../Styles/Controls.Calendar.xaml             | 18 ++--
 .../Styles/Controls.CheckBox.xaml             |  2 +-
 .../Styles/Controls.ComboBox.xaml             | 34 ++++----
 .../Styles/Controls.ContextMenu.xaml          | 26 +++---
 .../Styles/Controls.DataGrid.xaml             | 74 ++++++++--------
 .../Styles/Controls.DatePicker.xaml           | 20 ++---
 .../Styles/Controls.Expander.xaml             | 36 ++++----
 .../Styles/Controls.GroupBox.xaml             |  2 +-
 src/MahApps.Metro/Styles/Controls.Label.xaml  |  2 +-
 .../Styles/Controls.ListBox.xaml              |  8 +-
 .../Styles/Controls.ListView.xaml             | 20 ++---
 src/MahApps.Metro/Styles/Controls.Page.xaml   |  2 +-
 .../Styles/Controls.PasswordBox.xaml          | 82 +++++++++---------
 .../Styles/Controls.ProgressBar.xaml          |  2 +-
 .../Styles/Controls.RadioButton.xaml          |  2 +-
 .../Styles/Controls.Scrollbars.xaml           | 38 ++++----
 src/MahApps.Metro/Styles/Controls.Slider.xaml | 52 +++++------
 .../Styles/Controls.StatusBar.xaml            |  6 +-
 .../Styles/Controls.TabControl.xaml           |  4 +-
 .../Styles/Controls.TextBlock.xaml            | 10 +--
 .../Styles/Controls.TextBox.xaml              | 54 ++++++------
 .../Styles/Controls.ToggleSwitch.xaml         | 10 +--
 .../Styles/Controls.Toolbar.xaml              | 22 ++---
 .../Styles/Controls.Tooltip.xaml              |  2 +-
 .../Styles/Controls.TreeView.xaml             | 12 +--
 src/MahApps.Metro/Styles/Controls.xaml        | 78 ++++++++---------
 src/MahApps.Metro/Styles/FlatButton.xaml      |  2 +-
 src/MahApps.Metro/Styles/FlatSlider.xaml      | 28 +++---
 src/MahApps.Metro/Styles/VS/Button.xaml       |  8 +-
 src/MahApps.Metro/Styles/VS/Expander.xaml     | 36 ++++----
 src/MahApps.Metro/Styles/VS/GroupBox.xaml     |  2 +-
 src/MahApps.Metro/Styles/VS/ListBox.xaml      |  2 +-
 src/MahApps.Metro/Styles/VS/Menu.xaml         |  4 +-
 src/MahApps.Metro/Styles/VS/ScrollBar.xaml    | 28 +++---
 src/MahApps.Metro/Styles/VS/Styles.xaml       | 20 ++---
 src/MahApps.Metro/Styles/VS/TabControl.xaml   | 14 +--
 src/MahApps.Metro/Styles/VS/TextBox.xaml      |  8 +-
 src/MahApps.Metro/Styles/VS/Window.xaml       | 26 +++---
 .../Styles/ValidationErrorTemplate.xaml       |  2 +-
 .../Themes/ContentControlEx.xaml              |  6 +-
 src/MahApps.Metro/Themes/DateTimePicker.xaml  | 16 ++--
 .../Themes/Dialogs/BaseMetroDialog.xaml       | 20 ++---
 src/MahApps.Metro/Themes/DropDownButton.xaml  | 10 +--
 src/MahApps.Metro/Themes/Flyout.xaml          |  4 +-
 src/MahApps.Metro/Themes/Generic.xaml         | 24 +++---
 src/MahApps.Metro/Themes/HamburgerMenu.xaml   | 10 +--
 .../Themes/HamburgerMenuTemplate.xaml         | 30 +++----
 src/MahApps.Metro/Themes/HotKeyBox.xaml       |  2 +-
 .../MetroAnimatedSingleRowTabControl.xaml     |  8 +-
 .../Themes/MetroAnimatedTabControl.xaml       |  2 +-
 src/MahApps.Metro/Themes/MetroHeader.xaml     |  2 +-
 .../Themes/MetroProgressBar.xaml              |  2 +-
 src/MahApps.Metro/Themes/MetroTabControl.xaml |  2 +-
 src/MahApps.Metro/Themes/MetroTabItem.xaml    |  4 +-
 src/MahApps.Metro/Themes/MetroWindow.xaml     |  8 +-
 src/MahApps.Metro/Themes/NumericUpDown.xaml   |  6 +-
 src/MahApps.Metro/Themes/Pivot.xaml           |  4 +-
 src/MahApps.Metro/Themes/RangeSlider.xaml     | 56 ++++++------
 src/MahApps.Metro/Themes/SplitButton.xaml     | 14 +--
 src/MahApps.Metro/Themes/Thumb.xaml           |  2 +-
 src/MahApps.Metro/Themes/ToggleSwitch.xaml    |  6 +-
 .../Themes/WindowButtonCommands.xaml          | 22 ++---
 src/MahApps.Metro/Themes/WindowCommands.xaml  | 28 +++---
 .../Views/ButtonWindow.xaml                   |  2 +-
 .../Views/CleanWindow.xaml                    |  2 +-
 .../Views/TextBoxHelperTestWindow.xaml        |  6 +-
 111 files changed, 784 insertions(+), 784 deletions(-)

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/Flyouts/Flyout3View.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/Flyouts/Flyout3View.xaml
index 3af2fd9288..cf21179a7e 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/Flyouts/Flyout3View.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/Flyouts/Flyout3View.xaml
@@ -18,7 +18,7 @@
     <StackPanel Margin="10" Orientation="Vertical">
 
         <Slider Margin="5"
-                Style="{DynamicResource MahApps.Metro.Styles.FlatSlider}"
+                Style="{DynamicResource MahApps.Styles.Slider.Flat}"
                 Value="50" />
 
         <ListView x:Name="Artists"
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/Flyouts/FlyoutBottomView.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/Flyouts/FlyoutBottomView.xaml
index 705a27b99c..58fc19e467 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/Flyouts/FlyoutBottomView.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/Flyouts/FlyoutBottomView.xaml
@@ -16,7 +16,7 @@
                 Height="36"
                 FontFamily="Segoe UI Symbol"
                 FontSize="16"
-                Style="{DynamicResource MahApps.Metro.Styles.MetroCircleButtonStyle}">
+                Style="{DynamicResource MahApps.Styles.ButtonBase.MetroCircle}">
             <iconPacks:PackIconModern Kind="Add" />
         </Button>
     </StackPanel>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/Flyouts/FlyoutTopView.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/Flyouts/FlyoutTopView.xaml
index 33f8c975b0..3463e9d87f 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/Flyouts/FlyoutTopView.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/Flyouts/FlyoutTopView.xaml
@@ -18,7 +18,7 @@
                 FontFamily="Segoe UI Symbol"
                 FontSize="16"
                 Foreground="{Binding RelativeSource={RelativeSource AncestorType={x:Type Controls:Flyout}}, Path=Foreground}"
-                Style="{DynamicResource MahApps.Metro.Styles.MetroCircleButtonStyle}">
+                Style="{DynamicResource MahApps.Styles.ButtonBase.MetroCircle}">
             <iconPacks:PackIconModern Kind="Add" />
         </Button>
     </StackPanel>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/App.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/App.xaml
index 2dcba5c40c..ed62b5fd17 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/App.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/App.xaml
@@ -17,7 +17,7 @@
                 <Setter Property="HorizontalAlignment" Value="Center" />
             </Style>
 
-            <Style BasedOn="{StaticResource MetroValidationPopup}" TargetType="{x:Type controls:CustomValidationPopup}">
+            <Style BasedOn="{StaticResource MahApps.Styles.CustomValidationPopup.Metro}" TargetType="{x:Type controls:CustomValidationPopup}">
                 <Setter Property="CloseOnMouseLeftButtonDown" Value="False" />
                 <Setter Property="ShowValidationErrorOnMouseOver" Value="False" />
             </Style>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
index 649dbb3b4e..c697ce90ff 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
@@ -61,21 +61,21 @@
             <Button Width="100"
                     Margin="{StaticResource ControlMargin}"
                     Content="Enabled"
-                    Style="{DynamicResource SquareButtonStyle}" />
+                    Style="{DynamicResource MahApps.Styles.ButtonBase.Square}" />
             <Button Width="100"
                     Margin="{StaticResource ControlMargin}"
                     Content="Enabled"
-                    Style="{DynamicResource AccentedSquareButtonStyle}" />
+                    Style="{DynamicResource MahApps.Styles.ButtonBase.AccentedSquare}" />
             <Button Width="100"
                     Margin="{StaticResource ControlMargin}"
                     Content="Disabled"
                     IsEnabled="False"
-                    Style="{DynamicResource SquareButtonStyle}" />
+                    Style="{DynamicResource MahApps.Styles.ButtonBase.Square}" />
             <Button Width="100"
                     Margin="{StaticResource ControlMargin}"
                     Content="Disabled"
                     IsEnabled="False"
-                    Style="{DynamicResource AccentedSquareButtonStyle}" />
+                    Style="{DynamicResource MahApps.Styles.ButtonBase.AccentedSquare}" />
         </StackPanel>
 
         <StackPanel Grid.Row="0" Grid.Column="2">
@@ -90,19 +90,19 @@
             <ToggleButton Width="100"
                           Margin="{StaticResource ControlMargin}"
                           Content="Enabled"
-                          Style="{DynamicResource MetroFlatToggleButton}" />
+                          Style="{DynamicResource MahApps.Styles.ToggleButton.Flat}" />
             <ToggleButton Width="100"
                           Margin="{StaticResource ControlMargin}"
                           Content="Disabled"
                           IsEnabled="False"
-                          Style="{DynamicResource MetroFlatToggleButton}" />
+                          Style="{DynamicResource MahApps.Styles.ToggleButton.Flat}" />
             <StackPanel Margin="{StaticResource ControlMargin}"
                         HorizontalAlignment="Center"
                         Orientation="Horizontal">
                 <ToggleButton Width="48"
                               Height="48"
                               Margin="4"
-                              Style="{DynamicResource MahApps.Metro.Styles.MetroCircleToggleButtonStyle}">
+                              Style="{DynamicResource MahApps.Styles.ToggleButton.MetroCircle}">
                     <iconPacks:PackIconModern Width="20"
                                               Height="20"
                                               Kind="City" />
@@ -111,7 +111,7 @@
                               Height="48"
                               Margin="4"
                               IsEnabled="False"
-                              Style="{DynamicResource MahApps.Metro.Styles.MetroCircleToggleButtonStyle}">
+                              Style="{DynamicResource MahApps.Styles.ToggleButton.MetroCircle}">
                     <iconPacks:PackIconModern Width="20"
                                               Height="20"
                                               Kind="City" />
@@ -144,7 +144,7 @@
                         Orientation="Horizontal">
                 <StackPanel.Resources>
                     <Style x:Key="AccentCircleButtonStyle"
-                           BasedOn="{StaticResource MahApps.Metro.Styles.MetroCircleButtonStyle}"
+                           BasedOn="{StaticResource MahApps.Styles.ButtonBase.MetroCircle}"
                            TargetType="{x:Type ButtonBase}">
                         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                         <Style.Triggers>
@@ -179,7 +179,7 @@
                         Margin="4"
                         Foreground="{DynamicResource MahApps.Brushes.Accent}"
                         IsEnabled="False"
-                        Style="{StaticResource MahApps.Metro.Styles.MetroCircleButtonStyle}">
+                        Style="{StaticResource MahApps.Styles.ButtonBase.MetroCircle}">
                     <Button.ContentTemplate>
                         <DataTemplate>
                             <iconPacks:PackIconModern Width="20"
@@ -196,7 +196,7 @@
                     HorizontalAlignment="Center">
             <StackPanel.Resources>
                 <Style x:Key="CustomMetroToggleSwitch"
-                       BasedOn="{StaticResource MahApps.Metro.Styles.ToggleSwitch}"
+                       BasedOn="{StaticResource MahApps.Styles.ToggleSwitch.Metro}"
                        TargetType="{x:Type Controls:ToggleSwitch}">
                     <Setter Property="OffLabel" Value="False" />
                     <Setter Property="OffSwitchBrush" Value="Red" />
@@ -204,7 +204,7 @@
                     <Setter Property="OnSwitchBrush" Value="Green" />
                 </Style>
                 <Style x:Key="CustomMetroToggleSwitchButton"
-                       BasedOn="{StaticResource MahApps.Metro.Styles.ToggleSwitchButton}"
+                       BasedOn="{StaticResource MahApps.Styles.ToggleSwitchButton.Metro}"
                        TargetType="{x:Type Controls:ToggleSwitchButton}">
                     <Setter Property="OffSwitchBrush" Value="DarkRed" />
                     <Setter Property="OnSwitchBrush" Value="DarkGreen" />
@@ -237,7 +237,7 @@
                                    IsChecked="True"
                                    OffLabel="Disabled"
                                    OnLabel="Enabled"
-                                   Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}" />
+                                   Style="{StaticResource MahApps.Styles.ToggleSwitch.Win10}" />
             <Controls:ToggleSwitch x:Name="visibleSwitch"
                                    Margin="{StaticResource ControlMargin}"
                                    Controls:ValidationHelper.CloseOnMouseLeftButtonDown="True"
@@ -245,20 +245,20 @@
                                    IsChecked="{Binding IsToggleSwitchVisible, ValidatesOnDataErrors=True}"
                                    OffLabel="Collapsed"
                                    OnLabel="Visible"
-                                   Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}" />
+                                   Style="{StaticResource MahApps.Styles.ToggleSwitch.Win10}" />
             <Controls:ToggleSwitch Margin="{StaticResource ControlMargin}"
                                    IsEnabled="{Binding ElementName=enabledSwitch, Path=IsChecked}"
-                                   Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}"
+                                   Style="{StaticResource MahApps.Styles.ToggleSwitch.Win10}"
                                    Visibility="{Binding ElementName=visibleSwitch, Path=IsChecked, Converter={StaticResource btv}}" />
 
             <Controls:ToggleSwitch Margin="{StaticResource ControlMargin}"
                                    IsChecked="True"
                                    IsEnabled="False"
-                                   Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}" />
+                                   Style="{StaticResource MahApps.Styles.ToggleSwitch.Win10}" />
             <Controls:ToggleSwitch Margin="{StaticResource ControlMargin}"
                                    IsChecked="False"
                                    IsEnabled="False"
-                                   Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}" />
+                                   Style="{StaticResource MahApps.Styles.ToggleSwitch.Win10}" />
         </StackPanel>
 
         <StackPanel Grid.Row="1"
@@ -318,7 +318,7 @@
                        TargetType="Controls:DropDownButton">
                     <Setter Property="ArrowVisibility" Value="Collapsed" />
                     <Setter Property="BorderThickness" Value="0" />
-                    <Setter Property="ButtonStyle" Value="{DynamicResource MahApps.Metro.Styles.MetroCircleButtonStyle}" />
+                    <Setter Property="ButtonStyle" Value="{DynamicResource MahApps.Styles.ButtonBase.MetroCircle}" />
                     <Setter Property="FocusVisualStyle" Value="{DynamicResource MahApps.Metro.Styles.MetroCircleFocusVisual}" />
                     <Setter Property="Height" Value="48" />
                     <Setter Property="Width" Value="48" />
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/CustomDialogExample.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/CustomDialogExample.xaml
index d9347f1d01..bc0188c4a2 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/CustomDialogExample.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/CustomDialogExample.xaml
@@ -44,6 +44,6 @@
                 HorizontalAlignment="Right"
                 Command="{Binding CloseCommand}"
                 Content="OK"
-                Style="{DynamicResource MahApps.Metro.Styles.Dialogs.Button}" />
+                Style="{DynamicResource MahApps.Styles.Button.Dialogs}" />
     </Grid>
 </UserControl>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DataGridExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DataGridExamples.xaml
index 982b27bf64..cc15288ea9 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DataGridExamples.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DataGridExamples.xaml
@@ -170,12 +170,12 @@
                   SelectionUnit="FullRow">
             <DataGrid.Columns>
                 <DataGridCheckBoxColumn Binding="{Binding RelativeSource={RelativeSource AncestorType=DataGridRow}, Path=IsSelected, Mode=OneWay}"
-                                        EditingElementStyle="{DynamicResource MetroDataGridCheckBox}"
-                                        ElementStyle="{DynamicResource MetroDataGridCheckBox}"
+                                        EditingElementStyle="{DynamicResource MahApps.Styles.CheckBox.MahApps.Styles.DataGrid.Metro}"
+                                        ElementStyle="{DynamicResource MahApps.Styles.CheckBox.MahApps.Styles.DataGrid.Metro}"
                                         Header="Row Selected" />
                 <DataGridCheckBoxColumn Binding="{Binding IsSelected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                        EditingElementStyle="{DynamicResource MetroDataGridCheckBox}"
-                                        ElementStyle="{DynamicResource MetroDataGridCheckBox}"
+                                        EditingElementStyle="{DynamicResource MahApps.Styles.CheckBox.MahApps.Styles.DataGrid.Metro}"
+                                        ElementStyle="{DynamicResource MahApps.Styles.CheckBox.MahApps.Styles.DataGrid.Metro}"
                                         Header="Album Selected" />
                 <DataGridTextColumn Binding="{Binding Title}" Header="Title" />
                 <DataGridTextColumn Binding="{Binding Artist.Name}" Header="Artist" />
@@ -186,12 +186,12 @@
                                                       StringFormat="{}{0:C}" />
             </DataGrid.Columns>
             <DataGrid.Style>
-                <Style BasedOn="{StaticResource MetroDataGrid}" TargetType="{x:Type DataGrid}">
+                <Style BasedOn="{StaticResource MahApps.Styles.DataGrid.Metro}" TargetType="{x:Type DataGrid}">
                     <Setter Property="AlternatingRowBackground" Value="{DynamicResource MahApps.Brushes.Gray10}" />
                 </Style>
             </DataGrid.Style>
             <DataGrid.RowStyle>
-                <Style BasedOn="{StaticResource MetroDataGridRow}" TargetType="{x:Type DataGridRow}">
+                <Style BasedOn="{StaticResource MahApps.Styles.DataGridRow.Metro}" TargetType="{x:Type DataGridRow}">
                     <Style.Triggers>
                         <DataTrigger Binding="{Binding Price, Mode=OneWay, Converter={StaticResource AlbumPriceIsTooMuchConverter}}" Value="True">
                             <Setter Property="Background" Value="#FF8B8B" />
@@ -232,7 +232,7 @@
                   AutoGenerateColumns="False"
                   ItemsSource="{Binding Path=Albums}"
                   RowHeaderWidth="0"
-                  Style="{DynamicResource AzureDataGrid}">
+                  Style="{DynamicResource MahApps.Styles.DataGrid.Azure}">
             <DataGrid.Columns>
                 <DataGridTextColumn Binding="{Binding Title}" Header="Title" />
                 <DataGridTextColumn Binding="{Binding Artist.Name}" Header="Artist" />
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuCreatorsUpdate.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuCreatorsUpdate.xaml
index 57bb9ef376..bd2b0b7712 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuCreatorsUpdate.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuCreatorsUpdate.xaml
@@ -72,7 +72,7 @@
             </ObjectDataProvider>
 
             <Style x:Key="HamburgerMenuCreatorsItemStyle"
-                   BasedOn="{StaticResource HamburgerMenuItemStyle}"
+                   BasedOn="{StaticResource MahApps.Styles.ListBoxItem.HamburgerMenuItem}"
                    TargetType="{x:Type ListBoxItem}">
                 <Setter Property="Controls:ItemHelper.ActiveSelectionBackgroundBrush" Value="Transparent" />
                 <Setter Property="Controls:ItemHelper.ActiveSelectionForegroundBrush" Value="{DynamicResource MahApps.Brushes.AccentBase}" />
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuSample.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuSample.xaml
index c6f50c9c95..b15859b1c5 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuSample.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuSample.xaml
@@ -12,13 +12,13 @@
              mc:Ignorable="d">
 
     <UserControl.Resources>
-        <Style BasedOn="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}" TargetType="{x:Type Controls:ToggleSwitch}">
+        <Style BasedOn="{StaticResource MahApps.Styles.ToggleSwitch.Win10}" TargetType="{x:Type Controls:ToggleSwitch}">
             <Setter Property="FontSize" Value="15" />
             <Setter Property="Margin" Value="0" />
             <Setter Property="VerticalAlignment" Value="Center" />
         </Style>
 
-        <Style BasedOn="{StaticResource MahApps.Metro.Styles.Slider.Win10}" TargetType="{x:Type Slider}" />
+        <Style BasedOn="{StaticResource MahApps.Styles.Slider.Metro.Win10}" TargetType="{x:Type Slider}" />
 
         <Style BasedOn="{StaticResource {x:Type Controls:MetroHeader}}" TargetType="{x:Type Controls:MetroHeader}">
             <Setter Property="Controls:ControlsHelper.HeaderMargin" Value="0 0 0 5" />
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ProgressBars.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ProgressBars.xaml
index f9a571feb8..0c66ccf1f3 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ProgressBars.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ProgressBars.xaml
@@ -12,7 +12,7 @@
 
     <UserControl.Resources>
         <ResourceDictionary>
-            <Style BasedOn="{StaticResource MahApps.Metro.Styles.MetroHeader}" TargetType="{x:Type Controls:MetroHeader}">
+            <Style BasedOn="{StaticResource MahApps.Styles.MetroHeader.Metro}" TargetType="{x:Type Controls:MetroHeader}">
                 <Setter Property="HeaderTemplate">
                     <Setter.Value>
                         <DataTemplate>
@@ -51,7 +51,7 @@
                             Minimum="0"
                             Orientation="Horizontal"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Metro.Styles.Slider.Win10}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Metro.Win10}"
                             Value="25" />
                     <ProgressBar Width="250"
                                  Margin="4"
@@ -131,7 +131,7 @@
                             Minimum="0"
                             Orientation="Horizontal"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Metro.Styles.Slider.Win10}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Metro.Win10}"
                             Value="25" />
                     <Controls:MetroProgressBar Width="250"
                                                Margin="4"
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SelectionExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SelectionExamples.xaml
index 8dad34f24d..e1a80866d9 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SelectionExamples.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SelectionExamples.xaml
@@ -22,14 +22,14 @@
                              DisplayMemberPath="Name"
                              ItemsSource="{Binding Artists}"
                              SelectedIndex="0"
-                             Style="{StaticResource VirtualisedMetroListBox}" />
+                             Style="{StaticResource MahApps.Styles.ListBox.MetroVirtualized}" />
                     <ListBox Margin="2"
                              BorderThickness="1"
                              DisplayMemberPath="Title"
                              IsEnabled="False"
                              ItemsSource="{Binding Albums}"
                              SelectedIndex="0"
-                             Style="{StaticResource VirtualisedMetroListBox}" />
+                             Style="{StaticResource MahApps.Styles.ListBox.MetroVirtualized}" />
 
                     <ListBox Margin="2" SelectedIndex="0">
                         <ListBoxItem Content="Item 1" />
@@ -56,7 +56,7 @@
                               BorderThickness="1"
                               ItemsSource="{Binding Artists}"
                               SelectedIndex="0"
-                              Style="{StaticResource VirtualisedMetroListView}">
+                              Style="{StaticResource MahApps.Styles.ListView.MetroVirtualized}">
                         <ListView.View>
                             <GridView>
                                 <GridViewColumn DisplayMemberBinding="{Binding ArtistId}" Header="ID" />
@@ -69,7 +69,7 @@
                               IsEnabled="False"
                               ItemsSource="{Binding Artists}"
                               SelectedIndex="0"
-                              Style="{StaticResource VirtualisedMetroListView}">
+                              Style="{StaticResource MahApps.Styles.ListView.MetroVirtualized}">
                         <ListView.View>
                             <GridView>
                                 <GridViewColumn DisplayMemberBinding="{Binding ArtistId}" Header="ID" />
@@ -80,7 +80,7 @@
 
                     <ListView Margin="2"
                               SelectedIndex="0"
-                              Style="{StaticResource VirtualisedMetroListView}">
+                              Style="{StaticResource MahApps.Styles.ListView.MetroVirtualized}">
                         <ListViewItem>Test 1</ListViewItem>
                         <ListViewItem>Test 2</ListViewItem>
                         <ListViewItem>Test 3</ListViewItem>
@@ -89,7 +89,7 @@
                     <ListView Margin="2"
                               IsEnabled="False"
                               SelectedIndex="0"
-                              Style="{StaticResource VirtualisedMetroListView}">
+                              Style="{StaticResource MahApps.Styles.ListView.MetroVirtualized}">
                         <ListViewItem>Test 1</ListViewItem>
                         <ListViewItem>Test 2</ListViewItem>
                         <ListViewItem>Test 3</ListViewItem>
@@ -107,7 +107,7 @@
                     <TreeView Margin="2"
                               BorderThickness="1"
                               ItemsSource="{Binding Artists}"
-                              Style="{StaticResource VirtualisedMetroTreeView}">
+                              Style="{StaticResource MahApps.Styles.TreeView.MetroVirtualized}">
                         <TreeView.ItemTemplate>
                             <HierarchicalDataTemplate ItemsSource="{Binding Albums}">
                                 <TextBlock Text="{Binding Name}" />
@@ -123,7 +123,7 @@
                               BorderThickness="1"
                               IsEnabled="False"
                               ItemsSource="{Binding Artists}"
-                              Style="{StaticResource VirtualisedMetroTreeView}">
+                              Style="{StaticResource MahApps.Styles.TreeView.MetroVirtualized}">
                         <TreeView.ItemTemplate>
                             <HierarchicalDataTemplate ItemsSource="{Binding Albums}">
                                 <TextBlock Text="{Binding Name}" />
@@ -257,7 +257,7 @@
                               IsEditable="True"
                               ItemsSource="{Binding Albums}"
                               MaxDropDownHeight="125"
-                              Style="{DynamicResource VirtualisedMetroComboBox}"
+                              Style="{DynamicResource MahApps.Styles.ComboBox.MetroVirtualized}"
                               Text="{Binding Path=Title}" />
                     <ComboBox x:Name="groupingComboBox"
                               Width="200"
@@ -267,7 +267,7 @@
                               IsEditable="True"
                               IsEnabled="True"
                               ItemsSource="{Binding Albums}"
-                              Style="{DynamicResource VirtualisedMetroComboBox}"
+                              Style="{DynamicResource MahApps.Styles.ComboBox.MetroVirtualized}"
                               Text="{Binding Path=Title}">
                         <ComboBox.GroupStyle>
                             <GroupStyle>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/Sliders.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/Sliders.xaml
index 847efae078..75187870d9 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/Sliders.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/Sliders.xaml
@@ -12,7 +12,7 @@
 
     <UserControl.Resources>
         <ResourceDictionary>
-            <Style BasedOn="{StaticResource MahApps.Metro.Styles.MetroHeader}" TargetType="{x:Type Controls:MetroHeader}">
+            <Style BasedOn="{StaticResource MahApps.Styles.MetroHeader.Metro}" TargetType="{x:Type Controls:MetroHeader}">
                 <Setter Property="HeaderTemplate">
                     <Setter.Value>
                         <DataTemplate>
@@ -49,7 +49,7 @@
                             Minimum="0"
                             Orientation="Vertical"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Metro.Styles.Slider.Win10}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Metro.Win10}"
                             Value="40" />
                     <Slider Height="150"
                             Margin="4"
@@ -60,7 +60,7 @@
                             Minimum="0"
                             Orientation="Vertical"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Metro.Styles.Slider.Win10}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Metro.Win10}"
                             TickPlacement="TopLeft"
                             Ticks="20 25 30 50 70 75 80"
                             Value="50" />
@@ -71,7 +71,7 @@
                             Minimum="0"
                             Orientation="Vertical"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Metro.Styles.Slider.Win10}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Metro.Win10}"
                             TickFrequency="5"
                             TickPlacement="TopLeft"
                             Value="40" />
@@ -85,7 +85,7 @@
                             SelectionEnd="80"
                             SelectionStart="20"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Metro.Styles.Slider.Win10}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Metro.Win10}"
                             TickFrequency="5"
                             TickPlacement="TopLeft"
                             Value="40" />
@@ -95,7 +95,7 @@
                             Maximum="100"
                             Minimum="0"
                             Orientation="Vertical"
-                            Style="{DynamicResource MahApps.Metro.Styles.Slider.Win10}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Metro.Win10}"
                             TickFrequency="5"
                             TickPlacement="TopLeft"
                             Value="40" />
@@ -106,7 +106,7 @@
                             Minimum="0"
                             Orientation="Vertical"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Metro.Styles.Slider.Win10}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Metro.Win10}"
                             TickFrequency="5"
                             TickPlacement="BottomRight"
                             Value="40" />
@@ -117,7 +117,7 @@
                             Minimum="0"
                             Orientation="Vertical"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Metro.Styles.Slider.Win10}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Metro.Win10}"
                             TickFrequency="5"
                             TickPlacement="Both"
                             Value="40" />
@@ -136,7 +136,7 @@
                             Minimum="0"
                             Orientation="Horizontal"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Metro.Styles.Slider.Win10}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Metro.Win10}"
                             Value="40" />
                     <Slider Width="200"
                             Margin="4"
@@ -147,7 +147,7 @@
                             Minimum="0"
                             Orientation="Horizontal"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Metro.Styles.Slider.Win10}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Metro.Win10}"
                             TickPlacement="TopLeft"
                             Ticks="20 25 30 50 70 75 80"
                             Value="50" />
@@ -158,7 +158,7 @@
                             Minimum="0"
                             Orientation="Horizontal"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Metro.Styles.Slider.Win10}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Metro.Win10}"
                             TickFrequency="5"
                             TickPlacement="TopLeft"
                             Value="40" />
@@ -172,7 +172,7 @@
                             SelectionEnd="80"
                             SelectionStart="20"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Metro.Styles.Slider.Win10}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Metro.Win10}"
                             TickFrequency="5"
                             TickPlacement="TopLeft"
                             Value="40" />
@@ -182,7 +182,7 @@
                             Maximum="100"
                             Minimum="0"
                             Orientation="Horizontal"
-                            Style="{DynamicResource MahApps.Metro.Styles.Slider.Win10}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Metro.Win10}"
                             TickFrequency="5"
                             TickPlacement="TopLeft"
                             Value="40" />
@@ -193,7 +193,7 @@
                             Minimum="0"
                             Orientation="Horizontal"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Metro.Styles.Slider.Win10}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Metro.Win10}"
                             TickFrequency="5"
                             TickPlacement="BottomRight"
                             Value="40" />
@@ -204,7 +204,7 @@
                             Minimum="0"
                             Orientation="Horizontal"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Metro.Styles.Slider.Win10}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Metro.Win10}"
                             TickFrequency="5"
                             TickPlacement="Both"
                             Value="40" />
@@ -402,7 +402,7 @@
                                           Minimum="0"
                                           Orientation="Vertical"
                                           SmallChange="1"
-                                          Style="{DynamicResource MahApps.Metro.Styles.RangeSlider.Win10}"
+                                          Style="{DynamicResource MahApps.Styles.RangeSlider.Win10}"
                                           UpperValue="40" />
                     <Controls:RangeSlider Height="150"
                                           Margin="4"
@@ -414,7 +414,7 @@
                                           Minimum="0"
                                           Orientation="Vertical"
                                           SmallChange="1"
-                                          Style="{DynamicResource MahApps.Metro.Styles.RangeSlider.Win10}"
+                                          Style="{DynamicResource MahApps.Styles.RangeSlider.Win10}"
                                           TickPlacement="TopLeft"
                                           Ticks="20 25 30 50 70 75 80"
                                           UpperValue="50" />
@@ -426,7 +426,7 @@
                                           Minimum="0"
                                           Orientation="Vertical"
                                           SmallChange="1"
-                                          Style="{DynamicResource MahApps.Metro.Styles.RangeSlider.Win10}"
+                                          Style="{DynamicResource MahApps.Styles.RangeSlider.Win10}"
                                           TickFrequency="5"
                                           TickPlacement="TopLeft"
                                           UpperValue="40" />
@@ -441,7 +441,7 @@
                                           SelectionEnd="80"
                                           SelectionStart="20"
                                           SmallChange="1"
-                                          Style="{DynamicResource MahApps.Metro.Styles.RangeSlider.Win10}"
+                                          Style="{DynamicResource MahApps.Styles.RangeSlider.Win10}"
                                           TickFrequency="5"
                                           TickPlacement="TopLeft"
                                           UpperValue="40" />
@@ -452,7 +452,7 @@
                                           Maximum="100"
                                           Minimum="0"
                                           Orientation="Vertical"
-                                          Style="{DynamicResource MahApps.Metro.Styles.RangeSlider.Win10}"
+                                          Style="{DynamicResource MahApps.Styles.RangeSlider.Win10}"
                                           TickFrequency="5"
                                           TickPlacement="TopLeft"
                                           UpperValue="40" />
@@ -464,7 +464,7 @@
                                           Minimum="0"
                                           Orientation="Vertical"
                                           SmallChange="1"
-                                          Style="{DynamicResource MahApps.Metro.Styles.RangeSlider.Win10}"
+                                          Style="{DynamicResource MahApps.Styles.RangeSlider.Win10}"
                                           TickFrequency="5"
                                           TickPlacement="BottomRight"
                                           UpperValue="40" />
@@ -476,7 +476,7 @@
                                           Minimum="0"
                                           Orientation="Vertical"
                                           SmallChange="1"
-                                          Style="{DynamicResource MahApps.Metro.Styles.RangeSlider.Win10}"
+                                          Style="{DynamicResource MahApps.Styles.RangeSlider.Win10}"
                                           TickFrequency="5"
                                           TickPlacement="Both"
                                           UpperValue="40" />
@@ -496,7 +496,7 @@
                                           Minimum="0"
                                           Orientation="Horizontal"
                                           SmallChange="1"
-                                          Style="{DynamicResource MahApps.Metro.Styles.RangeSlider.Win10}"
+                                          Style="{DynamicResource MahApps.Styles.RangeSlider.Win10}"
                                           UpperValue="60">
                         <Controls:RangeSlider.AutoToolTipRangeValuesTemplate>
                             <DataTemplate DataType="Controls:RangeSliderAutoTooltipValues">
@@ -519,7 +519,7 @@
                                           Minimum="0"
                                           Orientation="Horizontal"
                                           SmallChange="1"
-                                          Style="{DynamicResource MahApps.Metro.Styles.RangeSlider.Win10}"
+                                          Style="{DynamicResource MahApps.Styles.RangeSlider.Win10}"
                                           TickPlacement="TopLeft"
                                           Ticks="20 25 30 50 70 75 80"
                                           UpperValue="50" />
@@ -531,7 +531,7 @@
                                           Minimum="0"
                                           Orientation="Horizontal"
                                           SmallChange="1"
-                                          Style="{DynamicResource MahApps.Metro.Styles.RangeSlider.Win10}"
+                                          Style="{DynamicResource MahApps.Styles.RangeSlider.Win10}"
                                           TickFrequency="5"
                                           TickPlacement="TopLeft"
                                           UpperValue="40" />
@@ -546,7 +546,7 @@
                                           SelectionEnd="80"
                                           SelectionStart="20"
                                           SmallChange="1"
-                                          Style="{DynamicResource MahApps.Metro.Styles.RangeSlider.Win10}"
+                                          Style="{DynamicResource MahApps.Styles.RangeSlider.Win10}"
                                           TickFrequency="5"
                                           TickPlacement="TopLeft"
                                           UpperValue="40" />
@@ -557,7 +557,7 @@
                                           Maximum="100"
                                           Minimum="0"
                                           Orientation="Horizontal"
-                                          Style="{DynamicResource MahApps.Metro.Styles.RangeSlider.Win10}"
+                                          Style="{DynamicResource MahApps.Styles.RangeSlider.Win10}"
                                           TickFrequency="5"
                                           TickPlacement="TopLeft"
                                           UpperValue="40" />
@@ -569,7 +569,7 @@
                                           Minimum="0"
                                           Orientation="Horizontal"
                                           SmallChange="1"
-                                          Style="{DynamicResource MahApps.Metro.Styles.RangeSlider.Win10}"
+                                          Style="{DynamicResource MahApps.Styles.RangeSlider.Win10}"
                                           TickFrequency="5"
                                           TickPlacement="BottomRight"
                                           UpperValue="40" />
@@ -581,7 +581,7 @@
                                           Minimum="0"
                                           Orientation="Horizontal"
                                           SmallChange="1"
-                                          Style="{DynamicResource MahApps.Metro.Styles.RangeSlider.Win10}"
+                                          Style="{DynamicResource MahApps.Styles.RangeSlider.Win10}"
                                           TickFrequency="5"
                                           TickPlacement="Both"
                                           UpperValue="40" />
@@ -792,7 +792,7 @@
                             Minimum="0"
                             Orientation="Vertical"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Metro.Styles.FlatSlider}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Flat}"
                             Value="40" />
                     <Slider Height="150"
                             Margin="4"
@@ -803,7 +803,7 @@
                             Minimum="0"
                             Orientation="Vertical"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Metro.Styles.FlatSlider}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Flat}"
                             TickPlacement="TopLeft"
                             Ticks="20 25 30 50 70 75 80"
                             Value="50" />
@@ -814,7 +814,7 @@
                             Minimum="0"
                             Orientation="Vertical"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Metro.Styles.FlatSlider}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Flat}"
                             TickFrequency="5"
                             TickPlacement="TopLeft"
                             Value="40" />
@@ -828,7 +828,7 @@
                             SelectionEnd="80"
                             SelectionStart="20"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Metro.Styles.FlatSlider}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Flat}"
                             TickFrequency="5"
                             TickPlacement="TopLeft"
                             Value="40" />
@@ -838,7 +838,7 @@
                             Maximum="100"
                             Minimum="0"
                             Orientation="Vertical"
-                            Style="{DynamicResource MahApps.Metro.Styles.FlatSlider}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Flat}"
                             TickFrequency="5"
                             TickPlacement="TopLeft"
                             Value="40" />
@@ -849,7 +849,7 @@
                             Minimum="0"
                             Orientation="Vertical"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Metro.Styles.FlatSlider}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Flat}"
                             TickFrequency="5"
                             TickPlacement="BottomRight"
                             Value="40" />
@@ -860,7 +860,7 @@
                             Minimum="0"
                             Orientation="Vertical"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Metro.Styles.FlatSlider}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Flat}"
                             TickFrequency="5"
                             TickPlacement="Both"
                             Value="40" />
@@ -879,7 +879,7 @@
                             Minimum="0"
                             Orientation="Horizontal"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Metro.Styles.FlatSlider}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Flat}"
                             Value="40" />
                     <Slider Width="200"
                             Margin="4"
@@ -890,7 +890,7 @@
                             Minimum="0"
                             Orientation="Horizontal"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Metro.Styles.FlatSlider}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Flat}"
                             TickPlacement="TopLeft"
                             Ticks="20 25 30 50 70 75 80"
                             Value="50" />
@@ -901,7 +901,7 @@
                             Minimum="0"
                             Orientation="Horizontal"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Metro.Styles.FlatSlider}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Flat}"
                             TickFrequency="5"
                             TickPlacement="TopLeft"
                             Value="40" />
@@ -915,7 +915,7 @@
                             SelectionEnd="80"
                             SelectionStart="20"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Metro.Styles.FlatSlider}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Flat}"
                             TickFrequency="5"
                             TickPlacement="TopLeft"
                             Value="40" />
@@ -925,7 +925,7 @@
                             Maximum="100"
                             Minimum="0"
                             Orientation="Horizontal"
-                            Style="{DynamicResource MahApps.Metro.Styles.FlatSlider}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Flat}"
                             TickFrequency="5"
                             TickPlacement="TopLeft"
                             Value="40" />
@@ -936,7 +936,7 @@
                             Minimum="0"
                             Orientation="Horizontal"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Metro.Styles.FlatSlider}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Flat}"
                             TickFrequency="5"
                             TickPlacement="BottomRight"
                             Value="40" />
@@ -947,7 +947,7 @@
                             Minimum="0"
                             Orientation="Horizontal"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Metro.Styles.FlatSlider}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Flat}"
                             TickFrequency="5"
                             TickPlacement="Both"
                             Value="40" />
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml
index a94eaafe72..597225dc93 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml
@@ -74,9 +74,9 @@
                         <ContextMenu>
                             <MenuItem Header="Custom Item" />
                             <Separator />
-                            <MenuItem Command="ApplicationCommands.Cut" Style="{DynamicResource MetroMenuItem}" />
-                            <MenuItem Command="ApplicationCommands.Copy" Style="{DynamicResource MetroMenuItem}" />
-                            <MenuItem Command="ApplicationCommands.Paste" Style="{DynamicResource MetroMenuItem}" />
+                            <MenuItem Command="ApplicationCommands.Cut" Style="{DynamicResource MahApps.Styles.MenuItem.Metro}" />
+                            <MenuItem Command="ApplicationCommands.Copy" Style="{DynamicResource MahApps.Styles.MenuItem.Metro}" />
+                            <MenuItem Command="ApplicationCommands.Paste" Style="{DynamicResource MahApps.Styles.MenuItem.Metro}" />
                         </ContextMenu>
                     </TextBox.ContextMenu>
                 </TextBox>
@@ -85,7 +85,7 @@
                          ContextMenu="{x:Null}"
                          Text="Clear button and no ContextMenu">
                     <TextBox.Style>
-                        <Style BasedOn="{StaticResource MetroTextBox}" TargetType="{x:Type TextBox}">
+                        <Style BasedOn="{StaticResource MahApps.Styles.TextBox.Metro}" TargetType="{x:Type TextBox}">
                             <Setter Property="Controls:TextBoxHelper.ClearTextButton" Value="True" />
                             <Style.Triggers>
                                 <Trigger Property="Controls:TextBoxHelper.HasText" Value="False">
@@ -110,7 +110,7 @@
                                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=TextBox}, Path=Text, Mode=OneWay}" />
                     </TextBox.InputBindings>
                     <TextBox.Style>
-                        <Style BasedOn="{StaticResource SearchMetroTextBox}" TargetType="{x:Type TextBox}">
+                        <Style BasedOn="{StaticResource MahApps.Styles.TextBox.MetroSearch}" TargetType="{x:Type TextBox}">
                             <Style.Triggers>
                                 <Trigger Property="Controls:TextBoxHelper.HasText" Value="True">
                                     <Setter Property="Controls:TextBoxHelper.ButtonContent" Value="r" />
@@ -125,12 +125,12 @@
                          Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmdWithParameter, Mode=OneWay}"
                          Controls:TextBoxHelper.ButtonCommandParameter="{Binding ElementName=test2, Path=Text}"
                          Controls:TextBoxHelper.Watermark="Enter parameter"
-                         Style="{DynamicResource SearchMetroTextBox}" />
+                         Style="{DynamicResource MahApps.Styles.TextBox.MetroSearch}" />
                 <TextBox Margin="{StaticResource ControlMargin}"
                          Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd, Mode=OneWay}"
                          Controls:TextBoxHelper.ButtonContent="s"
                          Controls:TextBoxHelper.Watermark="Custom icon style"
-                         Style="{DynamicResource MetroButtonTextBox}" />
+                         Style="{DynamicResource MahApps.Styles.TextBox.MetroButton}" />
                 <TextBox Margin="{StaticResource ControlMargin}"
                          Controls:TextBoxHelper.Watermark="Number smaller than 10"
                          Text="{Binding IntegerGreater10Property, ValidatesOnDataErrors=True, UpdateSourceTrigger=PropertyChanged, NotifyOnValidationError=True}" />
@@ -151,7 +151,7 @@
                 <TextBox Margin="{StaticResource ControlMargin}"
                          Controls:TextBoxHelper.Watermark="Search style"
                          IsEnabled="False"
-                         Style="{DynamicResource SearchMetroTextBox}" />
+                         Style="{DynamicResource MahApps.Styles.TextBox.MetroSearch}" />
                 <TextBox Margin="{StaticResource ControlMargin}"
                          Controls:TextBoxHelper.Watermark="Number smaller than 10"
                          IsEnabled="False"
@@ -178,7 +178,7 @@
                              Controls:TextBoxHelper.ButtonContent="s"
                              IsDocumentEnabled="True"
                              SpellCheck.IsEnabled="True"
-                             Style="{StaticResource MahApps.Metro.Styles.ButtonRichTextBox}" />
+                             Style="{StaticResource MahApps.Styles.RichTextBox.MetroButton}" />
                 <RichTextBox Height="120"
                              Margin="{StaticResource ControlMargin}"
                              Padding="5"
@@ -187,7 +187,7 @@
                              SpellCheck.IsEnabled="True">
                     <!--
                         Workaround for: RichTextBox behaves oddly inside a ScrollViewer
-                        
+
                         The workaround would be to bind the Documents PageWidth to the RichTextBox's ActualWidth
                     -->
                     <FlowDocument PageWidth="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type RichTextBox}}, Path=ActualWidth}">
@@ -244,13 +244,13 @@
                              Controls:TextBoxHelper.UseFloatingWatermark="True"
                              Controls:TextBoxHelper.Watermark="Win8"
                              Password="Win8"
-                             Style="{StaticResource Win8MetroPasswordBox}" />
+                             Style="{StaticResource MahApps.Styles.PasswordBox.Win8}" />
                 <PasswordBox Margin="{StaticResource ControlMargin}"
                              Controls:TextBoxHelper.ClearTextButton="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.HasText), Mode=OneWay}"
                              Controls:TextBoxHelper.IsWaitingForData="True"
                              Controls:TextBoxHelper.UseFloatingWatermark="True"
                              Controls:TextBoxHelper.Watermark="Revealed PasswordBox"
-                             Style="{StaticResource MetroButtonRevealedPasswordBox}" />
+                             Style="{StaticResource MahApps.Styles.PasswordBox.MetroButtonRevealed}" />
                 <PasswordBox Margin="{StaticResource ControlMargin}"
                              Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd, Mode=OneWay}"
                              Controls:TextBoxHelper.ClearTextButton="True"
@@ -263,7 +263,7 @@
                              Controls:TextBoxHelper.ButtonContent="4"
                              Controls:TextBoxHelper.UseFloatingWatermark="True"
                              Controls:TextBoxHelper.Watermark="Custom icon style"
-                             Style="{DynamicResource MetroButtonPasswordBox}">
+                             Style="{DynamicResource MahApps.Styles.PasswordBox.MetroButton}">
                     <Controls:PasswordBoxHelper.CapsLockWarningToolTip>
                         <TextBlock>
                             <Run Text="This is a custom Warning to show you that" />
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/CleanWindowDemo.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/CleanWindowDemo.xaml
index f8c1ac895e..33e45d7c0d 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/CleanWindowDemo.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/CleanWindowDemo.xaml
@@ -11,7 +11,7 @@
                       Icon="..\mahapps.metro.logo2.ico"
                       ResizeMode="CanResizeWithGrip"
                       ShowIconOnTitleBar="True"
-                      Style="{DynamicResource CleanWindowStyleKey}">
+                      Style="{DynamicResource MahApps.Styles.MetroWindow.Clean}">
 
     <Window.Resources>
         <ResourceDictionary>
@@ -86,10 +86,10 @@
                                  Columns="2">
                         <Button Margin="10"
                                 Content="Create"
-                                Style="{DynamicResource SquareButtonStyle}" />
+                                Style="{DynamicResource MahApps.Styles.ButtonBase.Square}" />
                         <Button Margin="10"
                                 Content="Cancel"
-                                Style="{DynamicResource SquareButtonStyle}" />
+                                Style="{DynamicResource MahApps.Styles.ButtonBase.Square}" />
                     </UniformGrid>
 
                 </Grid>
@@ -121,7 +121,7 @@
                       Header="artists">
                 <ListBox x:Name="artist"
                          ItemsSource="{x:Static models:SampleData.Artists}"
-                         Style="{DynamicResource VirtualisedMetroListBox}">
+                         Style="{DynamicResource MahApps.Styles.ListBox.MetroVirtualized}">
                     <ListBox.ItemTemplate>
                         <DataTemplate DataType="{x:Type models:Artist}">
                             <TextBlock>
@@ -147,7 +147,7 @@
                 <Controls:MetroTabItem Header="albums">
                     <ListBox x:Name="albums"
                              ItemsSource="{Binding ElementName=artist, Path=SelectedItem.Albums}"
-                             Style="{DynamicResource VirtualisedMetroListBox}">
+                             Style="{DynamicResource MahApps.Styles.ListBox.MetroVirtualized}">
                         <ListBox.ItemTemplate>
                             <DataTemplate DataType="{x:Type models:Album}">
                                 <TextBlock>
@@ -175,11 +175,11 @@
                     <Button Margin="2"
                             Click="Button_Click"
                             Content="Flyout"
-                            Style="{DynamicResource MetroFlatButton}" />
+                            Style="{DynamicResource MahApps.Styles.Button.Flat}" />
                     <Button Margin="2"
                             Click="Button_Click_1"
                             Content="Dialog"
-                            Style="{DynamicResource MetroFlatButton}" />
+                            Style="{DynamicResource MahApps.Styles.Button.Flat}" />
                     <ComboBox Margin="2"
                               ItemsSource="{Binding Source={StaticResource HorizontalAlignmentEnumValues}}"
                               SelectedItem="{Binding ElementName=ThisView, Path=TitleAlignment, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
@@ -189,7 +189,7 @@
 
         <StatusBar Grid.Row="2">
             <StatusBarItem>MahApps.Metro Clean Window</StatusBarItem>
-            <Separator Style="{StaticResource CleanMetroStatusBarSeparator}" />
+            <Separator Style="{StaticResource MahApps.Styles.Separator.Clean}" />
             <StatusBarItem>Some stuff</StatusBarItem>
         </StatusBar>
     </Grid>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/DynamicFlyout.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/DynamicFlyout.xaml
index b4842888b3..ad663064c9 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/DynamicFlyout.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/DynamicFlyout.xaml
@@ -42,11 +42,11 @@
             <Button Margin="10"
                     Click="CloseFlyoutClick"
                     Content="OK"
-                    Style="{DynamicResource SquareButtonStyle}" />
+                    Style="{DynamicResource MahApps.Styles.ButtonBase.Square}" />
             <Button Margin="10"
                     Click="CloseFlyoutClick"
                     Content="Cancel"
-                    Style="{DynamicResource SquareButtonStyle}" />
+                    Style="{DynamicResource MahApps.Styles.ButtonBase.Square}" />
         </UniformGrid>
     </Grid>
 </Controls:Flyout>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml
index b3feb73099..81b80084fe 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml
@@ -66,7 +66,7 @@
                 <Button Margin="1 0 1 1"
                         Click="ClickMeOnClick"
                         Content="Click Me..."
-                        Style="{StaticResource MetroFlatButton}" />
+                        Style="{StaticResource MahApps.Styles.Button.Flat}" />
             </StackPanel>
         </DataTemplate>
     </Controls:MetroWindow.TitleTemplate>
@@ -134,10 +134,10 @@
                                  Columns="2">
                         <Button Margin="10"
                                 Content="Create"
-                                Style="{DynamicResource SquareButtonStyle}" />
+                                Style="{DynamicResource MahApps.Styles.ButtonBase.Square}" />
                         <Button Margin="10"
                                 Content="Cancel"
-                                Style="{DynamicResource SquareButtonStyle}" />
+                                Style="{DynamicResource MahApps.Styles.ButtonBase.Square}" />
                     </UniformGrid>
                 </Grid>
             </Controls:Flyout>
@@ -150,10 +150,10 @@
                 <StackPanel Margin="10" Orientation="Vertical">
                     <Button Margin="2"
                             Content="create"
-                            Style="{StaticResource MetroFlatButton}" />
+                            Style="{StaticResource MahApps.Styles.Button.Flat}" />
                     <Button Margin="2"
                             Content="cancel"
-                            Style="{StaticResource MetroFlatButton}" />
+                            Style="{StaticResource MahApps.Styles.Button.Flat}" />
                 </StackPanel>
             </Controls:Flyout>
 
@@ -218,7 +218,7 @@
                             HorizontalAlignment="Right"
                             VerticalAlignment="Bottom"
                             Content="Save"
-                            Style="{StaticResource MetroFlatButton}" />
+                            Style="{StaticResource MahApps.Styles.Button.Flat}" />
                     <UniformGrid Grid.Row="2"
                                  Grid.Column="0"
                                  Grid.ColumnSpan="2"
@@ -228,11 +228,11 @@
                         <Button Margin="10"
                                 Click="ShowSettingsLeft"
                                 Content="Left"
-                                Style="{DynamicResource SquareButtonStyle}" />
+                                Style="{DynamicResource MahApps.Styles.ButtonBase.Square}" />
                         <Button Margin="10"
                                 Click="ShowSettingsRight"
                                 Content="Right"
-                                Style="{DynamicResource SquareButtonStyle}" />
+                                Style="{DynamicResource MahApps.Styles.ButtonBase.Square}" />
                     </UniformGrid>
                 </Grid>
             </Controls:Flyout>
@@ -270,13 +270,13 @@
                                 Margin="5"
                                 Content="_Save"
                                 IsEnabled="False"
-                                Style="{DynamicResource MetroFlatButton}" />
+                                Style="{DynamicResource MahApps.Styles.Button.Flat}" />
                         <Button Grid.Column="2"
                                 Margin="5"
                                 Click="TopFlyoutCloseButtonOnClick"
                                 Content="_Close"
                                 IsCancel="True"
-                                Style="{DynamicResource MetroFlatButton}" />
+                                Style="{DynamicResource MahApps.Styles.Button.Flat}" />
                     </Grid>
                 </Grid>
             </Controls:Flyout>
@@ -291,7 +291,7 @@
                             Orientation="Horizontal">
                     <Button Width="36"
                             Height="36"
-                            Style="{DynamicResource MahApps.Metro.Styles.MetroCircleButtonStyle}">
+                            Style="{DynamicResource MahApps.Styles.ButtonBase.MetroCircle}">
                         <iconPacks:PackIconModern Kind="Alert" />
                     </Button>
                 </StackPanel>
@@ -306,7 +306,7 @@
                             Height="36"
                             FontFamily="Segoe UI Symbol"
                             FontSize="16"
-                            Style="{DynamicResource MahApps.Metro.Styles.MetroCircleButtonStyle}">
+                            Style="{DynamicResource MahApps.Styles.ButtonBase.MetroCircle}">
                         <iconPacks:PackIconModern Kind="Add" />
                     </Button>
                 </StackPanel>
@@ -359,7 +359,7 @@
     <Grid>
 
         <Grid.Resources>
-            <Style BasedOn="{StaticResource MetroFlatButton}" TargetType="{x:Type Button}" />
+            <Style BasedOn="{StaticResource MahApps.Styles.Button.Flat}" TargetType="{x:Type Button}" />
         </Grid.Resources>
 
         <Grid.ColumnDefinitions>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/ShowcaseFlyout.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/ShowcaseFlyout.xaml
index d683833dbf..b7a8f2e40f 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/ShowcaseFlyout.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/ShowcaseFlyout.xaml
@@ -46,7 +46,7 @@
                         FontSize="16"
                         Foreground="{Binding RelativeSource={RelativeSource AncestorType={x:Type controls:Flyout}}, Path=Foreground}"
                         IsCancel="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:Flyout}}, Path=CloseButtonIsCancel}"
-                        Style="{DynamicResource MahApps.Metro.Styles.MetroCircleButtonStyle}"
+                        Style="{DynamicResource MahApps.Styles.ButtonBase.MetroCircle}"
                         Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:Flyout}}, Path=CloseButtonVisibility}">
                     <i:Interaction.Triggers>
                         <i:EventTrigger EventName="Click">
@@ -57,7 +57,7 @@
                                     Height="20"
                                     Content="M19,34V42H43.75L33.75,52H44.25L58.25,38L44.25,24H33.75L43.75,34H19Z"
                                     FlowDirection="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:Flyout}}, Path=FlowDirection}"
-                                    Style="{DynamicResource PathIconContentControlStyle}" />
+                                    Style="{DynamicResource MahApps.Styles.ContentControl.PathIcon}" />
                 </Button>
                 <TextBlock x:Name="PART_BackHeaderText"
                            Margin="15 0 0 0"
@@ -139,7 +139,7 @@
                                        IsChecked="{Binding CanCloseFlyout, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                        OffLabel="Disabled"
                                        OnLabel="Allowed"
-                                       Style="{DynamicResource MahApps.Metro.Styles.ToggleSwitch.Win10}" />
+                                       Style="{DynamicResource MahApps.Styles.ToggleSwitch.Win10}" />
 
             </Grid>
 
@@ -151,7 +151,7 @@
                               BorderThickness="0"
                               ItemsSource="{Binding Artists, Mode=OneWay}"
                               SelectedIndex="0"
-                              Style="{StaticResource VirtualisedMetroListView}">
+                              Style="{StaticResource MahApps.Styles.ListView.MetroVirtualized}">
                         <ListView.View>
                             <GridView>
                                 <GridViewColumn DisplayMemberBinding="{Binding ArtistId}" Header="ID" />
@@ -166,7 +166,7 @@
                              DisplayMemberPath="Title"
                              ItemsSource="{Binding Albums, Mode=OneWay}"
                              SelectedIndex="0"
-                             Style="{StaticResource VirtualisedMetroListBox}" />
+                             Style="{StaticResource MahApps.Styles.ListBox.MetroVirtualized}" />
                 </TabItem>
                 <TabItem Header="Slider">
                     <StackPanel Orientation="Vertical">
@@ -183,7 +183,7 @@
                                 Maximum="100"
                                 Minimum="0"
                                 SmallChange="1"
-                                Style="{StaticResource MahApps.Metro.Styles.FlatSlider}"
+                                Style="{StaticResource MahApps.Styles.Slider.Flat}"
                                 Value="{Binding ElementName=TheSlider, Path=Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                         <TextBlock Margin="2"
                                    HorizontalAlignment="Center"
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/SizeToContentDemo.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/SizeToContentDemo.xaml
index e63f3ff26c..c3b5f68f11 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/SizeToContentDemo.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/SizeToContentDemo.xaml
@@ -8,7 +8,7 @@
                       SizeToContent="WidthAndHeight"
                       WindowStartupLocation="CenterOwner">
     <controls:MetroWindow.WindowButtonCommands>
-        <controls:WindowButtonCommands Style="{DynamicResource MahApps.Metro.Styles.WindowButtonCommands.Win10}" />
+        <controls:WindowButtonCommands Style="{DynamicResource MahApps.Styles.WindowButtonCommands.Win10}" />
     </controls:MetroWindow.WindowButtonCommands>
     <Grid Width="50"
           Height="50"
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/VSDemo.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/VSDemo.xaml
index 09b20dc86b..97d793331a 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/VSDemo.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/VSDemo.xaml
@@ -8,7 +8,7 @@
                       Title="Visual Studio 2012 Style Demo"
                       Width="1000"
                       Height="800"
-                      Style="{DynamicResource VSWindowStyleKey}"
+                      Style="{DynamicResource MahApps.Styles.MetroWindow.VisualStudio}"
                       WindowStartupLocation="CenterScreen">
 
     <Window.Resources>
@@ -28,7 +28,7 @@
 
     <Controls:MetroWindow.RightWindowCommands>
         <Controls:WindowCommands ShowSeparators="False">
-            <Button Style="{StaticResource VSWindowNotificationButtonStyle}" ToolTip="1 Notification">
+            <Button Style="{StaticResource MahApps.Styles.Button.VisualStudioWindowNotification}" ToolTip="1 Notification">
                 <iconPacks:PackIconEntypo Width="16"
                                           Height="16"
                                           Kind="Flag" />
@@ -38,7 +38,7 @@
                                                                              Width=12,
                                                                              Height=12}"
                      Controls:TextBoxHelper.Watermark="Quick Launch (Ctrl+Q)"
-                     Style="{DynamicResource VSWindowQuickLaunchTextBoxStyle}" />
+                     Style="{DynamicResource MahApps.Styles.TextBox.VisualStudioWindowQuickLaunch}" />
         </Controls:WindowCommands>
     </Controls:MetroWindow.RightWindowCommands>
 
@@ -232,7 +232,7 @@
                                  Grid.Column="1"
                                  Margin="5"
                                  FontSize="16"
-                                 Style="{StaticResource SearchTextBox}" />
+                                 Style="{StaticResource MahApps.Styles.TextBox.VisualStudioSearch}" />
                         <TextBox Grid.Row="2"
                                  Grid.ColumnSpan="2"
                                  Margin="5"
@@ -424,11 +424,11 @@
                 <Button Margin="0 10 0 3"
                         Content="Fire rocket..."
                         FontSize="14"
-                        Style="{StaticResource LinkButton}" />
+                        Style="{StaticResource MahApps.Styles.Button.VisualStudioWindowLink}" />
                 <Button Margin="0 3 0 10"
                         Content="Throw something over board..."
                         FontSize="14"
-                        Style="{StaticResource LinkButton}" />
+                        Style="{StaticResource MahApps.Styles.Button.VisualStudioWindowLink}" />
                 <Separator Background="#11FFFFFF" />
                 <TextBlock Margin="0 10 0 10"
                            FontSize="18"
@@ -438,11 +438,11 @@
                 <Button Margin="0 10 0 3"
                         Content="blastallenemies.cmd"
                         FontSize="14"
-                        Style="{StaticResource LinkButton}" />
+                        Style="{StaticResource MahApps.Styles.Button.VisualStudioWindowLink}" />
                 <Button Margin="0 3 0 3"
                         Content="verysecretmessage.txt"
                         FontSize="14"
-                        Style="{StaticResource LinkButton}" />
+                        Style="{StaticResource MahApps.Styles.Button.VisualStudioWindowLink}" />
             </StackPanel>
         </Grid>
     </DockPanel>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/HamburgerMenuRipple/HamburgerMenuRipple.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/HamburgerMenuRipple/HamburgerMenuRipple.xaml
index 6b48eeaf61..bc49b5619d 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/HamburgerMenuRipple/HamburgerMenuRipple.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/HamburgerMenuRipple/HamburgerMenuRipple.xaml
@@ -58,7 +58,7 @@
             <materialDesignConverters:BrushRoundConverter x:Key="BrushRoundConverter" />
 
             <Style x:Key="HamburgerMenuCreatorsItemStyle"
-                   BasedOn="{StaticResource HamburgerMenuItemStyle}"
+                   BasedOn="{StaticResource MahApps.Styles.ListBoxItem.HamburgerMenuItem}"
                    TargetType="{x:Type ListBoxItem}">
                 <Setter Property="Controls:ItemHelper.ActiveSelectionBackgroundBrush" Value="Transparent" />
                 <Setter Property="Controls:ItemHelper.ActiveSelectionForegroundBrush" Value="{DynamicResource MahApps.Brushes.AccentBase}" />
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml
index 9080f39afa..0f211a080a 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml
@@ -47,7 +47,7 @@
                      Fill="{Binding ColorBrush, Mode=OneWay}" />
 
             <Style x:Key="AppThemeMenuItemStyle"
-                   BasedOn="{StaticResource MetroMenuItem}"
+                   BasedOn="{StaticResource MahApps.Styles.MenuItem.Metro}"
                    TargetType="{x:Type MenuItem}">
                 <Setter Property="Command" Value="{Binding ChangeAccentCommand}" />
                 <Setter Property="Header" Value="{Binding Name, Mode=OneWay}" />
@@ -55,7 +55,7 @@
             </Style>
 
             <Style x:Key="AccentColorMenuItemStyle"
-                   BasedOn="{StaticResource MetroMenuItem}"
+                   BasedOn="{StaticResource MahApps.Styles.MenuItem.Metro}"
                    TargetType="{x:Type MenuItem}">
                 <Setter Property="Command" Value="{Binding ChangeAccentCommand}" />
                 <Setter Property="Header" Value="{Binding Name, Mode=OneWay}" />
@@ -82,7 +82,7 @@
                                TextWrapping="Wrap" />
                     <Button Click="CloseCustomDialog"
                             Content="Close Me!"
-                            Style="{DynamicResource MahApps.Metro.Styles.Dialogs.Button}" />
+                            Style="{DynamicResource MahApps.Styles.Button.Dialogs}" />
                 </StackPanel>
 
             </Dialog:CustomDialog>
@@ -91,7 +91,7 @@
     </Window.Resources>
 
     <Controls:MetroWindow.WindowButtonCommands>
-        <Controls:WindowButtonCommands Style="{DynamicResource MahApps.Metro.Styles.WindowButtonCommands.Win10}" />
+        <Controls:WindowButtonCommands Style="{DynamicResource MahApps.Styles.WindowButtonCommands.Win10}" />
     </Controls:MetroWindow.WindowButtonCommands>
 
     <Controls:MetroWindow.LeftWindowCommands>
@@ -320,7 +320,7 @@
 
         <StatusBar Grid.Row="2">
             <StatusBarItem>MahApps.Metro DEMO Application</StatusBarItem>
-            <Separator Style="{StaticResource MetroStatusBarSeparator}" />
+            <Separator Style="{StaticResource MahApps.Styles.Separator.MahApps.Styles.StatusBar.Metro}" />
             <StatusBarItem>Selected Tab:</StatusBarItem>
             <StatusBarItem Content="{Binding ElementName=MainTabControl, Path=SelectedItem.Header, Mode=OneWay}" />
         </StatusBar>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml.cs b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml.cs
index 3e46af87d8..da4024c5ba 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml.cs
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml.cs
@@ -347,7 +347,7 @@ private void LaunchNavigationDemo(object sender, RoutedEventArgs e)
 
             //uncomment the next two lines if you want the clean style.
             //navWin.Resources.MergedDictionaries.Add(new ResourceDictionary() { Source = new Uri("pack://application:,,,/MahApps.Metro;component/Styles/Clean/CleanWindow.xaml", UriKind.Absolute) });
-            //navWin.SetResourceReference(StyleProperty, "CleanWindowStyleKey");
+            //navWin.SetResourceReference(StyleProperty, "MahApps.Styles.MetroWindow.Clean");
 
             navWin.Show();
             navWin.Navigate(new Navigation.HomePage());
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/Navigation/HomePage.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/Navigation/HomePage.xaml
index 13b2519e12..0f31d23f7b 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/Navigation/HomePage.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/Navigation/HomePage.xaml
@@ -6,7 +6,7 @@
       Title="Home Page"
       d:DesignHeight="300"
       d:DesignWidth="300"
-      Style="{DynamicResource MetroPage}"
+      Style="{DynamicResource MahApps.Styles.Page.Metro}"
       mc:Ignorable="d">
 
     <StackPanel Margin="2">
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/Navigation/InterestingPage.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/Navigation/InterestingPage.xaml
index daf64378a1..052f0896d1 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/Navigation/InterestingPage.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/Navigation/InterestingPage.xaml
@@ -6,7 +6,7 @@
       Title="Interesting Page"
       d:DesignHeight="300"
       d:DesignWidth="300"
-      Style="{DynamicResource MetroPage}"
+      Style="{DynamicResource MahApps.Styles.Page.Metro}"
       mc:Ignorable="d">
 
     <StackPanel Margin="10" Orientation="Vertical">
diff --git a/src/MahApps.Metro/Controls/DataGridNumericUpDownColumn.cs b/src/MahApps.Metro/Controls/DataGridNumericUpDownColumn.cs
index 75aab25b78..f1134fa129 100644
--- a/src/MahApps.Metro/Controls/DataGridNumericUpDownColumn.cs
+++ b/src/MahApps.Metro/Controls/DataGridNumericUpDownColumn.cs
@@ -28,7 +28,7 @@ public static Style DefaultEditingElementStyle
                 {
                     var numericUpDown = new NumericUpDown();
 
-                    var style = numericUpDown.TryFindResource("MahApps.Metro.Styles.DataGrid.NumericUpDownColumnEditingStyle") is Style baseStyle ? new Style(typeof(NumericUpDown), baseStyle) : new Style(typeof(NumericUpDown));
+                    var style = numericUpDown.TryFindResource("MahApps.Styles.NumericUpDown.DataGridColumnEditing") is Style baseStyle ? new Style(typeof(NumericUpDown), baseStyle) : new Style(typeof(NumericUpDown));
 
                     style.Setters.Add(new Setter(ScrollViewer.HorizontalScrollBarVisibilityProperty, ScrollBarVisibility.Disabled));
                     style.Setters.Add(new Setter(ScrollViewer.VerticalScrollBarVisibilityProperty, ScrollBarVisibility.Disabled));
@@ -50,7 +50,7 @@ public static Style DefaultElementStyle
                 {
                     var numericUpDown = new NumericUpDown();
 
-                    var style = numericUpDown.TryFindResource("MahApps.Metro.Styles.DataGrid.NumericUpDownColumnStyle") is Style baseStyle ? new Style(typeof(NumericUpDown), baseStyle) : new Style(typeof(NumericUpDown));
+                    var style = numericUpDown.TryFindResource("MahApps.Styles.NumericUpDown.DataGridColumn") is Style baseStyle ? new Style(typeof(NumericUpDown), baseStyle) : new Style(typeof(NumericUpDown));
 
                     style.Setters.Add(new Setter(ScrollViewer.HorizontalScrollBarVisibilityProperty, ScrollBarVisibility.Disabled));
                     style.Setters.Add(new Setter(ScrollViewer.VerticalScrollBarVisibilityProperty, ScrollBarVisibility.Disabled));
diff --git a/src/MahApps.Metro/Controls/Dialogs/BaseMetroDialog.cs b/src/MahApps.Metro/Controls/Dialogs/BaseMetroDialog.cs
index 64f4771e8f..180be38de9 100644
--- a/src/MahApps.Metro/Controls/Dialogs/BaseMetroDialog.cs
+++ b/src/MahApps.Metro/Controls/Dialogs/BaseMetroDialog.cs
@@ -434,7 +434,7 @@ public Task WaitForCloseAsync()
 
             if (this.DialogSettings.AnimateHide)
             {
-                Storyboard closingStoryboard = this.TryFindResource("DialogCloseStoryboard") as Storyboard;
+                Storyboard closingStoryboard = this.TryFindResource("MahApps.Storyboard.DialogClose") as Storyboard;
 
                 if (closingStoryboard == null)
                 {
diff --git a/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml b/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml
index 94e8ef6fc2..435c7b14fa 100644
--- a/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml
+++ b/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml
@@ -32,11 +32,11 @@
             <Button x:Name="PART_AffirmativeButton"
                     Margin="0 0 5 0"
                     Content="{Binding AffirmativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:InputDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
-                    Style="{DynamicResource MahApps.Metro.Styles.Dialogs.AccentButton}" />
+                    Style="{DynamicResource MahApps.Styles.ButtonBase.DialogsAccent}" />
             <Button x:Name="PART_NegativeButton"
                     Margin="5 0 5 0"
                     Content="{Binding NegativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:InputDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
-                    Style="{DynamicResource MahApps.Metro.Styles.Dialogs.Button}" />
+                    Style="{DynamicResource MahApps.Styles.Button.Dialogs}" />
         </StackPanel>
     </Grid>
 </Dialogs:BaseMetroDialog>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml.cs b/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml.cs
index 865d912d1f..cf2f424018 100644
--- a/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml.cs
+++ b/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml.cs
@@ -169,7 +169,7 @@ protected override void OnLoaded()
             switch (this.DialogSettings.ColorScheme)
             {
                 case MetroDialogColorScheme.Accented:
-                    this.PART_NegativeButton.SetResourceReference(StyleProperty, "MahApps.Metro.Styles.Dialogs.AccentHighlightButton");
+                    this.PART_NegativeButton.SetResourceReference(StyleProperty, "MahApps.Styles.ButtonBase.DialogsAccentHighlight");
                     this.PART_TextBox.SetResourceReference(ForegroundProperty, "MahApps.Brushes.BlackColor");
                     this.PART_TextBox.SetResourceReference(ControlsHelper.FocusBorderBrushProperty, "MahApps.Brushes.TextBox.FocusBorder");
                     break;
diff --git a/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml b/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml
index fc9c5e737b..50539873c3 100644
--- a/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml
+++ b/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml
@@ -51,11 +51,11 @@
             <Button x:Name="PART_AffirmativeButton"
                     Margin="0 0 5 0"
                     Content="{Binding AffirmativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
-                    Style="{DynamicResource MahApps.Metro.Styles.Dialogs.AccentButton}" />
+                    Style="{DynamicResource MahApps.Styles.ButtonBase.DialogsAccent}" />
             <Button x:Name="PART_NegativeButton"
                     Margin="5 0 5 0"
                     Content="{Binding NegativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
-                    Style="{DynamicResource MahApps.Metro.Styles.Dialogs.Button}"
+                    Style="{DynamicResource MahApps.Styles.Button.Dialogs}"
                     Visibility="{Binding NegativeButtonButtonVisibility, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}" />
         </StackPanel>
     </Grid>
diff --git a/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml.cs b/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml.cs
index 35b108a9ee..c446ba1681 100644
--- a/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml.cs
+++ b/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml.cs
@@ -276,7 +276,7 @@ protected override void OnLoaded()
             var settings = this.DialogSettings as LoginDialogSettings;
             if (settings != null && settings.EnablePasswordPreview)
             {
-                var win8MetroPasswordStyle = this.FindResource("Win8MetroPasswordBox") as Style;
+                var win8MetroPasswordStyle = this.FindResource("MahApps.Styles.PasswordBox.Win8") as Style;
                 if (win8MetroPasswordStyle != null)
                 {
                     this.PART_TextBox2.Style = win8MetroPasswordStyle;
@@ -291,7 +291,7 @@ protected override void OnLoaded()
             switch (this.DialogSettings.ColorScheme)
             {
                 case MetroDialogColorScheme.Accented:
-                    this.PART_NegativeButton.SetResourceReference(StyleProperty, "MahApps.Metro.Styles.Dialogs.AccentHighlightButton");
+                    this.PART_NegativeButton.SetResourceReference(StyleProperty, "MahApps.Styles.ButtonBase.DialogsAccentHighlight");
                     this.PART_TextBox.SetResourceReference(ForegroundProperty, "MahApps.Brushes.BlackColor");
                     this.PART_TextBox2.SetResourceReference(ForegroundProperty, "MahApps.Brushes.BlackColor");
                     break;
diff --git a/src/MahApps.Metro/Controls/Dialogs/MessageDialog.xaml b/src/MahApps.Metro/Controls/Dialogs/MessageDialog.xaml
index 50dc79201a..88555974ac 100644
--- a/src/MahApps.Metro/Controls/Dialogs/MessageDialog.xaml
+++ b/src/MahApps.Metro/Controls/Dialogs/MessageDialog.xaml
@@ -30,20 +30,20 @@
             <Button x:Name="PART_AffirmativeButton"
                     Margin="0 0 5 0"
                     Content="{Binding AffirmativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:MessageDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
-                    Style="{DynamicResource MahApps.Metro.Styles.Dialogs.Button}" />
+                    Style="{DynamicResource MahApps.Styles.Button.Dialogs}" />
             <Button x:Name="PART_NegativeButton"
                     Margin="5 0 5 0"
                     Content="{Binding NegativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:MessageDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
-                    Style="{DynamicResource MahApps.Metro.Styles.Dialogs.Button}" />
+                    Style="{DynamicResource MahApps.Styles.Button.Dialogs}" />
             <Button x:Name="PART_FirstAuxiliaryButton"
                     Margin="5 0 5 0"
                     Content="{Binding FirstAuxiliaryButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:MessageDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
-                    Style="{DynamicResource MahApps.Metro.Styles.Dialogs.Button}"
+                    Style="{DynamicResource MahApps.Styles.Button.Dialogs}"
                     Visibility="Collapsed" />
             <Button x:Name="PART_SecondAuxiliaryButton"
                     Margin="5 0 0 0"
                     Content="{Binding SecondAuxiliaryButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:MessageDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
-                    Style="{DynamicResource MahApps.Metro.Styles.Dialogs.Button}"
+                    Style="{DynamicResource MahApps.Styles.Button.Dialogs}"
                     Visibility="Collapsed" />
         </StackPanel>
     </Grid>
diff --git a/src/MahApps.Metro/Controls/Dialogs/MessageDialog.xaml.cs b/src/MahApps.Metro/Controls/Dialogs/MessageDialog.xaml.cs
index 664615ce0c..f59269c4ea 100644
--- a/src/MahApps.Metro/Controls/Dialogs/MessageDialog.xaml.cs
+++ b/src/MahApps.Metro/Controls/Dialogs/MessageDialog.xaml.cs
@@ -11,8 +11,8 @@ namespace MahApps.Metro.Controls.Dialogs
     /// </summary>
     public partial class MessageDialog : BaseMetroDialog
     {
-        private const string ACCENT_BUTTON_STYLE = "MahApps.Metro.Styles.Dialogs.AccentButton";
-        private const string ACCENT_HIGHLIGHT_BUTTON_STYLE = "MahApps.Metro.Styles.Dialogs.AccentHighlightButton";
+        private const string ACCENT_BUTTON_STYLE = "MahApps.Styles.ButtonBase.DialogsAccent";
+        private const string ACCENT_HIGHLIGHT_BUTTON_STYLE = "MahApps.Styles.ButtonBase.DialogsAccentHighlight";
 
         /// <summary>Identifies the <see cref="Message"/> dependency property.</summary>
         public static readonly DependencyProperty MessageProperty = DependencyProperty.Register(nameof(Message), typeof(string), typeof(MessageDialog), new PropertyMetadata(default(string)));
diff --git a/src/MahApps.Metro/Controls/Dialogs/ProgressDialog.xaml b/src/MahApps.Metro/Controls/Dialogs/ProgressDialog.xaml
index fcdbf6c3d1..20127f86bc 100644
--- a/src/MahApps.Metro/Controls/Dialogs/ProgressDialog.xaml
+++ b/src/MahApps.Metro/Controls/Dialogs/ProgressDialog.xaml
@@ -25,7 +25,7 @@
                         Margin="5 0 0 0"
                         Content="{Binding NegativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:ProgressDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                         Cursor="Arrow"
-                        Style="{DynamicResource MahApps.Metro.Styles.Dialogs.AccentButton}"
+                        Style="{DynamicResource MahApps.Styles.ButtonBase.DialogsAccent}"
                         Visibility="Hidden" />
             </StackPanel>
         </Grid>
diff --git a/src/MahApps.Metro/Controls/Helper/TextBoxHelper.cs b/src/MahApps.Metro/Controls/Helper/TextBoxHelper.cs
index 9b620366f6..20a9f72b13 100644
--- a/src/MahApps.Metro/Controls/Helper/TextBoxHelper.cs
+++ b/src/MahApps.Metro/Controls/Helper/TextBoxHelper.cs
@@ -339,11 +339,11 @@ private static void RemoveSpellCheckMenuItems([CanBeNull] ContextMenu contextMen
             var defaultMenu = new ContextMenu();
 
             var m1 = new MenuItem { Command = ApplicationCommands.Cut };
-            m1.SetResourceReference(FrameworkElement.StyleProperty, "MetroMenuItem");
+            m1.SetResourceReference(FrameworkElement.StyleProperty, "MahApps.Styles.MenuItem.Metro");
             var m2 = new MenuItem { Command = ApplicationCommands.Copy };
-            m2.SetResourceReference(FrameworkElement.StyleProperty, "MetroMenuItem");
+            m2.SetResourceReference(FrameworkElement.StyleProperty, "MahApps.Styles.MenuItem.Metro");
             var m3 = new MenuItem { Command = ApplicationCommands.Paste };
-            m3.SetResourceReference(FrameworkElement.StyleProperty, "MetroMenuItem");
+            m3.SetResourceReference(FrameworkElement.StyleProperty, "MahApps.Styles.MenuItem.Metro");
 
             defaultMenu.Items.Add(m1);
             defaultMenu.Items.Add(m2);
diff --git a/src/MahApps.Metro/Controls/MetroNavigationWindow.xaml b/src/MahApps.Metro/Controls/MetroNavigationWindow.xaml
index 7554ea53c5..332a34674a 100644
--- a/src/MahApps.Metro/Controls/MetroNavigationWindow.xaml
+++ b/src/MahApps.Metro/Controls/MetroNavigationWindow.xaml
@@ -16,11 +16,11 @@
                     Height="34"
                     Margin="4 2 2 2"
                     VerticalAlignment="Center"
-                    Style="{DynamicResource MahApps.Metro.Styles.MetroCircleButtonStyle}">
+                    Style="{DynamicResource MahApps.Styles.ButtonBase.MetroCircle}">
                 <ContentControl Width="20"
                                 Height="20"
                                 Content="M57,42V34H32.25L42.25,24H31.75L17.75,38L31.75,52H42.25L32.25,42H57Z"
-                                Style="{DynamicResource PathIconContentControlStyle}" />
+                                Style="{DynamicResource MahApps.Styles.ContentControl.PathIcon}" />
             </Button>
             <Button x:Name="PART_ForwardButton"
                     Width="34"
@@ -28,11 +28,11 @@
                     Margin="2 2 4 2"
                     VerticalAlignment="Center"
                     IsEnabled="False"
-                    Style="{DynamicResource MahApps.Metro.Styles.MetroCircleButtonStyle}">
+                    Style="{DynamicResource MahApps.Styles.ButtonBase.MetroCircle}">
                 <ContentControl Width="20"
                                 Height="20"
                                 Content="M19,34V42H43.75L33.75,52H44.25L58.25,38L44.25,24H33.75L43.75,34H19Z"
-                                Style="{DynamicResource PathIconContentControlStyle}" />
+                                Style="{DynamicResource MahApps.Styles.ContentControl.PathIcon}" />
             </Button>
             <Label x:Name="PART_Title"
                    VerticalAlignment="Center"
diff --git a/src/MahApps.Metro/Styles/Clean/Clean.xaml b/src/MahApps.Metro/Styles/Clean/Clean.xaml
index bc113e9853..44789bf4a5 100644
--- a/src/MahApps.Metro/Styles/Clean/Clean.xaml
+++ b/src/MahApps.Metro/Styles/Clean/Clean.xaml
@@ -10,10 +10,10 @@
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Clean/CleanStatusBar.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <Style BasedOn="{StaticResource CleanGroupBoxStyleKey}" TargetType="{x:Type GroupBox}" />
-    <Style BasedOn="{StaticResource CleanWindowStyleKey}" TargetType="{x:Type Controls:MetroWindow}" />
-    <Style BasedOn="{StaticResource CleanWindowButtonCommandsStyleKey}" TargetType="{x:Type Controls:WindowButtonCommands}" />
-    <Style BasedOn="{StaticResource CleanWindowCommandsStyleKey}" TargetType="{x:Type Controls:WindowCommands}" />
-    <Style BasedOn="{StaticResource CleanMetroStatusBarKey}" TargetType="{x:Type StatusBar}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.GroupBox.Clean}" TargetType="{x:Type GroupBox}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.MetroWindow.Clean}" TargetType="{x:Type Controls:MetroWindow}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.WindowButtonCommands.Clean}" TargetType="{x:Type Controls:WindowButtonCommands}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.WindowCommands.Clean}" TargetType="{x:Type Controls:WindowCommands}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.StatusBar.Clean}" TargetType="{x:Type StatusBar}" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Clean/CleanGroupBox.xaml b/src/MahApps.Metro/Styles/Clean/CleanGroupBox.xaml
index 59eb6463cd..e39364d35d 100644
--- a/src/MahApps.Metro/Styles/Clean/CleanGroupBox.xaml
+++ b/src/MahApps.Metro/Styles/Clean/CleanGroupBox.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
-    <Style x:Key="CleanGroupBoxStyleKey" TargetType="GroupBox">
+    <Style x:Key="MahApps.Styles.GroupBox.Clean" TargetType="GroupBox">
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray7}" />
         <Setter Property="BorderThickness" Value="0.3" />
         <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="16" />
diff --git a/src/MahApps.Metro/Styles/Clean/CleanStatusBar.xaml b/src/MahApps.Metro/Styles/Clean/CleanStatusBar.xaml
index f827328d03..53b6202a90 100644
--- a/src/MahApps.Metro/Styles/Clean/CleanStatusBar.xaml
+++ b/src/MahApps.Metro/Styles/Clean/CleanStatusBar.xaml
@@ -5,14 +5,14 @@
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.StatusBar.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <Style x:Key="CleanMetroStatusBarKey"
-           BasedOn="{StaticResource MetroStatusBar}"
+    <Style x:Key="MahApps.Styles.StatusBar.Clean"
+           BasedOn="{StaticResource MahApps.Styles.StatusBar.Metro}"
            TargetType="{x:Type StatusBar}">
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
     </Style>
 
-    <Style x:Key="CleanMetroStatusBarSeparator"
-           BasedOn="{StaticResource MetroStatusBarSeparator}"
+    <Style x:Key="MahApps.Styles.Separator.Clean"
+           BasedOn="{StaticResource MahApps.Styles.Separator.MahApps.Styles.StatusBar.Metro}"
            TargetType="{x:Type Separator}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Black}" />
     </Style>
diff --git a/src/MahApps.Metro/Styles/Clean/CleanWindow.xaml b/src/MahApps.Metro/Styles/Clean/CleanWindow.xaml
index b9d4006521..cf2822390d 100644
--- a/src/MahApps.Metro/Styles/Clean/CleanWindow.xaml
+++ b/src/MahApps.Metro/Styles/Clean/CleanWindow.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
-    <Style x:Key="CleanWindowStyleKey" TargetType="{x:Type Controls:MetroWindow}">
+    <Style x:Key="MahApps.Styles.MetroWindow.Clean" TargetType="{x:Type Controls:MetroWindow}">
         <Setter Property="NonActiveWindowTitleBrush" Value="{DynamicResource MahApps.Brushes.TransparentWhite}" />
         <Setter Property="OverrideDefaultWindowCommandsBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="TitleAlignment" Value="Center" />
diff --git a/src/MahApps.Metro/Styles/Clean/CleanWindowButtonCommands.xaml b/src/MahApps.Metro/Styles/Clean/CleanWindowButtonCommands.xaml
index e22feebe0f..c2155f052c 100644
--- a/src/MahApps.Metro/Styles/Clean/CleanWindowButtonCommands.xaml
+++ b/src/MahApps.Metro/Styles/Clean/CleanWindowButtonCommands.xaml
@@ -6,9 +6,9 @@
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Clean/CleanWindowButtons.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <Style x:Key="CleanWindowButtonCommandsStyleKey" TargetType="{x:Type Controls:WindowButtonCommands}">
-        <Setter Property="DarkCloseButtonStyle" Value="{StaticResource DarkCleanWindowCloseButtonStyle}" />
-        <Setter Property="LightCloseButtonStyle" Value="{StaticResource LightCleanWindowCloseButtonStyle}" />
+    <Style x:Key="MahApps.Styles.WindowButtonCommands.Clean" TargetType="{x:Type Controls:WindowButtonCommands}">
+        <Setter Property="DarkCloseButtonStyle" Value="{StaticResource MahApps.Styles.Button.CleanWindowClose.Dark}" />
+        <Setter Property="LightCloseButtonStyle" Value="{StaticResource MahApps.Styles.Button.CleanWindowClose.Light}" />
     </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Clean/CleanWindowButtons.xaml b/src/MahApps.Metro/Styles/Clean/CleanWindowButtons.xaml
index 9d60217f9c..d5532f9ba7 100644
--- a/src/MahApps.Metro/Styles/Clean/CleanWindowButtons.xaml
+++ b/src/MahApps.Metro/Styles/Clean/CleanWindowButtons.xaml
@@ -6,8 +6,8 @@
     </ResourceDictionary.MergedDictionaries>
 
     <!--  light button style for close window button (clean style)  -->
-    <Style x:Key="LightCleanWindowCloseButtonStyle"
-           BasedOn="{StaticResource LightMetroWindowButtonStyle}"
+    <Style x:Key="MahApps.Styles.Button.CleanWindowClose.Light"
+           BasedOn="{StaticResource MahApps.Styles.Button.MetroWindow.Light}"
            TargetType="{x:Type Button}">
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
@@ -21,8 +21,8 @@
     </Style>
 
     <!--  dark button style for close window button (clean style)  -->
-    <Style x:Key="DarkCleanWindowCloseButtonStyle"
-           BasedOn="{StaticResource DarkMetroWindowButtonStyle}"
+    <Style x:Key="MahApps.Styles.Button.CleanWindowClose.Dark"
+           BasedOn="{StaticResource MahApps.Styles.Button.MetroWindow.Dark}"
            TargetType="{x:Type Button}">
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
diff --git a/src/MahApps.Metro/Styles/Clean/CleanWindowCommands.xaml b/src/MahApps.Metro/Styles/Clean/CleanWindowCommands.xaml
index 466670bce0..5b6e66b311 100644
--- a/src/MahApps.Metro/Styles/Clean/CleanWindowCommands.xaml
+++ b/src/MahApps.Metro/Styles/Clean/CleanWindowCommands.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
-    <Style x:Key="CleanWindowCommandsStyleKey" TargetType="{x:Type Controls:WindowCommands}">
+    <Style x:Key="MahApps.Styles.WindowCommands.Clean" TargetType="{x:Type Controls:WindowCommands}">
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Upper" />
         <Setter Property="SeparatorHeight" Value="11" />
         <Setter Property="ShowLastSeparator" Value="False" />
diff --git a/src/MahApps.Metro/Styles/Controls.AnimatedSingleRowTabControl.xaml b/src/MahApps.Metro/Styles/Controls.AnimatedSingleRowTabControl.xaml
index 2674870577..843c40de26 100644
--- a/src/MahApps.Metro/Styles/Controls.AnimatedSingleRowTabControl.xaml
+++ b/src/MahApps.Metro/Styles/Controls.AnimatedSingleRowTabControl.xaml
@@ -7,7 +7,7 @@
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.TabControl.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <Style x:Key="ScrollBarRepeatButtonStyle" TargetType="{x:Type RepeatButton}">
+    <Style x:Key="MahApps.Styles.RepeatButton.ScrollBar" TargetType="{x:Type RepeatButton}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="Focusable" Value="False" />
@@ -28,7 +28,7 @@
                                         Content="{TemplateBinding Content}"
                                         Foreground="{TemplateBinding Foreground}"
                                         SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                        Style="{DynamicResource PathIconContentControlStyle}" />
+                                        Style="{DynamicResource MahApps.Styles.ContentControl.PathIcon}" />
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsEnabled" Value="False">
@@ -57,12 +57,12 @@
                           Width="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarButtonWidthKey}}"
                           Command="ScrollBar.PageLeftCommand"
                           Content="M6 2L0 8l6 6z"
-                          Style="{DynamicResource ScrollBarRepeatButtonStyle}" />
+                          Style="{DynamicResource MahApps.Styles.RepeatButton.ScrollBar}" />
             <RepeatButton Grid.Column="2"
                           Width="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarButtonWidthKey}}"
                           Command="ScrollBar.PageRightCommand"
                           Content="M0 14l6-6-6-6z"
-                          Style="{DynamicResource ScrollBarRepeatButtonStyle}" />
+                          Style="{DynamicResource MahApps.Styles.RepeatButton.ScrollBar}" />
         </Grid>
     </ControlTemplate>
 
@@ -77,12 +77,12 @@
                           Height="{DynamicResource {x:Static SystemParameters.VerticalScrollBarButtonHeightKey}}"
                           Command="ScrollBar.PageUpCommand"
                           Content="M12 11L6 5l-6 6z"
-                          Style="{DynamicResource ScrollBarRepeatButtonStyle}" />
+                          Style="{DynamicResource MahApps.Styles.RepeatButton.ScrollBar}" />
             <RepeatButton Grid.Row="2"
                           Height="{DynamicResource {x:Static SystemParameters.VerticalScrollBarButtonHeightKey}}"
                           Command="ScrollBar.PageDownCommand"
                           Content="M0 5l6 6 6-6z"
-                          Style="{DynamicResource ScrollBarRepeatButtonStyle}" />
+                          Style="{DynamicResource MahApps.Styles.RepeatButton.ScrollBar}" />
         </Grid>
     </ControlTemplate>
 
@@ -273,7 +273,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style BasedOn="{StaticResource MetroTabControl}" TargetType="{x:Type TabControl}">
+    <Style BasedOn="{StaticResource MahApps.Styles.TabControl.Metro}" TargetType="{x:Type TabControl}">
         <Setter Property="Controls:ScrollViewerHelper.IsHorizontalScrollWheelEnabled" Value="True" />
         <Setter Property="Controls:TabControlHelper.Transition" Value="Left" />
         <Setter Property="Template" Value="{StaticResource MahApps.Templates.TabControl.HorizontalAnimatedSingleRow}" />
diff --git a/src/MahApps.Metro/Styles/Controls.AnimatedTabControl.xaml b/src/MahApps.Metro/Styles/Controls.AnimatedTabControl.xaml
index 5324d2fa3e..556f651b55 100644
--- a/src/MahApps.Metro/Styles/Controls.AnimatedTabControl.xaml
+++ b/src/MahApps.Metro/Styles/Controls.AnimatedTabControl.xaml
@@ -7,7 +7,7 @@
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.TabControl.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <Style BasedOn="{StaticResource MetroTabControl}" TargetType="{x:Type TabControl}">
+    <Style BasedOn="{StaticResource MahApps.Styles.TabControl.Metro}" TargetType="{x:Type TabControl}">
         <Setter Property="Controls:TabControlHelper.Transition" Value="Left" />
         <Setter Property="Template">
             <Setter.Value>
diff --git a/src/MahApps.Metro/Styles/Controls.Buttons.xaml b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
index ea9c07a4e7..bd76fc8f3d 100644
--- a/src/MahApps.Metro/Styles/Controls.Buttons.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
@@ -5,7 +5,7 @@
 
     <converters:ThicknessToDoubleConverter x:Key="BorderThicknessToStrokeThicknessConverter" TakeThicknessSide="Left" />
 
-    <Style x:Key="MahApps.Metro.Styles.FlatButtonFocusVisualStyle">
+    <Style x:Key="MahApps.Styles.Button.FlatFocusVisualStyle">
         <Setter Property="Control.Template">
             <Setter.Value>
                 <ControlTemplate>
@@ -20,10 +20,10 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MetroFlatButton" TargetType="{x:Type Button}">
+    <Style x:Key="MahApps.Styles.Button.Flat" TargetType="{x:Type Button}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.FlatButton.Background}" />
         <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource MahApps.Metro.Styles.FlatButtonFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource MahApps.Styles.Button.FlatFocusVisualStyle}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.FlatButton}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.FlatButton.Foreground}" />
         <Setter Property="Padding" Value="10 5 10 5" />
@@ -66,11 +66,11 @@
         </Style.Triggers>
     </Style>
 
-    <!--  style for flat toggle button like MetroFlatButton  -->
-    <Style x:Key="MetroFlatToggleButton" TargetType="{x:Type ToggleButton}">
+    <!--  style for flat toggle button like MahApps.Styles.ToggleButton.Flat  -->
+    <Style x:Key="MahApps.Styles.ToggleButton.Flat" TargetType="{x:Type ToggleButton}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.FlatButton.Background}" />
         <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource MahApps.Metro.Styles.FlatButtonFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource MahApps.Styles.Button.FlatFocusVisualStyle}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.FlatButton}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.FlatButton.Foreground}" />
         <Setter Property="Padding" Value="10 5 10 5" />
@@ -144,7 +144,7 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="MahApps.Metro.Styles.CircleButtonFocusVisualStyle">
+    <Style x:Key="MahApps.Styles.ButtonBase.MetroCircleFocusVisualStyle">
         <Setter Property="Control.Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Control}">
@@ -160,11 +160,11 @@
     </Style>
 
     <!--  style for WP7/Circle button  -->
-    <Style x:Key="MahApps.Metro.Styles.MetroCircleButtonStyle" TargetType="{x:Type ButtonBase}">
+    <Style x:Key="MahApps.Styles.ButtonBase.MetroCircle" TargetType="{x:Type ButtonBase}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray3}" />
         <Setter Property="BorderThickness" Value="2" />
-        <Setter Property="FocusVisualStyle" Value="{StaticResource MahApps.Metro.Styles.CircleButtonFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{StaticResource MahApps.Styles.ButtonBase.MetroCircleFocusVisualStyle}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="Padding" Value="1" />
         <Setter Property="Template">
@@ -252,7 +252,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style x:Key="ChromelessButtonStyle" TargetType="{x:Type ButtonBase}">
+    <Style x:Key="MahApps.Styles.ButtonBase.Chromeless" TargetType="{x:Type ButtonBase}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TransparentWhite}" />
         <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
@@ -262,7 +262,7 @@
     </Style>
 
     <!--  base button style for min, max and close window buttons  -->
-    <Style x:Key="BaseMetroWindowButtonStyle" TargetType="{x:Type Button}">
+    <Style x:Key="MahApps.Styles.Button.BaseMetroWindow" TargetType="{x:Type Button}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TransparentWhite}" />
         <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
@@ -308,8 +308,8 @@
     </Style>
 
     <!--  light button style for min, max and close window buttons  -->
-    <Style x:Key="LightMetroWindowButtonStyle"
-           BasedOn="{StaticResource BaseMetroWindowButtonStyle}"
+    <Style x:Key="MahApps.Styles.Button.MetroWindow.Light"
+           BasedOn="{StaticResource MahApps.Styles.Button.BaseMetroWindow}"
            TargetType="{x:Type Button}">
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="Focusable" Value="False" />
@@ -332,8 +332,8 @@
     </Style>
 
     <!--  dark button style for min, max and close window buttons  -->
-    <Style x:Key="DarkMetroWindowButtonStyle"
-           BasedOn="{StaticResource LightMetroWindowButtonStyle}"
+    <Style x:Key="MahApps.Styles.Button.MetroWindow.Dark"
+           BasedOn="{StaticResource MahApps.Styles.Button.MetroWindow.Light}"
            TargetType="{x:Type Button}">
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
@@ -349,8 +349,8 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="MahApps.Metro.Styles.WindowButton.Close.Light.Win10"
-           BasedOn="{StaticResource LightMetroWindowButtonStyle}"
+    <Style x:Key="MahApps.Styles.Button.MetroWindowClose.Light.Win10"
+           BasedOn="{StaticResource MahApps.Styles.Button.MetroWindow.Light}"
            TargetType="{x:Type Button}">
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
@@ -366,8 +366,8 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="MahApps.Metro.Styles.WindowButton.Close.Dark.Win10"
-           BasedOn="{StaticResource DarkMetroWindowButtonStyle}"
+    <Style x:Key="MahApps.Styles.Button.MetroWindowClose.Dark.Win10"
+           BasedOn="{StaticResource MahApps.Styles.Button.MetroWindow.Dark}"
            TargetType="{x:Type Button}">
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
@@ -384,7 +384,7 @@
     </Style>
 
     <!--  style for default button  -->
-    <Style x:Key="MahApps.Metro.Styles.MetroButton" TargetType="{x:Type ButtonBase}">
+    <Style x:Key="MahApps.Styles.ButtonBase.Metro" TargetType="{x:Type ButtonBase}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Gray10}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
@@ -449,7 +449,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="SquareButtonStyle" TargetType="{x:Type ButtonBase}">
+    <Style x:Key="MahApps.Styles.ButtonBase.Square" TargetType="{x:Type ButtonBase}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="BorderThickness" Value="2" />
@@ -525,15 +525,15 @@
         </Setter>
     </Style>
 
-    <Style x:Key="AccentedSquareButtonStyle"
-           BasedOn="{StaticResource SquareButtonStyle}"
+    <Style x:Key="MahApps.Styles.ButtonBase.AccentedSquare"
+           BasedOn="{StaticResource MahApps.Styles.ButtonBase.Square}"
            TargetType="{x:Type ButtonBase}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.IdealForeground}" />
     </Style>
 
-    <Style x:Key="HighlightedSquareButtonStyle"
-           BasedOn="{StaticResource SquareButtonStyle}"
+    <Style x:Key="MahApps.Styles.ButtonBase.HighlightedSquare"
+           BasedOn="{StaticResource MahApps.Styles.ButtonBase.Square}"
            TargetType="{x:Type ButtonBase}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Highlight}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.IdealForeground}" />
@@ -602,11 +602,11 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Metro.Styles.MetroCircleToggleButtonStyle" TargetType="{x:Type ToggleButton}">
+    <Style x:Key="MahApps.Styles.ToggleButton.MetroCircle" TargetType="{x:Type ToggleButton}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray3}" />
         <Setter Property="BorderThickness" Value="2" />
-        <Setter Property="FocusVisualStyle" Value="{StaticResource MahApps.Metro.Styles.CircleButtonFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{StaticResource MahApps.Styles.ButtonBase.MetroCircleFocusVisualStyle}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="Padding" Value="1" />
@@ -673,7 +673,7 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
-    <Style x:Key="MahApps.Metro.Styles.MetroToggleButton" TargetType="{x:Type ToggleButton}">
+    <Style x:Key="MahApps.Styles.ToggleButton.Metro" TargetType="{x:Type ToggleButton}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Gray10}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
@@ -758,7 +758,7 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="SquareMetroButton" TargetType="{x:Type ButtonBase}">
+    <Style x:Key="MahApps.Styles.ButtonBase.MetroSquare" TargetType="{x:Type ButtonBase}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="BorderThickness" Value="2" />
@@ -871,8 +871,8 @@
         <Setter Property="VerticalAlignment" Value="Center" />
     </Style>
 
-    <Style x:Key="MetroAccentButton"
-           BasedOn="{StaticResource SquareMetroButton}"
+    <Style x:Key="MahApps.Styles.ButtonBase.MetroAccentSquare"
+           BasedOn="{StaticResource MahApps.Styles.ButtonBase.MetroSquare}"
            TargetType="{x:Type ButtonBase}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.AccentSelectedColor}" />
@@ -979,7 +979,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="ButtonDropDownStyle"
+    <Style x:Key="MahApps.Styles.Button.DropDown"
            BasedOn="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
            TargetType="{x:Type Button}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
@@ -1021,14 +1021,14 @@
         </Setter>
     </Style>
 
-    <Style x:Key="ButtonSplitStyle"
-           BasedOn="{StaticResource ButtonDropDownStyle}"
+    <Style x:Key="MahApps.Styles.Button.Split"
+           BasedOn="{StaticResource MahApps.Styles.Button.DropDown}"
            TargetType="{x:Type Button}">
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="VerticalAlignment" Value="Stretch" />
     </Style>
-    <Style x:Key="ButtonSplitArrowStyle"
-           BasedOn="{StaticResource ButtonSplitStyle}"
+    <Style x:Key="MahApps.Styles.Button.SplitArrow"
+           BasedOn="{StaticResource MahApps.Styles.Button.Split}"
            TargetType="{x:Type Button}">
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
diff --git a/src/MahApps.Metro/Styles/Controls.Calendar.xaml b/src/MahApps.Metro/Styles/Controls.Calendar.xaml
index 3952f4bbf6..7ce0fd589e 100644
--- a/src/MahApps.Metro/Styles/Controls.Calendar.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Calendar.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <Style x:Key="MahApps.Metro.Styles.MetroCalendarDayButtonStyle" TargetType="{x:Type CalendarDayButton}">
+    <Style x:Key="MahApps.Styles.CalendarDayButton.Metro" TargetType="{x:Type CalendarDayButton}">
         <Setter Property="FontFamily" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Calendar}}, Path=FontFamily, Mode=OneWay}" />
         <Setter Property="FontSize" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Calendar}}, Path=FontSize, Mode=OneWay}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
@@ -145,7 +145,7 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
-    <Style x:Key="MahApps.Metro.Styles.MetroCalendarItemStyle" TargetType="{x:Type CalendarItem}">
+    <Style x:Key="MahApps.Styles.CalendarItem.Metro" TargetType="{x:Type CalendarItem}">
         <Setter Property="Margin" Value="0 3" />
         <Setter Property="Padding" Value="2" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -409,7 +409,7 @@
     </Style>
 
     <!--  Style for Month and Year buttons  -->
-    <Style x:Key="MahApps.Metro.Styles.MetroCalendarButtonStyle" TargetType="{x:Type CalendarButton}">
+    <Style x:Key="MahApps.Styles.CalendarButton.Metro" TargetType="{x:Type CalendarButton}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Accent4}" />
         <Setter Property="FontFamily" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Calendar}}, Path=FontFamily, Mode=OneWay}" />
         <Setter Property="FontSize" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Calendar}}, Path=FontSize, Mode=OneWay}" />
@@ -532,13 +532,13 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
-    <Style x:Key="MahApps.Metro.Styles.BaseMetroCalendar" TargetType="{x:Type Calendar}">
+    <Style x:Key="MahApps.Styles.Calendar.MetroBase" TargetType="{x:Type Calendar}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="CalendarButtonStyle" Value="{DynamicResource MahApps.Metro.Styles.MetroCalendarButtonStyle}" />
-        <Setter Property="CalendarDayButtonStyle" Value="{DynamicResource MahApps.Metro.Styles.MetroCalendarDayButtonStyle}" />
-        <Setter Property="CalendarItemStyle" Value="{DynamicResource MahApps.Metro.Styles.MetroCalendarItemStyle}" />
+        <Setter Property="CalendarButtonStyle" Value="{DynamicResource MahApps.Styles.CalendarButton.Metro}" />
+        <Setter Property="CalendarDayButtonStyle" Value="{DynamicResource MahApps.Styles.CalendarDayButton.Metro}" />
+        <Setter Property="CalendarItemStyle" Value="{DynamicResource MahApps.Styles.CalendarItem.Metro}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -560,8 +560,8 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Metro.Styles.MetroCalendar"
-           BasedOn="{StaticResource MahApps.Metro.Styles.BaseMetroCalendar}"
+    <Style x:Key="MahApps.Styles.Calendar.Metro"
+           BasedOn="{StaticResource MahApps.Styles.Calendar.MetroBase}"
            TargetType="{x:Type Calendar}">
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Content}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
diff --git a/src/MahApps.Metro/Styles/Controls.CheckBox.xaml b/src/MahApps.Metro/Styles/Controls.CheckBox.xaml
index 2d49e66417..ea0b3d6387 100644
--- a/src/MahApps.Metro/Styles/Controls.CheckBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.CheckBox.xaml
@@ -4,7 +4,7 @@
 
     <!--  ********************************** CheckBoxStyle **********************************  -->
     <!--  adapted from http://brianlagunas.com/free-metro-light-and-dark-themes-for-wpf-and-silverlight-microsoft-controls/  -->
-    <Style x:Key="MetroCheckBox" TargetType="CheckBox">
+    <Style x:Key="MahApps.Styles.CheckBox.Metro" TargetType="CheckBox">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.CheckBox}" />
         <Setter Property="BorderThickness" Value="1" />
diff --git a/src/MahApps.Metro/Styles/Controls.ComboBox.xaml b/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
index 4d37928559..07d516df29 100644
--- a/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
@@ -11,8 +11,8 @@
     <Thickness x:Key="ComboBoxPopupBorderThemeThickness">1</Thickness>
     <Thickness x:Key="ComboBoxPopupBorderThemePadding">1</Thickness>
 
-    <Style x:Key="EditableTextBoxStyle"
-           BasedOn="{StaticResource MetroTextBox}"
+    <Style x:Key="MahApps.Styles.TextBox.Editable"
+           BasedOn="{StaticResource MahApps.Styles.TextBox.Metro}"
            TargetType="{x:Type TextBox}">
         <Setter Property="MinHeight" Value="0" />
         <Setter Property="Template">
@@ -71,7 +71,7 @@
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
-                                       Style="{DynamicResource MahApps.Metro.Styles.MetroWatermarkTextBlock}"
+                                       Style="{DynamicResource MahApps.Styles.TextBlock.MetroWatermark}"
                                        Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                        TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                        TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
@@ -79,7 +79,7 @@
                             <ContentControl x:Name="PART_FloatingMessageContainer"
                                             Grid.Row="0"
                                             Grid.Column="0"
-                                            Style="{DynamicResource FloatingMessageContainerStyle}">
+                                            Style="{DynamicResource MahApps.Styles.ContentControl.FloatingMessageContainer}">
                                 <ContentControl.Height>
                                     <MultiBinding Converter="{Converters:MathMultiplyConverter}">
                                         <Binding ElementName="PART_FloatingMessage"
@@ -94,7 +94,7 @@
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
-                                           Style="{DynamicResource MetroAutoCollapsingTextBlock}"
+                                           Style="{DynamicResource MahApps.Styles.TextBlock.MetroAutoCollapsing}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                            TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                            TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
@@ -127,7 +127,7 @@
                                     FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
                                     Foreground="{TemplateBinding Foreground}"
                                     IsTabStop="False"
-                                    Style="{DynamicResource ChromelessButtonStyle}"
+                                    Style="{DynamicResource MahApps.Styles.ButtonBase.Chromeless}"
                                     Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ClearTextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
                         </Grid>
                     </Grid>
@@ -198,7 +198,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MetroComboBoxDropDownToggleButtonStyle" TargetType="{x:Type ToggleButton}">
+    <Style x:Key="MahApps.Styles.ToggleButton.MahApps.Styles.ComboBox.MetroDropDown" TargetType="{x:Type ToggleButton}">
         <Setter Property="ClickMode" Value="Press" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="IsTabStop" Value="False" />
@@ -223,7 +223,7 @@
                                 FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
                                 Foreground="{TemplateBinding Foreground}"
                                 IsTabStop="False"
-                                Style="{DynamicResource ChromelessButtonStyle}"
+                                Style="{DynamicResource MahApps.Styles.ButtonBase.Chromeless}"
                                 Visibility="{Binding RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}, Path=(Controls:TextBoxHelper.ClearTextButton), Converter={StaticResource BooleanToVisibilityConverter}}" />
                         <Grid x:Name="BtnArrowBackground"
                               Grid.Column="2"
@@ -263,7 +263,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MetroComboBox" TargetType="{x:Type ComboBox}">
+    <Style x:Key="MahApps.Styles.ComboBox.Metro" TargetType="{x:Type ComboBox}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="{DynamicResource ComboBoxBorderThemeThickness}" />
@@ -351,7 +351,7 @@
                                           IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
                                           KeyboardNavigation.IsTabStop="False"
                                           SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                          Style="{DynamicResource MetroComboBoxDropDownToggleButtonStyle}" />
+                                          Style="{DynamicResource MahApps.Styles.ToggleButton.MahApps.Styles.ComboBox.MetroDropDown}" />
 
                             <TextBox x:Name="PART_EditableTextBox"
                                      Grid.Row="1"
@@ -381,7 +381,7 @@
                                      IsReadOnly="{TemplateBinding IsReadOnly}"
                                      MaxLength="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ComboBoxHelper.MaxLength), Mode=OneWay}"
                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                     Style="{StaticResource EditableTextBoxStyle}"
+                                     Style="{StaticResource MahApps.Styles.TextBox.Editable}"
                                      Visibility="Collapsed" />
 
                             <TextBlock x:Name="PART_WatermarkMessage"
@@ -392,7 +392,7 @@
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
-                                       Style="{DynamicResource MahApps.Metro.Styles.MetroWatermarkTextBlock}"
+                                       Style="{DynamicResource MahApps.Styles.TextBlock.MetroWatermark}"
                                        Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                        TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                        TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
@@ -400,7 +400,7 @@
                             <ContentControl x:Name="PART_FloatingMessageContainer"
                                             Grid.Row="0"
                                             Grid.Column="0"
-                                            Style="{DynamicResource FloatingMessageContainerStyle}">
+                                            Style="{DynamicResource MahApps.Styles.ContentControl.FloatingMessageContainer}">
                                 <ContentControl.Height>
                                     <MultiBinding Converter="{Converters:MathMultiplyConverter}">
                                         <Binding ElementName="PART_FloatingMessage"
@@ -416,7 +416,7 @@
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
-                                           Style="{DynamicResource MetroAutoCollapsingTextBlock}"
+                                           Style="{DynamicResource MahApps.Styles.TextBlock.MetroAutoCollapsing}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                            TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                            TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
@@ -630,8 +630,8 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="VirtualisedMetroComboBox"
-           BasedOn="{StaticResource MetroComboBox}"
+    <Style x:Key="MahApps.Styles.ComboBox.MetroVirtualized"
+           BasedOn="{StaticResource MahApps.Styles.ComboBox.Metro}"
            TargetType="{x:Type ComboBox}">
         <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
         <Setter Property="VirtualizingStackPanel.IsVirtualizing" Value="True" />
@@ -639,7 +639,7 @@
         <Setter Property="VirtualizingStackPanel.VirtualizationMode" Value="Recycling" />
     </Style>
 
-    <Style x:Key="MetroComboBoxItem" TargetType="ComboBoxItem">
+    <Style x:Key="MahApps.Styles.ComboBoxItem.Metro" TargetType="ComboBoxItem">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="Controls:ItemHelper.ActiveSelectionBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
diff --git a/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml b/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml
index 9c41eabb67..7344416307 100644
--- a/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml
@@ -34,7 +34,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MetroMenu" TargetType="{x:Type Menu}">
+    <Style x:Key="MahApps.Styles.Menu.Metro" TargetType="{x:Type Menu}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Menu.Background}" />
         <Setter Property="FontFamily" Value="{DynamicResource {x:Static SystemFonts.MenuFontFamilyKey}}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Menu}" />
@@ -59,7 +59,7 @@
         <Setter Property="TextOptions.TextFormattingMode" Value="Ideal" />
     </Style>
 
-    <Style x:Key="MetroContextMenu" TargetType="{x:Type ContextMenu}">
+    <Style x:Key="MahApps.Styles.ContextMenu.Metro" TargetType="{x:Type ContextMenu}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ContextMenu.Background}" />
         <Setter Property="Block.TextAlignment" Value="Left" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ContextMenu.Border}" />
@@ -121,7 +121,7 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
-    <Style x:Key="MetroMenuItem" TargetType="{x:Type MenuItem}">
+    <Style x:Key="MahApps.Styles.MenuItem.Metro" TargetType="{x:Type MenuItem}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.MenuItem.Background}" />
         <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
         <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
@@ -149,20 +149,20 @@
     </Style>
 
     <Style x:Key="{x:Static controls:Spelling.SuggestionMenuItemStyleKey}"
-           BasedOn="{StaticResource MetroMenuItem}"
+           BasedOn="{StaticResource MahApps.Styles.MenuItem.Metro}"
            TargetType="{x:Type MenuItem}">
         <Setter Property="FontWeight" Value="Bold" />
         <Setter Property="Header" Value="{Binding RelativeSource={RelativeSource Self}, Path=CommandParameter}" />
     </Style>
 
     <Style x:Key="{x:Static controls:Spelling.IgnoreAllMenuItemStyleKey}"
-           BasedOn="{StaticResource MetroMenuItem}"
+           BasedOn="{StaticResource MahApps.Styles.MenuItem.Metro}"
            TargetType="{x:Type MenuItem}">
         <Setter Property="Header" Value="Ignore All" />
     </Style>
 
     <Style x:Key="{x:Static controls:Spelling.NoSuggestionsMenuItemStyleKey}"
-           BasedOn="{StaticResource MetroMenuItem}"
+           BasedOn="{StaticResource MahApps.Styles.MenuItem.Metro}"
            TargetType="{x:Type MenuItem}">
         <Setter Property="Header" Value="(no spelling suggestions)" />
         <Setter Property="IsEnabled" Value="False" />
@@ -172,13 +172,13 @@
            BasedOn="{StaticResource {x:Static MenuItem.SeparatorStyleKey}}"
            TargetType="{x:Type Separator}" />
 
-    <ContextMenu x:Key="TextBoxMetroContextMenu" Style="{StaticResource MetroContextMenu}">
-        <MenuItem Command="ApplicationCommands.Cut" Style="{DynamicResource MetroMenuItem}" />
-        <MenuItem Command="ApplicationCommands.Copy" Style="{DynamicResource MetroMenuItem}" />
-        <MenuItem Command="ApplicationCommands.Paste" Style="{DynamicResource MetroMenuItem}" />
+    <ContextMenu x:Key="TextBoxMahApps.Styles.ContextMenu.Metro" Style="{StaticResource MahApps.Styles.ContextMenu.Metro}">
+        <MenuItem Command="ApplicationCommands.Cut" Style="{DynamicResource MahApps.Styles.MenuItem.Metro}" />
+        <MenuItem Command="ApplicationCommands.Copy" Style="{DynamicResource MahApps.Styles.MenuItem.Metro}" />
+        <MenuItem Command="ApplicationCommands.Paste" Style="{DynamicResource MahApps.Styles.MenuItem.Metro}" />
     </ContextMenu>
 
-    <Style x:Key="MenuScrollButton"
+    <Style x:Key="MahApps.Styles.RepeatButton.MenuScroll"
            BasedOn="{x:Null}"
            TargetType="{x:Type RepeatButton}">
         <Setter Property="ClickMode" Value="Hover" />
@@ -246,7 +246,7 @@
                                       Command="{x:Static ScrollBar.LineUpCommand}"
                                       CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}"
                                       Focusable="False"
-                                      Style="{StaticResource MenuScrollButton}">
+                                      Style="{StaticResource MahApps.Styles.RepeatButton.MenuScroll}">
                             <RepeatButton.Visibility>
                                 <MultiBinding Converter="{StaticResource MenuScrollingVisibilityConverter}"
                                               ConverterParameter="0"
@@ -264,7 +264,7 @@
                                       Command="{x:Static ScrollBar.LineDownCommand}"
                                       CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}"
                                       Focusable="False"
-                                      Style="{StaticResource MenuScrollButton}">
+                                      Style="{StaticResource MahApps.Styles.RepeatButton.MenuScroll}">
                             <RepeatButton.Visibility>
                                 <MultiBinding Converter="{StaticResource MenuScrollingVisibilityConverter}"
                                               ConverterParameter="100"
diff --git a/src/MahApps.Metro/Styles/Controls.DataGrid.xaml b/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
index b1fdd52610..2ec44fcb57 100644
--- a/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
+++ b/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
@@ -8,8 +8,8 @@
 
     <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
 
-    <Style x:Key="MetroDataGridCheckBox"
-           BasedOn="{StaticResource MetroCheckBox}"
+    <Style x:Key="MahApps.Styles.CheckBox.MahApps.Styles.DataGrid.Metro"
+           BasedOn="{StaticResource MahApps.Styles.CheckBox.Metro}"
            TargetType="CheckBox">
         <Setter Property="HorizontalAlignment" Value="Center" />
         <Setter Property="Margin" Value="0" />
@@ -26,7 +26,7 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="MahApps.Metro.Styles.DataGrid.NumericUpDownColumnStyle"
+    <Style x:Key="MahApps.Styles.NumericUpDown.DataGridColumn"
            BasedOn="{StaticResource {x:Type Controls:NumericUpDown}}"
            TargetType="{x:Type Controls:NumericUpDown}">
         <Setter Property="Background" Value="Transparent" />
@@ -38,8 +38,8 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
-    <Style x:Key="MahApps.Metro.Styles.DataGrid.NumericUpDownColumnEditingStyle"
-           BasedOn="{StaticResource MahApps.Metro.Styles.DataGrid.NumericUpDownColumnStyle}"
+    <Style x:Key="MahApps.Styles.NumericUpDown.DataGridColumnEditing"
+           BasedOn="{StaticResource MahApps.Styles.NumericUpDown.DataGridColumn}"
            TargetType="{x:Type Controls:NumericUpDown}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="HideUpDownButtons" Value="False" />
@@ -73,7 +73,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MetroColumnHeaderGripperStyle" TargetType="{x:Type Thumb}">
+    <Style x:Key="MahApps.Styles.Thumb.MetroColumnHeaderGripper" TargetType="{x:Type Thumb}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Gray5}" />
         <Setter Property="Cursor" Value="SizeWE" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -91,7 +91,7 @@
         <Setter Property="Width" Value="8" />
     </Style>
 
-    <Style x:Key="MetroRowHeaderGripperStyle" TargetType="{x:Type Thumb}">
+    <Style x:Key="MahApps.Styles.Thumb.MetroRowHeaderGripper" TargetType="{x:Type Thumb}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Gray5}" />
         <Setter Property="Cursor" Value="SizeNS" />
         <Setter Property="Height" Value="6" />
@@ -109,7 +109,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MetroDataGridColumnHeader" TargetType="{x:Type DataGridColumnHeader}">
+    <Style x:Key="MahApps.Styles.DataGridColumnHeader.Metro" TargetType="{x:Type DataGridColumnHeader}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray5}" />
         <Setter Property="BorderThickness" Value="0 0 0 3" />
@@ -164,12 +164,12 @@
                         <Thumb x:Name="PART_LeftHeaderGripper"
                                HorizontalAlignment="Left"
                                Background="Transparent"
-                               Style="{StaticResource MetroColumnHeaderGripperStyle}" />
+                               Style="{StaticResource MahApps.Styles.Thumb.MetroColumnHeaderGripper}" />
 
                         <Thumb x:Name="PART_RightHeaderGripper"
                                Grid.Column="1"
                                HorizontalAlignment="Right"
-                               Style="{StaticResource MetroColumnHeaderGripperStyle}" />
+                               Style="{StaticResource MahApps.Styles.Thumb.MetroColumnHeaderGripper}" />
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="SortDirection" Value="Ascending">
@@ -203,7 +203,7 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="MetroDataGridRowHeader" TargetType="{x:Type DataGridRowHeader}">
+    <Style x:Key="MahApps.Styles.DataGridRowHeader.Metro" TargetType="{x:Type DataGridRowHeader}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray5}" />
         <Setter Property="BorderThickness" Value="0 0 1 0" />
@@ -238,10 +238,10 @@
                         <Thumb x:Name="PART_TopHeaderGripper"
                                VerticalAlignment="Top"
                                Background="Transparent"
-                               Style="{StaticResource MetroRowHeaderGripperStyle}" />
+                               Style="{StaticResource MahApps.Styles.Thumb.MetroRowHeaderGripper}" />
                         <Thumb x:Name="PART_BottomHeaderGripper"
                                VerticalAlignment="Bottom"
-                               Style="{StaticResource MetroRowHeaderGripperStyle}" />
+                               Style="{StaticResource MahApps.Styles.Thumb.MetroRowHeaderGripper}" />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
@@ -255,7 +255,7 @@
     </Style>
 
     <!--  ____________________ Metro CellStyle ____________________  -->
-    <Style x:Key="MetroDataGridCell" TargetType="{x:Type DataGridCell}">
+    <Style x:Key="MahApps.Styles.DataGridCell.Metro" TargetType="{x:Type DataGridCell}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderBrush" Value="Transparent" />
         <Setter Property="Controls:DataGridCellHelper.SelectionUnit" Value="{Binding Path=(Controls:DataGridRowHelper.SelectionUnit), Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}}" />
@@ -380,7 +380,7 @@
 
     <!--  ____________________ Metro RowStyle ____________________  -->
     <!--  Don't set the MinHeight or Height property, use the MinRowHeight or RowHeight property on DataGrid style!  -->
-    <Style x:Key="MetroDataGridRow" TargetType="{x:Type DataGridRow}">
+    <Style x:Key="MahApps.Styles.DataGridRow.Metro" TargetType="{x:Type DataGridRow}">
         <Setter Property="Controls:DataGridRowHelper.SelectionUnit" Value="{Binding Path=SelectionUnit, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
         <Setter Property="Margin" Value="0 0 0 0" />
         <Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
@@ -443,12 +443,12 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="MetroDataGrid" TargetType="{x:Type DataGrid}">
+    <Style x:Key="MahApps.Styles.DataGrid.Metro" TargetType="{x:Type DataGrid}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="BorderThickness" Value="0 0 0 0" />
-        <Setter Property="CellStyle" Value="{StaticResource MetroDataGridCell}" />
-        <Setter Property="ColumnHeaderStyle" Value="{StaticResource MetroDataGridColumnHeader}" />
+        <Setter Property="CellStyle" Value="{StaticResource MahApps.Styles.DataGridCell.Metro}" />
+        <Setter Property="ColumnHeaderStyle" Value="{StaticResource MahApps.Styles.DataGridColumnHeader.Metro}" />
         <Setter Property="DropLocationIndicatorStyle">
             <Setter.Value>
                 <Style TargetType="Separator">
@@ -470,8 +470,8 @@
         <Setter Property="HeadersVisibility" Value="Column" />
         <Setter Property="HorizontalGridLinesBrush" Value="{DynamicResource MahApps.Brushes.Gray7}" />
         <Setter Property="MinRowHeight" Value="25" />
-        <Setter Property="RowHeaderStyle" Value="{StaticResource MetroDataGridRowHeader}" />
-        <Setter Property="RowStyle" Value="{StaticResource MetroDataGridRow}" />
+        <Setter Property="RowHeaderStyle" Value="{StaticResource MahApps.Styles.DataGridRowHeader.Metro}" />
+        <Setter Property="RowStyle" Value="{StaticResource MahApps.Styles.DataGridRow.Metro}" />
         <Setter Property="ScrollViewer.CanContentScroll" Value="true" />
         <Setter Property="Template">
             <Setter.Value>
@@ -550,21 +550,21 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="AzureDataGridColumnHeader"
-           BasedOn="{StaticResource MetroDataGridColumnHeader}"
+    <Style x:Key="MahApps.Styles.DataGridColumnHeader.Azure"
+           BasedOn="{StaticResource MahApps.Styles.DataGridColumnHeader.Metro}"
            TargetType="{x:Type DataGridColumnHeader}">
         <Setter Property="Margin" Value="0 0 0 10" />
     </Style>
 
-    <Style x:Key="AzureDataGridRowHeader"
-           BasedOn="{StaticResource MetroDataGridRowHeader}"
+    <Style x:Key="MahApps.Styles.DataGridRowHeader.Azure"
+           BasedOn="{StaticResource MahApps.Styles.DataGridRowHeader.Metro}"
            TargetType="{x:Type DataGridRowHeader}">
         <Setter Property="BorderThickness" Value="0" />
     </Style>
 
     <!--  ____________________ Azure CellStyle ____________________  -->
-    <Style x:Key="AzureDataGridCell"
-           BasedOn="{StaticResource MetroDataGridCell}"
+    <Style x:Key="MahApps.Styles.DataGridCell.Azure"
+           BasedOn="{StaticResource MahApps.Styles.DataGridCell.Metro}"
            TargetType="{x:Type DataGridCell}">
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="Template">
@@ -600,25 +600,25 @@
     </Style>
 
     <!--  ____________________ Azure RowStyle ____________________  -->
-    <Style x:Key="AzureDataGridRow"
-           BasedOn="{StaticResource MetroDataGridRow}"
+    <Style x:Key="MahApps.Styles.DataGridRow.Azure"
+           BasedOn="{StaticResource MahApps.Styles.DataGridRow.Metro}"
            TargetType="{x:Type DataGridRow}" />
-    <Style x:Key="AzureDataGridRowWithMargin"
-           BasedOn="{StaticResource AzureDataGridRow}"
+    <Style x:Key="MahApps.Styles.DataGridRow.AzureWithMargin"
+           BasedOn="{StaticResource MahApps.Styles.DataGridRow.Azure}"
            TargetType="{x:Type DataGridRow}">
         <Setter Property="Margin" Value="0 0 0 1" />
     </Style>
 
-    <Style x:Key="AzureDataGrid"
-           BasedOn="{StaticResource MetroDataGrid}"
+    <Style x:Key="MahApps.Styles.DataGrid.Azure"
+           BasedOn="{StaticResource MahApps.Styles.DataGrid.Metro}"
            TargetType="{x:Type DataGrid}">
-        <Setter Property="CellStyle" Value="{StaticResource AzureDataGridCell}" />
-        <Setter Property="ColumnHeaderStyle" Value="{StaticResource AzureDataGridColumnHeader}" />
-        <Setter Property="RowHeaderStyle" Value="{StaticResource AzureDataGridRowHeader}" />
-        <Setter Property="RowStyle" Value="{StaticResource AzureDataGridRow}" />
+        <Setter Property="CellStyle" Value="{StaticResource MahApps.Styles.DataGridCell.Azure}" />
+        <Setter Property="ColumnHeaderStyle" Value="{StaticResource MahApps.Styles.DataGridColumnHeader.Azure}" />
+        <Setter Property="RowHeaderStyle" Value="{StaticResource MahApps.Styles.DataGridRowHeader.Azure}" />
+        <Setter Property="RowStyle" Value="{StaticResource MahApps.Styles.DataGridRow.Azure}" />
         <Style.Triggers>
             <Trigger Property="GridLinesVisibility" Value="None">
-                <Setter Property="RowStyle" Value="{StaticResource AzureDataGridRowWithMargin}" />
+                <Setter Property="RowStyle" Value="{StaticResource MahApps.Styles.DataGridRow.AzureWithMargin}" />
             </Trigger>
         </Style.Triggers>
     </Style>
diff --git a/src/MahApps.Metro/Styles/Controls.DatePicker.xaml b/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
index 2a32a488b2..3d534f5db3 100644
--- a/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
+++ b/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
@@ -9,12 +9,12 @@
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Shared.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <Style x:Key="MetroDatePicker" TargetType="{x:Type DatePicker}">
+    <Style x:Key="MahApps.Styles.DatePicker.Metro" TargetType="{x:Type DatePicker}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="CalendarStyle" Value="{DynamicResource MahApps.Metro.Styles.BaseMetroCalendar}" />
-        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
+        <Setter Property="CalendarStyle" Value="{DynamicResource MahApps.Styles.Calendar.MetroBase}" />
+        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMahApps.Styles.ContextMenu.Metro}" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
         <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="22" />
@@ -51,13 +51,13 @@
                                     Grid.Column="1"
                                     Foreground="{TemplateBinding Foreground}"
                                     IsTabStop="False"
-                                    Style="{DynamicResource ChromelessButtonStyle}">
+                                    Style="{DynamicResource MahApps.Styles.ButtonBase.Chromeless}">
                                 <!--  PackIconModern - Calendar14  -->
                                 <ContentControl Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
                                                 Height="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
                                                 Padding="2"
                                                 Content="M34,52H31V38.5C29.66,39.9 28.16,40.78 26.34,41.45V37.76C27.3,37.45 28.34,36.86 29.46,36C30.59,35.15 31.36,34.15 31.78,33H34V52M45,52V48H37V45L45,33H48V45H50V48H48V52H45M45,45V38.26L40.26,45H45M18,57V23H23V20A2,2 0 0,1 25,18H29C30.11,18 31,18.9 31,20V23H45V20A2,2 0 0,1 47,18H51C52.11,18 53,18.9 53,20V23H58V57H18M21,54H55V31H21V54M48.5,20A1.5,1.5 0 0,0 47,21.5V24.5A1.5,1.5 0 0,0 48.5,26H49.5C50.34,26 51,25.33 51,24.5V21.5A1.5,1.5 0 0,0 49.5,20H48.5M26.5,20A1.5,1.5 0 0,0 25,21.5V24.5A1.5,1.5 0 0,0 26.5,26H27.5A1.5,1.5 0 0,0 29,24.5V21.5A1.5,1.5 0 0,0 27.5,20H26.5Z"
-                                                Style="{DynamicResource PathIconContentControlStyle}" />
+                                                Style="{DynamicResource MahApps.Styles.ContentControl.PathIcon}" />
                             </Button>
 
                             <DatePickerTextBox x:Name="PART_TextBox"
@@ -82,7 +82,7 @@
                             <ContentControl x:Name="PART_FloatingMessageContainer"
                                             Grid.Row="0"
                                             Grid.Column="0"
-                                            Style="{DynamicResource FloatingMessageContainerStyle}">
+                                            Style="{DynamicResource MahApps.Styles.ContentControl.FloatingMessageContainer}">
                                 <ContentControl.Height>
                                     <MultiBinding Converter="{Converters:MathMultiplyConverter}">
                                         <Binding ElementName="PART_FloatingMessage"
@@ -97,7 +97,7 @@
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
-                                           Style="{DynamicResource MetroAutoCollapsingTextBlock}"
+                                           Style="{DynamicResource MahApps.Styles.TextBlock.MetroAutoCollapsing}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                            TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                            TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
@@ -182,9 +182,9 @@
         <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource MahApps.Templates.ValidationError}" />
     </Style>
 
-    <Style x:Key="MetroDatePickerTextBox" TargetType="{x:Type DatePickerTextBox}">
+    <Style x:Key="MahApps.Styles.DatePickerTextBox.Metro" TargetType="{x:Type DatePickerTextBox}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
-        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
+        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMahApps.Styles.ContextMenu.Metro}" />
         <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Content}" />
@@ -270,7 +270,7 @@
                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                    Foreground="{TemplateBinding Foreground}"
-                                   Style="{DynamicResource MahApps.Metro.Styles.MetroWatermarkTextBlock}"
+                                   Style="{DynamicResource MahApps.Styles.TextBlock.MetroWatermark}"
                                    Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                    TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                    TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}" />
diff --git a/src/MahApps.Metro/Styles/Controls.Expander.xaml b/src/MahApps.Metro/Styles/Controls.Expander.xaml
index 65d63ad987..df6eb98e4e 100644
--- a/src/MahApps.Metro/Styles/Controls.Expander.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Expander.xaml
@@ -9,7 +9,7 @@
     <Thickness x:Key="ExpanderHeaderThemePadding">2</Thickness>
     <sys:Double x:Key="ExpanderToggleButtonEllipseThemeSize">18</sys:Double>
 
-    <Style x:Key="ExpanderBaseHeaderStyle" TargetType="{x:Type ToggleButton}">
+    <Style x:Key="MahApps.Styles.ToggleButton.ExpanderBaseHeader" TargetType="{x:Type ToggleButton}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderBrush" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />
@@ -19,8 +19,8 @@
         <Setter Property="SnapsToDevicePixels" Value="True" />
     </Style>
 
-    <Style x:Key="ExpanderRightHeaderStyle"
-           BasedOn="{StaticResource ExpanderBaseHeaderStyle}"
+    <Style x:Key="MahApps.Styles.ToggleButton.ExpanderRightHeader"
+           BasedOn="{StaticResource MahApps.Styles.ToggleButton.ExpanderBaseHeader}"
            TargetType="{x:Type ToggleButton}">
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="Template">
@@ -94,8 +94,8 @@
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
     </Style>
 
-    <Style x:Key="ExpanderUpHeaderStyle"
-           BasedOn="{StaticResource ExpanderBaseHeaderStyle}"
+    <Style x:Key="MahApps.Styles.ToggleButton.ExpanderUpHeader"
+           BasedOn="{StaticResource MahApps.Styles.ToggleButton.ExpanderBaseHeader}"
            TargetType="{x:Type ToggleButton}">
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="Template">
@@ -168,8 +168,8 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
-    <Style x:Key="ExpanderLeftHeaderStyle"
-           BasedOn="{StaticResource ExpanderRightHeaderStyle}"
+    <Style x:Key="MahApps.Styles.ToggleButton.ExpanderLeftHeader"
+           BasedOn="{StaticResource MahApps.Styles.ToggleButton.ExpanderRightHeader}"
            TargetType="{x:Type ToggleButton}">
         <Setter Property="Template">
             <Setter.Value>
@@ -240,8 +240,8 @@
         </Setter>
     </Style>
 
-    <Style x:Key="ExpanderDownHeaderStyle"
-           BasedOn="{StaticResource ExpanderUpHeaderStyle}"
+    <Style x:Key="MahApps.Styles.ToggleButton.ExpanderDownHeader"
+           BasedOn="{StaticResource MahApps.Styles.ToggleButton.ExpanderUpHeader}"
            TargetType="{x:Type ToggleButton}">
         <Setter Property="Template">
             <Setter.Value>
@@ -303,7 +303,7 @@
         </Setter>
     </Style>
 
-    <Storyboard x:Key="MetroExpanderExpandStoryboard">
+    <Storyboard x:Key="MahApps.Storyboard.MahApps.Styles.Expander.MetroExpand">
         <DoubleAnimation Storyboard.TargetName="ExpandSite"
                          Storyboard.TargetProperty="(UIElement.Opacity)"
                          To="1"
@@ -313,7 +313,7 @@
         </ObjectAnimationUsingKeyFrames>
     </Storyboard>
 
-    <Storyboard x:Key="MetroExpanderCollapseStoryboard">
+    <Storyboard x:Key="MahApps.Storyboard.MahApps.Styles.Expander.MetroCollapse">
         <DoubleAnimation Storyboard.TargetName="ExpandSite"
                          Storyboard.TargetProperty="(UIElement.Opacity)"
                          To="0"
@@ -323,16 +323,16 @@
         </ObjectAnimationUsingKeyFrames>
     </Storyboard>
 
-    <Style x:Key="MetroExpander" TargetType="{x:Type Expander}">
+    <Style x:Key="MahApps.Styles.Expander.Metro" TargetType="{x:Type Expander}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Upper" />
         <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
-        <Setter Property="Controls:ExpanderHelper.HeaderDownStyle" Value="{StaticResource ExpanderDownHeaderStyle}" />
-        <Setter Property="Controls:ExpanderHelper.HeaderLeftStyle" Value="{StaticResource ExpanderLeftHeaderStyle}" />
-        <Setter Property="Controls:ExpanderHelper.HeaderRightStyle" Value="{StaticResource ExpanderRightHeaderStyle}" />
-        <Setter Property="Controls:ExpanderHelper.HeaderUpStyle" Value="{StaticResource ExpanderUpHeaderStyle}" />
+        <Setter Property="Controls:ExpanderHelper.HeaderDownStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderDownHeader}" />
+        <Setter Property="Controls:ExpanderHelper.HeaderLeftStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderLeftHeader}" />
+        <Setter Property="Controls:ExpanderHelper.HeaderRightStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderRightHeader}" />
+        <Setter Property="Controls:ExpanderHelper.HeaderUpStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderUpHeader}" />
         <Setter Property="Controls:GroupBoxHelper.HeaderForeground" Value="{x:Null}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="Padding" Value="4" />
@@ -418,10 +418,10 @@
                         <Trigger Property="IsExpanded" Value="true">
                             <Setter TargetName="ExpandSite" Property="Visibility" Value="Visible" />
                             <Trigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource MetroExpanderExpandStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.MahApps.Styles.Expander.MetroExpand}" />
                             </Trigger.EnterActions>
                             <Trigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource MetroExpanderCollapseStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.MahApps.Styles.Expander.MetroCollapse}" />
                             </Trigger.ExitActions>
                         </Trigger>
                         <Trigger Property="ExpandDirection" Value="Right">
diff --git a/src/MahApps.Metro/Styles/Controls.GroupBox.xaml b/src/MahApps.Metro/Styles/Controls.GroupBox.xaml
index c9b64b101f..9fc7c52d40 100644
--- a/src/MahApps.Metro/Styles/Controls.GroupBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.GroupBox.xaml
@@ -7,7 +7,7 @@
 
     <Thickness x:Key="GroupBoxHeaderThemePadding">4</Thickness>
 
-    <Style x:Key="MetroGroupBox" TargetType="{x:Type GroupBox}">
+    <Style x:Key="MahApps.Styles.GroupBox.Metro" TargetType="{x:Type GroupBox}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="BorderThickness" Value="1" />
diff --git a/src/MahApps.Metro/Styles/Controls.Label.xaml b/src/MahApps.Metro/Styles/Controls.Label.xaml
index 5230805832..073cbcdf3a 100644
--- a/src/MahApps.Metro/Styles/Controls.Label.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Label.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <Style x:Key="MetroLabel" TargetType="{x:Type Label}">
+    <Style x:Key="MahApps.Styles.Label.Metro" TargetType="{x:Type Label}">
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Label.Text}" />
     </Style>
 
diff --git a/src/MahApps.Metro/Styles/Controls.ListBox.xaml b/src/MahApps.Metro/Styles/Controls.ListBox.xaml
index 31f79ef725..2ff6875910 100644
--- a/src/MahApps.Metro/Styles/Controls.ListBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ListBox.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
-    <Style x:Key="MetroListBox" TargetType="{x:Type ListBox}">
+    <Style x:Key="MahApps.Styles.ListBox.Metro" TargetType="{x:Type ListBox}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
         <!--  default to 0  -->
@@ -63,8 +63,8 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="VirtualisedMetroListBox"
-           BasedOn="{StaticResource MetroListBox}"
+    <Style x:Key="MahApps.Styles.ListBox.MetroVirtualized"
+           BasedOn="{StaticResource MahApps.Styles.ListBox.Metro}"
            TargetType="{x:Type ListBox}">
         <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
         <Setter Property="VirtualizingStackPanel.IsVirtualizing" Value="True" />
@@ -72,7 +72,7 @@
         <Setter Property="VirtualizingStackPanel.VirtualizationMode" Value="Recycling" />
     </Style>
 
-    <Style x:Key="MetroListBoxItem" TargetType="{x:Type ListBoxItem}">
+    <Style x:Key="MahApps.Styles.ListBoxItem.Metro" TargetType="{x:Type ListBoxItem}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="Controls:ItemHelper.ActiveSelectionBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
diff --git a/src/MahApps.Metro/Styles/Controls.ListView.xaml b/src/MahApps.Metro/Styles/Controls.ListView.xaml
index 3375dd8384..890f924645 100644
--- a/src/MahApps.Metro/Styles/Controls.ListView.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ListView.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
-    <Style x:Key="MetroGridViewScrollViewerStyle"
+    <Style x:Key="MahApps.Styles.ScrollViewer.MetroGridView"
            BasedOn="{StaticResource {x:Static GridView.GridViewScrollViewerStyleKey}}"
            TargetType="{x:Type ScrollViewer}">
         <Setter Property="Focusable" Value="False" />
@@ -93,7 +93,7 @@
         It also (setting True) has the ugly side effect of scrolling the entire group and not the items. The downside is we lose
         virtualisation http://serialseb.blogspot.com/2007/09/wpf-tips-7-smooth-scrolling.html
     -->
-    <Style x:Key="MetroListView" TargetType="{x:Type ListView}">
+    <Style x:Key="MahApps.Styles.ListView.Metro" TargetType="{x:Type ListView}">
         <Setter Property="AlternationCount" Value="2" />
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
@@ -116,7 +116,7 @@
                                       Focusable="False"
                                       HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                      Style="{DynamicResource MetroGridViewScrollViewerStyle}"
+                                      Style="{DynamicResource MahApps.Styles.ScrollViewer.MetroGridView}"
                                       VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
                             <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </ScrollViewer>
@@ -139,8 +139,8 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
-    <Style x:Key="VirtualisedMetroListView"
-           BasedOn="{StaticResource MetroListView}"
+    <Style x:Key="MahApps.Styles.ListView.MetroVirtualized"
+           BasedOn="{StaticResource MahApps.Styles.ListView.Metro}"
            TargetType="{x:Type ListView}">
         <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
         <Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="True" />
@@ -149,7 +149,7 @@
         <Setter Property="VirtualizingStackPanel.VirtualizationMode" Value="Recycling" />
     </Style>
 
-    <Style x:Key="MetroListViewItem" TargetType="{x:Type ListViewItem}">
+    <Style x:Key="MahApps.Styles.ListViewItem.Metro" TargetType="{x:Type ListViewItem}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="Controls:ItemHelper.ActiveSelectionBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
@@ -245,7 +245,7 @@
     </Style>
 
     <!--  Gives the impression that items cannot be selected on the ListView  -->
-    <Style x:Key="NonSelectableListViewContainerStyle" TargetType="{x:Type ListViewItem}">
+    <Style x:Key="MahApps.Styles.ListViewItem.NonSelectable" TargetType="{x:Type ListViewItem}">
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray1}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
@@ -282,7 +282,7 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="GridViewColumnHeaderGripper" TargetType="Thumb">
+    <Style x:Key="MahApps.Styles.Thumb.GridViewColumnHeaderGripper" TargetType="Thumb">
         <Setter Property="Background" Value="LightGray" />
         <Setter Property="Template">
             <Setter.Value>
@@ -300,7 +300,7 @@
         <Setter Property="Width" Value="18" />
     </Style>
 
-    <Style x:Key="MetroGridViewColumnHeader" TargetType="GridViewColumnHeader">
+    <Style x:Key="MahApps.Styles.GridViewColumnHeader.Metro" TargetType="GridViewColumnHeader">
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Upper" />
         <Setter Property="FontWeight" Value="SemiBold" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
@@ -329,7 +329,7 @@
                         <Thumb x:Name="PART_HeaderGripper"
                                Margin="0 0 -9 0"
                                HorizontalAlignment="Right"
-                               Style="{StaticResource GridViewColumnHeaderGripper}" />
+                               Style="{StaticResource MahApps.Styles.Thumb.GridViewColumnHeaderGripper}" />
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsPressed" Value="True">
diff --git a/src/MahApps.Metro/Styles/Controls.Page.xaml b/src/MahApps.Metro/Styles/Controls.Page.xaml
index 8e7e7caa8d..3726c1e3d4 100644
--- a/src/MahApps.Metro/Styles/Controls.Page.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Page.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <Style x:Key="MetroPage" TargetType="{x:Type Page}">
+    <Style x:Key="MahApps.Styles.Page.Metro" TargetType="{x:Type Page}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="TextElement.FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
diff --git a/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml b/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
index e47d90b473..ba775cea2a 100644
--- a/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
@@ -13,9 +13,9 @@
 
     <Converters:StringToVisibilityConverter x:Key="StringToVisibilityConverter" />
 
-    <!--  Button Style for Win8MetroPasswordBox  -->
-    <Style x:Key="RevealButtonStyle"
-           BasedOn="{StaticResource ChromelessButtonStyle}"
+    <!--  Button Style for MahApps.Styles.PasswordBox.Win8  -->
+    <Style x:Key="MahApps.Styles.ButtonBase.Reveal"
+           BasedOn="{StaticResource MahApps.Styles.ButtonBase.Chromeless}"
            TargetType="{x:Type ButtonBase}">
         <Setter Property="Template">
             <Setter.Value>
@@ -42,7 +42,7 @@
     </Style>
 
     <!--  Material - Eye  -->
-    <ContentControl x:Key="DefaultRevealButtonIcon"
+    <ContentControl x:Key="MahApps.Controls.DefaultRevealButtonIcon"
                     Width="Auto"
                     Height="Auto"
                     Padding="2"
@@ -50,9 +50,9 @@
                     VerticalAlignment="Center"
                     x:Shared="False"
                     Content="M12,9A3,3 0 0,0 9,12A3,3 0 0,0 12,15A3,3 0 0,0 15,12A3,3 0 0,0 12,9M12,17A5,5 0 0,1 7,12A5,5 0 0,1 12,7A5,5 0 0,1 17,12A5,5 0 0,1 12,17M12,4.5C7,4.5 2.73,7.61 1,12C2.73,16.39 7,19.5 12,19.5C17,19.5 21.27,16.39 23,12C21.27,7.61 17,4.5 12,4.5Z"
-                    Style="{DynamicResource PathIconContentControlStyle}" />
+                    Style="{DynamicResource MahApps.Styles.ContentControl.PathIcon}" />
 
-    <Grid x:Key="DefaultCapsLockIcon"
+    <Grid x:Key="MahApps.Controls.Grid.DefaultCapsLockIcon"
           Width="16"
           Height="16"
           x:Shared="False"
@@ -70,7 +70,7 @@
     </Grid>
 
     <!--  PasswordBox Style  -->
-    <Style x:Key="MetroPasswordBox" TargetType="{x:Type PasswordBox}">
+    <Style x:Key="MahApps.Styles.PasswordBox.Metro" TargetType="{x:Type PasswordBox}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
         <Setter Property="Behaviors:StylizedBehaviors.Behaviors">
             <Setter.Value>
@@ -82,10 +82,10 @@
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="CaretBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
-        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
+        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMahApps.Styles.ContextMenu.Metro}" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
-        <Setter Property="Controls:PasswordBoxHelper.CapsLockIcon" Value="{StaticResource DefaultCapsLockIcon}" />
+        <Setter Property="Controls:PasswordBoxHelper.CapsLockIcon" Value="{StaticResource MahApps.Controls.Grid.DefaultCapsLockIcon}" />
         <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Sizes.Font.ClearTextButton}" />
         <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="22" />
         <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True" />
@@ -167,7 +167,7 @@
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
-                                       Style="{DynamicResource MahApps.Metro.Styles.MetroWatermarkTextBlock}"
+                                       Style="{DynamicResource MahApps.Styles.TextBlock.MetroWatermark}"
                                        Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                        TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                        TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
@@ -175,7 +175,7 @@
                             <ContentControl x:Name="PART_FloatingMessageContainer"
                                             Grid.Row="0"
                                             Grid.Column="0"
-                                            Style="{DynamicResource FloatingMessageContainerStyle}">
+                                            Style="{DynamicResource MahApps.Styles.ContentControl.FloatingMessageContainer}">
                                 <ContentControl.Height>
                                     <MultiBinding Converter="{Converters:MathMultiplyConverter}">
                                         <Binding ElementName="PART_FloatingMessage"
@@ -190,7 +190,7 @@
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
-                                           Style="{DynamicResource MetroAutoCollapsingTextBlock}"
+                                           Style="{DynamicResource MahApps.Styles.TextBlock.MetroAutoCollapsing}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                            TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                            TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
@@ -234,7 +234,7 @@
                                     FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
                                     Foreground="{TemplateBinding Foreground}"
                                     IsTabStop="False"
-                                    Style="{DynamicResource ChromelessButtonStyle}"
+                                    Style="{DynamicResource MahApps.Styles.ButtonBase.Chromeless}"
                                     Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ClearTextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
                         </Grid>
                         <Border x:Name="DisabledVisualElement"
@@ -267,10 +267,10 @@
                                 <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource ShowFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.ShowFloatingMessage}" />
                             </MultiDataTrigger.EnterActions>
                             <MultiDataTrigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource HideFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.HideFloatingMessage}" />
                             </MultiDataTrigger.ExitActions>
                         </MultiDataTrigger>
 
@@ -324,7 +324,7 @@
                             </MultiTrigger.Conditions>
                             <Setter TargetName="PART_WaitingForDataEffectAdornerDecorator" Property="Visibility" Value="Visible" />
                             <MultiTrigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource WaitingForDataStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.WaitingForData}" />
                             </MultiTrigger.EnterActions>
                         </MultiTrigger>
                         <Trigger Property="Controls:TextBoxHelper.IsWaitingForData" Value="False">
@@ -338,8 +338,8 @@
     </Style>
 
     <!--  Button Command PasswordBox Style  -->
-    <Style x:Key="MetroButtonPasswordBox"
-           BasedOn="{StaticResource MetroPasswordBox}"
+    <Style x:Key="MahApps.Styles.PasswordBox.MetroButton"
+           BasedOn="{StaticResource MahApps.Styles.PasswordBox.Metro}"
            TargetType="{x:Type PasswordBox}">
         <Setter Property="Controls:TextBoxHelper.ButtonTemplate" Value="{DynamicResource MahApps.Templates.ButtonBase.Chromeless}" />
         <Setter Property="Controls:TextBoxHelper.TextButton" Value="True" />
@@ -413,7 +413,7 @@
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
-                                       Style="{DynamicResource MahApps.Metro.Styles.MetroWatermarkTextBlock}"
+                                       Style="{DynamicResource MahApps.Styles.TextBlock.MetroWatermark}"
                                        Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                        TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                        TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
@@ -421,7 +421,7 @@
                             <ContentControl x:Name="PART_FloatingMessageContainer"
                                             Grid.Row="0"
                                             Grid.Column="0"
-                                            Style="{DynamicResource FloatingMessageContainerStyle}">
+                                            Style="{DynamicResource MahApps.Styles.ContentControl.FloatingMessageContainer}">
                                 <ContentControl.Height>
                                     <MultiBinding Converter="{Converters:MathMultiplyConverter}">
                                         <Binding ElementName="PART_FloatingMessage"
@@ -436,7 +436,7 @@
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
-                                           Style="{DynamicResource MetroAutoCollapsingTextBlock}"
+                                           Style="{DynamicResource MahApps.Styles.TextBlock.MetroAutoCollapsing}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                            TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                            TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
@@ -480,7 +480,7 @@
                                     FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
                                     Foreground="{TemplateBinding Foreground}"
                                     IsTabStop="False"
-                                    Style="{DynamicResource ChromelessButtonStyle}"
+                                    Style="{DynamicResource MahApps.Styles.ButtonBase.Chromeless}"
                                     Template="{TemplateBinding Controls:TextBoxHelper.ButtonTemplate}"
                                     Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.TextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
                         </Grid>
@@ -514,10 +514,10 @@
                                 <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource ShowFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.ShowFloatingMessage}" />
                             </MultiDataTrigger.EnterActions>
                             <MultiDataTrigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource HideFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.HideFloatingMessage}" />
                             </MultiDataTrigger.ExitActions>
                         </MultiDataTrigger>
 
@@ -570,7 +570,7 @@
                             </MultiTrigger.Conditions>
                             <Setter TargetName="PART_WaitingForDataEffectAdornerDecorator" Property="Visibility" Value="Visible" />
                             <MultiTrigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource WaitingForDataStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.WaitingForData}" />
                             </MultiTrigger.EnterActions>
                         </MultiTrigger>
                         <Trigger Property="Controls:TextBoxHelper.IsWaitingForData" Value="False">
@@ -582,7 +582,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="RevealedTextBoxStyle" TargetType="{x:Type TextBox}">
+    <Style x:Key="MahApps.Styles.TextBox.Revealed" TargetType="{x:Type TextBox}">
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TextBox}">
@@ -599,10 +599,10 @@
     </Style>
 
     <!--  Button Revealed PasswordBox Style  -->
-    <Style x:Key="MetroButtonRevealedPasswordBox"
-           BasedOn="{StaticResource MetroPasswordBox}"
+    <Style x:Key="MahApps.Styles.PasswordBox.MetroButtonRevealed"
+           BasedOn="{StaticResource MahApps.Styles.PasswordBox.Metro}"
            TargetType="{x:Type PasswordBox}">
-        <Setter Property="Controls:PasswordBoxHelper.RevealButtonContent" Value="{DynamicResource DefaultRevealButtonIcon}" />
+        <Setter Property="Controls:PasswordBoxHelper.RevealButtonContent" Value="{DynamicResource MahApps.Controls.DefaultRevealButtonIcon}" />
         <Setter Property="Controls:TextBoxHelper.ButtonTemplate" Value="{DynamicResource MahApps.Templates.ButtonBase.Chromeless}" />
         <Setter Property="Template">
             <Setter.Value>
@@ -683,7 +683,7 @@
                                      Foreground="{TemplateBinding Foreground}"
                                      SelectionBrush="{TemplateBinding SelectionBrush}"
                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                     Style="{DynamicResource RevealedTextBoxStyle}"
+                                     Style="{DynamicResource MahApps.Styles.TextBox.Revealed}"
                                      Text="{TemplateBinding Behaviors:PasswordBoxBindingBehavior.Password}"
                                      Visibility="Hidden" />
                             <TextBlock x:Name="PART_Message"
@@ -694,7 +694,7 @@
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
-                                       Style="{DynamicResource MahApps.Metro.Styles.MetroWatermarkTextBlock}"
+                                       Style="{DynamicResource MahApps.Styles.TextBlock.MetroWatermark}"
                                        Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                        TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                        TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
@@ -702,7 +702,7 @@
                             <ContentControl x:Name="PART_FloatingMessageContainer"
                                             Grid.Row="0"
                                             Grid.Column="0"
-                                            Style="{DynamicResource FloatingMessageContainerStyle}">
+                                            Style="{DynamicResource MahApps.Styles.ContentControl.FloatingMessageContainer}">
                                 <ContentControl.Height>
                                     <MultiBinding Converter="{Converters:MathMultiplyConverter}">
                                         <Binding ElementName="PART_FloatingMessage"
@@ -717,7 +717,7 @@
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
-                                           Style="{DynamicResource MetroAutoCollapsingTextBlock}"
+                                           Style="{DynamicResource MahApps.Styles.TextBlock.MetroAutoCollapsing}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                            TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                            TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
@@ -758,7 +758,7 @@
                                     Focusable="False"
                                     Foreground="{TemplateBinding Foreground}"
                                     IsTabStop="False"
-                                    Style="{DynamicResource RevealButtonStyle}"
+                                    Style="{DynamicResource MahApps.Styles.ButtonBase.Reveal}"
                                     Visibility="{Binding ElementName=RevealedPassword, Path=Text, Converter={StaticResource StringToVisibilityConverter}}" />
                             <Button x:Name="PART_ClearText"
                                     Grid.Row="0"
@@ -773,7 +773,7 @@
                                     FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
                                     Foreground="{TemplateBinding Foreground}"
                                     IsTabStop="False"
-                                    Style="{DynamicResource ChromelessButtonStyle}"
+                                    Style="{DynamicResource MahApps.Styles.ButtonBase.Chromeless}"
                                     Template="{TemplateBinding Controls:TextBoxHelper.ButtonTemplate}"
                                     Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ClearTextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
                         </Grid>
@@ -810,10 +810,10 @@
                                 <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource ShowFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.ShowFloatingMessage}" />
                             </MultiDataTrigger.EnterActions>
                             <MultiDataTrigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource HideFloatingMessageStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.HideFloatingMessage}" />
                             </MultiDataTrigger.ExitActions>
                         </MultiDataTrigger>
 
@@ -876,7 +876,7 @@
                             </MultiTrigger.Conditions>
                             <Setter TargetName="PART_WaitingForDataEffectAdornerDecorator" Property="Visibility" Value="Visible" />
                             <MultiTrigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource WaitingForDataStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.WaitingForData}" />
                             </MultiTrigger.EnterActions>
                         </MultiTrigger>
                         <Trigger Property="Controls:TextBoxHelper.IsWaitingForData" Value="False">
@@ -888,9 +888,9 @@
         </Setter>
     </Style>
 
-    <!--  Win8MetroPasswordBox Style  -->
-    <Style x:Key="Win8MetroPasswordBox"
-           BasedOn="{StaticResource MetroButtonRevealedPasswordBox}"
+    <!--  MahApps.Styles.PasswordBox.Win8 Style  -->
+    <Style x:Key="MahApps.Styles.PasswordBox.Win8"
+           BasedOn="{StaticResource MahApps.Styles.PasswordBox.MetroButtonRevealed}"
            TargetType="{x:Type PasswordBox}">
         <Setter Property="AllowDrop" Value="true" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
diff --git a/src/MahApps.Metro/Styles/Controls.ProgressBar.xaml b/src/MahApps.Metro/Styles/Controls.ProgressBar.xaml
index 278fb05e7b..c54bf3fef2 100644
--- a/src/MahApps.Metro/Styles/Controls.ProgressBar.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ProgressBar.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <!--  ProgressBar Style  -->
-    <Style x:Key="MahApps.Metro.Styles.ProgressBar" TargetType="ProgressBar">
+    <Style x:Key="MahApps.Styles.ProgressBar.Metro" TargetType="ProgressBar">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Gray5}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Controls.Border}" />
         <Setter Property="BorderThickness" Value="1" />
diff --git a/src/MahApps.Metro/Styles/Controls.RadioButton.xaml b/src/MahApps.Metro/Styles/Controls.RadioButton.xaml
index df12fbcf2a..bb1c9508b5 100644
--- a/src/MahApps.Metro/Styles/Controls.RadioButton.xaml
+++ b/src/MahApps.Metro/Styles/Controls.RadioButton.xaml
@@ -5,7 +5,7 @@
 
     <!--  ********************************** RadioButton Style **********************************  -->
     <!--  adapted from http://brianlagunas.com/free-metro-light-and-dark-themes-for-wpf-and-silverlight-microsoft-controls/  -->
-    <Style x:Key="MetroRadioButton" TargetType="RadioButton">
+    <Style x:Key="MahApps.Styles.RadioButton.Metro" TargetType="RadioButton">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.CheckBox}" />
         <Setter Property="BorderThickness" Value="1" />
diff --git a/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml b/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
index c672ebfb00..56a5521f09 100644
--- a/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
@@ -4,19 +4,19 @@
                     xmlns:System="clr-namespace:System;assembly=mscorlib"
                     xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options">
 
-    <Storyboard x:Key="MetroScrollBarThumbMouseOverStoryboard" po:Freeze="True">
+    <Storyboard x:Key="MahApps.Storyboard.MahApps.Styles.ScrollBar.MetroThumbMouseOver" po:Freeze="True">
         <DoubleAnimationUsingKeyFrames Storyboard.TargetName="MouseOverRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
             <EasingDoubleKeyFrame KeyTime="0:0:0.15" Value="0.6" />
         </DoubleAnimationUsingKeyFrames>
     </Storyboard>
 
-    <Storyboard x:Key="MetroScrollBarThumbPressedStoryboard" po:Freeze="True">
+    <Storyboard x:Key="MahApps.Storyboard.MahApps.Styles.ScrollBar.MetroThumbPressed" po:Freeze="True">
         <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PressedRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
             <EasingDoubleKeyFrame KeyTime="0:0:0.15" Value="0.8" />
         </DoubleAnimationUsingKeyFrames>
     </Storyboard>
 
-    <Style x:Key="MetroScrollBarRepeatButtonSmallStyle" TargetType="{x:Type RepeatButton}">
+    <Style x:Key="MahApps.Styles.RepeatButton.MahApps.Styles.ScrollBar.MetroSmall" TargetType="{x:Type RepeatButton}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="Height" Value="{DynamicResource MahApps.Templates.ScrollBar.VerticalRepeatButtonHeight}" />
@@ -64,7 +64,7 @@
         <Setter Property="Width" Value="{DynamicResource MahApps.Templates.ScrollBar.HorizontalRepeatButtonWidth}" />
     </Style>
 
-    <Style x:Key="MetroScrollBarRepeatButtonLargeStyle" TargetType="{x:Type RepeatButton}">
+    <Style x:Key="MahApps.Styles.RepeatButton.MahApps.Styles.ScrollBar.MetroLarge" TargetType="{x:Type RepeatButton}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="Interval" Value="50" />
@@ -81,7 +81,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MetroScrollBarThumbStyle" TargetType="{x:Type Thumb}">
+    <Style x:Key="MahApps.Styles.Thumb.MahApps.Styles.ScrollBar.Metro" TargetType="{x:Type Thumb}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Thumb}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="IsTabStop" Value="False" />
@@ -107,8 +107,8 @@
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualState x:Name="Normal" />
-                                <VisualState x:Name="MouseOver" Storyboard="{StaticResource MetroScrollBarThumbMouseOverStoryboard}" />
-                                <VisualState x:Name="Pressed" Storyboard="{StaticResource MetroScrollBarThumbPressedStoryboard}" />
+                                <VisualState x:Name="MouseOver" Storyboard="{StaticResource MahApps.Storyboard.MahApps.Styles.ScrollBar.MetroThumbMouseOver}" />
+                                <VisualState x:Name="Pressed" Storyboard="{StaticResource MahApps.Storyboard.MahApps.Styles.ScrollBar.MetroThumbPressed}" />
                                 <VisualState x:Name="Disabled" />
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
@@ -135,29 +135,29 @@
                           Grid.Column="0"
                           Command="ScrollBar.LineLeftCommand"
                           Content="M54,14.9765625L54,74.9765625 24,44.9765625 54,14.9765625z"
-                          Style="{DynamicResource MetroScrollBarRepeatButtonSmallStyle}" />
+                          Style="{DynamicResource MahApps.Styles.RepeatButton.MahApps.Styles.ScrollBar.MetroSmall}" />
             <Track x:Name="PART_Track"
                    Grid.Column="1"
                    IsDirectionReversed="False">
                 <Track.DecreaseRepeatButton>
                     <RepeatButton x:Name="HorizontalLargeDecrease"
                                   Command="ScrollBar.PageLeftCommand"
-                                  Style="{DynamicResource MetroScrollBarRepeatButtonLargeStyle}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.MahApps.Styles.ScrollBar.MetroLarge}" />
                 </Track.DecreaseRepeatButton>
                 <Track.Thumb>
-                    <Controls:MetroThumb Margin="0 1 0 1" Style="{DynamicResource MetroScrollBarThumbStyle}" />
+                    <Controls:MetroThumb Margin="0 1 0 1" Style="{DynamicResource MahApps.Styles.Thumb.MahApps.Styles.ScrollBar.Metro}" />
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
                     <RepeatButton x:Name="HorizontalLargeIncrease"
                                   Command="ScrollBar.PageRightCommand"
-                                  Style="{DynamicResource MetroScrollBarRepeatButtonLargeStyle}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.MahApps.Styles.ScrollBar.MetroLarge}" />
                 </Track.IncreaseRepeatButton>
             </Track>
             <RepeatButton x:Name="HorizontalSmallIncrease"
                           Grid.Column="2"
                           Command="ScrollBar.LineRightCommand"
                           Content="M192,79.875L352,239.875 192,399.875 192,79.875z"
-                          Style="{DynamicResource MetroScrollBarRepeatButtonSmallStyle}" />
+                          Style="{DynamicResource MahApps.Styles.RepeatButton.MahApps.Styles.ScrollBar.MetroSmall}" />
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsEnabled" Value="False">
@@ -177,7 +177,7 @@
                           Grid.Row="0"
                           Command="ScrollBar.LineUpCommand"
                           Content="M240.125,160L400.125,320 80.125,320 240.125,160z"
-                          Style="{DynamicResource MetroScrollBarRepeatButtonSmallStyle}" />
+                          Style="{DynamicResource MahApps.Styles.RepeatButton.MahApps.Styles.ScrollBar.MetroSmall}" />
             <Track x:Name="PART_Track"
                    Grid.Row="1"
                    IsDirectionReversed="True">
@@ -187,22 +187,22 @@
                 <Track.DecreaseRepeatButton>
                     <RepeatButton x:Name="VerticalLargeDecrease"
                                   Command="ScrollBar.PageUpCommand"
-                                  Style="{DynamicResource MetroScrollBarRepeatButtonLargeStyle}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.MahApps.Styles.ScrollBar.MetroLarge}" />
                 </Track.DecreaseRepeatButton>
                 <Track.Thumb>
-                    <Controls:MetroThumb Margin="1 0 1 0" Style="{DynamicResource MetroScrollBarThumbStyle}" />
+                    <Controls:MetroThumb Margin="1 0 1 0" Style="{DynamicResource MahApps.Styles.Thumb.MahApps.Styles.ScrollBar.Metro}" />
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
                     <RepeatButton x:Name="VerticalLargeIncrease"
                                   Command="ScrollBar.PageDownCommand"
-                                  Style="{DynamicResource MetroScrollBarRepeatButtonLargeStyle}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.MahApps.Styles.ScrollBar.MetroLarge}" />
                 </Track.IncreaseRepeatButton>
             </Track>
             <RepeatButton x:Name="VerticalSmallIncrease"
                           Grid.Row="2"
                           Command="ScrollBar.LineDownCommand"
                           Content="M80.125,192L400.125,192 240.125,352 80.125,192z"
-                          Style="{DynamicResource MetroScrollBarRepeatButtonSmallStyle}" />
+                          Style="{DynamicResource MahApps.Styles.RepeatButton.MahApps.Styles.ScrollBar.MetroSmall}" />
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsEnabled" Value="False">
@@ -212,7 +212,7 @@
     </ControlTemplate>
 
     <!--  Style for overall  ScrollBar  -->
-    <Style x:Key="MetroScrollBar" TargetType="{x:Type ScrollBar}">
+    <Style x:Key="MahApps.Styles.ScrollBar.Metro" TargetType="{x:Type ScrollBar}">
         <Setter Property="OverridesDefaultStyle" Value="True" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Style.Triggers>
@@ -229,7 +229,7 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="MetroScrollViewer" TargetType="{x:Type ScrollViewer}">
+    <Style x:Key="MahApps.Styles.ScrollViewer.Metro" TargetType="{x:Type ScrollViewer}">
         <Setter Property="Controls:ScrollViewerHelper.VerticalScrollBarOnLeftSide" Value="False" />
         <Setter Property="Template">
             <Setter.Value>
diff --git a/src/MahApps.Metro/Styles/Controls.Slider.xaml b/src/MahApps.Metro/Styles/Controls.Slider.xaml
index b91a84112e..feab28f0f9 100644
--- a/src/MahApps.Metro/Styles/Controls.Slider.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Slider.xaml
@@ -8,7 +8,7 @@
     <System:Double x:Key="MahApps.Sizes.Slider.VerticalThumbWidth">16</System:Double>
     <System:Double x:Key="MahApps.Sizes.Slider.VerticalThumbHeight">10</System:Double>
 
-    <Style x:Key="MahApps.Metro.Styles.Slider.Thumb" TargetType="Thumb">
+    <Style x:Key="MahApps.Styles.Thumb.Slider" TargetType="Thumb">
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -25,7 +25,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Metro.Styles.Slider.HorizontalTrack" TargetType="{x:Type RepeatButton}">
+    <Style x:Key="MahApps.Styles.RepeatButton.SliderHorizontalTrack" TargetType="{x:Type RepeatButton}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="IsTabStop" Value="False" />
@@ -41,8 +41,8 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Metro.Styles.Slider.HorizontalTrackValue"
-           BasedOn="{StaticResource MahApps.Metro.Styles.Slider.HorizontalTrack}"
+    <Style x:Key="MahApps.Styles.RepeatButton.SliderHorizontalTrackValue"
+           BasedOn="{StaticResource MahApps.Styles.RepeatButton.SliderHorizontalTrack}"
            TargetType="{x:Type RepeatButton}">
         <Setter Property="Template">
             <Setter.Value>
@@ -55,8 +55,8 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Metro.Styles.Slider.VerticalTrack"
-           BasedOn="{StaticResource MahApps.Metro.Styles.Slider.HorizontalTrack}"
+    <Style x:Key="MahApps.Styles.RepeatButton.SliderVerticalTrack"
+           BasedOn="{StaticResource MahApps.Styles.RepeatButton.SliderHorizontalTrack}"
            TargetType="{x:Type RepeatButton}">
         <Setter Property="Template">
             <Setter.Value>
@@ -69,8 +69,8 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Metro.Styles.Slider.VerticalTrackValue"
-           BasedOn="{StaticResource MahApps.Metro.Styles.Slider.VerticalTrack}"
+    <Style x:Key="MahApps.Styles.RepeatButton.SliderVerticalTrackValue"
+           BasedOn="{StaticResource MahApps.Styles.RepeatButton.SliderVerticalTrack}"
            TargetType="{x:Type RepeatButton}">
         <Setter Property="Template">
             <Setter.Value>
@@ -110,13 +110,13 @@
                     <RepeatButton x:Name="HorizontalTrackDecrease"
                                   Command="{x:Static Slider.DecreaseLarge}"
                                   Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillBrush)}"
-                                  Style="{DynamicResource MahApps.Metro.Styles.Slider.HorizontalTrackValue}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.SliderHorizontalTrackValue}" />
                 </Track.DecreaseRepeatButton>
                 <Track.IncreaseRepeatButton>
                     <RepeatButton x:Name="HorizontalTrackIncrease"
                                   Command="{x:Static Slider.IncreaseLarge}"
                                   Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillBrush)}"
-                                  Style="{DynamicResource MahApps.Metro.Styles.Slider.HorizontalTrack}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.SliderHorizontalTrack}" />
                 </Track.IncreaseRepeatButton>
                 <Track.Thumb>
                     <Controls:MetroThumb x:Name="HorizontalThumb"
@@ -125,7 +125,7 @@
                                          Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillBrush)}"
                                          BorderThickness="1 0"
                                          IsTabStop="True"
-                                         Style="{DynamicResource MahApps.Metro.Styles.Slider.Thumb}" />
+                                         Style="{DynamicResource MahApps.Styles.Thumb.Slider}" />
                 </Track.Thumb>
             </Track>
         </Grid>
@@ -196,13 +196,13 @@
                     <RepeatButton x:Name="VerticalTrackDecrease"
                                   Command="{x:Static Slider.DecreaseLarge}"
                                   Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillBrush)}"
-                                  Style="{DynamicResource MahApps.Metro.Styles.Slider.VerticalTrackValue}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.SliderVerticalTrackValue}" />
                 </Track.DecreaseRepeatButton>
                 <Track.IncreaseRepeatButton>
                     <RepeatButton x:Name="VerticalTrackIncrease"
                                   Command="{x:Static Slider.IncreaseLarge}"
                                   Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillBrush)}"
-                                  Style="{DynamicResource MahApps.Metro.Styles.Slider.VerticalTrack}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.SliderVerticalTrack}" />
                 </Track.IncreaseRepeatButton>
                 <Track.Thumb>
                     <Controls:MetroThumb x:Name="VerticalThumb"
@@ -211,7 +211,7 @@
                                          Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillBrush)}"
                                          BorderThickness="0 1"
                                          IsTabStop="True"
-                                         Style="{DynamicResource MahApps.Metro.Styles.Slider.Thumb}" />
+                                         Style="{DynamicResource MahApps.Styles.Thumb.Slider}" />
                 </Track.Thumb>
             </Track>
         </Grid>
@@ -256,7 +256,7 @@
     </ControlTemplate>
 
     <!--  Slider Style  -->
-    <Style x:Key="MahApps.Metro.Styles.Slider" TargetType="{x:Type Slider}">
+    <Style x:Key="MahApps.Styles.Slider.Metro" TargetType="{x:Type Slider}">
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Controls.Border}" />
         <Setter Property="BorderThickness" Value="2" />
         <Setter Property="Controls:SliderHelper.ThumbFillBrush" Value="{DynamicResource MahApps.Brushes.Gray2}" />
@@ -287,7 +287,7 @@
 
     <!--  Windows 10  -->
 
-    <Style x:Key="MahApps.Metro.Styles.Slider.Thumb.Win10" TargetType="Thumb">
+    <Style x:Key="MahApps.Styles.Thumb.Slider.Win10" TargetType="Thumb">
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -304,7 +304,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Metro.Styles.Slider.HorizontalTrack.Win10" TargetType="{x:Type RepeatButton}">
+    <Style x:Key="MahApps.Styles.RepeatButton.SliderHorizontalTrack.Win10" TargetType="{x:Type RepeatButton}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="IsTabStop" Value="False" />
@@ -320,8 +320,8 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Metro.Styles.Slider.VerticalTrack.Win10"
-           BasedOn="{StaticResource MahApps.Metro.Styles.Slider.HorizontalTrack.Win10}"
+    <Style x:Key="MahApps.Styles.RepeatButton.SliderVerticalTrack.Win10"
+           BasedOn="{StaticResource MahApps.Styles.RepeatButton.SliderHorizontalTrack.Win10}"
            TargetType="{x:Type RepeatButton}">
         <Setter Property="Template">
             <Setter.Value>
@@ -363,13 +363,13 @@
                     <RepeatButton x:Name="HorizontalTrackDecrease"
                                   Command="{x:Static Slider.DecreaseLarge}"
                                   Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillBrush)}"
-                                  Style="{DynamicResource MahApps.Metro.Styles.Slider.HorizontalTrack.Win10}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.SliderHorizontalTrack.Win10}" />
                 </Track.DecreaseRepeatButton>
                 <Track.IncreaseRepeatButton>
                     <RepeatButton x:Name="HorizontalTrackIncrease"
                                   Command="{x:Static Slider.IncreaseLarge}"
                                   Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillBrush)}"
-                                  Style="{DynamicResource MahApps.Metro.Styles.Slider.HorizontalTrack.Win10}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.SliderHorizontalTrack.Win10}" />
                 </Track.IncreaseRepeatButton>
                 <Track.Thumb>
                     <Controls:MetroThumb x:Name="HorizontalThumb"
@@ -377,7 +377,7 @@
                                          Height="24"
                                          Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillBrush)}"
                                          IsTabStop="True"
-                                         Style="{DynamicResource MahApps.Metro.Styles.Slider.Thumb.Win10}" />
+                                         Style="{DynamicResource MahApps.Styles.Thumb.Slider.Win10}" />
                 </Track.Thumb>
             </Track>
         </Grid>
@@ -450,13 +450,13 @@
                     <RepeatButton x:Name="VerticalTrackDecrease"
                                   Command="{x:Static Slider.DecreaseLarge}"
                                   Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillBrush)}"
-                                  Style="{DynamicResource MahApps.Metro.Styles.Slider.VerticalTrack.Win10}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.SliderVerticalTrack.Win10}" />
                 </Track.DecreaseRepeatButton>
                 <Track.IncreaseRepeatButton>
                     <RepeatButton x:Name="VerticalTrackIncrease"
                                   Command="{x:Static Slider.IncreaseLarge}"
                                   Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillBrush)}"
-                                  Style="{DynamicResource MahApps.Metro.Styles.Slider.VerticalTrack.Win10}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.SliderVerticalTrack.Win10}" />
                 </Track.IncreaseRepeatButton>
                 <Track.Thumb>
                     <Controls:MetroThumb x:Name="VerticalThumb"
@@ -464,7 +464,7 @@
                                          Height="8"
                                          Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillBrush)}"
                                          IsTabStop="True"
-                                         Style="{DynamicResource MahApps.Metro.Styles.Slider.Thumb.Win10}" />
+                                         Style="{DynamicResource MahApps.Styles.Thumb.Slider.Win10}" />
                 </Track.Thumb>
             </Track>
         </Grid>
@@ -509,7 +509,7 @@
     </ControlTemplate>
 
     <!--  Slider Win10 Style  -->
-    <Style x:Key="MahApps.Metro.Styles.Slider.Win10" TargetType="{x:Type Slider}">
+    <Style x:Key="MahApps.Styles.Slider.Metro.Win10" TargetType="{x:Type Slider}">
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Controls.Border}" />
         <Setter Property="BorderThickness" Value="2" />
         <Setter Property="Controls:SliderHelper.ThumbFillBrush" Value="{DynamicResource MahApps.Brushes.AccentBase}" />
diff --git a/src/MahApps.Metro/Styles/Controls.StatusBar.xaml b/src/MahApps.Metro/Styles/Controls.StatusBar.xaml
index 212d91ad59..9dec9dc9cf 100644
--- a/src/MahApps.Metro/Styles/Controls.StatusBar.xaml
+++ b/src/MahApps.Metro/Styles/Controls.StatusBar.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
-    <Style x:Key="MetroStatusBarItem" TargetType="{x:Type StatusBarItem}">
+    <Style x:Key="MahApps.Styles.StatusBarItem.Metro" TargetType="{x:Type StatusBarItem}">
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.IdealForeground}" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="Padding" Value="3" />
@@ -29,7 +29,7 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
-    <Style x:Key="MetroStatusBarSeparator" TargetType="{x:Type Separator}">
+    <Style x:Key="MahApps.Styles.Separator.MahApps.Styles.StatusBar.Metro" TargetType="{x:Type Separator}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.IdealForeground}" />
         <Setter Property="MinHeight" Value="1" />
         <Setter Property="MinWidth" Value="1" />
@@ -48,7 +48,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MetroStatusBar" TargetType="{x:Type StatusBar}">
+    <Style x:Key="MahApps.Styles.StatusBar.Metro" TargetType="{x:Type StatusBar}">
         <Setter Property="FontFamily" Value="{DynamicResource {x:Static SystemFonts.StatusFontFamilyKey}}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.StatusBar}" />
         <Setter Property="FontStyle" Value="{DynamicResource {x:Static SystemFonts.StatusFontStyleKey}}" />
diff --git a/src/MahApps.Metro/Styles/Controls.TabControl.xaml b/src/MahApps.Metro/Styles/Controls.TabControl.xaml
index 235d2be095..68e9f9f90d 100644
--- a/src/MahApps.Metro/Styles/Controls.TabControl.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TabControl.xaml
@@ -5,7 +5,7 @@
 
     <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
 
-    <Style x:Key="MetroTabControl" TargetType="{x:Type TabControl}">
+    <Style x:Key="MahApps.Styles.TabControl.Metro" TargetType="{x:Type TabControl}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderBrush" Value="{x:Null}" />
         <!--  special property for header font size  -->
@@ -100,7 +100,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MetroTabItem" TargetType="TabItem">
+    <Style x:Key="MahApps.Styles.TabItem.Metro" TargetType="TabItem">
         <Setter Property="Background" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=Background, Mode=OneWay, FallbackValue=Transparent}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="BorderThickness" Value="0" />
diff --git a/src/MahApps.Metro/Styles/Controls.TextBlock.xaml b/src/MahApps.Metro/Styles/Controls.TextBlock.xaml
index a7e7b5b992..bcbf5ed27d 100644
--- a/src/MahApps.Metro/Styles/Controls.TextBlock.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TextBlock.xaml
@@ -2,17 +2,17 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <!--  never ever make a default style for TextBlock in App.xaml !!!  -->
-    <Style x:Key="MetroTextBlock" TargetType="{x:Type TextBlock}" />
+    <Style x:Key="MahApps.Styles.TextBlock.Metro" TargetType="{x:Type TextBlock}" />
 
-    <Style x:Key="MahApps.Metro.Styles.MetroWatermarkTextBlock"
-           BasedOn="{StaticResource MetroTextBlock}"
+    <Style x:Key="MahApps.Styles.TextBlock.MetroWatermark"
+           BasedOn="{StaticResource MahApps.Styles.TextBlock.Metro}"
            TargetType="{x:Type TextBlock}">
         <Setter Property="IsHitTestVisible" Value="False" />
         <Setter Property="Opacity" Value="0.6" />
     </Style>
 
-    <Style x:Key="MetroAutoCollapsingTextBlock"
-           BasedOn="{StaticResource MetroTextBlock}"
+    <Style x:Key="MahApps.Styles.TextBlock.MetroAutoCollapsing"
+           BasedOn="{StaticResource MahApps.Styles.TextBlock.Metro}"
            TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.FloatingWatermark}" />
         <Setter Property="Opacity" Value="0.6" />
diff --git a/src/MahApps.Metro/Styles/Controls.TextBox.xaml b/src/MahApps.Metro/Styles/Controls.TextBox.xaml
index 0d68d15aca..10d3efe782 100644
--- a/src/MahApps.Metro/Styles/Controls.TextBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TextBox.xaml
@@ -10,12 +10,12 @@
     <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
 
     <!--  TextBox Style  -->
-    <Style x:Key="MetroTextBox" TargetType="{x:Type TextBox}">
+    <Style x:Key="MahApps.Styles.TextBox.Metro" TargetType="{x:Type TextBox}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="CaretBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
-        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
+        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMahApps.Styles.ContextMenu.Metro}" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
         <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Sizes.Font.ClearTextButton}" />
@@ -100,7 +100,7 @@
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
-                                       Style="{DynamicResource MahApps.Metro.Styles.MetroWatermarkTextBlock}"
+                                       Style="{DynamicResource MahApps.Styles.TextBlock.MetroWatermark}"
                                        Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                        TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                        TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
@@ -109,7 +109,7 @@
                             <ContentControl x:Name="PART_FloatingMessageContainer"
                                             Grid.Row="0"
                                             Grid.Column="0"
-                                            Style="{DynamicResource FloatingMessageContainerStyle}">
+                                            Style="{DynamicResource MahApps.Styles.ContentControl.FloatingMessageContainer}">
                                 <ContentControl.Height>
                                     <MultiBinding Converter="{Converters:MathMultiplyConverter}">
                                         <Binding ElementName="PART_FloatingMessage"
@@ -124,7 +124,7 @@
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
-                                           Style="{DynamicResource MetroAutoCollapsingTextBlock}"
+                                           Style="{DynamicResource MahApps.Styles.TextBlock.MetroAutoCollapsing}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                            TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                            TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
@@ -157,7 +157,7 @@
                                     FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
                                     Foreground="{TemplateBinding Foreground}"
                                     IsTabStop="False"
-                                    Style="{DynamicResource ChromelessButtonStyle}"
+                                    Style="{DynamicResource MahApps.Styles.ButtonBase.Chromeless}"
                                     Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ClearTextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
                         </Grid>
                         <Border x:Name="DisabledVisualElement"
@@ -270,8 +270,8 @@
         <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource MahApps.Templates.ValidationError}" />
     </Style>
 
-    <Style x:Key="MetroButtonTextBox"
-           BasedOn="{StaticResource MetroTextBox}"
+    <Style x:Key="MahApps.Styles.TextBox.MetroButton"
+           BasedOn="{StaticResource MahApps.Styles.TextBox.Metro}"
            TargetType="{x:Type TextBox}">
         <Setter Property="Controls:TextBoxHelper.ButtonTemplate" Value="{DynamicResource MahApps.Templates.ButtonBase.Chromeless}" />
         <Setter Property="Controls:TextBoxHelper.TextButton" Value="True" />
@@ -345,7 +345,7 @@
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
-                                       Style="{DynamicResource MahApps.Metro.Styles.MetroWatermarkTextBlock}"
+                                       Style="{DynamicResource MahApps.Styles.TextBlock.MetroWatermark}"
                                        Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                        TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                        TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
@@ -354,7 +354,7 @@
                             <ContentControl x:Name="PART_FloatingMessageContainer"
                                             Grid.Row="0"
                                             Grid.Column="0"
-                                            Style="{DynamicResource FloatingMessageContainerStyle}">
+                                            Style="{DynamicResource MahApps.Styles.ContentControl.FloatingMessageContainer}">
                                 <ContentControl.Height>
                                     <MultiBinding Converter="{Converters:MathMultiplyConverter}">
                                         <Binding ElementName="PART_FloatingMessage"
@@ -369,7 +369,7 @@
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
-                                           Style="{DynamicResource MetroAutoCollapsingTextBlock}"
+                                           Style="{DynamicResource MahApps.Styles.TextBlock.MetroAutoCollapsing}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                            TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                            TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
@@ -402,7 +402,7 @@
                                     FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
                                     Foreground="{TemplateBinding Foreground}"
                                     IsTabStop="False"
-                                    Style="{DynamicResource ChromelessButtonStyle}"
+                                    Style="{DynamicResource MahApps.Styles.ButtonBase.Chromeless}"
                                     Template="{TemplateBinding Controls:TextBoxHelper.ButtonTemplate}"
                                     Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.TextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
                         </Grid>
@@ -497,8 +497,8 @@
         </Setter>
     </Style>
 
-    <Style x:Key="SearchMetroTextBox"
-           BasedOn="{StaticResource MetroButtonTextBox}"
+    <Style x:Key="MahApps.Styles.TextBox.MetroSearch"
+           BasedOn="{StaticResource MahApps.Styles.TextBox.MetroButton}"
            TargetType="{x:Type TextBox}">
         <Setter Property="Controls:TextBoxHelper.ButtonContentTemplate">
             <Setter.Value>
@@ -511,13 +511,13 @@
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
                                     Content="M42.5,22A12.5,12.5 0 0,1 55,34.5A12.5,12.5 0 0,1 42.5,47C40.14,47 37.92,46.34 36,45.24L26.97,54.27C25.8,55.44 23.9,55.44 22.73,54.27C21.56,53.1 21.56,51.2 22.73,50.03L31.8,40.96C30.66,39.08 30,36.86 30,34.5A12.5,12.5 0 0,1 42.5,22M42.5,26A8.5,8.5 0 0,0 34,34.5A8.5,8.5 0 0,0 42.5,43A8.5,8.5 0 0,0 51,34.5A8.5,8.5 0 0,0 42.5,26Z"
-                                    Style="{DynamicResource PathIconContentControlStyle}" />
+                                    Style="{DynamicResource MahApps.Styles.ContentControl.PathIcon}" />
                 </DataTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style x:Key="MetroRichTextBox" TargetType="{x:Type RichTextBox}">
+    <Style x:Key="MahApps.Styles.RichTextBox.Metro" TargetType="{x:Type RichTextBox}">
         <Style.Resources>
             <Storyboard x:Key="enterGotFocus">
                 <DoubleAnimation Storyboard.TargetName="PART_Message"
@@ -565,7 +565,7 @@
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="CaretBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
-        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
+        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMahApps.Styles.ContextMenu.Metro}" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
         <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Sizes.Font.ClearTextButton}" />
@@ -624,7 +624,7 @@
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
-                                       Style="{DynamicResource MahApps.Metro.Styles.MetroWatermarkTextBlock}"
+                                       Style="{DynamicResource MahApps.Styles.TextBlock.MetroWatermark}"
                                        Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                        TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                        TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
@@ -635,7 +635,7 @@
                                             Grid.Row="0"
                                             Grid.Column="0"
                                             Margin="6 0"
-                                            Style="{DynamicResource FloatingMessageContainerStyle}">
+                                            Style="{DynamicResource MahApps.Styles.ContentControl.FloatingMessageContainer}">
                                 <ContentControl.Height>
                                     <MultiBinding Converter="{Converters:MathMultiplyConverter}">
                                         <Binding ElementName="PART_FloatingMessage"
@@ -650,7 +650,7 @@
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
-                                           Style="{DynamicResource MetroAutoCollapsingTextBlock}"
+                                           Style="{DynamicResource MahApps.Styles.TextBlock.MetroAutoCollapsing}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                            TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                            TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
@@ -684,7 +684,7 @@
                                     FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
                                     Foreground="{TemplateBinding Foreground}"
                                     IsTabStop="False"
-                                    Style="{DynamicResource ChromelessButtonStyle}"
+                                    Style="{DynamicResource MahApps.Styles.ButtonBase.Chromeless}"
                                     Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ClearTextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
                         </Grid>
 
@@ -782,8 +782,8 @@
         <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource MahApps.Templates.ValidationError}" />
     </Style>
 
-    <Style x:Key="MahApps.Metro.Styles.ButtonRichTextBox"
-           BasedOn="{StaticResource MetroRichTextBox}"
+    <Style x:Key="MahApps.Styles.RichTextBox.MetroButton"
+           BasedOn="{StaticResource MahApps.Styles.RichTextBox.Metro}"
            TargetType="{x:Type RichTextBox}">
         <Setter Property="Controls:TextBoxHelper.ButtonCommandParameter" Value="{Binding RelativeSource={RelativeSource Self}}" />
         <Setter Property="Controls:TextBoxHelper.ButtonTemplate" Value="{DynamicResource MahApps.Templates.ButtonBase.Chromeless}" />
@@ -826,7 +826,7 @@
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
-                                       Style="{DynamicResource MahApps.Metro.Styles.MetroWatermarkTextBlock}"
+                                       Style="{DynamicResource MahApps.Styles.TextBlock.MetroWatermark}"
                                        Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                        TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                        TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
@@ -837,7 +837,7 @@
                                             Grid.Row="0"
                                             Grid.Column="0"
                                             Margin="6 0"
-                                            Style="{DynamicResource FloatingMessageContainerStyle}">
+                                            Style="{DynamicResource MahApps.Styles.ContentControl.FloatingMessageContainer}">
                                 <ContentControl.Height>
                                     <MultiBinding Converter="{Converters:MathMultiplyConverter}">
                                         <Binding ElementName="PART_FloatingMessage"
@@ -852,7 +852,7 @@
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
-                                           Style="{DynamicResource MetroAutoCollapsingTextBlock}"
+                                           Style="{DynamicResource MahApps.Styles.TextBlock.MetroAutoCollapsing}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                            TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                            TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
@@ -888,7 +888,7 @@
                                     FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
                                     Foreground="{TemplateBinding Foreground}"
                                     IsTabStop="False"
-                                    Style="{DynamicResource ChromelessButtonStyle}"
+                                    Style="{DynamicResource MahApps.Styles.ButtonBase.Chromeless}"
                                     Template="{TemplateBinding Controls:TextBoxHelper.ButtonTemplate}"
                                     Visibility="Visible" />
                         </Grid>
diff --git a/src/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml b/src/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
index a102a138c9..e009bd9bca 100644
--- a/src/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
@@ -11,8 +11,8 @@
 
     <converters:ThicknessToDoubleConverter x:Key="ThicknessToDouble" TakeThicknessSide="Left" />
 
-    <Style x:Key="MahApps.Metro.Styles.ToggleSwitchButton.Win10"
-           BasedOn="{StaticResource MahApps.Metro.Styles.ToggleSwitchButton}"
+    <Style x:Key="MahApps.Styles.ToggleSwitchButton.Win10"
+           BasedOn="{StaticResource MahApps.Styles.ToggleSwitchButton.Metro}"
            TargetType="{x:Type Controls:ToggleSwitchButton}">
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.OffBorderBrush.Win10}" />
         <Setter Property="BorderThickness" Value="2" />
@@ -135,8 +135,8 @@
         <Setter Property="Width" Value="44" />
     </Style>
 
-    <Style x:Key="MahApps.Metro.Styles.ToggleSwitch.Win10"
-           BasedOn="{StaticResource MahApps.Metro.Styles.ToggleSwitch}"
+    <Style x:Key="MahApps.Styles.ToggleSwitch.Win10"
+           BasedOn="{StaticResource MahApps.Styles.ToggleSwitch.Metro}"
            TargetType="{x:Type Controls:ToggleSwitch}">
         <Setter Property="ContentDirection" Value="RightToLeft" />
         <Setter Property="ContentPadding" Value="0 0 10 0" />
@@ -149,7 +149,7 @@
         <Setter Property="ThumbIndicatorBrush" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorBrush.Win10}" />
         <Setter Property="ThumbIndicatorDisabledBrush" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorDisabledBrush.Win10}" />
         <Setter Property="ThumbIndicatorWidth" Value="10" />
-        <Setter Property="ToggleSwitchButtonStyle" Value="{StaticResource MahApps.Metro.Styles.ToggleSwitchButton.Win10}" />
+        <Setter Property="ToggleSwitchButtonStyle" Value="{StaticResource MahApps.Styles.ToggleSwitchButton.Win10}" />
         <Style.Triggers>
             <Trigger Property="ContentDirection" Value="RightToLeft">
                 <Setter Property="ContentPadding" Value="10 0 0 0" />
diff --git a/src/MahApps.Metro/Styles/Controls.Toolbar.xaml b/src/MahApps.Metro/Styles/Controls.Toolbar.xaml
index 3ada9633ea..d8efdcd103 100644
--- a/src/MahApps.Metro/Styles/Controls.Toolbar.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Toolbar.xaml
@@ -7,7 +7,7 @@
     </ResourceDictionary.MergedDictionaries>
 
     <!--  Style for toolbar buttons  -->
-    <Style x:Key="ToolBarButtonBaseStyle" TargetType="{x:Type ButtonBase}">
+    <Style x:Key="MahApps.Styles.ButtonBase.ToolBar" TargetType="{x:Type ButtonBase}">
         <Style.Resources>
             <!--  Disabled all images placed inside a button - most common scenario  -->
             <Style TargetType="Image">
@@ -60,29 +60,29 @@
 
     <!--  Style for all types of regular buttons  -->
     <Style x:Key="{x:Static ToolBar.ButtonStyleKey}"
-           BasedOn="{StaticResource ToolBarButtonBaseStyle}"
+           BasedOn="{StaticResource MahApps.Styles.ButtonBase.ToolBar}"
            TargetType="{x:Type Button}" />
     <Style x:Key="{x:Static ToolBar.ToggleButtonStyleKey}"
-           BasedOn="{StaticResource ToolBarButtonBaseStyle}"
+           BasedOn="{StaticResource MahApps.Styles.ButtonBase.ToolBar}"
            TargetType="{x:Type ToggleButton}" />
     <Style x:Key="{x:Static ToolBar.CheckBoxStyleKey}"
-           BasedOn="{StaticResource ToolBarButtonBaseStyle}"
+           BasedOn="{StaticResource MahApps.Styles.ButtonBase.ToolBar}"
            TargetType="{x:Type CheckBox}" />
     <Style x:Key="{x:Static ToolBar.RadioButtonStyleKey}"
-           BasedOn="{StaticResource ToolBarButtonBaseStyle}"
+           BasedOn="{StaticResource MahApps.Styles.ButtonBase.ToolBar}"
            TargetType="{x:Type RadioButton}" />
 
     <!--  Style for text box inside a toolbar if needed  -->
     <Style x:Key="{x:Static ToolBar.TextBoxStyleKey}"
-           BasedOn="{StaticResource MetroTextBox}"
+           BasedOn="{StaticResource MahApps.Styles.TextBox.Metro}"
            TargetType="{x:Type TextBox}" />
 
     <Style x:Key="{x:Static ToolBar.ComboBoxStyleKey}"
-           BasedOn="{StaticResource MetroComboBox}"
+           BasedOn="{StaticResource MahApps.Styles.ComboBox.Metro}"
            TargetType="{x:Type ComboBox}" />
 
     <!--  Style the toolbar thumb  -->
-    <Style x:Key="ToolBarThumbStyle" TargetType="{x:Type Thumb}">
+    <Style x:Key="MahApps.Styles.Thumb.ToolBar" TargetType="{x:Type Thumb}">
         <Setter Property="Cursor" Value="SizeAll" />
         <Setter Property="OverridesDefaultStyle" Value="true" />
         <Setter Property="Template">
@@ -121,7 +121,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="ToolBarOverflowButtonStyle" TargetType="{x:Type ToggleButton}">
+    <Style x:Key="MahApps.Styles.ToggleButton.ToolBarOverflow" TargetType="{x:Type ToggleButton}">
         <Setter Property="OverridesDefaultStyle" Value="true" />
         <Setter Property="Template">
             <Setter.Value>
@@ -189,7 +189,7 @@
                                           DockPanel.Dock="Right"
                                           IsChecked="{Binding Path=IsOverflowOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
                                           IsEnabled="{TemplateBinding HasOverflowItems}"
-                                          Style="{StaticResource ToolBarOverflowButtonStyle}">
+                                          Style="{StaticResource MahApps.Styles.ToggleButton.ToolBarOverflow}">
                                 <Popup x:Name="OverflowPopup"
                                        AllowsTransparency="true"
                                        Focusable="false"
@@ -214,7 +214,7 @@
 
                             <Thumb x:Name="ToolBarThumb"
                                    Width="10"
-                                   Style="{StaticResource ToolBarThumbStyle}" />
+                                   Style="{StaticResource MahApps.Styles.Thumb.ToolBar}" />
 
                             <ToolBarPanel x:Name="PART_ToolBarPanel"
                                           Margin="0 1 2 2"
diff --git a/src/MahApps.Metro/Styles/Controls.Tooltip.xaml b/src/MahApps.Metro/Styles/Controls.Tooltip.xaml
index abed59e993..989fc5143c 100644
--- a/src/MahApps.Metro/Styles/Controls.Tooltip.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Tooltip.xaml
@@ -3,7 +3,7 @@
                     xmlns:controls="clr-namespace:MahApps.Metro.Controls">
 
     <!--  Tooltip Style  -->
-    <Style x:Key="MetroToolTip" TargetType="ToolTip">
+    <Style x:Key="MahApps.Styles.ToolTip.Metro" TargetType="ToolTip">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray7}" />
         <Setter Property="BorderThickness" Value="1" />
diff --git a/src/MahApps.Metro/Styles/Controls.TreeView.xaml b/src/MahApps.Metro/Styles/Controls.TreeView.xaml
index e9348d5e1d..e48b5cd609 100644
--- a/src/MahApps.Metro/Styles/Controls.TreeView.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TreeView.xaml
@@ -9,7 +9,7 @@
 
     <PathGeometry x:Key="TreeArrow" Figures="M0,0 L0,6 L6,0 z" />
 
-    <Style x:Key="ExpandCollapseToggleStyle" TargetType="{x:Type ToggleButton}">
+    <Style x:Key="MahApps.Styles.ToggleButton.ExpandCollapse" TargetType="{x:Type ToggleButton}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
@@ -66,7 +66,7 @@
 
     <Converters:TreeViewMarginConverter x:Key="LengthConverter" Length="12" />
 
-    <Style x:Key="MetroTreeViewItem" TargetType="{x:Type TreeViewItem}">
+    <Style x:Key="MahApps.Styles.TreeViewItem.Metro" TargetType="{x:Type TreeViewItem}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="Controls:ItemHelper.ActiveSelectionBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="Controls:ItemHelper.ActiveSelectionForegroundBrush" Value="{DynamicResource MahApps.Brushes.AccentSelectedColor}" />
@@ -103,7 +103,7 @@
                                 <ToggleButton x:Name="Expander"
                                               ClickMode="Press"
                                               IsChecked="{Binding Path=IsExpanded, RelativeSource={x:Static RelativeSource.TemplatedParent}, Mode=TwoWay}"
-                                              Style="{StaticResource ExpandCollapseToggleStyle}" />
+                                              Style="{StaticResource MahApps.Styles.ToggleButton.ExpandCollapse}" />
                                 <ContentPresenter x:Name="PART_Header"
                                                   Grid.Column="1"
                                                   HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -182,7 +182,7 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="MetroTreeView" TargetType="{x:Type TreeView}">
+    <Style x:Key="MahApps.Styles.TreeView.Metro" TargetType="{x:Type TreeView}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
         <!--  default to 0  -->
@@ -229,8 +229,8 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="VirtualisedMetroTreeView"
-           BasedOn="{StaticResource MetroTreeView}"
+    <Style x:Key="MahApps.Styles.TreeView.MetroVirtualized"
+           BasedOn="{StaticResource MahApps.Styles.TreeView.Metro}"
            TargetType="{x:Type TreeView}">
         <Setter Property="VirtualizingStackPanel.IsVirtualizing" Value="True" />
         <Setter Property="VirtualizingStackPanel.VirtualizationMode" Value="Recycling" />
diff --git a/src/MahApps.Metro/Styles/Controls.xaml b/src/MahApps.Metro/Styles/Controls.xaml
index 5a48ad4b45..fe30e3bfee 100644
--- a/src/MahApps.Metro/Styles/Controls.xaml
+++ b/src/MahApps.Metro/Styles/Controls.xaml
@@ -44,7 +44,7 @@
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Themes/MetroProgressBar.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <Style x:Key="FloatingMessageContainerStyle" TargetType="{x:Type ContentControl}">
+    <Style x:Key="MahApps.Styles.ContentControl.FloatingMessageContainer" TargetType="{x:Type ContentControl}">
         <Setter Property="Focusable" Value="False" />
         <Setter Property="IsHitTestVisible" Value="False" />
         <Setter Property="IsTabStop" Value="False" />
@@ -52,7 +52,7 @@
         <Setter Property="Visibility" Value="Collapsed" />
     </Style>
 
-    <Style x:Key="PathIconContentControlStyle" TargetType="{x:Type ContentControl}">
+    <Style x:Key="MahApps.Styles.ContentControl.PathIcon" TargetType="{x:Type ContentControl}">
         <Setter Property="FlowDirection" Value="LeftToRight" />
         <Setter Property="Height" Value="16" />
         <Setter Property="HorizontalAlignment" Value="Center" />
@@ -79,42 +79,42 @@
 
     <!--  note: default style for textblock is now in MetroWindow !!!  -->
 
-    <Style BasedOn="{StaticResource MetroValidationPopup}" TargetType="{x:Type Controls:CustomValidationPopup}" />
-    <Style BasedOn="{StaticResource MetroToolTip}" TargetType="ToolTip" />
-    <Style BasedOn="{StaticResource MahApps.Metro.Styles.MetroButton}" TargetType="Button" />
-    <Style BasedOn="{StaticResource MahApps.Metro.Styles.MetroButton}" TargetType="RepeatButton" />
-    <Style BasedOn="{StaticResource MahApps.Metro.Styles.MetroToggleButton}" TargetType="ToggleButton" />
-    <Style BasedOn="{StaticResource MetroTextBox}" TargetType="TextBox" />
-    <Style BasedOn="{StaticResource MetroRichTextBox}" TargetType="RichTextBox" />
-    <Style BasedOn="{StaticResource MahApps.Metro.Styles.Slider}" TargetType="Slider" />
-    <Style BasedOn="{StaticResource MetroLabel}" TargetType="Label" />
-    <Style BasedOn="{StaticResource MetroTabItem}" TargetType="TabItem" />
-    <Style BasedOn="{StaticResource MetroTabControl}" TargetType="TabControl" />
-    <Style BasedOn="{StaticResource MetroScrollBar}" TargetType="ScrollBar" />
-    <Style BasedOn="{StaticResource MetroRadioButton}" TargetType="RadioButton" />
-    <Style BasedOn="{StaticResource MahApps.Metro.Styles.ProgressBar}" TargetType="ProgressBar" />
-    <Style BasedOn="{StaticResource MetroPasswordBox}" TargetType="PasswordBox" />
-    <Style BasedOn="{StaticResource MetroCheckBox}" TargetType="CheckBox" />
-    <Style BasedOn="{StaticResource MetroComboBox}" TargetType="ComboBox" />
-    <Style BasedOn="{StaticResource MetroComboBoxItem}" TargetType="ComboBoxItem" />
-    <Style BasedOn="{StaticResource MetroMenuItem}" TargetType="MenuItem" />
-    <Style BasedOn="{StaticResource MetroMenu}" TargetType="Menu" />
-    <Style BasedOn="{StaticResource MetroContextMenu}" TargetType="ContextMenu" />
-    <Style BasedOn="{StaticResource MetroExpander}" TargetType="Expander" />
-    <Style BasedOn="{StaticResource MetroGroupBox}" TargetType="GroupBox" />
-    <Style BasedOn="{StaticResource MetroListBox}" TargetType="ListBox" />
-    <Style BasedOn="{StaticResource MetroListBoxItem}" TargetType="ListBoxItem" />
-    <Style BasedOn="{StaticResource MetroGridViewColumnHeader}" TargetType="GridViewColumnHeader" />
-    <Style BasedOn="{StaticResource MetroListView}" TargetType="ListView" />
-    <Style BasedOn="{StaticResource MetroListViewItem}" TargetType="ListViewItem" />
-    <Style BasedOn="{StaticResource MetroTreeView}" TargetType="TreeView" />
-    <Style BasedOn="{StaticResource MetroTreeViewItem}" TargetType="TreeViewItem" />
-    <Style BasedOn="{StaticResource MetroDatePicker}" TargetType="DatePicker" />
-    <Style BasedOn="{StaticResource MetroDatePickerTextBox}" TargetType="DatePickerTextBox" />
-    <Style BasedOn="{StaticResource MahApps.Metro.Styles.MetroCalendar}" TargetType="Calendar" />
-    <Style BasedOn="{StaticResource MetroDataGrid}" TargetType="DataGrid" />
-    <Style BasedOn="{StaticResource MetroStatusBar}" TargetType="StatusBar" />
-    <Style BasedOn="{StaticResource MetroStatusBarItem}" TargetType="StatusBarItem" />
-    <Style BasedOn="{StaticResource MetroScrollViewer}" TargetType="ScrollViewer" />
+    <Style BasedOn="{StaticResource MahApps.Styles.CustomValidationPopup.Metro}" TargetType="{x:Type Controls:CustomValidationPopup}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ToolTip.Metro}" TargetType="ToolTip" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ButtonBase.Metro}" TargetType="Button" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ButtonBase.Metro}" TargetType="RepeatButton" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ToggleButton.Metro}" TargetType="ToggleButton" />
+    <Style BasedOn="{StaticResource MahApps.Styles.TextBox.Metro}" TargetType="TextBox" />
+    <Style BasedOn="{StaticResource MahApps.Styles.RichTextBox.Metro}" TargetType="RichTextBox" />
+    <Style BasedOn="{StaticResource MahApps.Styles.Slider.Metro}" TargetType="Slider" />
+    <Style BasedOn="{StaticResource MahApps.Styles.Label.Metro}" TargetType="Label" />
+    <Style BasedOn="{StaticResource MahApps.Styles.TabItem.Metro}" TargetType="TabItem" />
+    <Style BasedOn="{StaticResource MahApps.Styles.TabControl.Metro}" TargetType="TabControl" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ScrollBar.Metro}" TargetType="ScrollBar" />
+    <Style BasedOn="{StaticResource MahApps.Styles.RadioButton.Metro}" TargetType="RadioButton" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ProgressBar.Metro}" TargetType="ProgressBar" />
+    <Style BasedOn="{StaticResource MahApps.Styles.PasswordBox.Metro}" TargetType="PasswordBox" />
+    <Style BasedOn="{StaticResource MahApps.Styles.CheckBox.Metro}" TargetType="CheckBox" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ComboBox.Metro}" TargetType="ComboBox" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ComboBoxItem.Metro}" TargetType="ComboBoxItem" />
+    <Style BasedOn="{StaticResource MahApps.Styles.MenuItem.Metro}" TargetType="MenuItem" />
+    <Style BasedOn="{StaticResource MahApps.Styles.Menu.Metro}" TargetType="Menu" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ContextMenu.Metro}" TargetType="ContextMenu" />
+    <Style BasedOn="{StaticResource MahApps.Styles.Expander.Metro}" TargetType="Expander" />
+    <Style BasedOn="{StaticResource MahApps.Styles.GroupBox.Metro}" TargetType="GroupBox" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ListBox.Metro}" TargetType="ListBox" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ListBoxItem.Metro}" TargetType="ListBoxItem" />
+    <Style BasedOn="{StaticResource MahApps.Styles.GridViewColumnHeader.Metro}" TargetType="GridViewColumnHeader" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ListView.Metro}" TargetType="ListView" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ListViewItem.Metro}" TargetType="ListViewItem" />
+    <Style BasedOn="{StaticResource MahApps.Styles.TreeView.Metro}" TargetType="TreeView" />
+    <Style BasedOn="{StaticResource MahApps.Styles.TreeViewItem.Metro}" TargetType="TreeViewItem" />
+    <Style BasedOn="{StaticResource MahApps.Styles.DatePicker.Metro}" TargetType="DatePicker" />
+    <Style BasedOn="{StaticResource MahApps.Styles.DatePickerTextBox.Metro}" TargetType="DatePickerTextBox" />
+    <Style BasedOn="{StaticResource MahApps.Styles.Calendar.Metro}" TargetType="Calendar" />
+    <Style BasedOn="{StaticResource MahApps.Styles.DataGrid.Metro}" TargetType="DataGrid" />
+    <Style BasedOn="{StaticResource MahApps.Styles.StatusBar.Metro}" TargetType="StatusBar" />
+    <Style BasedOn="{StaticResource MahApps.Styles.StatusBarItem.Metro}" TargetType="StatusBarItem" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ScrollViewer.Metro}" TargetType="ScrollViewer" />
 
 </ResourceDictionary>
diff --git a/src/MahApps.Metro/Styles/FlatButton.xaml b/src/MahApps.Metro/Styles/FlatButton.xaml
index 7bf0a64918..c883d3240e 100644
--- a/src/MahApps.Metro/Styles/FlatButton.xaml
+++ b/src/MahApps.Metro/Styles/FlatButton.xaml
@@ -5,6 +5,6 @@
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.Buttons.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <Style BasedOn="{StaticResource MetroFlatButton}" TargetType="{x:Type Button}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.Button.Flat}" TargetType="{x:Type Button}" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/FlatSlider.xaml b/src/MahApps.Metro/Styles/FlatSlider.xaml
index 0851b9c045..0942a6edc5 100644
--- a/src/MahApps.Metro/Styles/FlatSlider.xaml
+++ b/src/MahApps.Metro/Styles/FlatSlider.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="clr-namespace:MahApps.Metro.Controls">
 
-    <Style x:Key="MahApps.Metro.Styles.FlatSlider.Track" TargetType="{x:Type RepeatButton}">
+    <Style x:Key="MahApps.Styles.RepeatButton.FlatSliderTrack" TargetType="{x:Type RepeatButton}">
         <Setter Property="Focusable" Value="False" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="OverridesDefaultStyle" Value="True" />
@@ -16,7 +16,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Metro.Styles.FlatSlider.Thumb" TargetType="{x:Type Thumb}">
+    <Style x:Key="MahApps.Styles.Thumb.FlatSlider" TargetType="{x:Type Thumb}">
         <Setter Property="OverridesDefaultStyle" Value="True" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
@@ -28,7 +28,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Metro.Styles.FlatSlider.TickBar" TargetType="TickBar">
+    <Style x:Key="MahApps.Styles.TickBar.FlatSlider" TargetType="TickBar">
         <Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.SliderThumb.Disabled}" />
         <Setter Property="Visibility" Value="Collapsed" />
         <Style.Triggers>
@@ -62,26 +62,26 @@
             <TickBar x:Name="TopTick"
                      Grid.Row="0"
                      Placement="Top"
-                     Style="{DynamicResource MahApps.Metro.Styles.FlatSlider.TickBar}" />
+                     Style="{DynamicResource MahApps.Styles.TickBar.FlatSlider}" />
             <TickBar x:Name="BottomTick"
                      Grid.Row="2"
                      Placement="Bottom"
-                     Style="{DynamicResource MahApps.Metro.Styles.FlatSlider.TickBar}" />
+                     Style="{DynamicResource MahApps.Styles.TickBar.FlatSlider}" />
             <Track x:Name="PART_Track" Grid.Row="1">
                 <Track.DecreaseRepeatButton>
                     <RepeatButton Background="{TemplateBinding Slider.Foreground}"
                                   Command="Slider.DecreaseLarge"
-                                  Style="{DynamicResource MahApps.Metro.Styles.FlatSlider.Track}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.FlatSliderTrack}" />
                 </Track.DecreaseRepeatButton>
                 <Track.Thumb>
                     <controls:MetroThumb Width="{TemplateBinding Slider.MinHeight}"
                                          Background="{TemplateBinding Slider.BorderBrush}"
-                                         Style="{DynamicResource MahApps.Metro.Styles.FlatSlider.Thumb}" />
+                                         Style="{DynamicResource MahApps.Styles.Thumb.FlatSlider}" />
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
                     <RepeatButton Background="{TemplateBinding Slider.Background}"
                                   Command="Slider.IncreaseLarge"
-                                  Style="{DynamicResource MahApps.Metro.Styles.FlatSlider.Track}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.FlatSliderTrack}" />
                 </Track.IncreaseRepeatButton>
             </Track>
         </Grid>
@@ -109,26 +109,26 @@
             <TickBar x:Name="TopTick"
                      Grid.Column="0"
                      Placement="Left"
-                     Style="{DynamicResource MahApps.Metro.Styles.FlatSlider.TickBar}" />
+                     Style="{DynamicResource MahApps.Styles.TickBar.FlatSlider}" />
             <TickBar x:Name="BottomTick"
                      Grid.Column="2"
                      Placement="Right"
-                     Style="{DynamicResource MahApps.Metro.Styles.FlatSlider.TickBar}" />
+                     Style="{DynamicResource MahApps.Styles.TickBar.FlatSlider}" />
             <Track x:Name="PART_Track" Grid.Column="1">
                 <Track.DecreaseRepeatButton>
                     <RepeatButton Background="{TemplateBinding Slider.Foreground}"
                                   Command="Slider.DecreaseLarge"
-                                  Style="{DynamicResource MahApps.Metro.Styles.FlatSlider.Track}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.FlatSliderTrack}" />
                 </Track.DecreaseRepeatButton>
                 <Track.Thumb>
                     <controls:MetroThumb Height="{TemplateBinding Slider.MinWidth}"
                                          Background="{TemplateBinding Slider.BorderBrush}"
-                                         Style="{DynamicResource MahApps.Metro.Styles.FlatSlider.Thumb}" />
+                                         Style="{DynamicResource MahApps.Styles.Thumb.FlatSlider}" />
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
                     <RepeatButton Background="{TemplateBinding Slider.Background}"
                                   Command="Slider.IncreaseLarge"
-                                  Style="{DynamicResource MahApps.Metro.Styles.FlatSlider.Track}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.FlatSliderTrack}" />
                 </Track.IncreaseRepeatButton>
             </Track>
         </Grid>
@@ -146,7 +146,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style x:Key="MahApps.Metro.Styles.FlatSlider" TargetType="{x:Type Slider}">
+    <Style x:Key="MahApps.Styles.Slider.Flat" TargetType="{x:Type Slider}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.SliderTrack.Normal}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
diff --git a/src/MahApps.Metro/Styles/VS/Button.xaml b/src/MahApps.Metro/Styles/VS/Button.xaml
index 1b20b4e5f4..bc7b970259 100644
--- a/src/MahApps.Metro/Styles/VS/Button.xaml
+++ b/src/MahApps.Metro/Styles/VS/Button.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <Style x:Key="StandardButton" TargetType="Button">
+    <Style x:Key="MahApps.Styles.Button.VisualStudioWindowStandard" TargetType="Button">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Background.Normal}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Normal}" />
         <Setter Property="Foreground" Value="{DynamicResource Foreground}" />
@@ -34,9 +34,9 @@
         </Setter>
     </Style>
 
-    <Style x:Key="LinkButton" TargetType="Button">
+    <Style x:Key="MahApps.Styles.Button.VisualStudioWindowLink" TargetType="Button">
         <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.LinkButton.Foreground}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.MahApps.Styles.Button.VisualStudioWindowLink.Foreground}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Button">
@@ -48,7 +48,7 @@
         </Setter>
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="true">
-                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.LinkButton.ForegroundHighlighted}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.MahApps.Styles.Button.VisualStudioWindowLink.ForegroundHighlighted}" />
             </Trigger>
         </Style.Triggers>
     </Style>
diff --git a/src/MahApps.Metro/Styles/VS/Expander.xaml b/src/MahApps.Metro/Styles/VS/Expander.xaml
index 2ff696760e..8d086b9e26 100644
--- a/src/MahApps.Metro/Styles/VS/Expander.xaml
+++ b/src/MahApps.Metro/Styles/VS/Expander.xaml
@@ -10,7 +10,7 @@
     <sys:Double x:Key="ExpanderHeaderThemeFontSize">16</sys:Double>
     <sys:Double x:Key="ExpanderToggleButtonThemeSize">18</sys:Double>
 
-    <Style x:Key="ExpanderBaseHeaderStyle" TargetType="{x:Type ToggleButton}">
+    <Style x:Key="MahApps.Styles.ToggleButton.ExpanderBaseHeader" TargetType="{x:Type ToggleButton}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderBrush" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />
@@ -20,8 +20,8 @@
         <Setter Property="SnapsToDevicePixels" Value="True" />
     </Style>
 
-    <Style x:Key="ExpanderRightHeaderStyle"
-           BasedOn="{StaticResource ExpanderBaseHeaderStyle}"
+    <Style x:Key="MahApps.Styles.ToggleButton.ExpanderRightHeader"
+           BasedOn="{StaticResource MahApps.Styles.ToggleButton.ExpanderBaseHeader}"
            TargetType="{x:Type ToggleButton}">
         <Setter Property="BorderThickness" Value="0 0 2 0" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
@@ -95,8 +95,8 @@
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
     </Style>
 
-    <Style x:Key="ExpanderUpHeaderStyle"
-           BasedOn="{StaticResource ExpanderBaseHeaderStyle}"
+    <Style x:Key="MahApps.Styles.ToggleButton.ExpanderUpHeader"
+           BasedOn="{StaticResource MahApps.Styles.ToggleButton.ExpanderBaseHeader}"
            TargetType="{x:Type ToggleButton}">
         <Setter Property="BorderThickness" Value="0 2 0 0" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
@@ -169,8 +169,8 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
-    <Style x:Key="ExpanderLeftHeaderStyle"
-           BasedOn="{StaticResource ExpanderRightHeaderStyle}"
+    <Style x:Key="MahApps.Styles.ToggleButton.ExpanderLeftHeader"
+           BasedOn="{StaticResource MahApps.Styles.ToggleButton.ExpanderRightHeader}"
            TargetType="{x:Type ToggleButton}">
         <Setter Property="BorderThickness" Value="2 0 0 0" />
         <Setter Property="Template">
@@ -240,8 +240,8 @@
         </Setter>
     </Style>
 
-    <Style x:Key="ExpanderDownHeaderStyle"
-           BasedOn="{StaticResource ExpanderUpHeaderStyle}"
+    <Style x:Key="MahApps.Styles.ToggleButton.ExpanderDownHeader"
+           BasedOn="{StaticResource MahApps.Styles.ToggleButton.ExpanderUpHeader}"
            TargetType="{x:Type ToggleButton}">
         <Setter Property="BorderThickness" Value="0 0 0 2" />
         <Setter Property="Template">
@@ -303,7 +303,7 @@
         </Setter>
     </Style>
 
-    <Storyboard x:Key="MetroExpanderExpandStoryboard">
+    <Storyboard x:Key="MahApps.Storyboard.MahApps.Styles.Expander.MetroExpand">
         <DoubleAnimation Storyboard.TargetName="ExpandSite"
                          Storyboard.TargetProperty="(UIElement.Opacity)"
                          To="1"
@@ -313,7 +313,7 @@
         </ObjectAnimationUsingKeyFrames>
     </Storyboard>
 
-    <Storyboard x:Key="MetroExpanderCollapseStoryboard">
+    <Storyboard x:Key="MahApps.Storyboard.MahApps.Styles.Expander.MetroCollapse">
         <DoubleAnimation Storyboard.TargetName="ExpandSite"
                          Storyboard.TargetProperty="(UIElement.Opacity)"
                          To="0"
@@ -323,16 +323,16 @@
         </ObjectAnimationUsingKeyFrames>
     </Storyboard>
 
-    <Style x:Key="StandardExpander" TargetType="{x:Type Expander}">
+    <Style x:Key="MahApps.Styles.Expander.VisualStudioStandard" TargetType="{x:Type Expander}">
         <Setter Property="Background" Value="{x:Null}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Normal}" />
         <Setter Property="BorderThickness" Value="2" />
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Normal" />
         <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource ExpanderHeaderThemeFontSize}" />
-        <Setter Property="Controls:ExpanderHelper.HeaderDownStyle" Value="{StaticResource ExpanderDownHeaderStyle}" />
-        <Setter Property="Controls:ExpanderHelper.HeaderLeftStyle" Value="{StaticResource ExpanderLeftHeaderStyle}" />
-        <Setter Property="Controls:ExpanderHelper.HeaderRightStyle" Value="{StaticResource ExpanderRightHeaderStyle}" />
-        <Setter Property="Controls:ExpanderHelper.HeaderUpStyle" Value="{StaticResource ExpanderUpHeaderStyle}" />
+        <Setter Property="Controls:ExpanderHelper.HeaderDownStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderDownHeader}" />
+        <Setter Property="Controls:ExpanderHelper.HeaderLeftStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderLeftHeader}" />
+        <Setter Property="Controls:ExpanderHelper.HeaderRightStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderRightHeader}" />
+        <Setter Property="Controls:ExpanderHelper.HeaderUpStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderUpHeader}" />
         <Setter Property="Controls:GroupBoxHelper.HeaderForeground" Value="{DynamicResource Foreground}" />
         <Setter Property="Foreground" Value="{DynamicResource Foreground}" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -401,10 +401,10 @@
                         <Trigger Property="IsExpanded" Value="True">
                             <Setter TargetName="ExpandSite" Property="Visibility" Value="Visible" />
                             <Trigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource MetroExpanderExpandStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.MahApps.Styles.Expander.MetroExpand}" />
                             </Trigger.EnterActions>
                             <Trigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource MetroExpanderCollapseStoryboard}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.MahApps.Styles.Expander.MetroCollapse}" />
                             </Trigger.ExitActions>
                         </Trigger>
                         <Trigger Property="ExpandDirection" Value="Right">
diff --git a/src/MahApps.Metro/Styles/VS/GroupBox.xaml b/src/MahApps.Metro/Styles/VS/GroupBox.xaml
index 0c56dc4810..7aab5616b3 100644
--- a/src/MahApps.Metro/Styles/VS/GroupBox.xaml
+++ b/src/MahApps.Metro/Styles/VS/GroupBox.xaml
@@ -6,7 +6,7 @@
     <Thickness x:Key="GroupBoxHeaderThemePadding">2</Thickness>
     <System:Double x:Key="MahApps.Sizes.GroupBox.HeaderThemeFont">16</System:Double>
 
-    <Style x:Key="StandardGroupBox" TargetType="{x:Type GroupBox}">
+    <Style x:Key="MahApps.Styles.GroupBox.Standard" TargetType="{x:Type GroupBox}">
         <Setter Property="Background" Value="{x:Null}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Normal}" />
         <Setter Property="BorderThickness" Value="2" />
diff --git a/src/MahApps.Metro/Styles/VS/ListBox.xaml b/src/MahApps.Metro/Styles/VS/ListBox.xaml
index 7ea604d567..a428423287 100644
--- a/src/MahApps.Metro/Styles/VS/ListBox.xaml
+++ b/src/MahApps.Metro/Styles/VS/ListBox.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <Style x:Key="StandardListBox" TargetType="{x:Type ListBox}">
+    <Style x:Key="MahApps.Styles.ListBox.Standard" TargetType="{x:Type ListBox}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />
         <Style.Resources>
diff --git a/src/MahApps.Metro/Styles/VS/Menu.xaml b/src/MahApps.Metro/Styles/VS/Menu.xaml
index 4bf1ae02a4..9628c88c1b 100644
--- a/src/MahApps.Metro/Styles/VS/Menu.xaml
+++ b/src/MahApps.Metro/Styles/VS/Menu.xaml
@@ -14,12 +14,12 @@
         </Setter>
     </Style>
 
-    <Style x:Key="StandardMenu" TargetType="{x:Type Menu}">
+    <Style x:Key="MahApps.Styles.Menu.Standard" TargetType="{x:Type Menu}">
         <Setter Property="Background" Value="{DynamicResource LightBackground}" />
         <Setter Property="Foreground" Value="{DynamicResource Foreground}" />
     </Style>
 
-    <Style x:Key="StandardMenuItem" TargetType="{x:Type MenuItem}">
+    <Style x:Key="MahApps.Styles.MenuItem.Standard" TargetType="{x:Type MenuItem}">
         <Setter Property="Foreground" Value="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Menu}}}" />
         <Setter Property="Template">
             <Setter.Value>
diff --git a/src/MahApps.Metro/Styles/VS/ScrollBar.xaml b/src/MahApps.Metro/Styles/VS/ScrollBar.xaml
index 071158452f..b0044ce4cb 100644
--- a/src/MahApps.Metro/Styles/VS/ScrollBar.xaml
+++ b/src/MahApps.Metro/Styles/VS/ScrollBar.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
-    <Style x:Key="ScrollBarLineButton" TargetType="{x:Type RepeatButton}">
+    <Style x:Key="MahApps.Styles.RepeatButton.VisualStudioScrollBarLine" TargetType="{x:Type RepeatButton}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Background.Normal}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Normal}" />
         <Setter Property="Focusable" Value="false" />
@@ -33,7 +33,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="ScrollBarPageButton" TargetType="{x:Type RepeatButton}">
+    <Style x:Key="MahApps.Styles.RepeatButton.VisualStudioScrollBarPage" TargetType="{x:Type RepeatButton}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
@@ -50,7 +50,7 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="ScrollBarThumb" TargetType="{x:Type Thumb}">
+    <Style x:Key="MahApps.Styles.Thumb.VisualStudioScrollBar" TargetType="{x:Type Thumb}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Background.Normal}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Normal}" />
         <Setter Property="Focusable" Value="false" />
@@ -87,22 +87,22 @@
             <RepeatButton Grid.Column="0"
                           Command="ScrollBar.LineLeftCommand"
                           Content="M 0 4 L 4 8 L 4 0 Z"
-                          Style="{StaticResource ScrollBarLineButton}" />
+                          Style="{StaticResource MahApps.Styles.RepeatButton.VisualStudioScrollBarLine}" />
             <Track Name="PART_Track" Grid.Column="1">
                 <Track.DecreaseRepeatButton>
-                    <RepeatButton Command="ScrollBar.PageLeftCommand" Style="{StaticResource ScrollBarPageButton}" />
+                    <RepeatButton Command="ScrollBar.PageLeftCommand" Style="{StaticResource MahApps.Styles.RepeatButton.VisualStudioScrollBarPage}" />
                 </Track.DecreaseRepeatButton>
                 <Track.Thumb>
-                    <Controls:MetroThumb Style="{StaticResource ScrollBarThumb}" />
+                    <Controls:MetroThumb Style="{StaticResource MahApps.Styles.Thumb.VisualStudioScrollBar}" />
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
-                    <RepeatButton Command="ScrollBar.PageRightCommand" Style="{StaticResource ScrollBarPageButton}" />
+                    <RepeatButton Command="ScrollBar.PageRightCommand" Style="{StaticResource MahApps.Styles.RepeatButton.VisualStudioScrollBarPage}" />
                 </Track.IncreaseRepeatButton>
             </Track>
             <RepeatButton Grid.Column="2"
                           Command="ScrollBar.LineRightCommand"
                           Content="M 0 0 L 0 8 L 4 4 Z"
-                          Style="{StaticResource ScrollBarLineButton}" />
+                          Style="{StaticResource MahApps.Styles.RepeatButton.VisualStudioScrollBarLine}" />
         </Grid>
     </ControlTemplate>
 
@@ -116,28 +116,28 @@
             <RepeatButton Grid.Row="0"
                           Command="ScrollBar.LineUpCommand"
                           Content="M 0 4 L 8 4 L 4 0 Z"
-                          Style="{StaticResource ScrollBarLineButton}" />
+                          Style="{StaticResource MahApps.Styles.RepeatButton.VisualStudioScrollBarLine}" />
             <Track Name="PART_Track"
                    Grid.Row="1"
                    IsDirectionReversed="true">
                 <Track.DecreaseRepeatButton>
-                    <RepeatButton Command="ScrollBar.PageUpCommand" Style="{StaticResource ScrollBarPageButton}" />
+                    <RepeatButton Command="ScrollBar.PageUpCommand" Style="{StaticResource MahApps.Styles.RepeatButton.VisualStudioScrollBarPage}" />
                 </Track.DecreaseRepeatButton>
                 <Track.Thumb>
-                    <Controls:MetroThumb Style="{StaticResource ScrollBarThumb}" />
+                    <Controls:MetroThumb Style="{StaticResource MahApps.Styles.Thumb.VisualStudioScrollBar}" />
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
-                    <RepeatButton Command="ScrollBar.PageDownCommand" Style="{StaticResource ScrollBarPageButton}" />
+                    <RepeatButton Command="ScrollBar.PageDownCommand" Style="{StaticResource MahApps.Styles.RepeatButton.VisualStudioScrollBarPage}" />
                 </Track.IncreaseRepeatButton>
             </Track>
             <RepeatButton Grid.Row="2"
                           Command="ScrollBar.LineDownCommand"
                           Content="M 0 0 L 4 4 L 8 0 Z"
-                          Style="{StaticResource ScrollBarLineButton}" />
+                          Style="{StaticResource MahApps.Styles.RepeatButton.VisualStudioScrollBarLine}" />
         </Grid>
     </ControlTemplate>
 
-    <Style x:Key="StandardScrollBar" TargetType="{x:Type ScrollBar}">
+    <Style x:Key="MahApps.Styles.ScrollBar.VisualStudioStandard" TargetType="{x:Type ScrollBar}">
         <Setter Property="OverridesDefaultStyle" Value="true" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Style.Triggers>
diff --git a/src/MahApps.Metro/Styles/VS/Styles.xaml b/src/MahApps.Metro/Styles/VS/Styles.xaml
index 654d295bb9..2ccb4e9027 100644
--- a/src/MahApps.Metro/Styles/VS/Styles.xaml
+++ b/src/MahApps.Metro/Styles/VS/Styles.xaml
@@ -13,15 +13,15 @@
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/VS/Expander.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <Style BasedOn="{StaticResource StandardButton}" TargetType="Button" />
-    <Style BasedOn="{StaticResource StandardListBox}" TargetType="ListBox" />
-    <Style BasedOn="{StaticResource StandardMenuItem}" TargetType="MenuItem" />
-    <Style BasedOn="{StaticResource StandardMenu}" TargetType="Menu" />
-    <Style BasedOn="{StaticResource StandardScrollBar}" TargetType="ScrollBar" />
-    <Style BasedOn="{StaticResource StandardTabItem}" TargetType="TabItem" />
-    <Style BasedOn="{StaticResource StandardTabControl}" TargetType="TabControl" />
-    <Style BasedOn="{StaticResource StandardTextBox}" TargetType="TextBox" />
-    <Style BasedOn="{StaticResource StandardGroupBox}" TargetType="GroupBox" />
-    <Style BasedOn="{StaticResource StandardExpander}" TargetType="Expander" />
+    <Style BasedOn="{StaticResource MahApps.Styles.Button.VisualStudioWindowStandard}" TargetType="Button" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ListBox.Standard}" TargetType="ListBox" />
+    <Style BasedOn="{StaticResource MahApps.Styles.MenuItem.Standard}" TargetType="MenuItem" />
+    <Style BasedOn="{StaticResource MahApps.Styles.Menu.Standard}" TargetType="Menu" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ScrollBar.VisualStudioStandard}" TargetType="ScrollBar" />
+    <Style BasedOn="{StaticResource MahApps.Styles.TabItem.VisualStudioStandard}" TargetType="TabItem" />
+    <Style BasedOn="{StaticResource MahApps.Styles.TabControl.VisualStudioStandard}" TargetType="TabControl" />
+    <Style BasedOn="{StaticResource MahApps.Styles.TextBox.VisualStudioStandard}" TargetType="TextBox" />
+    <Style BasedOn="{StaticResource MahApps.Styles.GroupBox.Standard}" TargetType="GroupBox" />
+    <Style BasedOn="{StaticResource MahApps.Styles.Expander.VisualStudioStandard}" TargetType="Expander" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/VS/TabControl.xaml b/src/MahApps.Metro/Styles/VS/TabControl.xaml
index 6b4ca74da5..266fd91399 100644
--- a/src/MahApps.Metro/Styles/VS/TabControl.xaml
+++ b/src/MahApps.Metro/Styles/VS/TabControl.xaml
@@ -11,8 +11,8 @@
 
     <System:Double x:Key="MahApps.Sizes.Font.TabItem">12</System:Double>
 
-    <Style x:Key="StandardTabControl"
-           BasedOn="{StaticResource MetroTabControl}"
+    <Style x:Key="MahApps.Styles.TabControl.VisualStudioStandard"
+           BasedOn="{StaticResource MahApps.Styles.TabControl.Metro}"
            TargetType="{x:Type TabControl}">
         <Setter Property="Background" Value="{DynamicResource Background}" />
         <Setter Property="BorderBrush" Value="{DynamicResource BackgroundSelected}" />
@@ -99,7 +99,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="StandardTabItemCloseButtonStyle" TargetType="{x:Type Button}">
+    <Style x:Key="MahApps.Styles.Button.VisualStudioWindowMahApps.Styles.TabItem.VisualStudioStandardClose" TargetType="{x:Type Button}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Cursor" Value="Hand" />
         <Setter Property="Focusable" Value="False" />
@@ -139,8 +139,8 @@
         <Setter Property="Width" Value="15" />
     </Style>
 
-    <Style x:Key="StandardTabItem"
-           BasedOn="{StaticResource MetroTabItem}"
+    <Style x:Key="MahApps.Styles.TabItem.VisualStudioStandard"
+           BasedOn="{StaticResource MahApps.Styles.TabItem.Metro}"
            TargetType="{x:Type TabItem}">
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Normal}" />
         <Setter Property="Controls:TabControlHelper.CloseButtonEnabled" Value="True" />
@@ -176,7 +176,7 @@
                             <Button x:Name="PART_CloseButton"
                                     VerticalAlignment="Center"
                                     IsTabStop="False"
-                                    Style="{DynamicResource StandardTabItemCloseButtonStyle}"
+                                    Style="{DynamicResource MahApps.Styles.Button.VisualStudioWindowMahApps.Styles.TabItem.VisualStudioStandardClose}"
                                     Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TabControlHelper.CloseButtonEnabled), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}">
                                 <i:Interaction.Triggers>
                                     <i:EventTrigger EventName="Click">
@@ -260,7 +260,7 @@
                     IsSynchronizedWithCurrentItem="True"
                     ItemTemplate="{StaticResource MahApps.Templates.TabItem.Closable}"
                     ItemsSource="{Binding}"
-                    Style="{DynamicResource StandardTabControl}" />
+                    Style="{DynamicResource MahApps.Styles.TabControl.VisualStudioStandard}" />
     </DataTemplate>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/VS/TextBox.xaml b/src/MahApps.Metro/Styles/VS/TextBox.xaml
index d7e0238750..967e8c0ccb 100644
--- a/src/MahApps.Metro/Styles/VS/TextBox.xaml
+++ b/src/MahApps.Metro/Styles/VS/TextBox.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <Style x:Key="StandardTextBox" TargetType="{x:Type TextBox}">
+    <Style x:Key="MahApps.Styles.TextBox.VisualStudioStandard" TargetType="{x:Type TextBox}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TextBox.Background}" />
         <Setter Property="CaretBrush" Value="{DynamicResource Foreground}" />
         <Setter Property="Foreground" Value="{DynamicResource Foreground}" />
@@ -27,8 +27,8 @@
         <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource MahApps.Templates.ValidationError}" />
     </Style>
 
-    <Style x:Key="SearchTextBox"
-           BasedOn="{StaticResource StandardTextBox}"
+    <Style x:Key="MahApps.Styles.TextBox.VisualStudioSearch"
+           BasedOn="{StaticResource MahApps.Styles.TextBox.VisualStudioStandard}"
            TargetType="{x:Type TextBox}">
         <Setter Property="Template">
             <Setter.Value>
@@ -37,7 +37,7 @@
                         <TextBlock Name="search"
                                    Margin="5 0 0 0"
                                    VerticalAlignment="Center"
-                                   Foreground="{DynamicResource MahApps.Brushes.SearchTextBox.Foreground}"
+                                   Foreground="{DynamicResource MahApps.Brushes.MahApps.Styles.TextBox.VisualStudioSearch.Foreground}"
                                    Text="Search ..."
                                    Visibility="Hidden" />
                         <ScrollViewer x:Name="PART_ContentHost" Margin="{TemplateBinding Padding}" />
diff --git a/src/MahApps.Metro/Styles/VS/Window.xaml b/src/MahApps.Metro/Styles/VS/Window.xaml
index a33708e170..d6cd0639a5 100644
--- a/src/MahApps.Metro/Styles/VS/Window.xaml
+++ b/src/MahApps.Metro/Styles/VS/Window.xaml
@@ -6,15 +6,15 @@
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.Buttons.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <Style x:Key="VSWindowStyleKey" TargetType="{x:Type Controls:MetroWindow}">
+    <Style x:Key="MahApps.Styles.MetroWindow.VisualStudio" TargetType="{x:Type Controls:MetroWindow}">
         <Setter Property="GlowBrush" Value="{DynamicResource MahApps.Brushes.Window.Glow}" />
         <Setter Property="NonActiveWindowTitleBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="ShowTitleBar" Value="True" />
         <Setter Property="TitleForeground" Value="{DynamicResource MahApps.Brushes.WindowTitle.Foreground}" />
     </Style>
 
-    <Style x:Key="VSWindowButtonStyle"
-           BasedOn="{StaticResource LightMetroWindowButtonStyle}"
+    <Style x:Key="MahApps.Styles.Button.VisualStudioWindow"
+           BasedOn="{StaticResource MahApps.Styles.Button.MetroWindow.Light}"
            TargetType="{x:Type Button}">
         <Style.Triggers>
             <Trigger Property="IsPressed" Value="True">
@@ -25,16 +25,16 @@
     </Style>
 
     <Style TargetType="{x:Type Controls:WindowButtonCommands}">
-        <Setter Property="DarkCloseButtonStyle" Value="{StaticResource VSWindowButtonStyle}" />
-        <Setter Property="DarkMaxButtonStyle" Value="{StaticResource VSWindowButtonStyle}" />
-        <Setter Property="DarkMinButtonStyle" Value="{StaticResource VSWindowButtonStyle}" />
-        <Setter Property="LightCloseButtonStyle" Value="{StaticResource VSWindowButtonStyle}" />
-        <Setter Property="LightMaxButtonStyle" Value="{StaticResource VSWindowButtonStyle}" />
-        <Setter Property="LightMinButtonStyle" Value="{StaticResource VSWindowButtonStyle}" />
+        <Setter Property="DarkCloseButtonStyle" Value="{StaticResource MahApps.Styles.Button.VisualStudioWindow}" />
+        <Setter Property="DarkMaxButtonStyle" Value="{StaticResource MahApps.Styles.Button.VisualStudioWindow}" />
+        <Setter Property="DarkMinButtonStyle" Value="{StaticResource MahApps.Styles.Button.VisualStudioWindow}" />
+        <Setter Property="LightCloseButtonStyle" Value="{StaticResource MahApps.Styles.Button.VisualStudioWindow}" />
+        <Setter Property="LightMaxButtonStyle" Value="{StaticResource MahApps.Styles.Button.VisualStudioWindow}" />
+        <Setter Property="LightMinButtonStyle" Value="{StaticResource MahApps.Styles.Button.VisualStudioWindow}" />
     </Style>
 
-    <Style x:Key="VSWindowNotificationButtonStyle"
-           BasedOn="{StaticResource MetroFlatButton}"
+    <Style x:Key="MahApps.Styles.Button.VisualStudioWindowNotification"
+           BasedOn="{StaticResource MahApps.Styles.Button.Flat}"
            TargetType="{x:Type Button}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.NotificationButton.Background}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.NotificationButton.Foreground}" />
@@ -51,8 +51,8 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="VSWindowQuickLaunchTextBoxStyle"
-           BasedOn="{StaticResource MetroButtonTextBox}"
+    <Style x:Key="MahApps.Styles.TextBox.VisualStudioWindowQuickLaunch"
+           BasedOn="{StaticResource MahApps.Styles.TextBox.MetroButton}"
            TargetType="{x:Type TextBox}">
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.QuickLaunchTextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
diff --git a/src/MahApps.Metro/Styles/ValidationErrorTemplate.xaml b/src/MahApps.Metro/Styles/ValidationErrorTemplate.xaml
index 1d15345e71..da26d6d264 100644
--- a/src/MahApps.Metro/Styles/ValidationErrorTemplate.xaml
+++ b/src/MahApps.Metro/Styles/ValidationErrorTemplate.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
-    <Style x:Key="MetroValidationPopup" TargetType="{x:Type mah:CustomValidationPopup}">
+    <Style x:Key="MahApps.Styles.CustomValidationPopup.Metro" TargetType="{x:Type mah:CustomValidationPopup}">
         <Setter Property="HorizontalAlignment" Value="Right" />
         <Setter Property="HorizontalOffset" Value="0" />
         <Setter Property="Placement" Value="Right" />
diff --git a/src/MahApps.Metro/Themes/ContentControlEx.xaml b/src/MahApps.Metro/Themes/ContentControlEx.xaml
index d5986e71d8..3d147e20c9 100644
--- a/src/MahApps.Metro/Themes/ContentControlEx.xaml
+++ b/src/MahApps.Metro/Themes/ContentControlEx.xaml
@@ -3,7 +3,7 @@
                     xmlns:controls="clr-namespace:MahApps.Metro.Controls"
                     xmlns:converters="clr-namespace:MahApps.Metro.Converters">
 
-    <Style x:Key="MahApps.Metro.Styles.ContentControlEx" TargetType="{x:Type controls:ContentControlEx}">
+    <Style x:Key="MahApps.Styles.ContentControlEx.Metro" TargetType="{x:Type controls:ContentControlEx}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
@@ -43,8 +43,8 @@
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
     </Style>
 
-    <Style x:Key="MahApps.Metro.Styles.MetroThumbContentControl"
-           BasedOn="{StaticResource MahApps.Metro.Styles.ContentControlEx}"
+    <Style x:Key="MahApps.Styles.MetroThumbContentControl.Metro"
+           BasedOn="{StaticResource MahApps.Styles.ContentControlEx.Metro}"
            TargetType="{x:Type controls:MetroThumbContentControl}" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Themes/DateTimePicker.xaml b/src/MahApps.Metro/Themes/DateTimePicker.xaml
index 5746210abd..968b9a4d04 100644
--- a/src/MahApps.Metro/Themes/DateTimePicker.xaml
+++ b/src/MahApps.Metro/Themes/DateTimePicker.xaml
@@ -108,11 +108,11 @@
         <system:Int32>59</system:Int32>
     </x:Array>
 
-    <Style x:Key="TimePartPickerBase" TargetType="{x:Type Controls:TimePickerBase}">
+    <Style x:Key="MahApps.Styles.TimePickerBase.Metro" TargetType="{x:Type Controls:TimePickerBase}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
+        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMahApps.Styles.ContextMenu.Metro}" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
         <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="22" />
@@ -166,7 +166,7 @@
                             <ContentControl x:Name="PART_FloatingMessageContainer"
                                             Grid.Row="0"
                                             Grid.Column="0"
-                                            Style="{DynamicResource FloatingMessageContainerStyle}">
+                                            Style="{DynamicResource MahApps.Styles.ContentControl.FloatingMessageContainer}">
                                 <ContentControl.Height>
                                     <MultiBinding Converter="{Converters:MathMultiplyConverter}">
                                         <Binding ElementName="PART_FloatingMessage"
@@ -181,7 +181,7 @@
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
-                                           Style="{DynamicResource MetroAutoCollapsingTextBlock}"
+                                           Style="{DynamicResource MahApps.Styles.TextBlock.MetroAutoCollapsing}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                            TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                            TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
@@ -206,14 +206,14 @@
                                     Grid.RowSpan="2"
                                     Grid.Column="1"
                                     IsTabStop="False"
-                                    Style="{DynamicResource ChromelessButtonStyle}">
+                                    Style="{DynamicResource MahApps.Styles.ButtonBase.Chromeless}">
                                 <!--  PackIconModern - Calendar14  -->
                                 <ContentControl x:Name="PART_ButtonIcon"
                                                 Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
                                                 Height="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
                                                 Padding="2"
                                                 Content="M34,52H31V38.5C29.66,39.9 28.16,40.78 26.34,41.45V37.76C27.3,37.45 28.34,36.86 29.46,36C30.59,35.15 31.36,34.15 31.78,33H34V52M45,52V48H37V45L45,33H48V45H50V48H48V52H45M45,45V38.26L40.26,45H45M18,57V23H23V20A2,2 0 0,1 25,18H29C30.11,18 31,18.9 31,20V23H45V20A2,2 0 0,1 47,18H51C52.11,18 53,18.9 53,20V23H58V57H18M21,54H55V31H21V54M48.5,20A1.5,1.5 0 0,0 47,21.5V24.5A1.5,1.5 0 0,0 48.5,26H49.5C50.34,26 51,25.33 51,24.5V21.5A1.5,1.5 0 0,0 49.5,20H48.5M26.5,20A1.5,1.5 0 0,0 25,21.5V24.5A1.5,1.5 0 0,0 26.5,26H27.5A1.5,1.5 0 0,0 29,24.5V21.5A1.5,1.5 0 0,0 27.5,20H26.5Z"
-                                                Style="{DynamicResource PathIconContentControlStyle}" />
+                                                Style="{DynamicResource MahApps.Styles.ContentControl.PathIcon}" />
                             </Button>
                             <Border x:Name="DisabledVisualElement"
                                     Grid.Row="0"
@@ -431,12 +431,12 @@
         <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource MahApps.Templates.ValidationError}" />
     </Style>
 
-    <Style BasedOn="{StaticResource TimePartPickerBase}" TargetType="{x:Type Controls:DateTimePicker}">
+    <Style BasedOn="{StaticResource MahApps.Styles.TimePickerBase.Metro}" TargetType="{x:Type Controls:DateTimePicker}">
         <Setter Property="Controls:TextBoxHelper.Watermark" Value="Select a date" />
         <Setter Property="IsTodayHighlighted" Value="True" />
     </Style>
 
-    <Style BasedOn="{StaticResource TimePartPickerBase}" TargetType="{x:Type Controls:TimePicker}">
+    <Style BasedOn="{StaticResource MahApps.Styles.TimePickerBase.Metro}" TargetType="{x:Type Controls:TimePicker}">
         <Setter Property="Controls:TextBoxHelper.Watermark" Value="Select a time" />
     </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml b/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml
index 45083b599f..6107f5cc4c 100644
--- a/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml
+++ b/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml
@@ -7,8 +7,8 @@
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.Buttons.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <Style x:Key="MahApps.Metro.Styles.Dialogs.Button"
-           BasedOn="{StaticResource SquareButtonStyle}"
+    <Style x:Key="MahApps.Styles.Button.Dialogs"
+           BasedOn="{StaticResource MahApps.Styles.ButtonBase.Square}"
            TargetType="{x:Type Button}">
         <Setter Property="MinHeight" Value="35" />
         <Setter Property="MinWidth" Value="80" />
@@ -16,8 +16,8 @@
         <Setter Property="controls:ControlsHelper.ContentCharacterCasing" Value="Normal" />
     </Style>
 
-    <Style x:Key="MahApps.Metro.Styles.Dialogs.AccentButton"
-           BasedOn="{StaticResource AccentedSquareButtonStyle}"
+    <Style x:Key="MahApps.Styles.ButtonBase.DialogsAccent"
+           BasedOn="{StaticResource MahApps.Styles.ButtonBase.AccentedSquare}"
            TargetType="{x:Type ButtonBase}">
         <Setter Property="MinHeight" Value="35" />
         <Setter Property="MinWidth" Value="80" />
@@ -25,8 +25,8 @@
         <Setter Property="controls:ControlsHelper.ContentCharacterCasing" Value="Normal" />
     </Style>
 
-    <Style x:Key="MahApps.Metro.Styles.Dialogs.AccentHighlightButton"
-           BasedOn="{StaticResource HighlightedSquareButtonStyle}"
+    <Style x:Key="MahApps.Styles.ButtonBase.DialogsAccentHighlight"
+           BasedOn="{StaticResource MahApps.Styles.ButtonBase.HighlightedSquare}"
            TargetType="{x:Type ButtonBase}">
         <Setter Property="MinHeight" Value="35" />
         <Setter Property="MinWidth" Value="80" />
@@ -34,7 +34,7 @@
         <Setter Property="controls:ControlsHelper.ContentCharacterCasing" Value="Normal" />
     </Style>
 
-    <Storyboard x:Key="DialogShownStoryboard">
+    <Storyboard x:Key="MahApps.Storyboard.DialogShown">
         <DoubleAnimation AccelerationRatio=".9"
                          BeginTime="0:0:0"
                          Storyboard.TargetProperty="Opacity"
@@ -42,7 +42,7 @@
                          Duration="0:0:0.2" />
     </Storyboard>
 
-    <Storyboard x:Key="DialogCloseStoryboard">
+    <Storyboard x:Key="MahApps.Storyboard.DialogClose">
         <DoubleAnimation AccelerationRatio=".9"
                          BeginTime="0:0:0"
                          Storyboard.TargetProperty="Opacity"
@@ -102,13 +102,13 @@
             </Trigger>
             <EventTrigger RoutedEvent="Loaded">
                 <EventTrigger.Actions>
-                    <BeginStoryboard Storyboard="{StaticResource DialogShownStoryboard}" />
+                    <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.DialogShown}" />
                 </EventTrigger.Actions>
             </EventTrigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style x:Key="MahApps.Metro.Styles.MetroDialog" TargetType="{x:Type Dialogs:BaseMetroDialog}">
+    <Style x:Key="MahApps.Styles.BaseMetroDialog.Metro" TargetType="{x:Type Dialogs:BaseMetroDialog}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.WhiteColor}" />
         <Setter Property="DialogMessageFontSize" Value="{DynamicResource MahApps.Sizes.Font.DialogMessage}" />
         <Setter Property="DialogTitleFontSize" Value="{DynamicResource MahApps.Sizes.Font.DialogTitle}" />
diff --git a/src/MahApps.Metro/Themes/DropDownButton.xaml b/src/MahApps.Metro/Themes/DropDownButton.xaml
index b7dd883cfa..35349c8027 100644
--- a/src/MahApps.Metro/Themes/DropDownButton.xaml
+++ b/src/MahApps.Metro/Themes/DropDownButton.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
-    <Style x:Key="ButtonDropDownFocusVisual">
+    <Style x:Key="MahApps.Styles.MahApps.Styles.FocusVisualStyle.ButtonDropDown">
         <Setter Property="Control.Template">
             <Setter.Value>
                 <ControlTemplate>
@@ -23,14 +23,14 @@
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.WhiteColor}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.BlackColor}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="ButtonStyle" Value="{DynamicResource ButtonDropDownStyle}" />
-        <Setter Property="FocusVisualStyle" Value="{StaticResource ButtonDropDownFocusVisual}" />
+        <Setter Property="ButtonStyle" Value="{DynamicResource MahApps.Styles.Button.DropDown}" />
+        <Setter Property="FocusVisualStyle" Value="{StaticResource MahApps.Styles.MahApps.Styles.FocusVisualStyle.ButtonDropDown}" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Content}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.BlackColor}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
-        <Setter Property="MenuStyle" Value="{DynamicResource MetroContextMenu}" />
+        <Setter Property="MenuStyle" Value="{DynamicResource MahApps.Styles.ContextMenu.Metro}" />
         <Setter Property="MinHeight" Value="26" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
@@ -74,7 +74,7 @@
                                                     Content="M7.41,8.58L12,13.17L16.59,8.58L18,10L12,16L6,10L7.41,8.58Z"
                                                     DockPanel.Dock="Right"
                                                     Foreground="{TemplateBinding ArrowBrush}"
-                                                    Style="{DynamicResource PathIconContentControlStyle}"
+                                                    Style="{DynamicResource MahApps.Styles.ContentControl.PathIcon}"
                                                     Visibility="{TemplateBinding ArrowVisibility}" />
                                     <StackPanel x:Name="PART_ContentOrientation"
                                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
diff --git a/src/MahApps.Metro/Themes/Flyout.xaml b/src/MahApps.Metro/Themes/Flyout.xaml
index d4e1fadc88..3bab16d39a 100644
--- a/src/MahApps.Metro/Themes/Flyout.xaml
+++ b/src/MahApps.Metro/Themes/Flyout.xaml
@@ -16,7 +16,7 @@
                     DockPanel.Dock="Left"
                     Foreground="{Binding RelativeSource={RelativeSource AncestorType={x:Type Controls:Flyout}}, Path=Foreground}"
                     IsCancel="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:Flyout}}, Path=CloseButtonIsCancel}"
-                    Style="{DynamicResource MahApps.Metro.Styles.MetroCircleButtonStyle}"
+                    Style="{DynamicResource MahApps.Styles.ButtonBase.MetroCircle}"
                     Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:Flyout}}, Path=CloseButtonVisibility}">
                 <i:Interaction.Triggers>
                     <i:EventTrigger EventName="Click">
@@ -27,7 +27,7 @@
                                 Height="20"
                                 Content="M19,34V42H43.75L33.75,52H44.25L58.25,38L44.25,24H33.75L43.75,34H19Z"
                                 FlowDirection="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:Flyout}}, Path=FlowDirection}"
-                                Style="{DynamicResource PathIconContentControlStyle}" />
+                                Style="{DynamicResource MahApps.Styles.ContentControl.PathIcon}" />
             </Button>
             <ContentControl x:Name="PART_BackHeaderText"
                             Margin="15 0 0 0"
diff --git a/src/MahApps.Metro/Themes/Generic.xaml b/src/MahApps.Metro/Themes/Generic.xaml
index 3dd6e55f23..2fd2e92bc2 100644
--- a/src/MahApps.Metro/Themes/Generic.xaml
+++ b/src/MahApps.Metro/Themes/Generic.xaml
@@ -40,17 +40,17 @@
 
     <!--  set up default styles for our custom controls  -->
 
-    <Style BasedOn="{StaticResource MahApps.Metro.Styles.ToggleSwitchButton}" TargetType="{x:Type Controls:ToggleSwitchButton}" />
-    <Style BasedOn="{StaticResource MahApps.Metro.Styles.ToggleSwitch}" TargetType="{x:Type Controls:ToggleSwitch}" />
-    <Style BasedOn="{StaticResource MahApps.Metro.Styles.ContentControlEx}" TargetType="{x:Type Controls:ContentControlEx}" />
-    <Style BasedOn="{StaticResource MahApps.Metro.Styles.MetroThumbContentControl}" TargetType="{x:Type Controls:MetroThumbContentControl}" />
-    <Style BasedOn="{StaticResource MahApps.Metro.Styles.WindowCommandsItem}" TargetType="{x:Type Controls:WindowCommandsItem}" />
-    <Style BasedOn="{StaticResource MahApps.Metro.Styles.WindowCommands}" TargetType="{x:Type Controls:WindowCommands}" />
-    <Style BasedOn="{StaticResource MahApps.Metro.Styles.WindowButtonCommands}" TargetType="{x:Type Controls:WindowButtonCommands}" />
-    <Style BasedOn="{StaticResource MahApps.Metro.Styles.HamburgerMenu}" TargetType="{x:Type Controls:HamburgerMenu}" />
-    <Style BasedOn="{StaticResource MahApps.Metro.Styles.MetroHeader}" TargetType="{x:Type Controls:MetroHeader}" />
-    <Style BasedOn="{StaticResource MahApps.Metro.Styles.MetroDialog}" TargetType="{x:Type Dialogs:BaseMetroDialog}" />
-    <Style BasedOn="{StaticResource MahApps.Metro.Styles.RangeSlider}" TargetType="{x:Type Controls:RangeSlider}" />
-    <Style BasedOn="{StaticResource MahApps.Metro.Styles.MetroProgressBar}" TargetType="{x:Type Controls:MetroProgressBar}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ToggleSwitchButton.Metro}" TargetType="{x:Type Controls:ToggleSwitchButton}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ToggleSwitch.Metro}" TargetType="{x:Type Controls:ToggleSwitch}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ContentControlEx.Metro}" TargetType="{x:Type Controls:ContentControlEx}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.MetroThumbContentControl.Metro}" TargetType="{x:Type Controls:MetroThumbContentControl}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.WindowCommandsItem.Metro}" TargetType="{x:Type Controls:WindowCommandsItem}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.WindowCommands.Metro}" TargetType="{x:Type Controls:WindowCommands}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.WindowButtonCommands.Metro}" TargetType="{x:Type Controls:WindowButtonCommands}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.HamburgerMenu.Metro}" TargetType="{x:Type Controls:HamburgerMenu}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.MetroHeader.Metro}" TargetType="{x:Type Controls:MetroHeader}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.BaseMetroDialog.Metro}" TargetType="{x:Type Dialogs:BaseMetroDialog}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.RangeSlider.Metro}" TargetType="{x:Type Controls:RangeSlider}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.MetroProgressBar.Metro}" TargetType="{x:Type Controls:MetroProgressBar}" />
 
 </ResourceDictionary>
diff --git a/src/MahApps.Metro/Themes/HamburgerMenu.xaml b/src/MahApps.Metro/Themes/HamburgerMenu.xaml
index 170a90bf65..a8fad9babf 100644
--- a/src/MahApps.Metro/Themes/HamburgerMenu.xaml
+++ b/src/MahApps.Metro/Themes/HamburgerMenu.xaml
@@ -6,7 +6,7 @@
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Themes/HamburgerMenuTemplate.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <Style x:Key="MahApps.Metro.Styles.HamburgerMenu" TargetType="{x:Type Controls:HamburgerMenu}">
+    <Style x:Key="MahApps.Styles.HamburgerMenu.Metro" TargetType="{x:Type Controls:HamburgerMenu}">
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="HamburgerButtonStyle" Value="{DynamicResource HamburgerButtonStyle}" />
@@ -17,21 +17,21 @@
                     <ContentControl Width="22"
                                     Height="22"
                                     Content="M3,6H21V8H3V6M3,11H21V13H3V11M3,16H21V18H3V16Z"
-                                    Style="{DynamicResource PathIconContentControlStyle}" />
+                                    Style="{DynamicResource MahApps.Styles.ContentControl.PathIcon}" />
                 </DataTemplate>
             </Setter.Value>
         </Setter>
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="ItemContainerStyle" Value="{StaticResource HamburgerMenuItemStyle}" />
+        <Setter Property="ItemContainerStyle" Value="{StaticResource MahApps.Styles.ListBoxItem.HamburgerMenuItem}" />
         <Setter Property="KeyboardNavigation.ControlTabNavigation" Value="Local" />
         <Setter Property="KeyboardNavigation.DirectionalNavigation" Value="Local" />
         <Setter Property="KeyboardNavigation.TabNavigation" Value="Local" />
-        <Setter Property="OptionsItemContainerStyle" Value="{StaticResource HamburgerMenuItemStyle}" />
+        <Setter Property="OptionsItemContainerStyle" Value="{StaticResource MahApps.Styles.ListBoxItem.HamburgerMenuItem}" />
         <Setter Property="PaneBackground" Value="{DynamicResource MahApps.HamburgerMenu.PaneBackground}" />
         <Setter Property="PaneForeground" Value="{DynamicResource MahApps.HamburgerMenu.PaneForeground}" />
         <Setter Property="PaneHeaderMargin" Value="0 0 0 8" />
         <Setter Property="PaneMargin" Value="0 0 0 8" />
-        <Setter Property="SeparatorItemContainerStyle" Value="{StaticResource HamburgerMenuSeparatorItemStyle}" />
+        <Setter Property="SeparatorItemContainerStyle" Value="{StaticResource MahApps.Styles.ListBoxItem.HamburgerMenuSeparator}" />
         <Setter Property="Template" Value="{DynamicResource MahApps.Templates.HamburgerMenu}" />
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
     </Style>
diff --git a/src/MahApps.Metro/Themes/HamburgerMenuTemplate.xaml b/src/MahApps.Metro/Themes/HamburgerMenuTemplate.xaml
index a16d324d8d..4f24994714 100644
--- a/src/MahApps.Metro/Themes/HamburgerMenuTemplate.xaml
+++ b/src/MahApps.Metro/Themes/HamburgerMenuTemplate.xaml
@@ -19,8 +19,8 @@
     <Controls:HamburgerMenuItemStyleSelector x:Key="HamburgerMenuItemStyleSelector" />
     <Controls:HamburgerMenuItemStyleSelector x:Key="HamburgerMenuItemOptionsStyleSelector" IsItemOptions="True" />
 
-    <Style x:Key="HamburgerButtonStyle"
-           BasedOn="{StaticResource ChromelessButtonStyle}"
+    <Style x:Key="MahApps.Styles.Button.Hamburger"
+           BasedOn="{StaticResource MahApps.Styles.ButtonBase.Chromeless}"
            TargetType="{x:Type Button}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="BorderThickness" Value="0" />
@@ -64,8 +64,8 @@
                  EasingMode="EaseInOut"
                  options:Freeze="true" />
 
-    <Style x:Key="HamburgerScrollViewerStyle"
-           BasedOn="{StaticResource MetroScrollViewer}"
+    <Style x:Key="MahApps.Styles.ScrollViewer.Hamburger"
+           BasedOn="{StaticResource MahApps.Styles.ScrollViewer.Metro}"
            TargetType="{x:Type ScrollViewer}">
         <Setter Property="Template">
             <Setter.Value>
@@ -179,8 +179,8 @@
                    UseLayoutRounding="True" />
     </ControlTemplate>
 
-    <Style x:Key="HamburgerMenuItemBaseStyle"
-           BasedOn="{StaticResource MetroListBoxItem}"
+    <Style x:Key="MahApps.Styles.ListBoxItem.HamburgerBase"
+           BasedOn="{StaticResource MahApps.Styles.ListBoxItem.Metro}"
            TargetType="{x:Type ListBoxItem}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />
@@ -192,8 +192,8 @@
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
     </Style>
 
-    <Style x:Key="HamburgerMenuItemStyle"
-           BasedOn="{StaticResource HamburgerMenuItemBaseStyle}"
+    <Style x:Key="MahApps.Styles.ListBoxItem.HamburgerMenuItem"
+           BasedOn="{StaticResource MahApps.Styles.ListBoxItem.HamburgerBase}"
            TargetType="{x:Type ListBoxItem}">
         <Setter Property="Controls:ItemHelper.SelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="FocusVisualStyle" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:HamburgerMenu}}, Path=ItemFocusVisualStyle, Mode=OneWay, FallbackValue={x:Null}}" />
@@ -273,8 +273,8 @@
         </Setter>
     </Style>
 
-    <Style x:Key="HamburgerMenuSeparatorItemStyle"
-           BasedOn="{StaticResource HamburgerMenuItemBaseStyle}"
+    <Style x:Key="MahApps.Styles.ListBoxItem.HamburgerMenuSeparator"
+           BasedOn="{StaticResource MahApps.Styles.ListBoxItem.HamburgerBase}"
            TargetType="{x:Type ListBoxItem}">
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="Focusable" Value="False" />
@@ -295,8 +295,8 @@
         </Setter>
     </Style>
 
-    <Style x:Key="HamburgerMenuListStyle"
-           BasedOn="{StaticResource MetroListBox}"
+    <Style x:Key="MahApps.Styles.ListBox.HamburgerMenu"
+           BasedOn="{StaticResource MahApps.Styles.ListBox.Metro}"
            TargetType="{x:Type ListBox}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />
@@ -317,7 +317,7 @@
                                       Focusable="False"
                                       HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                      Style="{StaticResource HamburgerScrollViewerStyle}"
+                                      Style="{StaticResource MahApps.Styles.ScrollViewer.Hamburger}"
                                       VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
                             <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </ScrollViewer>
@@ -391,7 +391,7 @@
                                  SelectedIndex="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedIndex, Mode=TwoWay}"
                                  SelectedItem="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedItem, Mode=TwoWay}"
                                  SelectionMode="Single"
-                                 Style="{StaticResource HamburgerMenuListStyle}"
+                                 Style="{StaticResource MahApps.Styles.ListBox.HamburgerMenu}"
                                  TabIndex="1" />
                         <ListBox Name="OptionsListView"
                                  Grid.Row="2"
@@ -409,7 +409,7 @@
                                  SelectedIndex="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedOptionsIndex, Mode=TwoWay}"
                                  SelectedItem="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedOptionsItem, Mode=TwoWay}"
                                  SelectionMode="Single"
-                                 Style="{StaticResource HamburgerMenuListStyle}"
+                                 Style="{StaticResource MahApps.Styles.ListBox.HamburgerMenu}"
                                  TabIndex="2" />
                     </Grid>
                 </Controls:SplitView.Pane>
diff --git a/src/MahApps.Metro/Themes/HotKeyBox.xaml b/src/MahApps.Metro/Themes/HotKeyBox.xaml
index c4ff66ade3..ec45110681 100644
--- a/src/MahApps.Metro/Themes/HotKeyBox.xaml
+++ b/src/MahApps.Metro/Themes/HotKeyBox.xaml
@@ -7,7 +7,7 @@
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
+        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMahApps.Styles.ContextMenu.Metro}" />
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Upper" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
diff --git a/src/MahApps.Metro/Themes/MetroAnimatedSingleRowTabControl.xaml b/src/MahApps.Metro/Themes/MetroAnimatedSingleRowTabControl.xaml
index e648e79dec..e7677415c8 100644
--- a/src/MahApps.Metro/Themes/MetroAnimatedSingleRowTabControl.xaml
+++ b/src/MahApps.Metro/Themes/MetroAnimatedSingleRowTabControl.xaml
@@ -5,7 +5,7 @@
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.AnimatedSingleRowTabControl.xaml" />
-        <!--  MetroScrollViewer  -->
+        <!--  MahApps.Styles.ScrollViewer.Metro  -->
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.Scrollbars.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
@@ -21,7 +21,7 @@
                           Panel.ZIndex="1"
                           Controls:ScrollViewerHelper.IsHorizontalScrollWheelEnabled="{TemplateBinding Controls:ScrollViewerHelper.IsHorizontalScrollWheelEnabled}"
                           HorizontalScrollBarVisibility="Auto"
-                          Style="{DynamicResource MetroScrollViewer}"
+                          Style="{DynamicResource MahApps.Styles.ScrollViewer.Metro}"
                           VerticalScrollBarVisibility="Disabled">
                 <Grid x:Name="HeaderPanelGrid">
                     <Controls:Underline x:Name="Underline"
@@ -81,7 +81,7 @@
                           Margin="{TemplateBinding TabStripMargin}"
                           Panel.ZIndex="1"
                           HorizontalScrollBarVisibility="Disabled"
-                          Style="{DynamicResource MetroScrollViewer}"
+                          Style="{DynamicResource MahApps.Styles.ScrollViewer.Metro}"
                           VerticalScrollBarVisibility="Auto">
                 <Grid x:Name="HeaderPanelGrid">
                     <Controls:Underline x:Name="Underline"
@@ -130,7 +130,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style BasedOn="{StaticResource MetroTabControl}" TargetType="{x:Type Controls:MetroAnimatedSingleRowTabControl}">
+    <Style BasedOn="{StaticResource MahApps.Styles.TabControl.Metro}" TargetType="{x:Type Controls:MetroAnimatedSingleRowTabControl}">
         <Setter Property="Controls:ScrollViewerHelper.IsHorizontalScrollWheelEnabled" Value="True" />
         <Setter Property="Controls:TabControlHelper.Transition" Value="Left" />
         <Setter Property="Template" Value="{StaticResource MahApps.Templates.MetroAnimatedSingleRowTabControl.Horizontal}" />
diff --git a/src/MahApps.Metro/Themes/MetroAnimatedTabControl.xaml b/src/MahApps.Metro/Themes/MetroAnimatedTabControl.xaml
index 6f61434c8c..4c46b00229 100644
--- a/src/MahApps.Metro/Themes/MetroAnimatedTabControl.xaml
+++ b/src/MahApps.Metro/Themes/MetroAnimatedTabControl.xaml
@@ -7,7 +7,7 @@
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.TabControl.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <Style BasedOn="{StaticResource MetroTabControl}" TargetType="{x:Type Controls:MetroAnimatedTabControl}">
+    <Style BasedOn="{StaticResource MahApps.Styles.TabControl.Metro}" TargetType="{x:Type Controls:MetroAnimatedTabControl}">
         <Setter Property="Controls:TabControlHelper.Transition" Value="Left" />
         <Setter Property="Template">
             <Setter.Value>
diff --git a/src/MahApps.Metro/Themes/MetroHeader.xaml b/src/MahApps.Metro/Themes/MetroHeader.xaml
index c71b6366e0..e254bf94cf 100644
--- a/src/MahApps.Metro/Themes/MetroHeader.xaml
+++ b/src/MahApps.Metro/Themes/MetroHeader.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
-    <Style x:Key="MahApps.Metro.Styles.MetroHeader" TargetType="{x:Type Controls:MetroHeader}">
+    <Style x:Key="MahApps.Styles.MetroHeader.Metro" TargetType="{x:Type Controls:MetroHeader}">
         <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource MahApps.Sizes.Font.Normal}" />
         <Setter Property="Controls:ControlsHelper.HeaderMargin" Value="0 0 0 2" />
         <Setter Property="Controls:GroupBoxHelper.HeaderForeground" Value="{Binding RelativeSource={RelativeSource Self}, Path=Foreground, Mode=OneWay}" />
diff --git a/src/MahApps.Metro/Themes/MetroProgressBar.xaml b/src/MahApps.Metro/Themes/MetroProgressBar.xaml
index ed2f152b9c..05eda9c188 100644
--- a/src/MahApps.Metro/Themes/MetroProgressBar.xaml
+++ b/src/MahApps.Metro/Themes/MetroProgressBar.xaml
@@ -5,7 +5,7 @@
 
     <System:Double x:Key="MahApps.Sizes.ProgressBar.MinHeight">6</System:Double>
 
-    <Style x:Key="MahApps.Metro.Styles.MetroProgressBar" TargetType="{x:Type Controls:MetroProgressBar}">
+    <Style x:Key="MahApps.Styles.MetroProgressBar.Metro" TargetType="{x:Type Controls:MetroProgressBar}">
         <Setter Property="Background" Value="#1FFFFFFF" />
         <Setter Property="BorderBrush" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />
diff --git a/src/MahApps.Metro/Themes/MetroTabControl.xaml b/src/MahApps.Metro/Themes/MetroTabControl.xaml
index 548f7e94fc..42cafa1de0 100644
--- a/src/MahApps.Metro/Themes/MetroTabControl.xaml
+++ b/src/MahApps.Metro/Themes/MetroTabControl.xaml
@@ -160,7 +160,7 @@
     </ControlTemplate>
 
     <Style x:Key="{x:Type Controls:MetroTabControl}"
-           BasedOn="{StaticResource MetroTabControl}"
+           BasedOn="{StaticResource MahApps.Styles.TabControl.Metro}"
            TargetType="{x:Type Controls:MetroTabControl}">
         <Setter Property="Template" Value="{StaticResource MahApps.Templates.MetroTabControl.DoNotKeepVisualTreeInMemoryWhenChangingTabs}" />
         <Style.Triggers>
diff --git a/src/MahApps.Metro/Themes/MetroTabItem.xaml b/src/MahApps.Metro/Themes/MetroTabItem.xaml
index 0a7d285141..eedf2f2cf0 100644
--- a/src/MahApps.Metro/Themes/MetroTabItem.xaml
+++ b/src/MahApps.Metro/Themes/MetroTabItem.xaml
@@ -11,7 +11,7 @@
 
     <Converters:MetroTabItemCloseButtonWidthConverter x:Key="MetroTabItemCloseButtonWidthConverter" />
 
-    <Style BasedOn="{StaticResource MetroTabItem}" TargetType="{x:Type Controls:MetroTabItem}">
+    <Style BasedOn="{StaticResource MahApps.Styles.TabItem.Metro}" TargetType="{x:Type Controls:MetroTabItem}">
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Controls:MetroTabItem}">
@@ -64,7 +64,7 @@
                                         VerticalAlignment="Top"
                                         Background="{DynamicResource MahApps.Brushes.GrayNormal}"
                                         IsTabStop="False"
-                                        Style="{DynamicResource ChromelessButtonStyle}"
+                                        Style="{DynamicResource MahApps.Styles.ButtonBase.Chromeless}"
                                         Visibility="Collapsed">
                                     <i:Interaction.Triggers>
                                         <i:EventTrigger EventName="Click">
diff --git a/src/MahApps.Metro/Themes/MetroWindow.xaml b/src/MahApps.Metro/Themes/MetroWindow.xaml
index dbfb44c379..84301537e8 100644
--- a/src/MahApps.Metro/Themes/MetroWindow.xaml
+++ b/src/MahApps.Metro/Themes/MetroWindow.xaml
@@ -63,7 +63,7 @@
                                     Grid.Row="1"
                                     Grid.Column="0"
                                     Grid.ColumnSpan="5"
-                                    Style="{StaticResource WindowTitleThumbStyle}"
+                                    Style="{StaticResource MahApps.Styles.Thumb.WindowTitle}"
                                     UseLayoutRounding="True" />
 
                     <DockPanel Grid.Row="1"
@@ -144,7 +144,7 @@
                                     Grid.Row="1"
                                     Grid.Column="0"
                                     Grid.ColumnSpan="5"
-                                    Style="{StaticResource WindowTitleThumbStyle}"
+                                    Style="{StaticResource MahApps.Styles.Thumb.WindowTitle}"
                                     Visibility="{Binding ElementName=PART_FlyoutModal, Path=Visibility, Mode=OneWay}" />
 
                     <!--  flyouts  -->
@@ -317,7 +317,7 @@
                                     Grid.Row="1"
                                     Grid.Column="0"
                                     Grid.ColumnSpan="5"
-                                    Style="{StaticResource WindowTitleThumbStyle}"
+                                    Style="{StaticResource MahApps.Styles.Thumb.WindowTitle}"
                                     UseLayoutRounding="True" />
 
                     <!--  the title bar  -->
@@ -404,7 +404,7 @@
                                     Grid.Row="1"
                                     Grid.Column="0"
                                     Grid.ColumnSpan="5"
-                                    Style="{StaticResource WindowTitleThumbStyle}"
+                                    Style="{StaticResource MahApps.Styles.Thumb.WindowTitle}"
                                     Visibility="{Binding ElementName=PART_FlyoutModal, Path=Visibility, Mode=OneWay}" />
 
                     <!--  flyouts  -->
diff --git a/src/MahApps.Metro/Themes/NumericUpDown.xaml b/src/MahApps.Metro/Themes/NumericUpDown.xaml
index c43f945e92..3a2b6f80ea 100644
--- a/src/MahApps.Metro/Themes/NumericUpDown.xaml
+++ b/src/MahApps.Metro/Themes/NumericUpDown.xaml
@@ -13,7 +13,7 @@
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
+        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMahApps.Styles.ContextMenu.Metro}" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
         <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Sizes.Font.ClearTextButton}" />
@@ -91,7 +91,7 @@
                                           Focusable="{TemplateBinding UpDownButtonsFocusable}"
                                           Foreground="{TemplateBinding Foreground}"
                                           IsTabStop="False"
-                                          Style="{DynamicResource ChromelessButtonStyle}">
+                                          Style="{DynamicResource MahApps.Styles.ButtonBase.Chromeless}">
                                 <Path x:Name="PolygonUp"
                                       Width="14"
                                       Height="14"
@@ -108,7 +108,7 @@
                                           Focusable="{TemplateBinding UpDownButtonsFocusable}"
                                           Foreground="{TemplateBinding Foreground}"
                                           IsTabStop="False"
-                                          Style="{DynamicResource ChromelessButtonStyle}">
+                                          Style="{DynamicResource MahApps.Styles.ButtonBase.Chromeless}">
                                 <Path x:Name="PolygonDown"
                                       Width="14"
                                       Height="3"
diff --git a/src/MahApps.Metro/Themes/Pivot.xaml b/src/MahApps.Metro/Themes/Pivot.xaml
index bfee2553f5..913596f099 100644
--- a/src/MahApps.Metro/Themes/Pivot.xaml
+++ b/src/MahApps.Metro/Themes/Pivot.xaml
@@ -8,7 +8,7 @@
                    Text="{Binding}" />
     </DataTemplate>
 
-    <Style x:Key="PivotListViewItem" TargetType="{x:Type ListViewItem}">
+    <Style x:Key="MahApps.Styles.ListViewItem.Pivot" TargetType="{x:Type ListViewItem}">
         <Setter Property="Border.BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray1}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
@@ -60,7 +60,7 @@
                                   Grid.Row="1"
                                   Background="{x:Null}"
                                   BorderBrush="{x:Null}"
-                                  ItemContainerStyle="{StaticResource PivotListViewItem}"
+                                  ItemContainerStyle="{StaticResource MahApps.Styles.ListViewItem.Pivot}"
                                   ItemsSource="{Binding Items, RelativeSource={RelativeSource AncestorType={x:Type Controls:Pivot}}}"
                                   ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                                   ScrollViewer.VerticalScrollBarVisibility="Disabled"
diff --git a/src/MahApps.Metro/Themes/RangeSlider.xaml b/src/MahApps.Metro/Themes/RangeSlider.xaml
index 6cf4eea40e..50b3aba44b 100644
--- a/src/MahApps.Metro/Themes/RangeSlider.xaml
+++ b/src/MahApps.Metro/Themes/RangeSlider.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
-    <Style x:Key="MahApps.Metro.Styles.RangeSlider.HorizontalMiddleThumb" TargetType="{x:Type Controls:MetroThumb}">
+    <Style x:Key="MahApps.Styles.MetroThumb.RangeSliderHorizontalMiddleThumb" TargetType="{x:Type Controls:MetroThumb}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="IsTabStop" Value="True" />
@@ -18,8 +18,8 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Metro.Styles.RangeSlider.VerticalMiddleThumb"
-           BasedOn="{StaticResource MahApps.Metro.Styles.RangeSlider.HorizontalMiddleThumb}"
+    <Style x:Key="MahApps.Styles.MetroThumb.RangeSliderVerticalMiddleThumb"
+           BasedOn="{StaticResource MahApps.Styles.MetroThumb.RangeSliderHorizontalMiddleThumb}"
            TargetType="{x:Type Controls:MetroThumb}">
         <Setter Property="Template">
             <Setter.Value>
@@ -75,7 +75,7 @@
                         Orientation="Horizontal">
                 <RepeatButton x:Name="PART_LeftEdge"
                               Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillBrush)}"
-                              Style="{DynamicResource MahApps.Metro.Styles.Slider.HorizontalTrack}" />
+                              Style="{DynamicResource MahApps.Styles.RepeatButton.SliderHorizontalTrack}" />
 
                 <Controls:MetroThumb x:Name="PART_LeftThumb"
                                      Width="{DynamicResource HorizontalThumbWidth}"
@@ -83,23 +83,23 @@
                                      Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillBrush)}"
                                      BorderThickness="1 0"
                                      Cursor="Arrow"
-                                     Style="{DynamicResource MahApps.Metro.Styles.Slider.Thumb}" />
+                                     Style="{DynamicResource MahApps.Styles.Thumb.Slider}" />
                 <Controls:MetroThumb x:Name="PART_MiddleThumb"
                                      MinWidth="{TemplateBinding MinRangeWidth}"
                                      Cursor="Hand"
                                      Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillBrush)}"
-                                     Style="{DynamicResource MahApps.Metro.Styles.RangeSlider.HorizontalMiddleThumb}" />
+                                     Style="{DynamicResource MahApps.Styles.MetroThumb.RangeSliderHorizontalMiddleThumb}" />
                 <Controls:MetroThumb x:Name="PART_RightThumb"
                                      Width="{DynamicResource HorizontalThumbWidth}"
                                      Height="{DynamicResource MahApps.Sizes.Slider.HorizontalThumbHeight}"
                                      Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillBrush)}"
                                      BorderThickness="1 0"
                                      Cursor="Arrow"
-                                     Style="{DynamicResource MahApps.Metro.Styles.Slider.Thumb}" />
+                                     Style="{DynamicResource MahApps.Styles.Thumb.Slider}" />
 
                 <RepeatButton x:Name="PART_RightEdge"
                               Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillBrush)}"
-                              Style="{DynamicResource MahApps.Metro.Styles.Slider.HorizontalTrack}" />
+                              Style="{DynamicResource MahApps.Styles.RepeatButton.SliderHorizontalTrack}" />
             </StackPanel>
         </Grid>
         <ControlTemplate.Triggers>
@@ -195,7 +195,7 @@
                         Orientation="Vertical">
                 <RepeatButton x:Name="PART_RightEdge"
                               Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillBrush)}"
-                              Style="{DynamicResource MahApps.Metro.Styles.Slider.VerticalTrack}" />
+                              Style="{DynamicResource MahApps.Styles.RepeatButton.SliderVerticalTrack}" />
 
                 <Controls:MetroThumb x:Name="PART_RightThumb"
                                      Width="{DynamicResource VerticalThumbWidth}"
@@ -203,23 +203,23 @@
                                      Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillBrush)}"
                                      BorderThickness="0 1"
                                      Cursor="Arrow"
-                                     Style="{DynamicResource MahApps.Metro.Styles.Slider.Thumb}" />
+                                     Style="{DynamicResource MahApps.Styles.Thumb.Slider}" />
                 <Controls:MetroThumb x:Name="PART_MiddleThumb"
                                      MinHeight="{TemplateBinding MinRangeWidth}"
                                      Cursor="Hand"
                                      Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillBrush)}"
-                                     Style="{StaticResource MahApps.Metro.Styles.RangeSlider.VerticalMiddleThumb}" />
+                                     Style="{StaticResource MahApps.Styles.MetroThumb.RangeSliderVerticalMiddleThumb}" />
                 <Controls:MetroThumb x:Name="PART_LeftThumb"
                                      Width="{DynamicResource VerticalThumbWidth}"
                                      Height="{DynamicResource VerticalThumbHeight}"
                                      Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillBrush)}"
                                      BorderThickness="0 1"
                                      Cursor="Arrow"
-                                     Style="{DynamicResource MahApps.Metro.Styles.Slider.Thumb}" />
+                                     Style="{DynamicResource MahApps.Styles.Thumb.Slider}" />
 
                 <RepeatButton x:Name="PART_LeftEdge"
                               Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillBrush)}"
-                              Style="{DynamicResource MahApps.Metro.Styles.Slider.VerticalTrack}" />
+                              Style="{DynamicResource MahApps.Styles.RepeatButton.SliderVerticalTrack}" />
             </StackPanel>
         </Grid>
         <ControlTemplate.Triggers>
@@ -272,7 +272,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style x:Key="MahApps.Metro.Styles.RangeSlider" TargetType="{x:Type Controls:RangeSlider}">
+    <Style x:Key="MahApps.Styles.RangeSlider.Metro" TargetType="{x:Type Controls:RangeSlider}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Controls:SliderHelper.ThumbFillBrush" Value="{DynamicResource MahApps.Brushes.Gray2}" />
         <Setter Property="Controls:SliderHelper.ThumbFillDisabledBrush" Value="{DynamicResource MahApps.Brushes.Gray6}" />
@@ -299,7 +299,7 @@
 
     <!--  Win10 RangeSlider style  -->
 
-    <Style x:Key="MahApps.Metro.Styles.RangeSlider.HorizontalMiddleThumb.Win10" TargetType="{x:Type Controls:MetroThumb}">
+    <Style x:Key="MahApps.Styles.MetroThumb.RangeSliderHorizontalMiddleThumb.Win10" TargetType="{x:Type Controls:MetroThumb}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="IsTabStop" Value="True" />
@@ -315,8 +315,8 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Metro.Styles.RangeSlider.VerticalMiddleThumb.Win10"
-           BasedOn="{StaticResource MahApps.Metro.Styles.RangeSlider.HorizontalMiddleThumb.Win10}"
+    <Style x:Key="MahApps.Styles.MetroThumb.RangeSliderVerticalMiddleThumb.Win10"
+           BasedOn="{StaticResource MahApps.Styles.MetroThumb.RangeSliderHorizontalMiddleThumb.Win10}"
            TargetType="{x:Type Controls:MetroThumb}">
         <Setter Property="Template">
             <Setter.Value>
@@ -373,29 +373,29 @@
                         Orientation="Horizontal">
                 <RepeatButton x:Name="PART_LeftEdge"
                               Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillBrush)}"
-                              Style="{DynamicResource MahApps.Metro.Styles.Slider.HorizontalTrack.Win10}" />
+                              Style="{DynamicResource MahApps.Styles.RepeatButton.SliderHorizontalTrack.Win10}" />
 
                 <Controls:MetroThumb x:Name="PART_LeftThumb"
                                      Width="8"
                                      Height="24"
                                      Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillBrush)}"
                                      Cursor="Arrow"
-                                     Style="{DynamicResource MahApps.Metro.Styles.Slider.Thumb.Win10}" />
+                                     Style="{DynamicResource MahApps.Styles.Thumb.Slider.Win10}" />
                 <Controls:MetroThumb x:Name="PART_MiddleThumb"
                                      MinWidth="{TemplateBinding MinRangeWidth}"
                                      Cursor="Hand"
                                      Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillBrush)}"
-                                     Style="{DynamicResource MahApps.Metro.Styles.RangeSlider.HorizontalMiddleThumb.Win10}" />
+                                     Style="{DynamicResource MahApps.Styles.MetroThumb.RangeSliderHorizontalMiddleThumb.Win10}" />
                 <Controls:MetroThumb x:Name="PART_RightThumb"
                                      Width="8"
                                      Height="24"
                                      Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillBrush)}"
                                      Cursor="Arrow"
-                                     Style="{DynamicResource MahApps.Metro.Styles.Slider.Thumb.Win10}" />
+                                     Style="{DynamicResource MahApps.Styles.Thumb.Slider.Win10}" />
 
                 <RepeatButton x:Name="PART_RightEdge"
                               Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillBrush)}"
-                              Style="{DynamicResource MahApps.Metro.Styles.Slider.HorizontalTrack.Win10}" />
+                              Style="{DynamicResource MahApps.Styles.RepeatButton.SliderHorizontalTrack.Win10}" />
             </StackPanel>
         </Grid>
         <ControlTemplate.Triggers>
@@ -508,29 +508,29 @@
                         Orientation="Vertical">
                 <RepeatButton x:Name="PART_RightEdge"
                               Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillBrush)}"
-                              Style="{DynamicResource MahApps.Metro.Styles.Slider.VerticalTrack.Win10}" />
+                              Style="{DynamicResource MahApps.Styles.RepeatButton.SliderVerticalTrack.Win10}" />
 
                 <Controls:MetroThumb x:Name="PART_RightThumb"
                                      Width="24"
                                      Height="8"
                                      Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillBrush)}"
                                      Cursor="Arrow"
-                                     Style="{DynamicResource MahApps.Metro.Styles.Slider.Thumb.Win10}" />
+                                     Style="{DynamicResource MahApps.Styles.Thumb.Slider.Win10}" />
                 <Controls:MetroThumb x:Name="PART_MiddleThumb"
                                      MinHeight="{TemplateBinding MinRangeWidth}"
                                      Cursor="Hand"
                                      Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillBrush)}"
-                                     Style="{StaticResource MahApps.Metro.Styles.RangeSlider.VerticalMiddleThumb.Win10}" />
+                                     Style="{StaticResource MahApps.Styles.MetroThumb.RangeSliderVerticalMiddleThumb.Win10}" />
                 <Controls:MetroThumb x:Name="PART_LeftThumb"
                                      Width="24"
                                      Height="8"
                                      Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillBrush)}"
                                      Cursor="Arrow"
-                                     Style="{DynamicResource MahApps.Metro.Styles.Slider.Thumb.Win10}" />
+                                     Style="{DynamicResource MahApps.Styles.Thumb.Slider.Win10}" />
 
                 <RepeatButton x:Name="PART_LeftEdge"
                               Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillBrush)}"
-                              Style="{DynamicResource MahApps.Metro.Styles.Slider.VerticalTrack.Win10}" />
+                              Style="{DynamicResource MahApps.Styles.RepeatButton.SliderVerticalTrack.Win10}" />
             </StackPanel>
         </Grid>
         <ControlTemplate.Triggers>
@@ -599,7 +599,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style x:Key="MahApps.Metro.Styles.RangeSlider.Win10" TargetType="{x:Type Controls:RangeSlider}">
+    <Style x:Key="MahApps.Styles.RangeSlider.Win10" TargetType="{x:Type Controls:RangeSlider}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Controls:SliderHelper.ThumbFillBrush" Value="{DynamicResource MahApps.Brushes.AccentBase}" />
         <Setter Property="Controls:SliderHelper.ThumbFillDisabledBrush" Value="{DynamicResource MahApps.Brushes.Gray6}" />
diff --git a/src/MahApps.Metro/Themes/SplitButton.xaml b/src/MahApps.Metro/Themes/SplitButton.xaml
index 51ff548733..6037e73eab 100644
--- a/src/MahApps.Metro/Themes/SplitButton.xaml
+++ b/src/MahApps.Metro/Themes/SplitButton.xaml
@@ -75,7 +75,7 @@
                             <ContentControl Width="9"
                                             Height="9"
                                             Content="M7.41,8.58L12,13.17L16.59,8.58L18,10L12,16L6,10L7.41,8.58Z"
-                                            Style="{DynamicResource PathIconContentControlStyle}" />
+                                            Style="{DynamicResource MahApps.Styles.ContentControl.PathIcon}" />
                         </Button>
                     </Grid>
                 </Controls:ClipBorder>
@@ -203,7 +203,7 @@
                             <ContentControl Width="9"
                                             Height="9"
                                             Content="M7.41,8.58L12,13.17L16.59,8.58L18,10L12,16L6,10L7.41,8.58Z"
-                                            Style="{DynamicResource PathIconContentControlStyle}" />
+                                            Style="{DynamicResource MahApps.Styles.ContentControl.PathIcon}" />
                         </Button>
                     </Grid>
                 </Controls:ClipBorder>
@@ -258,7 +258,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style x:Key="ButtonSplitFocusVisual">
+    <Style x:Key="MahApps.Styles.FocusVisualStyle.ButtonSplit">
         <Setter Property="Control.Template">
             <Setter.Value>
                 <ControlTemplate>
@@ -279,15 +279,15 @@
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.WhiteColor}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.BlackColor}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="ButtonArrowStyle" Value="{DynamicResource ButtonSplitArrowStyle}" />
-        <Setter Property="ButtonStyle" Value="{DynamicResource ButtonSplitStyle}" />
-        <Setter Property="FocusVisualStyle" Value="{StaticResource ButtonSplitFocusVisual}" />
+        <Setter Property="ButtonArrowStyle" Value="{DynamicResource MahApps.Styles.Button.SplitArrow}" />
+        <Setter Property="ButtonStyle" Value="{DynamicResource MahApps.Styles.Button.Split}" />
+        <Setter Property="FocusVisualStyle" Value="{StaticResource MahApps.Styles.FocusVisualStyle.ButtonSplit}" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Content}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.BlackColor}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
-        <Setter Property="ListBoxStyle" Value="{DynamicResource VirtualisedMetroListBox}" />
+        <Setter Property="ListBoxStyle" Value="{DynamicResource MahApps.Styles.ListBox.MetroVirtualized}" />
         <Setter Property="MinHeight" Value="26" />
         <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
diff --git a/src/MahApps.Metro/Themes/Thumb.xaml b/src/MahApps.Metro/Themes/Thumb.xaml
index 00ebfa7515..f942d0db9f 100644
--- a/src/MahApps.Metro/Themes/Thumb.xaml
+++ b/src/MahApps.Metro/Themes/Thumb.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <Style x:Key="WindowTitleThumbStyle" TargetType="{x:Type Thumb}">
+    <Style x:Key="MahApps.Styles.Thumb.WindowTitle" TargetType="{x:Type Thumb}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Template">
             <Setter.Value>
diff --git a/src/MahApps.Metro/Themes/ToggleSwitch.xaml b/src/MahApps.Metro/Themes/ToggleSwitch.xaml
index a9552f2163..1b6fb042c4 100644
--- a/src/MahApps.Metro/Themes/ToggleSwitch.xaml
+++ b/src/MahApps.Metro/Themes/ToggleSwitch.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
-    <Style x:Key="MahApps.Metro.Styles.ToggleSwitchButton" TargetType="{x:Type Controls:ToggleSwitchButton}">
+    <Style x:Key="MahApps.Styles.ToggleSwitchButton.Metro" TargetType="{x:Type Controls:ToggleSwitchButton}">
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray4}" />
         <Setter Property="BorderThickness" Value="2" />
         <Setter Property="Height" Value="35" />
@@ -88,7 +88,7 @@
         <Setter Property="Width" Value="70" />
     </Style>
 
-    <Style x:Key="MahApps.Metro.Styles.ToggleSwitch" TargetType="{x:Type Controls:ToggleSwitch}">
+    <Style x:Key="MahApps.Styles.ToggleSwitch.Metro" TargetType="{x:Type Controls:ToggleSwitch}">
         <Setter Property="ContentPadding" Value="0 0 4 0" />
         <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource ToggleSwitchMahApps.Sizes.HeaderFont}" />
         <Setter Property="Controls:ControlsHelper.HeaderMargin" Value="0 0 0 5" />
@@ -222,7 +222,7 @@
         <Setter Property="ThumbIndicatorBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="ThumbIndicatorDisabledBrush" Value="{DynamicResource MahApps.Brushes.Gray4}" />
         <Setter Property="ThumbIndicatorWidth" Value="13" />
-        <Setter Property="ToggleSwitchButtonStyle" Value="{DynamicResource MahApps.Metro.Styles.ToggleSwitchButton}" />
+        <Setter Property="ToggleSwitchButtonStyle" Value="{DynamicResource MahApps.Styles.ToggleSwitchButton.Metro}" />
         <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource MahApps.Templates.ValidationError}" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
diff --git a/src/MahApps.Metro/Themes/WindowButtonCommands.xaml b/src/MahApps.Metro/Themes/WindowButtonCommands.xaml
index 9613034cbb..10b71a9413 100644
--- a/src/MahApps.Metro/Themes/WindowButtonCommands.xaml
+++ b/src/MahApps.Metro/Themes/WindowButtonCommands.xaml
@@ -222,17 +222,17 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style x:Key="MahApps.Metro.Styles.WindowButtonCommands" TargetType="{x:Type Controls:WindowButtonCommands}">
+    <Style x:Key="MahApps.Styles.WindowButtonCommands.Metro" TargetType="{x:Type Controls:WindowButtonCommands}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TransparentWhite}" />
-        <Setter Property="DarkCloseButtonStyle" Value="{DynamicResource DarkMetroWindowButtonStyle}" />
-        <Setter Property="DarkMaxButtonStyle" Value="{DynamicResource DarkMetroWindowButtonStyle}" />
-        <Setter Property="DarkMinButtonStyle" Value="{DynamicResource DarkMetroWindowButtonStyle}" />
+        <Setter Property="DarkCloseButtonStyle" Value="{DynamicResource MahApps.Styles.Button.MetroWindow.Dark}" />
+        <Setter Property="DarkMaxButtonStyle" Value="{DynamicResource MahApps.Styles.Button.MetroWindow.Dark}" />
+        <Setter Property="DarkMinButtonStyle" Value="{DynamicResource MahApps.Styles.Button.MetroWindow.Dark}" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="LightCloseButtonStyle" Value="{DynamicResource LightMetroWindowButtonStyle}" />
-        <Setter Property="LightMaxButtonStyle" Value="{DynamicResource LightMetroWindowButtonStyle}" />
-        <Setter Property="LightMinButtonStyle" Value="{DynamicResource LightMetroWindowButtonStyle}" />
+        <Setter Property="LightCloseButtonStyle" Value="{DynamicResource MahApps.Styles.Button.MetroWindow.Light}" />
+        <Setter Property="LightMaxButtonStyle" Value="{DynamicResource MahApps.Styles.Button.MetroWindow.Light}" />
+        <Setter Property="LightMinButtonStyle" Value="{DynamicResource MahApps.Styles.Button.MetroWindow.Light}" />
         <Setter Property="Template" Value="{StaticResource MahApps.Templates.WindowButtonCommands}" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Style.Triggers>
@@ -242,11 +242,11 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="MahApps.Metro.Styles.WindowButtonCommands.Win10"
-           BasedOn="{StaticResource MahApps.Metro.Styles.WindowButtonCommands}"
+    <Style x:Key="MahApps.Styles.WindowButtonCommands.Win10"
+           BasedOn="{StaticResource MahApps.Styles.WindowButtonCommands.Metro}"
            TargetType="{x:Type Controls:WindowButtonCommands}">
-        <Setter Property="DarkCloseButtonStyle" Value="{DynamicResource MahApps.Metro.Styles.WindowButton.Close.Dark.Win10}" />
-        <Setter Property="LightCloseButtonStyle" Value="{DynamicResource MahApps.Metro.Styles.WindowButton.Close.Light.Win10}" />
+        <Setter Property="DarkCloseButtonStyle" Value="{DynamicResource MahApps.Styles.Button.MetroWindowClose.Dark.Win10}" />
+        <Setter Property="LightCloseButtonStyle" Value="{DynamicResource MahApps.Styles.Button.MetroWindowClose.Light.Win10}" />
         <Setter Property="Template" Value="{StaticResource MahApps.Templates.WindowButtonCommands.Win10}" />
     </Style>
 
diff --git a/src/MahApps.Metro/Themes/WindowCommands.xaml b/src/MahApps.Metro/Themes/WindowCommands.xaml
index 15a88038a9..a09d36b0be 100644
--- a/src/MahApps.Metro/Themes/WindowCommands.xaml
+++ b/src/MahApps.Metro/Themes/WindowCommands.xaml
@@ -49,7 +49,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style x:Key="WindowCommandsControlStyle" TargetType="{x:Type Control}">
+    <Style x:Key="MahApps.Styles.Control.WindowCommands" TargetType="{x:Type Control}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TransparentWhite}" />
         <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground), Mode=OneWay}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
@@ -62,7 +62,7 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="ToolBarOverflowButtonStyle" TargetType="{x:Type ToggleButton}">
+    <Style x:Key="MahApps.Styles.ToggleButton.ToolBarOverflow" TargetType="{x:Type ToggleButton}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TransparentWhite}" />
         <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground), Mode=OneWay}" />
         <Setter Property="OverridesDefaultStyle" Value="true" />
@@ -109,7 +109,7 @@
                           DockPanel.Dock="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(DockPanel.Dock), Mode=OneWay}"
                           IsChecked="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=IsOverflowOpen, Mode=TwoWay}"
                           IsEnabled="false"
-                          Style="{StaticResource ToolBarOverflowButtonStyle}"
+                          Style="{StaticResource MahApps.Styles.ToggleButton.ToolBarOverflow}"
                           Visibility="Collapsed">
                 <Popup x:Name="OverflowPopup"
                        AllowsTransparency="true"
@@ -145,20 +145,20 @@
 
         <ControlTemplate.Resources>
             <ResourceDictionary>
-                <Style BasedOn="{StaticResource WindowCommandsControlStyle}" TargetType="{x:Type Button}">
+                <Style BasedOn="{StaticResource MahApps.Styles.Control.WindowCommands}" TargetType="{x:Type Button}">
                     <Setter Property="Template" Value="{StaticResource MahApps.Templates.Button.WindowCommands}" />
                 </Style>
-                <Style BasedOn="{StaticResource WindowCommandsControlStyle}" TargetType="{x:Type ToggleButton}">
+                <Style BasedOn="{StaticResource MahApps.Styles.Control.WindowCommands}" TargetType="{x:Type ToggleButton}">
                     <Setter Property="Template" Value="{StaticResource MahApps.Templates.ToggleButton.WindowCommands}" />
                 </Style>
 
                 <Style x:Key="{x:Static ToolBar.ButtonStyleKey}"
-                       BasedOn="{StaticResource WindowCommandsControlStyle}"
+                       BasedOn="{StaticResource MahApps.Styles.Control.WindowCommands}"
                        TargetType="{x:Type Button}">
                     <Setter Property="Template" Value="{StaticResource MahApps.Templates.Button.WindowCommands}" />
                 </Style>
                 <Style x:Key="{x:Static ToolBar.ToggleButtonStyleKey}"
-                       BasedOn="{StaticResource WindowCommandsControlStyle}"
+                       BasedOn="{StaticResource MahApps.Styles.Control.WindowCommands}"
                        TargetType="{x:Type ToggleButton}">
                     <Setter Property="Template" Value="{StaticResource MahApps.Templates.ToggleButton.WindowCommands}" />
                 </Style>
@@ -173,7 +173,7 @@
                           DockPanel.Dock="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(DockPanel.Dock), Mode=OneWay}"
                           IsChecked="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=IsOverflowOpen, Mode=TwoWay}"
                           IsEnabled="false"
-                          Style="{StaticResource ToolBarOverflowButtonStyle}"
+                          Style="{StaticResource MahApps.Styles.ToggleButton.ToolBarOverflow}"
                           Visibility="Collapsed">
                 <Popup x:Name="OverflowPopup"
                        AllowsTransparency="true"
@@ -209,7 +209,7 @@
 
         <ControlTemplate.Resources>
             <ResourceDictionary>
-                <Style BasedOn="{StaticResource WindowCommandsControlStyle}" TargetType="{x:Type Button}">
+                <Style BasedOn="{StaticResource MahApps.Styles.Control.WindowCommands}" TargetType="{x:Type Button}">
                     <Setter Property="Template" Value="{StaticResource MahApps.Templates.Button.WindowCommands}" />
                     <Style.Triggers>
                         <Trigger Property="IsPressed" Value="True">
@@ -217,7 +217,7 @@
                         </Trigger>
                     </Style.Triggers>
                 </Style>
-                <Style BasedOn="{StaticResource WindowCommandsControlStyle}" TargetType="{x:Type ToggleButton}">
+                <Style BasedOn="{StaticResource MahApps.Styles.Control.WindowCommands}" TargetType="{x:Type ToggleButton}">
                     <Setter Property="Template" Value="{StaticResource MahApps.Templates.ToggleButton.WindowCommands}" />
                     <Style.Triggers>
                         <Trigger Property="IsPressed" Value="True">
@@ -227,7 +227,7 @@
                 </Style>
 
                 <Style x:Key="{x:Static ToolBar.ButtonStyleKey}"
-                       BasedOn="{StaticResource WindowCommandsControlStyle}"
+                       BasedOn="{StaticResource MahApps.Styles.Control.WindowCommands}"
                        TargetType="{x:Type Button}">
                     <Setter Property="Template" Value="{StaticResource MahApps.Templates.Button.WindowCommands}" />
                     <Style.Triggers>
@@ -237,7 +237,7 @@
                     </Style.Triggers>
                 </Style>
                 <Style x:Key="{x:Static ToolBar.ToggleButtonStyleKey}"
-                       BasedOn="{StaticResource WindowCommandsControlStyle}"
+                       BasedOn="{StaticResource MahApps.Styles.Control.WindowCommands}"
                        TargetType="{x:Type ToggleButton}">
                     <Setter Property="Template" Value="{StaticResource MahApps.Templates.ToggleButton.WindowCommands}" />
                     <Style.Triggers>
@@ -250,7 +250,7 @@
         </ControlTemplate.Resources>
     </ControlTemplate>
 
-    <Style x:Key="MahApps.Metro.Styles.WindowCommandsItem" TargetType="{x:Type Controls:WindowCommandsItem}">
+    <Style x:Key="MahApps.Styles.WindowCommandsItem.Metro" TargetType="{x:Type Controls:WindowCommandsItem}">
         <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentWindowCommands.Foreground, Mode=OneWay}" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="MinHeight" Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentWindowCommands.ParentWindow.TitleBarHeight, Mode=OneWay}" />
@@ -287,7 +287,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Metro.Styles.WindowCommands" TargetType="{x:Type Controls:WindowCommands}">
+    <Style x:Key="MahApps.Styles.WindowCommands.Metro" TargetType="{x:Type Controls:WindowCommands}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TransparentWhite}" />
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Normal" />
         <Setter Property="DarkTemplate" Value="{StaticResource MahApps.Templates.WindowCommands.Dark}" />
diff --git a/src/Mahapps.Metro.Tests/Views/ButtonWindow.xaml b/src/Mahapps.Metro.Tests/Views/ButtonWindow.xaml
index 867c7ec031..249126a87c 100644
--- a/src/Mahapps.Metro.Tests/Views/ButtonWindow.xaml
+++ b/src/Mahapps.Metro.Tests/Views/ButtonWindow.xaml
@@ -11,6 +11,6 @@
         <Button Name="DefaultButton" Content="SomeText" />
         <Button Name="SquareButton"
                 Content="SomeText"
-                Style="{DynamicResource SquareButtonStyle}" />
+                Style="{DynamicResource MahApps.Styles.ButtonBase.Square}" />
     </StackPanel>
 </controls:MetroWindow>
\ No newline at end of file
diff --git a/src/Mahapps.Metro.Tests/Views/CleanWindow.xaml b/src/Mahapps.Metro.Tests/Views/CleanWindow.xaml
index 70ca305846..2b79404cb7 100644
--- a/src/Mahapps.Metro.Tests/Views/CleanWindow.xaml
+++ b/src/Mahapps.Metro.Tests/Views/CleanWindow.xaml
@@ -7,7 +7,7 @@
                       d:DesignHeight="300"
                       d:DesignWidth="300"
                       ResizeMode="CanResizeWithGrip"
-                      Style="{DynamicResource CleanWindowStyleKey}"
+                      Style="{DynamicResource MahApps.Styles.MetroWindow.Clean}"
                       mc:Ignorable="d">
     <Window.Resources>
         <ResourceDictionary>
diff --git a/src/Mahapps.Metro.Tests/Views/TextBoxHelperTestWindow.xaml b/src/Mahapps.Metro.Tests/Views/TextBoxHelperTestWindow.xaml
index 94d7bf525a..2aab9fbca9 100644
--- a/src/Mahapps.Metro.Tests/Views/TextBoxHelperTestWindow.xaml
+++ b/src/Mahapps.Metro.Tests/Views/TextBoxHelperTestWindow.xaml
@@ -9,10 +9,10 @@
                       mc:Ignorable="d">
     <StackPanel>
         <TextBox x:Name="TestTextBox" />
-        <TextBox x:Name="TestButtonTextBox" Style="{DynamicResource MetroButtonTextBox}" />
+        <TextBox x:Name="TestButtonTextBox" Style="{DynamicResource MahApps.Styles.TextBox.MetroButton}" />
         <PasswordBox x:Name="TestPasswordBox" />
-        <PasswordBox x:Name="TestButtonPasswordBox" Style="{DynamicResource MetroButtonPasswordBox}" />
-        <PasswordBox x:Name="TestButtonRevealedPasswordBox" Style="{DynamicResource MetroButtonRevealedPasswordBox}" />
+        <PasswordBox x:Name="TestButtonPasswordBox" Style="{DynamicResource MahApps.Styles.PasswordBox.MetroButton}" />
+        <PasswordBox x:Name="TestButtonRevealedPasswordBox" Style="{DynamicResource MahApps.Styles.PasswordBox.MetroButtonRevealed}" />
         <ComboBox x:Name="TestComboBox" />
         <ComboBox x:Name="TestEditableComboBox" IsEditable="True" />
         <controls:NumericUpDown x:Name="TestNumericUpDown" />

From 5664e63282a33196fc95d5339b1fc64a1b4093b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Mon, 15 Jul 2019 15:38:41 +0200
Subject: [PATCH 12/46] Fix names broken by search and replace

---
 .../ExampleViews/DataGridExamples.xaml        |  8 ++---
 .../MahApps.Metro.Demo/MainWindow.xaml        |  2 +-
 .../Styles/Clean/CleanStatusBar.xaml          |  2 +-
 .../Styles/Controls.ComboBox.xaml             |  4 +--
 .../Styles/Controls.DataGrid.xaml             |  2 +-
 .../Styles/Controls.Expander.xaml             |  8 ++---
 .../Styles/Controls.Scrollbars.xaml           | 34 +++++++++----------
 .../Styles/Controls.StatusBar.xaml            |  2 +-
 src/MahApps.Metro/Styles/VS/Button.xaml       |  4 +--
 src/MahApps.Metro/Styles/VS/Expander.xaml     |  8 ++---
 src/MahApps.Metro/Styles/VS/TextBox.xaml      |  2 +-
 src/MahApps.Metro/Themes/DropDownButton.xaml  |  4 +--
 12 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DataGridExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DataGridExamples.xaml
index cc15288ea9..0b7d3d7744 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DataGridExamples.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DataGridExamples.xaml
@@ -170,12 +170,12 @@
                   SelectionUnit="FullRow">
             <DataGrid.Columns>
                 <DataGridCheckBoxColumn Binding="{Binding RelativeSource={RelativeSource AncestorType=DataGridRow}, Path=IsSelected, Mode=OneWay}"
-                                        EditingElementStyle="{DynamicResource MahApps.Styles.CheckBox.MahApps.Styles.DataGrid.Metro}"
-                                        ElementStyle="{DynamicResource MahApps.Styles.CheckBox.MahApps.Styles.DataGrid.Metro}"
+                                        EditingElementStyle="{DynamicResource MahApps.Styles.CheckBox.MetroDataGrid}"
+                                        ElementStyle="{DynamicResource MahApps.Styles.CheckBox.MetroDataGrid}"
                                         Header="Row Selected" />
                 <DataGridCheckBoxColumn Binding="{Binding IsSelected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                        EditingElementStyle="{DynamicResource MahApps.Styles.CheckBox.MahApps.Styles.DataGrid.Metro}"
-                                        ElementStyle="{DynamicResource MahApps.Styles.CheckBox.MahApps.Styles.DataGrid.Metro}"
+                                        EditingElementStyle="{DynamicResource MahApps.Styles.CheckBox.MetroDataGrid}"
+                                        ElementStyle="{DynamicResource MahApps.Styles.CheckBox.MetroDataGrid}"
                                         Header="Album Selected" />
                 <DataGridTextColumn Binding="{Binding Title}" Header="Title" />
                 <DataGridTextColumn Binding="{Binding Artist.Name}" Header="Artist" />
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml
index 0f211a080a..521bf9f819 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml
@@ -320,7 +320,7 @@
 
         <StatusBar Grid.Row="2">
             <StatusBarItem>MahApps.Metro DEMO Application</StatusBarItem>
-            <Separator Style="{StaticResource MahApps.Styles.Separator.MahApps.Styles.StatusBar.Metro}" />
+            <Separator Style="{StaticResource MahApps.Styles.Separator.MetroStatusBar}" />
             <StatusBarItem>Selected Tab:</StatusBarItem>
             <StatusBarItem Content="{Binding ElementName=MainTabControl, Path=SelectedItem.Header, Mode=OneWay}" />
         </StatusBar>
diff --git a/src/MahApps.Metro/Styles/Clean/CleanStatusBar.xaml b/src/MahApps.Metro/Styles/Clean/CleanStatusBar.xaml
index 53b6202a90..f87a49494e 100644
--- a/src/MahApps.Metro/Styles/Clean/CleanStatusBar.xaml
+++ b/src/MahApps.Metro/Styles/Clean/CleanStatusBar.xaml
@@ -12,7 +12,7 @@
     </Style>
 
     <Style x:Key="MahApps.Styles.Separator.Clean"
-           BasedOn="{StaticResource MahApps.Styles.Separator.MahApps.Styles.StatusBar.Metro}"
+           BasedOn="{StaticResource MahApps.Styles.Separator.MetroStatusBar}"
            TargetType="{x:Type Separator}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Black}" />
     </Style>
diff --git a/src/MahApps.Metro/Styles/Controls.ComboBox.xaml b/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
index 07d516df29..8e62a2cbee 100644
--- a/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
@@ -198,7 +198,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.ToggleButton.MahApps.Styles.ComboBox.MetroDropDown" TargetType="{x:Type ToggleButton}">
+    <Style x:Key="MahApps.Styles.ToggleButton.MetroComboBoxDropDown" TargetType="{x:Type ToggleButton}">
         <Setter Property="ClickMode" Value="Press" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="IsTabStop" Value="False" />
@@ -351,7 +351,7 @@
                                           IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
                                           KeyboardNavigation.IsTabStop="False"
                                           SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                          Style="{DynamicResource MahApps.Styles.ToggleButton.MahApps.Styles.ComboBox.MetroDropDown}" />
+                                          Style="{DynamicResource MahApps.Styles.ToggleButton.MetroComboBoxDropDown}" />
 
                             <TextBox x:Name="PART_EditableTextBox"
                                      Grid.Row="1"
diff --git a/src/MahApps.Metro/Styles/Controls.DataGrid.xaml b/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
index 2ec44fcb57..ed7a9350c9 100644
--- a/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
+++ b/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
@@ -8,7 +8,7 @@
 
     <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
 
-    <Style x:Key="MahApps.Styles.CheckBox.MahApps.Styles.DataGrid.Metro"
+    <Style x:Key="MahApps.Styles.CheckBox.MetroDataGrid"
            BasedOn="{StaticResource MahApps.Styles.CheckBox.Metro}"
            TargetType="CheckBox">
         <Setter Property="HorizontalAlignment" Value="Center" />
diff --git a/src/MahApps.Metro/Styles/Controls.Expander.xaml b/src/MahApps.Metro/Styles/Controls.Expander.xaml
index df6eb98e4e..023e0011fb 100644
--- a/src/MahApps.Metro/Styles/Controls.Expander.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Expander.xaml
@@ -303,7 +303,7 @@
         </Setter>
     </Style>
 
-    <Storyboard x:Key="MahApps.Storyboard.MahApps.Styles.Expander.MetroExpand">
+    <Storyboard x:Key="MahApps.Storyboard.MetroExpanderExpand">
         <DoubleAnimation Storyboard.TargetName="ExpandSite"
                          Storyboard.TargetProperty="(UIElement.Opacity)"
                          To="1"
@@ -313,7 +313,7 @@
         </ObjectAnimationUsingKeyFrames>
     </Storyboard>
 
-    <Storyboard x:Key="MahApps.Storyboard.MahApps.Styles.Expander.MetroCollapse">
+    <Storyboard x:Key="MahApps.Storyboard.MetroExpanderCollapse">
         <DoubleAnimation Storyboard.TargetName="ExpandSite"
                          Storyboard.TargetProperty="(UIElement.Opacity)"
                          To="0"
@@ -418,10 +418,10 @@
                         <Trigger Property="IsExpanded" Value="true">
                             <Setter TargetName="ExpandSite" Property="Visibility" Value="Visible" />
                             <Trigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.MahApps.Styles.Expander.MetroExpand}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.MetroExpanderExpand}" />
                             </Trigger.EnterActions>
                             <Trigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.MahApps.Styles.Expander.MetroCollapse}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.MetroExpanderCollapse}" />
                             </Trigger.ExitActions>
                         </Trigger>
                         <Trigger Property="ExpandDirection" Value="Right">
diff --git a/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml b/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
index 56a5521f09..7ff66a7dcf 100644
--- a/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
@@ -4,19 +4,19 @@
                     xmlns:System="clr-namespace:System;assembly=mscorlib"
                     xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options">
 
-    <Storyboard x:Key="MahApps.Storyboard.MahApps.Styles.ScrollBar.MetroThumbMouseOver" po:Freeze="True">
+    <Storyboard x:Key="MahApps.Storyboard.MetroScrollBarThumbMouseOver" po:Freeze="True">
         <DoubleAnimationUsingKeyFrames Storyboard.TargetName="MouseOverRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
             <EasingDoubleKeyFrame KeyTime="0:0:0.15" Value="0.6" />
         </DoubleAnimationUsingKeyFrames>
     </Storyboard>
 
-    <Storyboard x:Key="MahApps.Storyboard.MahApps.Styles.ScrollBar.MetroThumbPressed" po:Freeze="True">
+    <Storyboard x:Key="MahApps.Storyboard.MetroScrollBarThumbPressed" po:Freeze="True">
         <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PressedRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
             <EasingDoubleKeyFrame KeyTime="0:0:0.15" Value="0.8" />
         </DoubleAnimationUsingKeyFrames>
     </Storyboard>
 
-    <Style x:Key="MahApps.Styles.RepeatButton.MahApps.Styles.ScrollBar.MetroSmall" TargetType="{x:Type RepeatButton}">
+    <Style x:Key="MahApps.Styles.RepeatButton.MetroScrollBarSmall" TargetType="{x:Type RepeatButton}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="Height" Value="{DynamicResource MahApps.Templates.ScrollBar.VerticalRepeatButtonHeight}" />
@@ -64,7 +64,7 @@
         <Setter Property="Width" Value="{DynamicResource MahApps.Templates.ScrollBar.HorizontalRepeatButtonWidth}" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.RepeatButton.MahApps.Styles.ScrollBar.MetroLarge" TargetType="{x:Type RepeatButton}">
+    <Style x:Key="MahApps.Styles.RepeatButton.MetroScrollBarLarge" TargetType="{x:Type RepeatButton}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="Interval" Value="50" />
@@ -81,7 +81,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.Thumb.MahApps.Styles.ScrollBar.Metro" TargetType="{x:Type Thumb}">
+    <Style x:Key="MahApps.Styles.Thumb.MetroScrollBar" TargetType="{x:Type Thumb}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Thumb}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="IsTabStop" Value="False" />
@@ -107,8 +107,8 @@
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualState x:Name="Normal" />
-                                <VisualState x:Name="MouseOver" Storyboard="{StaticResource MahApps.Storyboard.MahApps.Styles.ScrollBar.MetroThumbMouseOver}" />
-                                <VisualState x:Name="Pressed" Storyboard="{StaticResource MahApps.Storyboard.MahApps.Styles.ScrollBar.MetroThumbPressed}" />
+                                <VisualState x:Name="MouseOver" Storyboard="{StaticResource MahApps.Storyboard.MetroScrollBarThumbMouseOver}" />
+                                <VisualState x:Name="Pressed" Storyboard="{StaticResource MahApps.Storyboard.MetroScrollBarThumbPressed}" />
                                 <VisualState x:Name="Disabled" />
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
@@ -135,29 +135,29 @@
                           Grid.Column="0"
                           Command="ScrollBar.LineLeftCommand"
                           Content="M54,14.9765625L54,74.9765625 24,44.9765625 54,14.9765625z"
-                          Style="{DynamicResource MahApps.Styles.RepeatButton.MahApps.Styles.ScrollBar.MetroSmall}" />
+                          Style="{DynamicResource MahApps.Styles.RepeatButton.MetroScrollBarSmall}" />
             <Track x:Name="PART_Track"
                    Grid.Column="1"
                    IsDirectionReversed="False">
                 <Track.DecreaseRepeatButton>
                     <RepeatButton x:Name="HorizontalLargeDecrease"
                                   Command="ScrollBar.PageLeftCommand"
-                                  Style="{DynamicResource MahApps.Styles.RepeatButton.MahApps.Styles.ScrollBar.MetroLarge}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.MetroScrollBarLarge}" />
                 </Track.DecreaseRepeatButton>
                 <Track.Thumb>
-                    <Controls:MetroThumb Margin="0 1 0 1" Style="{DynamicResource MahApps.Styles.Thumb.MahApps.Styles.ScrollBar.Metro}" />
+                    <Controls:MetroThumb Margin="0 1 0 1" Style="{DynamicResource MahApps.Styles.Thumb.MetroScrollBar}" />
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
                     <RepeatButton x:Name="HorizontalLargeIncrease"
                                   Command="ScrollBar.PageRightCommand"
-                                  Style="{DynamicResource MahApps.Styles.RepeatButton.MahApps.Styles.ScrollBar.MetroLarge}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.MetroScrollBarLarge}" />
                 </Track.IncreaseRepeatButton>
             </Track>
             <RepeatButton x:Name="HorizontalSmallIncrease"
                           Grid.Column="2"
                           Command="ScrollBar.LineRightCommand"
                           Content="M192,79.875L352,239.875 192,399.875 192,79.875z"
-                          Style="{DynamicResource MahApps.Styles.RepeatButton.MahApps.Styles.ScrollBar.MetroSmall}" />
+                          Style="{DynamicResource MahApps.Styles.RepeatButton.MetroScrollBarSmall}" />
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsEnabled" Value="False">
@@ -177,7 +177,7 @@
                           Grid.Row="0"
                           Command="ScrollBar.LineUpCommand"
                           Content="M240.125,160L400.125,320 80.125,320 240.125,160z"
-                          Style="{DynamicResource MahApps.Styles.RepeatButton.MahApps.Styles.ScrollBar.MetroSmall}" />
+                          Style="{DynamicResource MahApps.Styles.RepeatButton.MetroScrollBarSmall}" />
             <Track x:Name="PART_Track"
                    Grid.Row="1"
                    IsDirectionReversed="True">
@@ -187,22 +187,22 @@
                 <Track.DecreaseRepeatButton>
                     <RepeatButton x:Name="VerticalLargeDecrease"
                                   Command="ScrollBar.PageUpCommand"
-                                  Style="{DynamicResource MahApps.Styles.RepeatButton.MahApps.Styles.ScrollBar.MetroLarge}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.MetroScrollBarLarge}" />
                 </Track.DecreaseRepeatButton>
                 <Track.Thumb>
-                    <Controls:MetroThumb Margin="1 0 1 0" Style="{DynamicResource MahApps.Styles.Thumb.MahApps.Styles.ScrollBar.Metro}" />
+                    <Controls:MetroThumb Margin="1 0 1 0" Style="{DynamicResource MahApps.Styles.Thumb.MetroScrollBar}" />
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
                     <RepeatButton x:Name="VerticalLargeIncrease"
                                   Command="ScrollBar.PageDownCommand"
-                                  Style="{DynamicResource MahApps.Styles.RepeatButton.MahApps.Styles.ScrollBar.MetroLarge}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.MetroScrollBarLarge}" />
                 </Track.IncreaseRepeatButton>
             </Track>
             <RepeatButton x:Name="VerticalSmallIncrease"
                           Grid.Row="2"
                           Command="ScrollBar.LineDownCommand"
                           Content="M80.125,192L400.125,192 240.125,352 80.125,192z"
-                          Style="{DynamicResource MahApps.Styles.RepeatButton.MahApps.Styles.ScrollBar.MetroSmall}" />
+                          Style="{DynamicResource MahApps.Styles.RepeatButton.MetroScrollBarSmall}" />
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsEnabled" Value="False">
diff --git a/src/MahApps.Metro/Styles/Controls.StatusBar.xaml b/src/MahApps.Metro/Styles/Controls.StatusBar.xaml
index 9dec9dc9cf..beba968252 100644
--- a/src/MahApps.Metro/Styles/Controls.StatusBar.xaml
+++ b/src/MahApps.Metro/Styles/Controls.StatusBar.xaml
@@ -29,7 +29,7 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.Separator.MahApps.Styles.StatusBar.Metro" TargetType="{x:Type Separator}">
+    <Style x:Key="MahApps.Styles.Separator.MetroStatusBar" TargetType="{x:Type Separator}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.IdealForeground}" />
         <Setter Property="MinHeight" Value="1" />
         <Setter Property="MinWidth" Value="1" />
diff --git a/src/MahApps.Metro/Styles/VS/Button.xaml b/src/MahApps.Metro/Styles/VS/Button.xaml
index bc7b970259..670f079ff5 100644
--- a/src/MahApps.Metro/Styles/VS/Button.xaml
+++ b/src/MahApps.Metro/Styles/VS/Button.xaml
@@ -36,7 +36,7 @@
 
     <Style x:Key="MahApps.Styles.Button.VisualStudioWindowLink" TargetType="Button">
         <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.MahApps.Styles.Button.VisualStudioWindowLink.Foreground}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.LinkButton.Foreground}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Button">
@@ -48,7 +48,7 @@
         </Setter>
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="true">
-                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.MahApps.Styles.Button.VisualStudioWindowLink.ForegroundHighlighted}" />
+                <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.LinkButton.ForegroundHighlighted}" />
             </Trigger>
         </Style.Triggers>
     </Style>
diff --git a/src/MahApps.Metro/Styles/VS/Expander.xaml b/src/MahApps.Metro/Styles/VS/Expander.xaml
index 8d086b9e26..fa0c45c575 100644
--- a/src/MahApps.Metro/Styles/VS/Expander.xaml
+++ b/src/MahApps.Metro/Styles/VS/Expander.xaml
@@ -303,7 +303,7 @@
         </Setter>
     </Style>
 
-    <Storyboard x:Key="MahApps.Storyboard.MahApps.Styles.Expander.MetroExpand">
+    <Storyboard x:Key="MahApps.Storyboard.MetroExpanderExpand">
         <DoubleAnimation Storyboard.TargetName="ExpandSite"
                          Storyboard.TargetProperty="(UIElement.Opacity)"
                          To="1"
@@ -313,7 +313,7 @@
         </ObjectAnimationUsingKeyFrames>
     </Storyboard>
 
-    <Storyboard x:Key="MahApps.Storyboard.MahApps.Styles.Expander.MetroCollapse">
+    <Storyboard x:Key="MahApps.Storyboard.MetroExpanderCollapse">
         <DoubleAnimation Storyboard.TargetName="ExpandSite"
                          Storyboard.TargetProperty="(UIElement.Opacity)"
                          To="0"
@@ -401,10 +401,10 @@
                         <Trigger Property="IsExpanded" Value="True">
                             <Setter TargetName="ExpandSite" Property="Visibility" Value="Visible" />
                             <Trigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.MahApps.Styles.Expander.MetroExpand}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.MetroExpanderExpand}" />
                             </Trigger.EnterActions>
                             <Trigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.MahApps.Styles.Expander.MetroCollapse}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.MetroExpanderCollapse}" />
                             </Trigger.ExitActions>
                         </Trigger>
                         <Trigger Property="ExpandDirection" Value="Right">
diff --git a/src/MahApps.Metro/Styles/VS/TextBox.xaml b/src/MahApps.Metro/Styles/VS/TextBox.xaml
index 967e8c0ccb..0c56982297 100644
--- a/src/MahApps.Metro/Styles/VS/TextBox.xaml
+++ b/src/MahApps.Metro/Styles/VS/TextBox.xaml
@@ -37,7 +37,7 @@
                         <TextBlock Name="search"
                                    Margin="5 0 0 0"
                                    VerticalAlignment="Center"
-                                   Foreground="{DynamicResource MahApps.Brushes.MahApps.Styles.TextBox.VisualStudioSearch.Foreground}"
+                                   Foreground="{DynamicResource MahApps.Brushes.SearchTextBox.Foreground}"
                                    Text="Search ..."
                                    Visibility="Hidden" />
                         <ScrollViewer x:Name="PART_ContentHost" Margin="{TemplateBinding Padding}" />
diff --git a/src/MahApps.Metro/Themes/DropDownButton.xaml b/src/MahApps.Metro/Themes/DropDownButton.xaml
index 35349c8027..96cf0689d1 100644
--- a/src/MahApps.Metro/Themes/DropDownButton.xaml
+++ b/src/MahApps.Metro/Themes/DropDownButton.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
-    <Style x:Key="MahApps.Styles.MahApps.Styles.FocusVisualStyle.ButtonDropDown">
+    <Style x:Key="MahApps.Styles.DropDownButton.FocusVisualStyle">
         <Setter Property="Control.Template">
             <Setter.Value>
                 <ControlTemplate>
@@ -24,7 +24,7 @@
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.BlackColor}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="ButtonStyle" Value="{DynamicResource MahApps.Styles.Button.DropDown}" />
-        <Setter Property="FocusVisualStyle" Value="{StaticResource MahApps.Styles.MahApps.Styles.FocusVisualStyle.ButtonDropDown}" />
+        <Setter Property="FocusVisualStyle" Value="{StaticResource MahApps.Styles.DropDownButton.FocusVisualStyle}" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Content}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />

From 3b3bc80c744b83ada584eefe06d1c15457395965 Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Wed, 17 Jul 2019 15:26:04 +0200
Subject: [PATCH 13/46] Fix font names broken by search and replace

---
 .../HamburgerMenuRipple/HamburgerMenuRipple.xaml                | 2 +-
 src/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml             | 2 +-
 src/MahApps.Metro/Themes/Flyout.xaml                            | 2 +-
 src/MahApps.Metro/Themes/Pivot.xaml                             | 2 +-
 src/MahApps.Metro/Themes/ToggleSwitch.xaml                      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/HamburgerMenuRipple/HamburgerMenuRipple.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/HamburgerMenuRipple/HamburgerMenuRipple.xaml
index bc49b5619d..fe26b66491 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/HamburgerMenuRipple/HamburgerMenuRipple.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/HamburgerMenuRipple/HamburgerMenuRipple.xaml
@@ -295,7 +295,7 @@
                                        Margin="0 15 0 5"
                                        Padding="0"
                                        FontFamily="{DynamicResource MahApps.Fonts.Header}"
-                                       FontSize="{DynamicResource MahApps.Sizes.HeaderFont}"
+                                       FontSize="{DynamicResource MahApps.Sizes.Font.Header}"
                                        Text="{Binding Label}" />
                             <ScrollViewer Grid.Row="1"
                                           Focusable="False"
diff --git a/src/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml b/src/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
index e009bd9bca..58be4cc50b 100644
--- a/src/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
@@ -140,7 +140,7 @@
            TargetType="{x:Type Controls:ToggleSwitch}">
         <Setter Property="ContentDirection" Value="RightToLeft" />
         <Setter Property="ContentPadding" Value="0 0 10 0" />
-        <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource ToggleSwitchMahApps.Sizes.HeaderFont.Win10}" />
+        <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource MahApps.Sizes.Font.ToggleSwitchHeader.Win10}" />
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.ToggleSwitch.Win10}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.ToggleSwitch.Win10}" />
         <Setter Property="HeaderFontFamily" Value="{DynamicResource MahApps.Fonts.ToggleSwitch.Header.Win10}" />
diff --git a/src/MahApps.Metro/Themes/Flyout.xaml b/src/MahApps.Metro/Themes/Flyout.xaml
index 3bab16d39a..b8885e71a9 100644
--- a/src/MahApps.Metro/Themes/Flyout.xaml
+++ b/src/MahApps.Metro/Themes/Flyout.xaml
@@ -222,7 +222,7 @@
     <Style TargetType="{x:Type Controls:Flyout}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Flyout.Background}" />
         <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource FlyoutMahApps.Sizes.HeaderFont}" />
+        <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource MahApps.Sizes.Font.FlyoutHeader}" />
         <Setter Property="Controls:ControlsHelper.HeaderMargin" Value="10" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Flyout.Foreground}" />
diff --git a/src/MahApps.Metro/Themes/Pivot.xaml b/src/MahApps.Metro/Themes/Pivot.xaml
index 913596f099..e29b6c5811 100644
--- a/src/MahApps.Metro/Themes/Pivot.xaml
+++ b/src/MahApps.Metro/Themes/Pivot.xaml
@@ -4,7 +4,7 @@
 
     <DataTemplate x:Key="MahApps.Templates.PivotHeader">
         <TextBlock FontFamily="{DynamicResource MahApps.Fonts.Header}"
-                   FontSize="{DynamicResource MahApps.Sizes.HeaderFont}"
+                   FontSize="{DynamicResource MahApps.Sizes.Font.Header}"
                    Text="{Binding}" />
     </DataTemplate>
 
diff --git a/src/MahApps.Metro/Themes/ToggleSwitch.xaml b/src/MahApps.Metro/Themes/ToggleSwitch.xaml
index 1b6fb042c4..b4f3817c46 100644
--- a/src/MahApps.Metro/Themes/ToggleSwitch.xaml
+++ b/src/MahApps.Metro/Themes/ToggleSwitch.xaml
@@ -90,7 +90,7 @@
 
     <Style x:Key="MahApps.Styles.ToggleSwitch.Metro" TargetType="{x:Type Controls:ToggleSwitch}">
         <Setter Property="ContentPadding" Value="0 0 4 0" />
-        <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource ToggleSwitchMahApps.Sizes.HeaderFont}" />
+        <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource MahApps.Sizes.Font.ToggleSwitchHeader}" />
         <Setter Property="Controls:ControlsHelper.HeaderMargin" Value="0 0 0 5" />
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.ToggleSwitch}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.ToggleSwitch}" />

From 68ad6d9aa5464028e31e4974569e5ba5659a69e8 Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Wed, 17 Jul 2019 15:37:47 +0200
Subject: [PATCH 14/46] Fix brush names broken by search and replace

---
 .../Styles/Controls.ToggleSwitch.xaml         | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml b/src/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
index 58be4cc50b..c8f89f3351 100644
--- a/src/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
@@ -14,12 +14,12 @@
     <Style x:Key="MahApps.Styles.ToggleSwitchButton.Win10"
            BasedOn="{StaticResource MahApps.Styles.ToggleSwitchButton.Metro}"
            TargetType="{x:Type Controls:ToggleSwitchButton}">
-        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.OffBorderBrush.Win10}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ToggleSwitchButton.OffBorder.Win10}" />
         <Setter Property="BorderThickness" Value="2" />
         <Setter Property="Height" Value="20" />
         <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="OffSwitchBrush" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.OffSwitchBrush.Win10}" />
-        <Setter Property="OnSwitchBrush" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10}" />
+        <Setter Property="OffSwitchBrush" Value="{DynamicResource MahApps.Brushes.ToggleSwitchButton.OffSwitch.Win10}" />
+        <Setter Property="OnSwitchBrush" Value="{DynamicResource MahApps.Brushes.ToggleSwitchButton.OnSwitch.Win10}" />
         <Setter Property="Padding" Value="0" />
         <Setter Property="Template">
             <Setter.Value>
@@ -79,7 +79,7 @@
                         <Trigger Property="IsChecked" Value="True">
                             <Setter TargetName="PART_SwitchBrushBorder" Property="Opacity" Value="1" />
                             <Setter TargetName="PART_SwitchBrushOuterBorder" Property="Opacity" Value="0" />
-                            <Setter TargetName="PART_ThumbIndicatorInner" Property="Fill" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorCheckedBrush.Win10}" />
+                            <Setter TargetName="PART_ThumbIndicatorInner" Property="Fill" Value="{DynamicResource MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorChecked.Win10}" />
                         </Trigger>
                         <!--  MouseOver  -->
                         <MultiTrigger>
@@ -88,8 +88,8 @@
                                 <Condition Property="IsChecked" Value="False" />
                                 <Condition Property="IsEnabled" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="PART_SwitchBrushOuterBorder" Property="Stroke" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.OffMouseOverBorderBrush.Win10}" />
-                            <Setter TargetName="PART_ThumbIndicatorInner" Property="Fill" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorMouseOverBrush.Win10}" />
+                            <Setter TargetName="PART_SwitchBrushOuterBorder" Property="Stroke" Value="{DynamicResource MahApps.Brushes.ToggleSwitchButton.OffMouseOverBorder.Win10}" />
+                            <Setter TargetName="PART_ThumbIndicatorInner" Property="Fill" Value="{DynamicResource MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorMouseOver.Win10}" />
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
@@ -97,14 +97,14 @@
                                 <Condition Property="IsChecked" Value="True" />
                                 <Condition Property="IsEnabled" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="PART_SwitchBrushBorder" Property="Fill" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchMouseOverBrush.Win10}" />
+                            <Setter TargetName="PART_SwitchBrushBorder" Property="Fill" Value="{DynamicResource MahApps.Brushes.ToggleSwitchButton.OnSwitchMouseOver.Win10}" />
                         </MultiTrigger>
                         <!--  Pressed  -->
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter TargetName="PART_SwitchBrushBorder" Property="Fill" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.PressedBrush.Win10}" />
+                            <Setter TargetName="PART_SwitchBrushBorder" Property="Fill" Value="{DynamicResource MahApps.Brushes.ToggleSwitchButton.Pressed.Win10}" />
                             <Setter TargetName="PART_SwitchBrushBorder" Property="Opacity" Value="1" />
                             <Setter TargetName="PART_SwitchBrushOuterBorder" Property="Opacity" Value="0" />
-                            <Setter TargetName="PART_ThumbIndicatorInner" Property="Fill" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorPressedBrush.Win10}" />
+                            <Setter TargetName="PART_ThumbIndicatorInner" Property="Fill" Value="{DynamicResource MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorPressed.Win10}" />
                         </Trigger>
                         <!--  Disabled  -->
                         <MultiTrigger>
@@ -112,7 +112,7 @@
                                 <Condition Property="IsEnabled" Value="False" />
                                 <Condition Property="IsChecked" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="PART_SwitchBrushBorder" Property="Fill" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchDisabledBrush.Win10}" />
+                            <Setter TargetName="PART_SwitchBrushBorder" Property="Fill" Value="{DynamicResource MahApps.Brushes.ToggleSwitchButton.OnSwitchDisabled.Win10}" />
                             <Setter TargetName="PART_SwitchBrushBorder" Property="Opacity" Value="1" />
                             <Setter TargetName="PART_SwitchBrushOuterBorder" Property="Opacity" Value="0" />
                             <Setter TargetName="PART_ThumbIndicatorInner" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ThumbIndicatorDisabledBrush}" />
@@ -122,15 +122,15 @@
                                 <Condition Property="IsEnabled" Value="False" />
                                 <Condition Property="IsChecked" Value="False" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="PART_SwitchBrushOuterBorder" Property="Stroke" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.OffDisabledBorderBrush.Win10}" />
+                            <Setter TargetName="PART_SwitchBrushOuterBorder" Property="Stroke" Value="{DynamicResource MahApps.Brushes.ToggleSwitchButton.OffDisabledBorder.Win10}" />
                             <Setter TargetName="PART_ThumbIndicatorInner" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ThumbIndicatorDisabledBrush}" />
                         </MultiTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-        <Setter Property="ThumbIndicatorBrush" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorBrush.Win10}" />
-        <Setter Property="ThumbIndicatorDisabledBrush" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorDisabledBrush.Win10}" />
+        <Setter Property="ThumbIndicatorBrush" Value="{DynamicResource MahApps.Brushes.ToggleSwitchButton.ThumbIndicator.Win10}" />
+        <Setter Property="ThumbIndicatorDisabledBrush" Value="{DynamicResource MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorDisabled.Win10}" />
         <Setter Property="ThumbIndicatorWidth" Value="10" />
         <Setter Property="Width" Value="44" />
     </Style>
@@ -144,10 +144,10 @@
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.ToggleSwitch.Win10}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.ToggleSwitch.Win10}" />
         <Setter Property="HeaderFontFamily" Value="{DynamicResource MahApps.Fonts.ToggleSwitch.Header.Win10}" />
-        <Setter Property="OffSwitchBrush" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.OffSwitchBrush.Win10}" />
-        <Setter Property="OnSwitchBrush" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10}" />
-        <Setter Property="ThumbIndicatorBrush" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorBrush.Win10}" />
-        <Setter Property="ThumbIndicatorDisabledBrush" Value="{DynamicResource MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorDisabledBrush.Win10}" />
+        <Setter Property="OffSwitchBrush" Value="{DynamicResource MahApps.Brushes.ToggleSwitchButton.OffSwitch.Win10}" />
+        <Setter Property="OnSwitchBrush" Value="{DynamicResource MahApps.Brushes.ToggleSwitchButton.OnSwitch.Win10}" />
+        <Setter Property="ThumbIndicatorBrush" Value="{DynamicResource MahApps.Brushes.ToggleSwitchButton.ThumbIndicator.Win10}" />
+        <Setter Property="ThumbIndicatorDisabledBrush" Value="{DynamicResource MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorDisabled.Win10}" />
         <Setter Property="ThumbIndicatorWidth" Value="10" />
         <Setter Property="ToggleSwitchButtonStyle" Value="{StaticResource MahApps.Styles.ToggleSwitchButton.Win10}" />
         <Style.Triggers>

From b4a3283add89c6c799431c524bcf01fe308b4e53 Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Wed, 17 Jul 2019 16:35:13 +0200
Subject: [PATCH 15/46] Fix control template names broken by search and replace

---
 src/MahApps.Metro/Styles/Controls.DataGrid.xaml | 6 +++---
 src/MahApps.Metro/Themes/HamburgerMenu.xaml     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/MahApps.Metro/Styles/Controls.DataGrid.xaml b/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
index ed7a9350c9..ed16d4b5cb 100644
--- a/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
+++ b/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
@@ -231,7 +231,7 @@
                                 <Control Grid.Column="1"
                                          Focusable="False"
                                          SnapsToDevicePixels="False"
-                                         Template="{Binding MahApps.Templates.ValidationError, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}}"
+                                         Template="{Binding ValidationErrorTemplate, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}}"
                                          Visibility="{Binding (Validation.HasError), Converter={StaticResource BooleanToVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}}" />
                             </Grid>
                         </Border>
@@ -358,7 +358,7 @@
         </Style.Triggers>
     </Style>
 
-    <ControlTemplate x:Key="DefaultRowMahApps.Templates.ValidationError">
+    <ControlTemplate x:Key="MahApps.Templates.DataGridRow.ValidationError">
         <Grid Margin="2 0 2 0"
               VerticalAlignment="Center"
               DataContext="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type DataGridRow}}, Path=(Validation.Errors).CurrentItem}"
@@ -384,7 +384,7 @@
         <Setter Property="Controls:DataGridRowHelper.SelectionUnit" Value="{Binding Path=SelectionUnit, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
         <Setter Property="Margin" Value="0 0 0 0" />
         <Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
-        <Setter Property="ValidationErrorTemplate" Value="{StaticResource DefaultRowValidationErrorTemplate}" />
+        <Setter Property="ValidationErrorTemplate" Value="{StaticResource MahApps.Templates.DataGridRow.ValidationError}" />
         <Style.Triggers>
             <!--  IsSelected  -->
             <MultiTrigger>
diff --git a/src/MahApps.Metro/Themes/HamburgerMenu.xaml b/src/MahApps.Metro/Themes/HamburgerMenu.xaml
index a8fad9babf..174316bdf7 100644
--- a/src/MahApps.Metro/Themes/HamburgerMenu.xaml
+++ b/src/MahApps.Metro/Themes/HamburgerMenu.xaml
@@ -9,7 +9,7 @@
     <Style x:Key="MahApps.Styles.HamburgerMenu.Metro" TargetType="{x:Type Controls:HamburgerMenu}">
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="Focusable" Value="False" />
-        <Setter Property="HamburgerButtonStyle" Value="{DynamicResource HamburgerButtonStyle}" />
+        <Setter Property="HamburgerButtonStyle" Value="{DynamicResource MahApps.Styles.Button.Hamburger}" />
         <Setter Property="HamburgerButtonTemplate">
             <Setter.Value>
                 <DataTemplate>

From 34f6814d6b716999c9c75e919a7184c9dcbf9912 Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Wed, 17 Jul 2019 17:00:27 +0200
Subject: [PATCH 16/46] Fix VS brush and color names broken by search and
 replace

---
 .../ExampleWindows/VSDemo.xaml                | 152 +++++++++---------
 src/MahApps.Metro/Styles/VS/Button.xaml       |   6 +-
 src/MahApps.Metro/Styles/VS/Expander.xaml     |  28 ++--
 src/MahApps.Metro/Styles/VS/GroupBox.xaml     |   4 +-
 src/MahApps.Metro/Styles/VS/ListBox.xaml      |   4 +-
 src/MahApps.Metro/Styles/VS/Menu.xaml         |   6 +-
 src/MahApps.Metro/Styles/VS/ScrollBar.xaml    |  10 +-
 src/MahApps.Metro/Styles/VS/TabControl.xaml   |  14 +-
 src/MahApps.Metro/Styles/VS/TextBox.xaml      |   6 +-
 src/MahApps.Metro/Styles/VS/Window.xaml       |   2 +-
 10 files changed, 116 insertions(+), 116 deletions(-)

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/VSDemo.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/VSDemo.xaml
index 97d793331a..923aa078b3 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/VSDemo.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/VSDemo.xaml
@@ -75,7 +75,7 @@
         <TextBlock Margin="5"
                    VerticalAlignment="Center"
                    DockPanel.Dock="Left"
-                   Foreground="{StaticResource Foreground}">
+                   Foreground="{StaticResource MahApps.Brushes.Foreground}">
             <TextBlock.LayoutTransform>
                 <RotateTransform Angle="90" />
             </TextBlock.LayoutTransform>
@@ -113,28 +113,28 @@
                                 <TextBlock Grid.Row="0"
                                            Grid.ColumnSpan="3"
                                            FontSize="30"
-                                           Foreground="{StaticResource Foreground}">
+                                           Foreground="{StaticResource MahApps.Brushes.Foreground}">
                                     Space Commander - Starship Enterprise
                                 </TextBlock>
                                 <TextBlock Grid.Row="1"
                                            FontSize="16"
-                                           Foreground="{StaticResource Foreground}">
+                                           Foreground="{StaticResource MahApps.Brushes.Foreground}">
                                     You are logged in as:
                                 </TextBlock>
                                 <TextBlock Grid.Row="1"
                                            Grid.Column="1"
                                            FontSize="16"
-                                           Foreground="{StaticResource Foreground}"
+                                           Foreground="{StaticResource MahApps.Brushes.Foreground}"
                                            Text="{x:Static System:Environment.UserName}" />
                                 <TextBlock Grid.Row="2"
                                            FontSize="16"
-                                           Foreground="{StaticResource Foreground}">
+                                           Foreground="{StaticResource MahApps.Brushes.Foreground}">
                                     Ship state
                                 </TextBlock>
                                 <TextBlock Grid.Row="2"
                                            Grid.Column="1"
                                            FontSize="16"
-                                           Foreground="{StaticResource BackgroundSelected}">
+                                           Foreground="{StaticResource MahApps.Brushes.BackgroundSelected}">
                                     IO
                                 </TextBlock>
                                 <Separator Grid.Row="3"
@@ -142,24 +142,24 @@
                                            Margin="5" />
                                 <TextBlock Grid.Row="4"
                                            FontSize="16"
-                                           Foreground="{StaticResource Foreground}">
+                                           Foreground="{StaticResource MahApps.Brushes.Foreground}">
                                     Ship commander
                                 </TextBlock>
                                 <TextBlock Grid.Row="4"
                                            Grid.Column="1"
                                            FontSize="16"
-                                           Foreground="{StaticResource Foreground}">
+                                           Foreground="{StaticResource MahApps.Brushes.Foreground}">
                                     Captain James T. Kirk
                                 </TextBlock>
                                 <TextBlock Grid.Row="5"
                                            FontSize="16"
-                                           Foreground="{StaticResource Foreground}">
+                                           Foreground="{StaticResource MahApps.Brushes.Foreground}">
                                     Ship name
                                 </TextBlock>
                                 <TextBlock Grid.Row="5"
                                            Grid.Column="1"
                                            FontSize="16"
-                                           Foreground="{StaticResource Foreground}">
+                                           Foreground="{StaticResource MahApps.Brushes.Foreground}">
                                     Enterprise (NCC-1701)
                                 </TextBlock>
                             </Grid>
@@ -183,18 +183,18 @@
                         <ListBox Margin="50" ScrollViewer.HorizontalScrollBarVisibility="Disabled">
                             <ListBoxItem>
                                 <StackPanel>
-                                    <TextBlock FontSize="30" Foreground="{StaticResource Foreground}">Rocket 1</TextBlock>
-                                    <TextBlock FontSize="16" Foreground="{StaticResource Foreground}">Status: IO</TextBlock>
-                                    <TextBlock FontSize="16" Foreground="{StaticResource Foreground}">Fire rate: 2ms</TextBlock>
-                                    <TextBlock FontSize="16" Foreground="{StaticResource Foreground}">Ammo: 455/455</TextBlock>
+                                    <TextBlock FontSize="30" Foreground="{StaticResource MahApps.Brushes.Foreground}">Rocket 1</TextBlock>
+                                    <TextBlock FontSize="16" Foreground="{StaticResource MahApps.Brushes.Foreground}">Status: IO</TextBlock>
+                                    <TextBlock FontSize="16" Foreground="{StaticResource MahApps.Brushes.Foreground}">Fire rate: 2ms</TextBlock>
+                                    <TextBlock FontSize="16" Foreground="{StaticResource MahApps.Brushes.Foreground}">Ammo: 455/455</TextBlock>
                                 </StackPanel>
                             </ListBoxItem>
                             <ListBoxItem>
                                 <StackPanel>
-                                    <TextBlock FontSize="30" Foreground="{StaticResource Foreground}">Rocket 2</TextBlock>
-                                    <TextBlock FontSize="16" Foreground="{StaticResource Foreground}">Status: Damaged</TextBlock>
-                                    <TextBlock FontSize="16" Foreground="{StaticResource Foreground}">Fire rate: 100ms</TextBlock>
-                                    <TextBlock FontSize="16" Foreground="{StaticResource Foreground}">Ammo: 50/156</TextBlock>
+                                    <TextBlock FontSize="30" Foreground="{StaticResource MahApps.Brushes.Foreground}">Rocket 2</TextBlock>
+                                    <TextBlock FontSize="16" Foreground="{StaticResource MahApps.Brushes.Foreground}">Status: Damaged</TextBlock>
+                                    <TextBlock FontSize="16" Foreground="{StaticResource MahApps.Brushes.Foreground}">Fire rate: 100ms</TextBlock>
+                                    <TextBlock FontSize="16" Foreground="{StaticResource MahApps.Brushes.Foreground}">Ammo: 50/156</TextBlock>
                                 </StackPanel>
                             </ListBoxItem>
                         </ListBox>
@@ -214,7 +214,7 @@
                         </Grid.RowDefinitions>
                         <TextBlock Margin="5"
                                    FontSize="16"
-                                   Foreground="{StaticResource Foreground}">
+                                   Foreground="{StaticResource MahApps.Brushes.Foreground}">
                             Receiver
                         </TextBlock>
                         <TextBox Grid.Column="1"
@@ -225,7 +225,7 @@
                         <TextBlock Grid.Row="1"
                                    Margin="5"
                                    FontSize="16"
-                                   Foreground="{StaticResource Foreground}">
+                                   Foreground="{StaticResource MahApps.Brushes.Foreground}">
                             Search for messages
                         </TextBlock>
                         <TextBox Grid.Row="1"
@@ -261,73 +261,73 @@
                     <ListBox Margin="50">
                         <ListBoxItem>
                             <StackPanel>
-                                <TextBlock FontSize="60" Foreground="{StaticResource Foreground}">James T. Kirk</TextBlock>
-                                <TextBlock FontSize="35" Foreground="{StaticResource Foreground}">Rank: Captain</TextBlock>
-                                <TextBlock FontSize="18" Foreground="{StaticResource Foreground}">Position: Commanding Officer</TextBlock>
+                                <TextBlock FontSize="60" Foreground="{StaticResource MahApps.Brushes.Foreground}">James T. Kirk</TextBlock>
+                                <TextBlock FontSize="35" Foreground="{StaticResource MahApps.Brushes.Foreground}">Rank: Captain</TextBlock>
+                                <TextBlock FontSize="18" Foreground="{StaticResource MahApps.Brushes.Foreground}">Position: Commanding Officer</TextBlock>
                                 <TextBlock FontSize="18" Foreground="#AAAAAA">Current action: Sleeping</TextBlock>
                             </StackPanel>
                         </ListBoxItem>
                         <ListBoxItem>
                             <StackPanel>
-                                <TextBlock FontSize="50" Foreground="{StaticResource Foreground}">Spock</TextBlock>
-                                <TextBlock FontSize="30" Foreground="{StaticResource Foreground}">Rank: Commander</TextBlock>
-                                <TextBlock FontSize="18" Foreground="{StaticResource Foreground}">Position: Executive (First)</TextBlock>
+                                <TextBlock FontSize="50" Foreground="{StaticResource MahApps.Brushes.Foreground}">Spock</TextBlock>
+                                <TextBlock FontSize="30" Foreground="{StaticResource MahApps.Brushes.Foreground}">Rank: Commander</TextBlock>
+                                <TextBlock FontSize="18" Foreground="{StaticResource MahApps.Brushes.Foreground}">Position: Executive (First)</TextBlock>
                                 <TextBlock FontSize="18" Foreground="#FFAAAA">Current action: Out for duty</TextBlock>
                             </StackPanel>
                         </ListBoxItem>
                         <ListBoxItem>
                             <StackPanel>
-                                <TextBlock FontSize="40" Foreground="{StaticResource Foreground}">Leonard McCoy</TextBlock>
-                                <TextBlock FontSize="22" Foreground="{StaticResource Foreground}">Rank: Lt. Commander</TextBlock>
-                                <TextBlock FontSize="18" Foreground="{StaticResource Foreground}">Position: Chief Medical Officer</TextBlock>
+                                <TextBlock FontSize="40" Foreground="{StaticResource MahApps.Brushes.Foreground}">Leonard McCoy</TextBlock>
+                                <TextBlock FontSize="22" Foreground="{StaticResource MahApps.Brushes.Foreground}">Rank: Lt. Commander</TextBlock>
+                                <TextBlock FontSize="18" Foreground="{StaticResource MahApps.Brushes.Foreground}">Position: Chief Medical Officer</TextBlock>
                                 <TextBlock FontSize="18" Foreground="#AAAAAA">Current action: Sleeping</TextBlock>
                             </StackPanel>
                         </ListBoxItem>
                         <ListBoxItem>
                             <StackPanel>
-                                <TextBlock FontSize="40" Foreground="{StaticResource Foreground}">Montgomery Scott</TextBlock>
-                                <TextBlock FontSize="22" Foreground="{StaticResource Foreground}">Rank: Lt. Commander</TextBlock>
-                                <TextBlock FontSize="18" Foreground="{StaticResource Foreground}">Position: Chief Engineer</TextBlock>
+                                <TextBlock FontSize="40" Foreground="{StaticResource MahApps.Brushes.Foreground}">Montgomery Scott</TextBlock>
+                                <TextBlock FontSize="22" Foreground="{StaticResource MahApps.Brushes.Foreground}">Rank: Lt. Commander</TextBlock>
+                                <TextBlock FontSize="18" Foreground="{StaticResource MahApps.Brushes.Foreground}">Position: Chief Engineer</TextBlock>
                                 <TextBlock FontSize="18" Foreground="#FFAAAA">Current action: Out for duty</TextBlock>
                             </StackPanel>
                         </ListBoxItem>
                         <ListBoxItem>
                             <StackPanel>
-                                <TextBlock FontSize="30" Foreground="{StaticResource Foreground}">Hikaru Sulu</TextBlock>
-                                <TextBlock FontSize="18" Foreground="{StaticResource Foreground}">Rank: Lieutenant</TextBlock>
-                                <TextBlock FontSize="18" Foreground="{StaticResource Foreground}">Position: Helm Officer</TextBlock>
+                                <TextBlock FontSize="30" Foreground="{StaticResource MahApps.Brushes.Foreground}">Hikaru Sulu</TextBlock>
+                                <TextBlock FontSize="18" Foreground="{StaticResource MahApps.Brushes.Foreground}">Rank: Lieutenant</TextBlock>
+                                <TextBlock FontSize="18" Foreground="{StaticResource MahApps.Brushes.Foreground}">Position: Helm Officer</TextBlock>
                                 <TextBlock FontSize="18" Foreground="#AAAAAA">Current action: Sleeping</TextBlock>
                             </StackPanel>
                         </ListBoxItem>
                         <ListBoxItem>
                             <StackPanel>
-                                <TextBlock FontSize="30" Foreground="{StaticResource Foreground}">Nyota Uhura</TextBlock>
-                                <TextBlock FontSize="18" Foreground="{StaticResource Foreground}">Rank: Lieutenant</TextBlock>
-                                <TextBlock FontSize="18" Foreground="{StaticResource Foreground}">Position: Communications Officer</TextBlock>
+                                <TextBlock FontSize="30" Foreground="{StaticResource MahApps.Brushes.Foreground}">Nyota Uhura</TextBlock>
+                                <TextBlock FontSize="18" Foreground="{StaticResource MahApps.Brushes.Foreground}">Rank: Lieutenant</TextBlock>
+                                <TextBlock FontSize="18" Foreground="{StaticResource MahApps.Brushes.Foreground}">Position: Communications Officer</TextBlock>
                                 <TextBlock FontSize="18" Foreground="#AAAAAA">Current action: Sleeping</TextBlock>
                             </StackPanel>
                         </ListBoxItem>
                         <ListBoxItem>
                             <StackPanel>
-                                <TextBlock FontSize="30" Foreground="{StaticResource Foreground}">Pavel Chekov</TextBlock>
-                                <TextBlock FontSize="18" Foreground="{StaticResource Foreground}">Rank: Ensign</TextBlock>
-                                <TextBlock FontSize="18" Foreground="{StaticResource Foreground}">Position: Navigator</TextBlock>
+                                <TextBlock FontSize="30" Foreground="{StaticResource MahApps.Brushes.Foreground}">Pavel Chekov</TextBlock>
+                                <TextBlock FontSize="18" Foreground="{StaticResource MahApps.Brushes.Foreground}">Rank: Ensign</TextBlock>
+                                <TextBlock FontSize="18" Foreground="{StaticResource MahApps.Brushes.Foreground}">Position: Navigator</TextBlock>
                                 <TextBlock FontSize="18" Foreground="#AAAAAA">Current action: Sleeping</TextBlock>
                             </StackPanel>
                         </ListBoxItem>
                         <ListBoxItem>
                             <StackPanel>
-                                <TextBlock FontSize="30" Foreground="{StaticResource Foreground}">Christine Chapel</TextBlock>
-                                <TextBlock FontSize="18" Foreground="{StaticResource Foreground}">Rank: Enlisted Nurse</TextBlock>
-                                <TextBlock FontSize="18" Foreground="{StaticResource Foreground}">Position: Nurse</TextBlock>
+                                <TextBlock FontSize="30" Foreground="{StaticResource MahApps.Brushes.Foreground}">Christine Chapel</TextBlock>
+                                <TextBlock FontSize="18" Foreground="{StaticResource MahApps.Brushes.Foreground}">Rank: Enlisted Nurse</TextBlock>
+                                <TextBlock FontSize="18" Foreground="{StaticResource MahApps.Brushes.Foreground}">Position: Nurse</TextBlock>
                                 <TextBlock FontSize="18" Foreground="#AAAAAA">Current action: Sleeping</TextBlock>
                             </StackPanel>
                         </ListBoxItem>
                         <ListBoxItem>
                             <StackPanel>
-                                <TextBlock FontSize="30" Foreground="{StaticResource Foreground}">Janice Rand</TextBlock>
-                                <TextBlock FontSize="18" Foreground="{StaticResource Foreground}">Rank: Enlisted Yeoman</TextBlock>
-                                <TextBlock FontSize="18" Foreground="{StaticResource Foreground}">Position: Yeoman</TextBlock>
+                                <TextBlock FontSize="30" Foreground="{StaticResource MahApps.Brushes.Foreground}">Janice Rand</TextBlock>
+                                <TextBlock FontSize="18" Foreground="{StaticResource MahApps.Brushes.Foreground}">Rank: Enlisted Yeoman</TextBlock>
+                                <TextBlock FontSize="18" Foreground="{StaticResource MahApps.Brushes.Foreground}">Position: Yeoman</TextBlock>
                                 <TextBlock FontSize="18" Foreground="#AAAAAA">Current action: Sleeping</TextBlock>
                             </StackPanel>
                         </ListBoxItem>
@@ -342,73 +342,73 @@
                         </ListBox.ItemsPanel>
                         <ListBoxItem>
                             <StackPanel>
-                                <TextBlock FontSize="60" Foreground="{StaticResource Foreground}">James T. Kirk</TextBlock>
-                                <TextBlock FontSize="35" Foreground="{StaticResource Foreground}">Rank: Captain</TextBlock>
-                                <TextBlock FontSize="18" Foreground="{StaticResource Foreground}">Position: Commanding Officer</TextBlock>
+                                <TextBlock FontSize="60" Foreground="{StaticResource MahApps.Brushes.Foreground}">James T. Kirk</TextBlock>
+                                <TextBlock FontSize="35" Foreground="{StaticResource MahApps.Brushes.Foreground}">Rank: Captain</TextBlock>
+                                <TextBlock FontSize="18" Foreground="{StaticResource MahApps.Brushes.Foreground}">Position: Commanding Officer</TextBlock>
                                 <TextBlock FontSize="18" Foreground="#AAAAAA">Current action: Sleeping</TextBlock>
                             </StackPanel>
                         </ListBoxItem>
                         <ListBoxItem>
                             <StackPanel>
-                                <TextBlock FontSize="50" Foreground="{StaticResource Foreground}">Spock</TextBlock>
-                                <TextBlock FontSize="30" Foreground="{StaticResource Foreground}">Rank: Commander</TextBlock>
-                                <TextBlock FontSize="18" Foreground="{StaticResource Foreground}">Position: Executive (First)</TextBlock>
+                                <TextBlock FontSize="50" Foreground="{StaticResource MahApps.Brushes.Foreground}">Spock</TextBlock>
+                                <TextBlock FontSize="30" Foreground="{StaticResource MahApps.Brushes.Foreground}">Rank: Commander</TextBlock>
+                                <TextBlock FontSize="18" Foreground="{StaticResource MahApps.Brushes.Foreground}">Position: Executive (First)</TextBlock>
                                 <TextBlock FontSize="18" Foreground="#FFAAAA">Current action: Out for duty</TextBlock>
                             </StackPanel>
                         </ListBoxItem>
                         <ListBoxItem>
                             <StackPanel>
-                                <TextBlock FontSize="40" Foreground="{StaticResource Foreground}">Leonard McCoy</TextBlock>
-                                <TextBlock FontSize="22" Foreground="{StaticResource Foreground}">Rank: Lt. Commander</TextBlock>
-                                <TextBlock FontSize="18" Foreground="{StaticResource Foreground}">Position: Chief Medical Officer</TextBlock>
+                                <TextBlock FontSize="40" Foreground="{StaticResource MahApps.Brushes.Foreground}">Leonard McCoy</TextBlock>
+                                <TextBlock FontSize="22" Foreground="{StaticResource MahApps.Brushes.Foreground}">Rank: Lt. Commander</TextBlock>
+                                <TextBlock FontSize="18" Foreground="{StaticResource MahApps.Brushes.Foreground}">Position: Chief Medical Officer</TextBlock>
                                 <TextBlock FontSize="18" Foreground="#AAAAAA">Current action: Sleeping</TextBlock>
                             </StackPanel>
                         </ListBoxItem>
                         <ListBoxItem>
                             <StackPanel>
-                                <TextBlock FontSize="40" Foreground="{StaticResource Foreground}">Montgomery Scott</TextBlock>
-                                <TextBlock FontSize="22" Foreground="{StaticResource Foreground}">Rank: Lt. Commander</TextBlock>
-                                <TextBlock FontSize="18" Foreground="{StaticResource Foreground}">Position: Chief Engineer</TextBlock>
+                                <TextBlock FontSize="40" Foreground="{StaticResource MahApps.Brushes.Foreground}">Montgomery Scott</TextBlock>
+                                <TextBlock FontSize="22" Foreground="{StaticResource MahApps.Brushes.Foreground}">Rank: Lt. Commander</TextBlock>
+                                <TextBlock FontSize="18" Foreground="{StaticResource MahApps.Brushes.Foreground}">Position: Chief Engineer</TextBlock>
                                 <TextBlock FontSize="18" Foreground="#FFAAAA">Current action: Out for duty</TextBlock>
                             </StackPanel>
                         </ListBoxItem>
                         <ListBoxItem>
                             <StackPanel>
-                                <TextBlock FontSize="30" Foreground="{StaticResource Foreground}">Hikaru Sulu</TextBlock>
-                                <TextBlock FontSize="18" Foreground="{StaticResource Foreground}">Rank: Lieutenant</TextBlock>
-                                <TextBlock FontSize="18" Foreground="{StaticResource Foreground}">Position: Helm Officer</TextBlock>
+                                <TextBlock FontSize="30" Foreground="{StaticResource MahApps.Brushes.Foreground}">Hikaru Sulu</TextBlock>
+                                <TextBlock FontSize="18" Foreground="{StaticResource MahApps.Brushes.Foreground}">Rank: Lieutenant</TextBlock>
+                                <TextBlock FontSize="18" Foreground="{StaticResource MahApps.Brushes.Foreground}">Position: Helm Officer</TextBlock>
                                 <TextBlock FontSize="18" Foreground="#AAAAAA">Current action: Sleeping</TextBlock>
                             </StackPanel>
                         </ListBoxItem>
                         <ListBoxItem>
                             <StackPanel>
-                                <TextBlock FontSize="30" Foreground="{StaticResource Foreground}">Nyota Uhura</TextBlock>
-                                <TextBlock FontSize="18" Foreground="{StaticResource Foreground}">Rank: Lieutenant</TextBlock>
-                                <TextBlock FontSize="18" Foreground="{StaticResource Foreground}">Position: Communications Officer</TextBlock>
+                                <TextBlock FontSize="30" Foreground="{StaticResource MahApps.Brushes.Foreground}">Nyota Uhura</TextBlock>
+                                <TextBlock FontSize="18" Foreground="{StaticResource MahApps.Brushes.Foreground}">Rank: Lieutenant</TextBlock>
+                                <TextBlock FontSize="18" Foreground="{StaticResource MahApps.Brushes.Foreground}">Position: Communications Officer</TextBlock>
                                 <TextBlock FontSize="18" Foreground="#AAAAAA">Current action: Sleeping</TextBlock>
                             </StackPanel>
                         </ListBoxItem>
                         <ListBoxItem>
                             <StackPanel>
-                                <TextBlock FontSize="30" Foreground="{StaticResource Foreground}">Pavel Chekov</TextBlock>
-                                <TextBlock FontSize="18" Foreground="{StaticResource Foreground}">Rank: Ensign</TextBlock>
-                                <TextBlock FontSize="18" Foreground="{StaticResource Foreground}">Position: Navigator</TextBlock>
+                                <TextBlock FontSize="30" Foreground="{StaticResource MahApps.Brushes.Foreground}">Pavel Chekov</TextBlock>
+                                <TextBlock FontSize="18" Foreground="{StaticResource MahApps.Brushes.Foreground}">Rank: Ensign</TextBlock>
+                                <TextBlock FontSize="18" Foreground="{StaticResource MahApps.Brushes.Foreground}">Position: Navigator</TextBlock>
                                 <TextBlock FontSize="18" Foreground="#AAAAAA">Current action: Sleeping</TextBlock>
                             </StackPanel>
                         </ListBoxItem>
                         <ListBoxItem>
                             <StackPanel>
-                                <TextBlock FontSize="30" Foreground="{StaticResource Foreground}">Christine Chapel</TextBlock>
-                                <TextBlock FontSize="18" Foreground="{StaticResource Foreground}">Rank: Enlisted Nurse</TextBlock>
-                                <TextBlock FontSize="18" Foreground="{StaticResource Foreground}">Position: Nurse</TextBlock>
+                                <TextBlock FontSize="30" Foreground="{StaticResource MahApps.Brushes.Foreground}">Christine Chapel</TextBlock>
+                                <TextBlock FontSize="18" Foreground="{StaticResource MahApps.Brushes.Foreground}">Rank: Enlisted Nurse</TextBlock>
+                                <TextBlock FontSize="18" Foreground="{StaticResource MahApps.Brushes.Foreground}">Position: Nurse</TextBlock>
                                 <TextBlock FontSize="18" Foreground="#AAAAAA">Current action: Sleeping</TextBlock>
                             </StackPanel>
                         </ListBoxItem>
                         <ListBoxItem>
                             <StackPanel>
-                                <TextBlock FontSize="30" Foreground="{StaticResource Foreground}">Janice Rand</TextBlock>
-                                <TextBlock FontSize="18" Foreground="{StaticResource Foreground}">Rank: Enlisted Yeoman</TextBlock>
-                                <TextBlock FontSize="18" Foreground="{StaticResource Foreground}">Position: Yeoman</TextBlock>
+                                <TextBlock FontSize="30" Foreground="{StaticResource MahApps.Brushes.Foreground}">Janice Rand</TextBlock>
+                                <TextBlock FontSize="18" Foreground="{StaticResource MahApps.Brushes.Foreground}">Rank: Enlisted Yeoman</TextBlock>
+                                <TextBlock FontSize="18" Foreground="{StaticResource MahApps.Brushes.Foreground}">Position: Yeoman</TextBlock>
                                 <TextBlock FontSize="18" Foreground="#AAAAAA">Current action: Sleeping</TextBlock>
                             </StackPanel>
                         </ListBoxItem>
@@ -418,7 +418,7 @@
             <StackPanel Grid.Column="1" Margin="50 25 25 0">
                 <TextBlock Margin="0 10 0 10"
                            FontSize="18"
-                           Foreground="{StaticResource Foreground}"
+                           Foreground="{StaticResource MahApps.Brushes.Foreground}"
                            Text="Actions" />
                 <Separator Background="#11FFFFFF" />
                 <Button Margin="0 10 0 3"
@@ -432,7 +432,7 @@
                 <Separator Background="#11FFFFFF" />
                 <TextBlock Margin="0 10 0 10"
                            FontSize="18"
-                           Foreground="{StaticResource Foreground}"
+                           Foreground="{StaticResource MahApps.Brushes.Foreground}"
                            Text="Recent" />
                 <Separator Background="#11FFFFFF" />
                 <Button Margin="0 10 0 3"
diff --git a/src/MahApps.Metro/Styles/VS/Button.xaml b/src/MahApps.Metro/Styles/VS/Button.xaml
index 670f079ff5..215022377b 100644
--- a/src/MahApps.Metro/Styles/VS/Button.xaml
+++ b/src/MahApps.Metro/Styles/VS/Button.xaml
@@ -4,7 +4,7 @@
     <Style x:Key="MahApps.Styles.Button.VisualStudioWindowStandard" TargetType="Button">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Background.Normal}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Normal}" />
-        <Setter Property="Foreground" Value="{DynamicResource Foreground}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Foreground}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Button">
@@ -18,11 +18,11 @@
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource BackgroundHighlighted}" />
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.BackgroundHighlighted}" />
                             <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Highlighted}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource BackgroundSelected}" />
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.BackgroundSelected}" />
                             <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Selected}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
diff --git a/src/MahApps.Metro/Styles/VS/Expander.xaml b/src/MahApps.Metro/Styles/VS/Expander.xaml
index fa0c45c575..0ece6af9d2 100644
--- a/src/MahApps.Metro/Styles/VS/Expander.xaml
+++ b/src/MahApps.Metro/Styles/VS/Expander.xaml
@@ -82,11 +82,11 @@
                             <Setter TargetName="Arrow" Property="Data" Value="M 1,4.5  L 4.5,1  L 8,4.5" />
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Arrow" Property="Stroke" Value="{DynamicResource Foreground}" />
-                            <Setter TargetName="ArrowGrid" Property="Background" Value="{DynamicResource BackgroundHighlighted}" />
+                            <Setter TargetName="Arrow" Property="Stroke" Value="{DynamicResource MahApps.Brushes.Foreground}" />
+                            <Setter TargetName="ArrowGrid" Property="Background" Value="{DynamicResource MahApps.Brushes.BackgroundHighlighted}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter TargetName="ArrowGrid" Property="Background" Value="{DynamicResource BackgroundSelected}" />
+                            <Setter TargetName="ArrowGrid" Property="Background" Value="{DynamicResource MahApps.Brushes.BackgroundSelected}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -156,11 +156,11 @@
                             <Setter TargetName="Arrow" Property="Data" Value="M 1,4.5  L 4.5,1  L 8,4.5" />
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Arrow" Property="Stroke" Value="{DynamicResource Foreground}" />
-                            <Setter TargetName="ArrowGrid" Property="Background" Value="{DynamicResource BackgroundHighlighted}" />
+                            <Setter TargetName="Arrow" Property="Stroke" Value="{DynamicResource MahApps.Brushes.Foreground}" />
+                            <Setter TargetName="ArrowGrid" Property="Background" Value="{DynamicResource MahApps.Brushes.BackgroundHighlighted}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter TargetName="ArrowGrid" Property="Background" Value="{DynamicResource BackgroundSelected}" />
+                            <Setter TargetName="ArrowGrid" Property="Background" Value="{DynamicResource MahApps.Brushes.BackgroundSelected}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -228,11 +228,11 @@
                             <Setter TargetName="Arrow" Property="Data" Value="M 1,4.5  L 4.5,1  L 8,4.5" />
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Arrow" Property="Stroke" Value="{DynamicResource Foreground}" />
-                            <Setter TargetName="ArrowGrid" Property="Background" Value="{DynamicResource BackgroundHighlighted}" />
+                            <Setter TargetName="Arrow" Property="Stroke" Value="{DynamicResource MahApps.Brushes.Foreground}" />
+                            <Setter TargetName="ArrowGrid" Property="Background" Value="{DynamicResource MahApps.Brushes.BackgroundHighlighted}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter TargetName="ArrowGrid" Property="Background" Value="{DynamicResource BackgroundSelected}" />
+                            <Setter TargetName="ArrowGrid" Property="Background" Value="{DynamicResource MahApps.Brushes.BackgroundSelected}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -291,11 +291,11 @@
                             <Setter TargetName="Arrow" Property="Data" Value="M 1,4.5  L 4.5,1  L 8,4.5" />
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Arrow" Property="Stroke" Value="{DynamicResource Foreground}" />
-                            <Setter TargetName="ArrowGrid" Property="Background" Value="{DynamicResource BackgroundHighlighted}" />
+                            <Setter TargetName="Arrow" Property="Stroke" Value="{DynamicResource MahApps.Brushes.Foreground}" />
+                            <Setter TargetName="ArrowGrid" Property="Background" Value="{DynamicResource MahApps.Brushes.BackgroundHighlighted}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter TargetName="ArrowGrid" Property="Background" Value="{DynamicResource BackgroundSelected}" />
+                            <Setter TargetName="ArrowGrid" Property="Background" Value="{DynamicResource MahApps.Brushes.BackgroundSelected}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -333,8 +333,8 @@
         <Setter Property="Controls:ExpanderHelper.HeaderLeftStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderLeftHeader}" />
         <Setter Property="Controls:ExpanderHelper.HeaderRightStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderRightHeader}" />
         <Setter Property="Controls:ExpanderHelper.HeaderUpStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderUpHeader}" />
-        <Setter Property="Controls:GroupBoxHelper.HeaderForeground" Value="{DynamicResource Foreground}" />
-        <Setter Property="Foreground" Value="{DynamicResource Foreground}" />
+        <Setter Property="Controls:GroupBoxHelper.HeaderForeground" Value="{DynamicResource MahApps.Brushes.Foreground}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Foreground}" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
diff --git a/src/MahApps.Metro/Styles/VS/GroupBox.xaml b/src/MahApps.Metro/Styles/VS/GroupBox.xaml
index 7aab5616b3..18f562a032 100644
--- a/src/MahApps.Metro/Styles/VS/GroupBox.xaml
+++ b/src/MahApps.Metro/Styles/VS/GroupBox.xaml
@@ -12,8 +12,8 @@
         <Setter Property="BorderThickness" Value="2" />
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Normal" />
         <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource MahApps.Sizes.GroupBox.HeaderThemeFont}" />
-        <Setter Property="Controls:GroupBoxHelper.HeaderForeground" Value="{DynamicResource Foreground}" />
-        <Setter Property="Foreground" Value="{DynamicResource Foreground}" />
+        <Setter Property="Controls:GroupBoxHelper.HeaderForeground" Value="{DynamicResource MahApps.Brushes.Foreground}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Foreground}" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
diff --git a/src/MahApps.Metro/Styles/VS/ListBox.xaml b/src/MahApps.Metro/Styles/VS/ListBox.xaml
index a428423287..2c18141f15 100644
--- a/src/MahApps.Metro/Styles/VS/ListBox.xaml
+++ b/src/MahApps.Metro/Styles/VS/ListBox.xaml
@@ -25,11 +25,11 @@
                                         <Condition Property="IsMouseOver" Value="True" />
                                         <Condition Property="IsSelected" Value="False" />
                                     </MultiTrigger.Conditions>
-                                    <Setter Property="Background" Value="{DynamicResource BackgroundHighlighted}" />
+                                    <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.BackgroundHighlighted}" />
                                     <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Highlighted}" />
                                 </MultiTrigger>
                                 <Trigger Property="IsSelected" Value="True">
-                                    <Setter Property="Background" Value="{DynamicResource BackgroundSelected}" />
+                                    <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.BackgroundSelected}" />
                                     <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Selected}" />
                                 </Trigger>
                             </ControlTemplate.Triggers>
diff --git a/src/MahApps.Metro/Styles/VS/Menu.xaml b/src/MahApps.Metro/Styles/VS/Menu.xaml
index 9628c88c1b..602c670447 100644
--- a/src/MahApps.Metro/Styles/VS/Menu.xaml
+++ b/src/MahApps.Metro/Styles/VS/Menu.xaml
@@ -15,8 +15,8 @@
     </Style>
 
     <Style x:Key="MahApps.Styles.Menu.Standard" TargetType="{x:Type Menu}">
-        <Setter Property="Background" Value="{DynamicResource LightBackground}" />
-        <Setter Property="Foreground" Value="{DynamicResource Foreground}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.LightBackground}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Foreground}" />
     </Style>
 
     <Style x:Key="MahApps.Styles.MenuItem.Standard" TargetType="{x:Type MenuItem}">
@@ -175,7 +175,7 @@
                             <Setter TargetName="Border" Property="BorderThickness" Value="1 1 1 0" />
                         </MultiTrigger>
                         <Trigger Property="IsSubmenuOpen" Value="true">
-                            <Setter TargetName="ArrowPanelPath" Property="Fill" Value="{DynamicResource BackgroundSelected}" />
+                            <Setter TargetName="ArrowPanelPath" Property="Fill" Value="{DynamicResource MahApps.Brushes.BackgroundSelected}" />
                         </Trigger>
                         <Trigger Property="IsSuspendingPopupAnimation" Value="true">
                             <Setter TargetName="SubMenuPopup" Property="PopupAnimation" Value="None" />
diff --git a/src/MahApps.Metro/Styles/VS/ScrollBar.xaml b/src/MahApps.Metro/Styles/VS/ScrollBar.xaml
index b0044ce4cb..b9dc3d8176 100644
--- a/src/MahApps.Metro/Styles/VS/ScrollBar.xaml
+++ b/src/MahApps.Metro/Styles/VS/ScrollBar.xaml
@@ -16,15 +16,15 @@
                         <Path HorizontalAlignment="Center"
                               VerticalAlignment="Center"
                               Data="{Binding Path=Content, RelativeSource={RelativeSource TemplatedParent}}"
-                              Fill="{DynamicResource Foreground}" />
+                              Fill="{DynamicResource MahApps.Brushes.Foreground}" />
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource BackgroundHighlighted}" />
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.BackgroundHighlighted}" />
                             <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Highlighted}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="true">
-                            <Setter Property="Background" Value="{DynamicResource BackgroundSelected}" />
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.BackgroundSelected}" />
                             <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Selected}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
@@ -64,11 +64,11 @@
                             BorderThickness="1" />
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource BackgroundHighlighted}" />
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.BackgroundHighlighted}" />
                             <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Highlighted}" />
                         </Trigger>
                         <Trigger Property="IsDragging" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource BackgroundSelected}" />
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.BackgroundSelected}" />
                             <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Selected}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
diff --git a/src/MahApps.Metro/Styles/VS/TabControl.xaml b/src/MahApps.Metro/Styles/VS/TabControl.xaml
index 266fd91399..c913395a7f 100644
--- a/src/MahApps.Metro/Styles/VS/TabControl.xaml
+++ b/src/MahApps.Metro/Styles/VS/TabControl.xaml
@@ -14,10 +14,10 @@
     <Style x:Key="MahApps.Styles.TabControl.VisualStudioStandard"
            BasedOn="{StaticResource MahApps.Styles.TabControl.Metro}"
            TargetType="{x:Type TabControl}">
-        <Setter Property="Background" Value="{DynamicResource Background}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource BackgroundSelected}" />
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Background}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.BackgroundSelected}" />
         <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Foreground" Value="{DynamicResource Foreground}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Foreground}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TabControl}">
@@ -212,11 +212,11 @@
                             </Setter>
                         </Trigger>
                         <Trigger Property="IsSelected" Value="true">
-                            <Setter Property="Background" Value="{DynamicResource BackgroundSelected}" />
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.BackgroundSelected}" />
                             <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Selected}" />
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource BackgroundHighlighted}" />
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.BackgroundHighlighted}" />
                             <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Highlighted}" />
                         </Trigger>
                         <MultiTrigger>
@@ -232,7 +232,7 @@
                                 <Condition Property="IsMouseOver" Value="True" />
                                 <Condition Property="IsSelected" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter Property="Background" Value="{DynamicResource BackgroundSelected}" />
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.BackgroundSelected}" />
                             <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Selected}" />
                         </MultiTrigger>
                     </ControlTemplate.Triggers>
@@ -247,7 +247,7 @@
                 <ContentPresenter.Resources>
                     <Style TargetType="TextBlock">
                         <Setter Property="FontSize" Value="20" />
-                        <Setter Property="Foreground" Value="{DynamicResource Foreground}" />
+                        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Foreground}" />
                     </Style>
                 </ContentPresenter.Resources>
             </ContentPresenter>
diff --git a/src/MahApps.Metro/Styles/VS/TextBox.xaml b/src/MahApps.Metro/Styles/VS/TextBox.xaml
index 0c56982297..74d72fd4b6 100644
--- a/src/MahApps.Metro/Styles/VS/TextBox.xaml
+++ b/src/MahApps.Metro/Styles/VS/TextBox.xaml
@@ -3,8 +3,8 @@
 
     <Style x:Key="MahApps.Styles.TextBox.VisualStudioStandard" TargetType="{x:Type TextBox}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TextBox.Background}" />
-        <Setter Property="CaretBrush" Value="{DynamicResource Foreground}" />
-        <Setter Property="Foreground" Value="{DynamicResource Foreground}" />
+        <Setter Property="CaretBrush" Value="{DynamicResource MahApps.Brushes.Foreground}" />
+        <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Foreground}" />
         <Setter Property="Padding" Value="1" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
@@ -51,7 +51,7 @@
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="true">
                             <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TextBox.BackgroundSelected}" />
-                            <Setter TargetName="search" Property="Foreground" Value="{DynamicResource Foreground}" />
+                            <Setter TargetName="search" Property="Foreground" Value="{DynamicResource MahApps.Brushes.Foreground}" />
                         </Trigger>
                         <Trigger Property="IsFocused" Value="true">
                             <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TextBox.BackgroundSelected}" />
diff --git a/src/MahApps.Metro/Styles/VS/Window.xaml b/src/MahApps.Metro/Styles/VS/Window.xaml
index d6cd0639a5..a7a310998d 100644
--- a/src/MahApps.Metro/Styles/VS/Window.xaml
+++ b/src/MahApps.Metro/Styles/VS/Window.xaml
@@ -18,7 +18,7 @@
            TargetType="{x:Type Button}">
         <Style.Triggers>
             <Trigger Property="IsPressed" Value="True">
-                <Setter Property="Background" Value="{DynamicResource BackgroundSelected}" />
+                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.BackgroundSelected}" />
                 <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.BlackColor}" />
             </Trigger>
         </Style.Triggers>

From 3b93558790410d0a3e4f94b5387ea5098f9f2323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Thu, 18 Jul 2019 13:04:26 +0200
Subject: [PATCH 17/46] Rename .Metro.Win10 into .Win10

---
 .../ExampleViews/HamburgerMenuSample.xaml     |  2 +-
 .../ExampleViews/ProgressBars.xaml            |  4 +--
 .../ExampleViews/Sliders.xaml                 | 28 +++++++++----------
 src/MahApps.Metro/Styles/Controls.Slider.xaml |  2 +-
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuSample.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuSample.xaml
index b15859b1c5..4d1e0a4b35 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuSample.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuSample.xaml
@@ -18,7 +18,7 @@
             <Setter Property="VerticalAlignment" Value="Center" />
         </Style>
 
-        <Style BasedOn="{StaticResource MahApps.Styles.Slider.Metro.Win10}" TargetType="{x:Type Slider}" />
+        <Style BasedOn="{StaticResource MahApps.Styles.Slider.Win10}" TargetType="{x:Type Slider}" />
 
         <Style BasedOn="{StaticResource {x:Type Controls:MetroHeader}}" TargetType="{x:Type Controls:MetroHeader}">
             <Setter Property="Controls:ControlsHelper.HeaderMargin" Value="0 0 0 5" />
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ProgressBars.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ProgressBars.xaml
index 0c66ccf1f3..dd8bf4d4cf 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ProgressBars.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ProgressBars.xaml
@@ -51,7 +51,7 @@
                             Minimum="0"
                             Orientation="Horizontal"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Styles.Slider.Metro.Win10}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Win10}"
                             Value="25" />
                     <ProgressBar Width="250"
                                  Margin="4"
@@ -131,7 +131,7 @@
                             Minimum="0"
                             Orientation="Horizontal"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Styles.Slider.Metro.Win10}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Win10}"
                             Value="25" />
                     <Controls:MetroProgressBar Width="250"
                                                Margin="4"
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/Sliders.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/Sliders.xaml
index 75187870d9..a2cb3b43b7 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/Sliders.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/Sliders.xaml
@@ -49,7 +49,7 @@
                             Minimum="0"
                             Orientation="Vertical"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Styles.Slider.Metro.Win10}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Win10}"
                             Value="40" />
                     <Slider Height="150"
                             Margin="4"
@@ -60,7 +60,7 @@
                             Minimum="0"
                             Orientation="Vertical"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Styles.Slider.Metro.Win10}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Win10}"
                             TickPlacement="TopLeft"
                             Ticks="20 25 30 50 70 75 80"
                             Value="50" />
@@ -71,7 +71,7 @@
                             Minimum="0"
                             Orientation="Vertical"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Styles.Slider.Metro.Win10}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Win10}"
                             TickFrequency="5"
                             TickPlacement="TopLeft"
                             Value="40" />
@@ -85,7 +85,7 @@
                             SelectionEnd="80"
                             SelectionStart="20"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Styles.Slider.Metro.Win10}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Win10}"
                             TickFrequency="5"
                             TickPlacement="TopLeft"
                             Value="40" />
@@ -95,7 +95,7 @@
                             Maximum="100"
                             Minimum="0"
                             Orientation="Vertical"
-                            Style="{DynamicResource MahApps.Styles.Slider.Metro.Win10}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Win10}"
                             TickFrequency="5"
                             TickPlacement="TopLeft"
                             Value="40" />
@@ -106,7 +106,7 @@
                             Minimum="0"
                             Orientation="Vertical"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Styles.Slider.Metro.Win10}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Win10}"
                             TickFrequency="5"
                             TickPlacement="BottomRight"
                             Value="40" />
@@ -117,7 +117,7 @@
                             Minimum="0"
                             Orientation="Vertical"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Styles.Slider.Metro.Win10}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Win10}"
                             TickFrequency="5"
                             TickPlacement="Both"
                             Value="40" />
@@ -136,7 +136,7 @@
                             Minimum="0"
                             Orientation="Horizontal"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Styles.Slider.Metro.Win10}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Win10}"
                             Value="40" />
                     <Slider Width="200"
                             Margin="4"
@@ -147,7 +147,7 @@
                             Minimum="0"
                             Orientation="Horizontal"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Styles.Slider.Metro.Win10}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Win10}"
                             TickPlacement="TopLeft"
                             Ticks="20 25 30 50 70 75 80"
                             Value="50" />
@@ -158,7 +158,7 @@
                             Minimum="0"
                             Orientation="Horizontal"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Styles.Slider.Metro.Win10}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Win10}"
                             TickFrequency="5"
                             TickPlacement="TopLeft"
                             Value="40" />
@@ -172,7 +172,7 @@
                             SelectionEnd="80"
                             SelectionStart="20"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Styles.Slider.Metro.Win10}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Win10}"
                             TickFrequency="5"
                             TickPlacement="TopLeft"
                             Value="40" />
@@ -182,7 +182,7 @@
                             Maximum="100"
                             Minimum="0"
                             Orientation="Horizontal"
-                            Style="{DynamicResource MahApps.Styles.Slider.Metro.Win10}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Win10}"
                             TickFrequency="5"
                             TickPlacement="TopLeft"
                             Value="40" />
@@ -193,7 +193,7 @@
                             Minimum="0"
                             Orientation="Horizontal"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Styles.Slider.Metro.Win10}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Win10}"
                             TickFrequency="5"
                             TickPlacement="BottomRight"
                             Value="40" />
@@ -204,7 +204,7 @@
                             Minimum="0"
                             Orientation="Horizontal"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Styles.Slider.Metro.Win10}"
+                            Style="{DynamicResource MahApps.Styles.Slider.Win10}"
                             TickFrequency="5"
                             TickPlacement="Both"
                             Value="40" />
diff --git a/src/MahApps.Metro/Styles/Controls.Slider.xaml b/src/MahApps.Metro/Styles/Controls.Slider.xaml
index feab28f0f9..3c1b2e6936 100644
--- a/src/MahApps.Metro/Styles/Controls.Slider.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Slider.xaml
@@ -509,7 +509,7 @@
     </ControlTemplate>
 
     <!--  Slider Win10 Style  -->
-    <Style x:Key="MahApps.Styles.Slider.Metro.Win10" TargetType="{x:Type Slider}">
+    <Style x:Key="MahApps.Styles.Slider.Win10" TargetType="{x:Type Slider}">
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Controls.Border}" />
         <Setter Property="BorderThickness" Value="2" />
         <Setter Property="Controls:SliderHelper.ThumbFillBrush" Value="{DynamicResource MahApps.Brushes.AccentBase}" />

From d20b7c5592c2185e4013c5c1077545d5805e35cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Thu, 18 Jul 2019 13:05:54 +0200
Subject: [PATCH 18/46] Change .MetroVirtualized into .Virtualized.Metro

---
 .../ExampleViews/SelectionExamples.xaml       | 20 +++++++++----------
 .../ExampleWindows/CleanWindowDemo.xaml       |  4 ++--
 .../ExampleWindows/ShowcaseFlyout.xaml        |  4 ++--
 .../Styles/Controls.ComboBox.xaml             |  2 +-
 .../Styles/Controls.ListBox.xaml              |  2 +-
 .../Styles/Controls.ListView.xaml             |  2 +-
 .../Styles/Controls.TreeView.xaml             |  2 +-
 src/MahApps.Metro/Themes/SplitButton.xaml     |  2 +-
 8 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SelectionExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SelectionExamples.xaml
index e1a80866d9..dac11cc31f 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SelectionExamples.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SelectionExamples.xaml
@@ -22,14 +22,14 @@
                              DisplayMemberPath="Name"
                              ItemsSource="{Binding Artists}"
                              SelectedIndex="0"
-                             Style="{StaticResource MahApps.Styles.ListBox.MetroVirtualized}" />
+                             Style="{StaticResource MahApps.Styles.ListBox.Virtualized.Metro}" />
                     <ListBox Margin="2"
                              BorderThickness="1"
                              DisplayMemberPath="Title"
                              IsEnabled="False"
                              ItemsSource="{Binding Albums}"
                              SelectedIndex="0"
-                             Style="{StaticResource MahApps.Styles.ListBox.MetroVirtualized}" />
+                             Style="{StaticResource MahApps.Styles.ListBox.Virtualized.Metro}" />
 
                     <ListBox Margin="2" SelectedIndex="0">
                         <ListBoxItem Content="Item 1" />
@@ -56,7 +56,7 @@
                               BorderThickness="1"
                               ItemsSource="{Binding Artists}"
                               SelectedIndex="0"
-                              Style="{StaticResource MahApps.Styles.ListView.MetroVirtualized}">
+                              Style="{StaticResource MahApps.Styles.ListView.Virtualized.Metro}">
                         <ListView.View>
                             <GridView>
                                 <GridViewColumn DisplayMemberBinding="{Binding ArtistId}" Header="ID" />
@@ -69,7 +69,7 @@
                               IsEnabled="False"
                               ItemsSource="{Binding Artists}"
                               SelectedIndex="0"
-                              Style="{StaticResource MahApps.Styles.ListView.MetroVirtualized}">
+                              Style="{StaticResource MahApps.Styles.ListView.Virtualized.Metro}">
                         <ListView.View>
                             <GridView>
                                 <GridViewColumn DisplayMemberBinding="{Binding ArtistId}" Header="ID" />
@@ -80,7 +80,7 @@
 
                     <ListView Margin="2"
                               SelectedIndex="0"
-                              Style="{StaticResource MahApps.Styles.ListView.MetroVirtualized}">
+                              Style="{StaticResource MahApps.Styles.ListView.Virtualized.Metro}">
                         <ListViewItem>Test 1</ListViewItem>
                         <ListViewItem>Test 2</ListViewItem>
                         <ListViewItem>Test 3</ListViewItem>
@@ -89,7 +89,7 @@
                     <ListView Margin="2"
                               IsEnabled="False"
                               SelectedIndex="0"
-                              Style="{StaticResource MahApps.Styles.ListView.MetroVirtualized}">
+                              Style="{StaticResource MahApps.Styles.ListView.Virtualized.Metro}">
                         <ListViewItem>Test 1</ListViewItem>
                         <ListViewItem>Test 2</ListViewItem>
                         <ListViewItem>Test 3</ListViewItem>
@@ -107,7 +107,7 @@
                     <TreeView Margin="2"
                               BorderThickness="1"
                               ItemsSource="{Binding Artists}"
-                              Style="{StaticResource MahApps.Styles.TreeView.MetroVirtualized}">
+                              Style="{StaticResource MahApps.Styles.TreeView.Virtualized.Metro}">
                         <TreeView.ItemTemplate>
                             <HierarchicalDataTemplate ItemsSource="{Binding Albums}">
                                 <TextBlock Text="{Binding Name}" />
@@ -123,7 +123,7 @@
                               BorderThickness="1"
                               IsEnabled="False"
                               ItemsSource="{Binding Artists}"
-                              Style="{StaticResource MahApps.Styles.TreeView.MetroVirtualized}">
+                              Style="{StaticResource MahApps.Styles.TreeView.Virtualized.Metro}">
                         <TreeView.ItemTemplate>
                             <HierarchicalDataTemplate ItemsSource="{Binding Albums}">
                                 <TextBlock Text="{Binding Name}" />
@@ -257,7 +257,7 @@
                               IsEditable="True"
                               ItemsSource="{Binding Albums}"
                               MaxDropDownHeight="125"
-                              Style="{DynamicResource MahApps.Styles.ComboBox.MetroVirtualized}"
+                              Style="{DynamicResource MahApps.Styles.ComboBox.Virtualized.Metro}"
                               Text="{Binding Path=Title}" />
                     <ComboBox x:Name="groupingComboBox"
                               Width="200"
@@ -267,7 +267,7 @@
                               IsEditable="True"
                               IsEnabled="True"
                               ItemsSource="{Binding Albums}"
-                              Style="{DynamicResource MahApps.Styles.ComboBox.MetroVirtualized}"
+                              Style="{DynamicResource MahApps.Styles.ComboBox.Virtualized.Metro}"
                               Text="{Binding Path=Title}">
                         <ComboBox.GroupStyle>
                             <GroupStyle>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/CleanWindowDemo.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/CleanWindowDemo.xaml
index 33e45d7c0d..4381a91fce 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/CleanWindowDemo.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/CleanWindowDemo.xaml
@@ -121,7 +121,7 @@
                       Header="artists">
                 <ListBox x:Name="artist"
                          ItemsSource="{x:Static models:SampleData.Artists}"
-                         Style="{DynamicResource MahApps.Styles.ListBox.MetroVirtualized}">
+                         Style="{DynamicResource MahApps.Styles.ListBox.Virtualized.Metro}">
                     <ListBox.ItemTemplate>
                         <DataTemplate DataType="{x:Type models:Artist}">
                             <TextBlock>
@@ -147,7 +147,7 @@
                 <Controls:MetroTabItem Header="albums">
                     <ListBox x:Name="albums"
                              ItemsSource="{Binding ElementName=artist, Path=SelectedItem.Albums}"
-                             Style="{DynamicResource MahApps.Styles.ListBox.MetroVirtualized}">
+                             Style="{DynamicResource MahApps.Styles.ListBox.Virtualized.Metro}">
                         <ListBox.ItemTemplate>
                             <DataTemplate DataType="{x:Type models:Album}">
                                 <TextBlock>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/ShowcaseFlyout.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/ShowcaseFlyout.xaml
index b7a8f2e40f..dab02a4344 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/ShowcaseFlyout.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/ShowcaseFlyout.xaml
@@ -151,7 +151,7 @@
                               BorderThickness="0"
                               ItemsSource="{Binding Artists, Mode=OneWay}"
                               SelectedIndex="0"
-                              Style="{StaticResource MahApps.Styles.ListView.MetroVirtualized}">
+                              Style="{StaticResource MahApps.Styles.ListView.Virtualized.Metro}">
                         <ListView.View>
                             <GridView>
                                 <GridViewColumn DisplayMemberBinding="{Binding ArtistId}" Header="ID" />
@@ -166,7 +166,7 @@
                              DisplayMemberPath="Title"
                              ItemsSource="{Binding Albums, Mode=OneWay}"
                              SelectedIndex="0"
-                             Style="{StaticResource MahApps.Styles.ListBox.MetroVirtualized}" />
+                             Style="{StaticResource MahApps.Styles.ListBox.Virtualized.Metro}" />
                 </TabItem>
                 <TabItem Header="Slider">
                     <StackPanel Orientation="Vertical">
diff --git a/src/MahApps.Metro/Styles/Controls.ComboBox.xaml b/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
index 8e62a2cbee..640e974ba6 100644
--- a/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
@@ -630,7 +630,7 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="MahApps.Styles.ComboBox.MetroVirtualized"
+    <Style x:Key="MahApps.Styles.ComboBox.Virtualized.Metro"
            BasedOn="{StaticResource MahApps.Styles.ComboBox.Metro}"
            TargetType="{x:Type ComboBox}">
         <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
diff --git a/src/MahApps.Metro/Styles/Controls.ListBox.xaml b/src/MahApps.Metro/Styles/Controls.ListBox.xaml
index 2ff6875910..ea0bf7f5b0 100644
--- a/src/MahApps.Metro/Styles/Controls.ListBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ListBox.xaml
@@ -63,7 +63,7 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="MahApps.Styles.ListBox.MetroVirtualized"
+    <Style x:Key="MahApps.Styles.ListBox.Virtualized.Metro"
            BasedOn="{StaticResource MahApps.Styles.ListBox.Metro}"
            TargetType="{x:Type ListBox}">
         <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
diff --git a/src/MahApps.Metro/Styles/Controls.ListView.xaml b/src/MahApps.Metro/Styles/Controls.ListView.xaml
index 890f924645..34f3cf085a 100644
--- a/src/MahApps.Metro/Styles/Controls.ListView.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ListView.xaml
@@ -139,7 +139,7 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.ListView.MetroVirtualized"
+    <Style x:Key="MahApps.Styles.ListView.Virtualized.Metro"
            BasedOn="{StaticResource MahApps.Styles.ListView.Metro}"
            TargetType="{x:Type ListView}">
         <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
diff --git a/src/MahApps.Metro/Styles/Controls.TreeView.xaml b/src/MahApps.Metro/Styles/Controls.TreeView.xaml
index e48b5cd609..3984243969 100644
--- a/src/MahApps.Metro/Styles/Controls.TreeView.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TreeView.xaml
@@ -229,7 +229,7 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="MahApps.Styles.TreeView.MetroVirtualized"
+    <Style x:Key="MahApps.Styles.TreeView.Virtualized.Metro"
            BasedOn="{StaticResource MahApps.Styles.TreeView.Metro}"
            TargetType="{x:Type TreeView}">
         <Setter Property="VirtualizingStackPanel.IsVirtualizing" Value="True" />
diff --git a/src/MahApps.Metro/Themes/SplitButton.xaml b/src/MahApps.Metro/Themes/SplitButton.xaml
index 6037e73eab..45e86acfd5 100644
--- a/src/MahApps.Metro/Themes/SplitButton.xaml
+++ b/src/MahApps.Metro/Themes/SplitButton.xaml
@@ -287,7 +287,7 @@
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.BlackColor}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
-        <Setter Property="ListBoxStyle" Value="{DynamicResource MahApps.Styles.ListBox.MetroVirtualized}" />
+        <Setter Property="ListBoxStyle" Value="{DynamicResource MahApps.Styles.ListBox.Virtualized.Metro}" />
         <Setter Property="MinHeight" Value="26" />
         <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
         <Setter Property="SnapsToDevicePixels" Value="True" />

From 7452406e8154dc7fb23a9bdde30a099a5d2be001 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Thu, 18 Jul 2019 14:22:24 +0200
Subject: [PATCH 19/46] Fix resource keys for which the specifier / theme was
 not good

---
 .../ExampleViews/DataGridExamples.xaml        |  8 +--
 .../ExampleViews/TextExamples.xaml            | 14 ++---
 .../ExampleWindows/VSDemo.xaml                | 14 ++---
 .../MahApps.Metro.Demo/MainWindow.xaml        |  2 +-
 .../Styles/Clean/CleanStatusBar.xaml          |  2 +-
 .../Styles/Controls.Buttons.xaml              | 17 +++---
 .../Styles/Controls.Calendar.xaml             |  4 +-
 .../Styles/Controls.ComboBox.xaml             | 12 ++---
 .../Styles/Controls.DataGrid.xaml             | 14 ++---
 .../Styles/Controls.DatePicker.xaml           |  6 +--
 .../Styles/Controls.Expander.xaml             | 26 +++++-----
 .../Styles/Controls.ListView.xaml             |  4 +-
 .../Styles/Controls.PasswordBox.xaml          | 18 +++----
 .../Styles/Controls.Scrollbars.xaml           | 26 +++++-----
 src/MahApps.Metro/Styles/Controls.Slider.xaml | 52 +++++++++----------
 .../Styles/Controls.StatusBar.xaml            |  2 +-
 .../Styles/Controls.TextBlock.xaml            |  4 +-
 .../Styles/Controls.TextBox.xaml              | 24 ++++-----
 src/MahApps.Metro/Styles/FlatSlider.xaml      | 34 ++++++------
 src/MahApps.Metro/Styles/Sizes.xaml           |  4 +-
 src/MahApps.Metro/Styles/VS/Button.xaml       |  4 +-
 src/MahApps.Metro/Styles/VS/Expander.xaml     | 28 +++++-----
 src/MahApps.Metro/Styles/VS/GroupBox.xaml     |  2 +-
 src/MahApps.Metro/Styles/VS/ListBox.xaml      |  2 +-
 src/MahApps.Metro/Styles/VS/Menu.xaml         |  4 +-
 src/MahApps.Metro/Styles/VS/ScrollBar.xaml    | 36 ++++++-------
 src/MahApps.Metro/Styles/VS/Styles.xaml       | 20 +++----
 src/MahApps.Metro/Styles/VS/TabControl.xaml   | 16 +++---
 src/MahApps.Metro/Styles/VS/TextBox.xaml      |  6 +--
 src/MahApps.Metro/Styles/VS/Window.xaml       | 20 +++----
 src/MahApps.Metro/Themes/DateTimePicker.xaml  |  2 +-
 src/MahApps.Metro/Themes/RangeSlider.xaml     | 20 +++----
 .../Views/TextBoxHelperTestWindow.xaml        |  6 +--
 33 files changed, 227 insertions(+), 226 deletions(-)

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DataGridExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DataGridExamples.xaml
index 0b7d3d7744..b662ca5d3c 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DataGridExamples.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DataGridExamples.xaml
@@ -170,12 +170,12 @@
                   SelectionUnit="FullRow">
             <DataGrid.Columns>
                 <DataGridCheckBoxColumn Binding="{Binding RelativeSource={RelativeSource AncestorType=DataGridRow}, Path=IsSelected, Mode=OneWay}"
-                                        EditingElementStyle="{DynamicResource MahApps.Styles.CheckBox.MetroDataGrid}"
-                                        ElementStyle="{DynamicResource MahApps.Styles.CheckBox.MetroDataGrid}"
+                                        EditingElementStyle="{DynamicResource MahApps.Styles.CheckBox.DataGrid.Metro}"
+                                        ElementStyle="{DynamicResource MahApps.Styles.CheckBox.DataGrid.Metro}"
                                         Header="Row Selected" />
                 <DataGridCheckBoxColumn Binding="{Binding IsSelected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                        EditingElementStyle="{DynamicResource MahApps.Styles.CheckBox.MetroDataGrid}"
-                                        ElementStyle="{DynamicResource MahApps.Styles.CheckBox.MetroDataGrid}"
+                                        EditingElementStyle="{DynamicResource MahApps.Styles.CheckBox.DataGrid.Metro}"
+                                        ElementStyle="{DynamicResource MahApps.Styles.CheckBox.DataGrid.Metro}"
                                         Header="Album Selected" />
                 <DataGridTextColumn Binding="{Binding Title}" Header="Title" />
                 <DataGridTextColumn Binding="{Binding Artist.Name}" Header="Artist" />
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml
index 597225dc93..cb58b4e3b6 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml
@@ -110,7 +110,7 @@
                                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=TextBox}, Path=Text, Mode=OneWay}" />
                     </TextBox.InputBindings>
                     <TextBox.Style>
-                        <Style BasedOn="{StaticResource MahApps.Styles.TextBox.MetroSearch}" TargetType="{x:Type TextBox}">
+                        <Style BasedOn="{StaticResource MahApps.Styles.TextBox.Search.Metro}" TargetType="{x:Type TextBox}">
                             <Style.Triggers>
                                 <Trigger Property="Controls:TextBoxHelper.HasText" Value="True">
                                     <Setter Property="Controls:TextBoxHelper.ButtonContent" Value="r" />
@@ -125,12 +125,12 @@
                          Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmdWithParameter, Mode=OneWay}"
                          Controls:TextBoxHelper.ButtonCommandParameter="{Binding ElementName=test2, Path=Text}"
                          Controls:TextBoxHelper.Watermark="Enter parameter"
-                         Style="{DynamicResource MahApps.Styles.TextBox.MetroSearch}" />
+                         Style="{DynamicResource MahApps.Styles.TextBox.Search.Metro}" />
                 <TextBox Margin="{StaticResource ControlMargin}"
                          Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd, Mode=OneWay}"
                          Controls:TextBoxHelper.ButtonContent="s"
                          Controls:TextBoxHelper.Watermark="Custom icon style"
-                         Style="{DynamicResource MahApps.Styles.TextBox.MetroButton}" />
+                         Style="{DynamicResource MahApps.Styles.TextBox.Button.Metro}" />
                 <TextBox Margin="{StaticResource ControlMargin}"
                          Controls:TextBoxHelper.Watermark="Number smaller than 10"
                          Text="{Binding IntegerGreater10Property, ValidatesOnDataErrors=True, UpdateSourceTrigger=PropertyChanged, NotifyOnValidationError=True}" />
@@ -151,7 +151,7 @@
                 <TextBox Margin="{StaticResource ControlMargin}"
                          Controls:TextBoxHelper.Watermark="Search style"
                          IsEnabled="False"
-                         Style="{DynamicResource MahApps.Styles.TextBox.MetroSearch}" />
+                         Style="{DynamicResource MahApps.Styles.TextBox.Search.Metro}" />
                 <TextBox Margin="{StaticResource ControlMargin}"
                          Controls:TextBoxHelper.Watermark="Number smaller than 10"
                          IsEnabled="False"
@@ -178,7 +178,7 @@
                              Controls:TextBoxHelper.ButtonContent="s"
                              IsDocumentEnabled="True"
                              SpellCheck.IsEnabled="True"
-                             Style="{StaticResource MahApps.Styles.RichTextBox.MetroButton}" />
+                             Style="{StaticResource MahApps.Styles.RichTextBox.Button.Metro}" />
                 <RichTextBox Height="120"
                              Margin="{StaticResource ControlMargin}"
                              Padding="5"
@@ -250,7 +250,7 @@
                              Controls:TextBoxHelper.IsWaitingForData="True"
                              Controls:TextBoxHelper.UseFloatingWatermark="True"
                              Controls:TextBoxHelper.Watermark="Revealed PasswordBox"
-                             Style="{StaticResource MahApps.Styles.PasswordBox.MetroButtonRevealed}" />
+                             Style="{StaticResource MahApps.Styles.PasswordBox.ButtonRevealed.Metro}" />
                 <PasswordBox Margin="{StaticResource ControlMargin}"
                              Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd, Mode=OneWay}"
                              Controls:TextBoxHelper.ClearTextButton="True"
@@ -263,7 +263,7 @@
                              Controls:TextBoxHelper.ButtonContent="4"
                              Controls:TextBoxHelper.UseFloatingWatermark="True"
                              Controls:TextBoxHelper.Watermark="Custom icon style"
-                             Style="{DynamicResource MahApps.Styles.PasswordBox.MetroButton}">
+                             Style="{DynamicResource MahApps.Styles.PasswordBox.Button.Metro}">
                     <Controls:PasswordBoxHelper.CapsLockWarningToolTip>
                         <TextBlock>
                             <Run Text="This is a custom Warning to show you that" />
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/VSDemo.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/VSDemo.xaml
index 923aa078b3..319d9f6264 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/VSDemo.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/VSDemo.xaml
@@ -28,7 +28,7 @@
 
     <Controls:MetroWindow.RightWindowCommands>
         <Controls:WindowCommands ShowSeparators="False">
-            <Button Style="{StaticResource MahApps.Styles.Button.VisualStudioWindowNotification}" ToolTip="1 Notification">
+            <Button Style="{StaticResource MahApps.Styles.Button.Window.Notification.VisualStudio}" ToolTip="1 Notification">
                 <iconPacks:PackIconEntypo Width="16"
                                           Height="16"
                                           Kind="Flag" />
@@ -38,7 +38,7 @@
                                                                              Width=12,
                                                                              Height=12}"
                      Controls:TextBoxHelper.Watermark="Quick Launch (Ctrl+Q)"
-                     Style="{DynamicResource MahApps.Styles.TextBox.VisualStudioWindowQuickLaunch}" />
+                     Style="{DynamicResource MahApps.Styles.TextBox.WindowQuickLaunch.VisualStudio}" />
         </Controls:WindowCommands>
     </Controls:MetroWindow.RightWindowCommands>
 
@@ -232,7 +232,7 @@
                                  Grid.Column="1"
                                  Margin="5"
                                  FontSize="16"
-                                 Style="{StaticResource MahApps.Styles.TextBox.VisualStudioSearch}" />
+                                 Style="{StaticResource MahApps.Styles.TextBox.Search.VisualStudio}" />
                         <TextBox Grid.Row="2"
                                  Grid.ColumnSpan="2"
                                  Margin="5"
@@ -424,11 +424,11 @@
                 <Button Margin="0 10 0 3"
                         Content="Fire rocket..."
                         FontSize="14"
-                        Style="{StaticResource MahApps.Styles.Button.VisualStudioWindowLink}" />
+                        Style="{StaticResource MahApps.Styles.Button.Window.Link.VisualStudio}" />
                 <Button Margin="0 3 0 10"
                         Content="Throw something over board..."
                         FontSize="14"
-                        Style="{StaticResource MahApps.Styles.Button.VisualStudioWindowLink}" />
+                        Style="{StaticResource MahApps.Styles.Button.Window.Link.VisualStudio}" />
                 <Separator Background="#11FFFFFF" />
                 <TextBlock Margin="0 10 0 10"
                            FontSize="18"
@@ -438,11 +438,11 @@
                 <Button Margin="0 10 0 3"
                         Content="blastallenemies.cmd"
                         FontSize="14"
-                        Style="{StaticResource MahApps.Styles.Button.VisualStudioWindowLink}" />
+                        Style="{StaticResource MahApps.Styles.Button.Window.Link.VisualStudio}" />
                 <Button Margin="0 3 0 3"
                         Content="verysecretmessage.txt"
                         FontSize="14"
-                        Style="{StaticResource MahApps.Styles.Button.VisualStudioWindowLink}" />
+                        Style="{StaticResource MahApps.Styles.Button.Window.Link.VisualStudio}" />
             </StackPanel>
         </Grid>
     </DockPanel>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml
index 521bf9f819..a503f35ae8 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml
@@ -320,7 +320,7 @@
 
         <StatusBar Grid.Row="2">
             <StatusBarItem>MahApps.Metro DEMO Application</StatusBarItem>
-            <Separator Style="{StaticResource MahApps.Styles.Separator.MetroStatusBar}" />
+            <Separator Style="{StaticResource MahApps.Styles.Separator.StatusBar.Metro}" />
             <StatusBarItem>Selected Tab:</StatusBarItem>
             <StatusBarItem Content="{Binding ElementName=MainTabControl, Path=SelectedItem.Header, Mode=OneWay}" />
         </StatusBar>
diff --git a/src/MahApps.Metro/Styles/Clean/CleanStatusBar.xaml b/src/MahApps.Metro/Styles/Clean/CleanStatusBar.xaml
index f87a49494e..75d04d3145 100644
--- a/src/MahApps.Metro/Styles/Clean/CleanStatusBar.xaml
+++ b/src/MahApps.Metro/Styles/Clean/CleanStatusBar.xaml
@@ -12,7 +12,7 @@
     </Style>
 
     <Style x:Key="MahApps.Styles.Separator.Clean"
-           BasedOn="{StaticResource MahApps.Styles.Separator.MetroStatusBar}"
+           BasedOn="{StaticResource MahApps.Styles.Separator.StatusBar.Metro}"
            TargetType="{x:Type Separator}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Black}" />
     </Style>
diff --git a/src/MahApps.Metro/Styles/Controls.Buttons.xaml b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
index bd76fc8f3d..571ca302d9 100644
--- a/src/MahApps.Metro/Styles/Controls.Buttons.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
@@ -5,7 +5,7 @@
 
     <converters:ThicknessToDoubleConverter x:Key="BorderThicknessToStrokeThicknessConverter" TakeThicknessSide="Left" />
 
-    <Style x:Key="MahApps.Styles.Button.FlatFocusVisualStyle">
+    <Style x:Key="MahApps.Styles.Button.FocusVisualStyle.Flat">
         <Setter Property="Control.Template">
             <Setter.Value>
                 <ControlTemplate>
@@ -23,7 +23,7 @@
     <Style x:Key="MahApps.Styles.Button.Flat" TargetType="{x:Type Button}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.FlatButton.Background}" />
         <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource MahApps.Styles.Button.FlatFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource MahApps.Styles.Button.FocusVisualStyle.Flat}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.FlatButton}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.FlatButton.Foreground}" />
         <Setter Property="Padding" Value="10 5 10 5" />
@@ -70,7 +70,7 @@
     <Style x:Key="MahApps.Styles.ToggleButton.Flat" TargetType="{x:Type ToggleButton}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.FlatButton.Background}" />
         <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="FocusVisualStyle" Value="{DynamicResource MahApps.Styles.Button.FlatFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource MahApps.Styles.Button.FocusVisualStyle.Flat}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.FlatButton}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.FlatButton.Foreground}" />
         <Setter Property="Padding" Value="10 5 10 5" />
@@ -144,7 +144,7 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="MahApps.Styles.ButtonBase.MetroCircleFocusVisualStyle">
+    <Style x:Key="MahApps.Styles.ButtonBase.FocusVisualStyle.MetroCircle">
         <Setter Property="Control.Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Control}">
@@ -164,7 +164,7 @@
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray3}" />
         <Setter Property="BorderThickness" Value="2" />
-        <Setter Property="FocusVisualStyle" Value="{StaticResource MahApps.Styles.ButtonBase.MetroCircleFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{StaticResource MahApps.Styles.ButtonBase.FocusVisualStyle.MetroCircle}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="Padding" Value="1" />
         <Setter Property="Template">
@@ -262,7 +262,7 @@
     </Style>
 
     <!--  base button style for min, max and close window buttons  -->
-    <Style x:Key="MahApps.Styles.Button.BaseMetroWindow" TargetType="{x:Type Button}">
+    <Style x:Key="MahApps.Styles.Button.MetroWindow.Base" TargetType="{x:Type Button}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TransparentWhite}" />
         <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
@@ -309,7 +309,7 @@
 
     <!--  light button style for min, max and close window buttons  -->
     <Style x:Key="MahApps.Styles.Button.MetroWindow.Light"
-           BasedOn="{StaticResource MahApps.Styles.Button.BaseMetroWindow}"
+           BasedOn="{StaticResource MahApps.Styles.Button.MetroWindow.Base}"
            TargetType="{x:Type Button}">
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="Focusable" Value="False" />
@@ -606,7 +606,7 @@
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray3}" />
         <Setter Property="BorderThickness" Value="2" />
-        <Setter Property="FocusVisualStyle" Value="{StaticResource MahApps.Styles.ButtonBase.MetroCircleFocusVisualStyle}" />
+        <Setter Property="FocusVisualStyle" Value="{StaticResource MahApps.Styles.ButtonBase.FocusVisualStyle.MetroCircle}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="Padding" Value="1" />
@@ -1027,6 +1027,7 @@
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="VerticalAlignment" Value="Stretch" />
     </Style>
+
     <Style x:Key="MahApps.Styles.Button.SplitArrow"
            BasedOn="{StaticResource MahApps.Styles.Button.Split}"
            TargetType="{x:Type Button}">
diff --git a/src/MahApps.Metro/Styles/Controls.Calendar.xaml b/src/MahApps.Metro/Styles/Controls.Calendar.xaml
index 7ce0fd589e..5306b571fb 100644
--- a/src/MahApps.Metro/Styles/Controls.Calendar.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Calendar.xaml
@@ -532,7 +532,7 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.Calendar.MetroBase" TargetType="{x:Type Calendar}">
+    <Style x:Key="MahApps.Styles.Calendar.Base.Metro" TargetType="{x:Type Calendar}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="BorderThickness" Value="1" />
@@ -561,7 +561,7 @@
     </Style>
 
     <Style x:Key="MahApps.Styles.Calendar.Metro"
-           BasedOn="{StaticResource MahApps.Styles.Calendar.MetroBase}"
+           BasedOn="{StaticResource MahApps.Styles.Calendar.Base.Metro}"
            TargetType="{x:Type Calendar}">
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Content}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
diff --git a/src/MahApps.Metro/Styles/Controls.ComboBox.xaml b/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
index 640e974ba6..1123977a31 100644
--- a/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
@@ -71,7 +71,7 @@
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
-                                       Style="{DynamicResource MahApps.Styles.TextBlock.MetroWatermark}"
+                                       Style="{DynamicResource MahApps.Styles.TextBlock.Watermark.Metro}"
                                        Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                        TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                        TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
@@ -94,7 +94,7 @@
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
-                                           Style="{DynamicResource MahApps.Styles.TextBlock.MetroAutoCollapsing}"
+                                           Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing.Metro}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                            TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                            TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
@@ -198,7 +198,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.ToggleButton.MetroComboBoxDropDown" TargetType="{x:Type ToggleButton}">
+    <Style x:Key="MahApps.Styles.ToggleButton.ComboBoxDropDown.Metro" TargetType="{x:Type ToggleButton}">
         <Setter Property="ClickMode" Value="Press" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="IsTabStop" Value="False" />
@@ -351,7 +351,7 @@
                                           IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
                                           KeyboardNavigation.IsTabStop="False"
                                           SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                          Style="{DynamicResource MahApps.Styles.ToggleButton.MetroComboBoxDropDown}" />
+                                          Style="{DynamicResource MahApps.Styles.ToggleButton.ComboBoxDropDown.Metro}" />
 
                             <TextBox x:Name="PART_EditableTextBox"
                                      Grid.Row="1"
@@ -392,7 +392,7 @@
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
-                                       Style="{DynamicResource MahApps.Styles.TextBlock.MetroWatermark}"
+                                       Style="{DynamicResource MahApps.Styles.TextBlock.Watermark.Metro}"
                                        Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                        TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                        TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
@@ -416,7 +416,7 @@
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
-                                           Style="{DynamicResource MahApps.Styles.TextBlock.MetroAutoCollapsing}"
+                                           Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing.Metro}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                            TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                            TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
diff --git a/src/MahApps.Metro/Styles/Controls.DataGrid.xaml b/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
index ed16d4b5cb..311b627727 100644
--- a/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
+++ b/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
@@ -8,7 +8,7 @@
 
     <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
 
-    <Style x:Key="MahApps.Styles.CheckBox.MetroDataGrid"
+    <Style x:Key="MahApps.Styles.CheckBox.DataGrid.Metro"
            BasedOn="{StaticResource MahApps.Styles.CheckBox.Metro}"
            TargetType="CheckBox">
         <Setter Property="HorizontalAlignment" Value="Center" />
@@ -73,7 +73,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.Thumb.MetroColumnHeaderGripper" TargetType="{x:Type Thumb}">
+    <Style x:Key="MahApps.Styles.Thumb.ColumnHeaderGripper.Metro" TargetType="{x:Type Thumb}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Gray5}" />
         <Setter Property="Cursor" Value="SizeWE" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -91,7 +91,7 @@
         <Setter Property="Width" Value="8" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.Thumb.MetroRowHeaderGripper" TargetType="{x:Type Thumb}">
+    <Style x:Key="MahApps.Styles.Thumb.RowHeaderGripper.Metro" TargetType="{x:Type Thumb}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Gray5}" />
         <Setter Property="Cursor" Value="SizeNS" />
         <Setter Property="Height" Value="6" />
@@ -164,12 +164,12 @@
                         <Thumb x:Name="PART_LeftHeaderGripper"
                                HorizontalAlignment="Left"
                                Background="Transparent"
-                               Style="{StaticResource MahApps.Styles.Thumb.MetroColumnHeaderGripper}" />
+                               Style="{StaticResource MahApps.Styles.Thumb.ColumnHeaderGripper.Metro}" />
 
                         <Thumb x:Name="PART_RightHeaderGripper"
                                Grid.Column="1"
                                HorizontalAlignment="Right"
-                               Style="{StaticResource MahApps.Styles.Thumb.MetroColumnHeaderGripper}" />
+                               Style="{StaticResource MahApps.Styles.Thumb.ColumnHeaderGripper.Metro}" />
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="SortDirection" Value="Ascending">
@@ -238,10 +238,10 @@
                         <Thumb x:Name="PART_TopHeaderGripper"
                                VerticalAlignment="Top"
                                Background="Transparent"
-                               Style="{StaticResource MahApps.Styles.Thumb.MetroRowHeaderGripper}" />
+                               Style="{StaticResource MahApps.Styles.Thumb.RowHeaderGripper.Metro}" />
                         <Thumb x:Name="PART_BottomHeaderGripper"
                                VerticalAlignment="Bottom"
-                               Style="{StaticResource MahApps.Styles.Thumb.MetroRowHeaderGripper}" />
+                               Style="{StaticResource MahApps.Styles.Thumb.RowHeaderGripper.Metro}" />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/src/MahApps.Metro/Styles/Controls.DatePicker.xaml b/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
index 3d534f5db3..4df4a1acbd 100644
--- a/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
+++ b/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
@@ -13,7 +13,7 @@
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="CalendarStyle" Value="{DynamicResource MahApps.Styles.Calendar.MetroBase}" />
+        <Setter Property="CalendarStyle" Value="{DynamicResource MahApps.Styles.Calendar.Base.Metro}" />
         <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMahApps.Styles.ContextMenu.Metro}" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
@@ -97,7 +97,7 @@
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
-                                           Style="{DynamicResource MahApps.Styles.TextBlock.MetroAutoCollapsing}"
+                                           Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing.Metro}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                            TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                            TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
@@ -270,7 +270,7 @@
                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                    Foreground="{TemplateBinding Foreground}"
-                                   Style="{DynamicResource MahApps.Styles.TextBlock.MetroWatermark}"
+                                   Style="{DynamicResource MahApps.Styles.TextBlock.Watermark.Metro}"
                                    Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                    TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                    TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}" />
diff --git a/src/MahApps.Metro/Styles/Controls.Expander.xaml b/src/MahApps.Metro/Styles/Controls.Expander.xaml
index 023e0011fb..942bfd3405 100644
--- a/src/MahApps.Metro/Styles/Controls.Expander.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Expander.xaml
@@ -9,7 +9,7 @@
     <Thickness x:Key="ExpanderHeaderThemePadding">2</Thickness>
     <sys:Double x:Key="ExpanderToggleButtonEllipseThemeSize">18</sys:Double>
 
-    <Style x:Key="MahApps.Styles.ToggleButton.ExpanderBaseHeader" TargetType="{x:Type ToggleButton}">
+    <Style x:Key="MahApps.Styles.ToggleButton.ExpanderHeader.Base" TargetType="{x:Type ToggleButton}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderBrush" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />
@@ -19,8 +19,8 @@
         <Setter Property="SnapsToDevicePixels" Value="True" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.ToggleButton.ExpanderRightHeader"
-           BasedOn="{StaticResource MahApps.Styles.ToggleButton.ExpanderBaseHeader}"
+    <Style x:Key="MahApps.Styles.ToggleButton.ExpanderHeader.Right"
+           BasedOn="{StaticResource MahApps.Styles.ToggleButton.ExpanderHeader.Base}"
            TargetType="{x:Type ToggleButton}">
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="Template">
@@ -94,8 +94,8 @@
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.ToggleButton.ExpanderUpHeader"
-           BasedOn="{StaticResource MahApps.Styles.ToggleButton.ExpanderBaseHeader}"
+    <Style x:Key="MahApps.Styles.ToggleButton.ExpanderHeader.Up"
+           BasedOn="{StaticResource MahApps.Styles.ToggleButton.ExpanderHeader.Base}"
            TargetType="{x:Type ToggleButton}">
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="Template">
@@ -168,8 +168,8 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.ToggleButton.ExpanderLeftHeader"
-           BasedOn="{StaticResource MahApps.Styles.ToggleButton.ExpanderRightHeader}"
+    <Style x:Key="MahApps.Styles.ToggleButton.ExpanderHeader.Left"
+           BasedOn="{StaticResource MahApps.Styles.ToggleButton.ExpanderHeader.Right}"
            TargetType="{x:Type ToggleButton}">
         <Setter Property="Template">
             <Setter.Value>
@@ -240,8 +240,8 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.ToggleButton.ExpanderDownHeader"
-           BasedOn="{StaticResource MahApps.Styles.ToggleButton.ExpanderUpHeader}"
+    <Style x:Key="MahApps.Styles.ToggleButton.ExpanderHeader.Down"
+           BasedOn="{StaticResource MahApps.Styles.ToggleButton.ExpanderHeader.Up}"
            TargetType="{x:Type ToggleButton}">
         <Setter Property="Template">
             <Setter.Value>
@@ -329,10 +329,10 @@
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Upper" />
         <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
-        <Setter Property="Controls:ExpanderHelper.HeaderDownStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderDownHeader}" />
-        <Setter Property="Controls:ExpanderHelper.HeaderLeftStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderLeftHeader}" />
-        <Setter Property="Controls:ExpanderHelper.HeaderRightStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderRightHeader}" />
-        <Setter Property="Controls:ExpanderHelper.HeaderUpStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderUpHeader}" />
+        <Setter Property="Controls:ExpanderHelper.HeaderDownStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderHeader.Down}" />
+        <Setter Property="Controls:ExpanderHelper.HeaderLeftStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderHeader.Left}" />
+        <Setter Property="Controls:ExpanderHelper.HeaderRightStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderHeader.Right}" />
+        <Setter Property="Controls:ExpanderHelper.HeaderUpStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderHeader.Up}" />
         <Setter Property="Controls:GroupBoxHelper.HeaderForeground" Value="{x:Null}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="Padding" Value="4" />
diff --git a/src/MahApps.Metro/Styles/Controls.ListView.xaml b/src/MahApps.Metro/Styles/Controls.ListView.xaml
index 34f3cf085a..605640d4ac 100644
--- a/src/MahApps.Metro/Styles/Controls.ListView.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ListView.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
-    <Style x:Key="MahApps.Styles.ScrollViewer.MetroGridView"
+    <Style x:Key="MahApps.Styles.ScrollViewer.GridView.Metro"
            BasedOn="{StaticResource {x:Static GridView.GridViewScrollViewerStyleKey}}"
            TargetType="{x:Type ScrollViewer}">
         <Setter Property="Focusable" Value="False" />
@@ -116,7 +116,7 @@
                                       Focusable="False"
                                       HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                      Style="{DynamicResource MahApps.Styles.ScrollViewer.MetroGridView}"
+                                      Style="{DynamicResource MahApps.Styles.ScrollViewer.GridView.Metro}"
                                       VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
                             <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </ScrollViewer>
diff --git a/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml b/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
index ba775cea2a..f4cf6e10e1 100644
--- a/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
@@ -167,7 +167,7 @@
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
-                                       Style="{DynamicResource MahApps.Styles.TextBlock.MetroWatermark}"
+                                       Style="{DynamicResource MahApps.Styles.TextBlock.Watermark.Metro}"
                                        Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                        TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                        TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
@@ -190,7 +190,7 @@
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
-                                           Style="{DynamicResource MahApps.Styles.TextBlock.MetroAutoCollapsing}"
+                                           Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing.Metro}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                            TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                            TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
@@ -338,7 +338,7 @@
     </Style>
 
     <!--  Button Command PasswordBox Style  -->
-    <Style x:Key="MahApps.Styles.PasswordBox.MetroButton"
+    <Style x:Key="MahApps.Styles.PasswordBox.Button.Metro"
            BasedOn="{StaticResource MahApps.Styles.PasswordBox.Metro}"
            TargetType="{x:Type PasswordBox}">
         <Setter Property="Controls:TextBoxHelper.ButtonTemplate" Value="{DynamicResource MahApps.Templates.ButtonBase.Chromeless}" />
@@ -413,7 +413,7 @@
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
-                                       Style="{DynamicResource MahApps.Styles.TextBlock.MetroWatermark}"
+                                       Style="{DynamicResource MahApps.Styles.TextBlock.Watermark.Metro}"
                                        Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                        TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                        TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
@@ -436,7 +436,7 @@
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
-                                           Style="{DynamicResource MahApps.Styles.TextBlock.MetroAutoCollapsing}"
+                                           Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing.Metro}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                            TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                            TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
@@ -599,7 +599,7 @@
     </Style>
 
     <!--  Button Revealed PasswordBox Style  -->
-    <Style x:Key="MahApps.Styles.PasswordBox.MetroButtonRevealed"
+    <Style x:Key="MahApps.Styles.PasswordBox.ButtonRevealed.Metro"
            BasedOn="{StaticResource MahApps.Styles.PasswordBox.Metro}"
            TargetType="{x:Type PasswordBox}">
         <Setter Property="Controls:PasswordBoxHelper.RevealButtonContent" Value="{DynamicResource MahApps.Controls.DefaultRevealButtonIcon}" />
@@ -694,7 +694,7 @@
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
-                                       Style="{DynamicResource MahApps.Styles.TextBlock.MetroWatermark}"
+                                       Style="{DynamicResource MahApps.Styles.TextBlock.Watermark.Metro}"
                                        Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                        TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                        TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
@@ -717,7 +717,7 @@
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
-                                           Style="{DynamicResource MahApps.Styles.TextBlock.MetroAutoCollapsing}"
+                                           Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing.Metro}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                            TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                            TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
@@ -890,7 +890,7 @@
 
     <!--  MahApps.Styles.PasswordBox.Win8 Style  -->
     <Style x:Key="MahApps.Styles.PasswordBox.Win8"
-           BasedOn="{StaticResource MahApps.Styles.PasswordBox.MetroButtonRevealed}"
+           BasedOn="{StaticResource MahApps.Styles.PasswordBox.ButtonRevealed.Metro}"
            TargetType="{x:Type PasswordBox}">
         <Setter Property="AllowDrop" Value="true" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
diff --git a/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml b/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
index 7ff66a7dcf..cedc8fe5e7 100644
--- a/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
@@ -16,7 +16,7 @@
         </DoubleAnimationUsingKeyFrames>
     </Storyboard>
 
-    <Style x:Key="MahApps.Styles.RepeatButton.MetroScrollBarSmall" TargetType="{x:Type RepeatButton}">
+    <Style x:Key="MahApps.Styles.RepeatButton.ScrollBarSmall.Metro" TargetType="{x:Type RepeatButton}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="Height" Value="{DynamicResource MahApps.Templates.ScrollBar.VerticalRepeatButtonHeight}" />
@@ -64,7 +64,7 @@
         <Setter Property="Width" Value="{DynamicResource MahApps.Templates.ScrollBar.HorizontalRepeatButtonWidth}" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.RepeatButton.MetroScrollBarLarge" TargetType="{x:Type RepeatButton}">
+    <Style x:Key="MahApps.Styles.RepeatButton.ScrollBarLarge.Metro" TargetType="{x:Type RepeatButton}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="Interval" Value="50" />
@@ -81,7 +81,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.Thumb.MetroScrollBar" TargetType="{x:Type Thumb}">
+    <Style x:Key="MahApps.Styles.Thumb.ScrollBar.Metro" TargetType="{x:Type Thumb}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Thumb}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="IsTabStop" Value="False" />
@@ -135,29 +135,29 @@
                           Grid.Column="0"
                           Command="ScrollBar.LineLeftCommand"
                           Content="M54,14.9765625L54,74.9765625 24,44.9765625 54,14.9765625z"
-                          Style="{DynamicResource MahApps.Styles.RepeatButton.MetroScrollBarSmall}" />
+                          Style="{DynamicResource MahApps.Styles.RepeatButton.ScrollBarSmall.Metro}" />
             <Track x:Name="PART_Track"
                    Grid.Column="1"
                    IsDirectionReversed="False">
                 <Track.DecreaseRepeatButton>
                     <RepeatButton x:Name="HorizontalLargeDecrease"
                                   Command="ScrollBar.PageLeftCommand"
-                                  Style="{DynamicResource MahApps.Styles.RepeatButton.MetroScrollBarLarge}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.ScrollBarLarge.Metro}" />
                 </Track.DecreaseRepeatButton>
                 <Track.Thumb>
-                    <Controls:MetroThumb Margin="0 1 0 1" Style="{DynamicResource MahApps.Styles.Thumb.MetroScrollBar}" />
+                    <Controls:MetroThumb Margin="0 1 0 1" Style="{DynamicResource MahApps.Styles.Thumb.ScrollBar.Metro}" />
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
                     <RepeatButton x:Name="HorizontalLargeIncrease"
                                   Command="ScrollBar.PageRightCommand"
-                                  Style="{DynamicResource MahApps.Styles.RepeatButton.MetroScrollBarLarge}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.ScrollBarLarge.Metro}" />
                 </Track.IncreaseRepeatButton>
             </Track>
             <RepeatButton x:Name="HorizontalSmallIncrease"
                           Grid.Column="2"
                           Command="ScrollBar.LineRightCommand"
                           Content="M192,79.875L352,239.875 192,399.875 192,79.875z"
-                          Style="{DynamicResource MahApps.Styles.RepeatButton.MetroScrollBarSmall}" />
+                          Style="{DynamicResource MahApps.Styles.RepeatButton.ScrollBarSmall.Metro}" />
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsEnabled" Value="False">
@@ -177,7 +177,7 @@
                           Grid.Row="0"
                           Command="ScrollBar.LineUpCommand"
                           Content="M240.125,160L400.125,320 80.125,320 240.125,160z"
-                          Style="{DynamicResource MahApps.Styles.RepeatButton.MetroScrollBarSmall}" />
+                          Style="{DynamicResource MahApps.Styles.RepeatButton.ScrollBarSmall.Metro}" />
             <Track x:Name="PART_Track"
                    Grid.Row="1"
                    IsDirectionReversed="True">
@@ -187,22 +187,22 @@
                 <Track.DecreaseRepeatButton>
                     <RepeatButton x:Name="VerticalLargeDecrease"
                                   Command="ScrollBar.PageUpCommand"
-                                  Style="{DynamicResource MahApps.Styles.RepeatButton.MetroScrollBarLarge}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.ScrollBarLarge.Metro}" />
                 </Track.DecreaseRepeatButton>
                 <Track.Thumb>
-                    <Controls:MetroThumb Margin="1 0 1 0" Style="{DynamicResource MahApps.Styles.Thumb.MetroScrollBar}" />
+                    <Controls:MetroThumb Margin="1 0 1 0" Style="{DynamicResource MahApps.Styles.Thumb.ScrollBar.Metro}" />
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
                     <RepeatButton x:Name="VerticalLargeIncrease"
                                   Command="ScrollBar.PageDownCommand"
-                                  Style="{DynamicResource MahApps.Styles.RepeatButton.MetroScrollBarLarge}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.ScrollBarLarge.Metro}" />
                 </Track.IncreaseRepeatButton>
             </Track>
             <RepeatButton x:Name="VerticalSmallIncrease"
                           Grid.Row="2"
                           Command="ScrollBar.LineDownCommand"
                           Content="M80.125,192L400.125,192 240.125,352 80.125,192z"
-                          Style="{DynamicResource MahApps.Styles.RepeatButton.MetroScrollBarSmall}" />
+                          Style="{DynamicResource MahApps.Styles.RepeatButton.ScrollBarSmall.Metro}" />
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsEnabled" Value="False">
diff --git a/src/MahApps.Metro/Styles/Controls.Slider.xaml b/src/MahApps.Metro/Styles/Controls.Slider.xaml
index 3c1b2e6936..ac8bf03cf8 100644
--- a/src/MahApps.Metro/Styles/Controls.Slider.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Slider.xaml
@@ -3,10 +3,10 @@
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls"
                     xmlns:System="clr-namespace:System;assembly=mscorlib">
 
-    <System:Double x:Key="MahApps.Sizes.Slider.HorizontalThumbHeight">16</System:Double>
-    <System:Double x:Key="MahApps.Sizes.Slider.HorizontalThumbWidth">10</System:Double>
-    <System:Double x:Key="MahApps.Sizes.Slider.VerticalThumbWidth">16</System:Double>
-    <System:Double x:Key="MahApps.Sizes.Slider.VerticalThumbHeight">10</System:Double>
+    <System:Double x:Key="MahApps.Sizes.Slider.HorizontalThumb.Height">16</System:Double>
+    <System:Double x:Key="MahApps.Sizes.Slider.HorizontalThumb.Width">10</System:Double>
+    <System:Double x:Key="MahApps.Sizes.Slider.VerticalThumb.Width">16</System:Double>
+    <System:Double x:Key="MahApps.Sizes.Slider.VerticalThumb.Height">10</System:Double>
 
     <Style x:Key="MahApps.Styles.Thumb.Slider" TargetType="Thumb">
         <Setter Property="BorderThickness" Value="0" />
@@ -25,7 +25,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.RepeatButton.SliderHorizontalTrack" TargetType="{x:Type RepeatButton}">
+    <Style x:Key="MahApps.Styles.RepeatButton.Slider.HorizontalTrack" TargetType="{x:Type RepeatButton}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="IsTabStop" Value="False" />
@@ -41,8 +41,8 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.RepeatButton.SliderHorizontalTrackValue"
-           BasedOn="{StaticResource MahApps.Styles.RepeatButton.SliderHorizontalTrack}"
+    <Style x:Key="MahApps.Styles.RepeatButton.Slider.HorizontalTrackValue"
+           BasedOn="{StaticResource MahApps.Styles.RepeatButton.Slider.HorizontalTrack}"
            TargetType="{x:Type RepeatButton}">
         <Setter Property="Template">
             <Setter.Value>
@@ -55,8 +55,8 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.RepeatButton.SliderVerticalTrack"
-           BasedOn="{StaticResource MahApps.Styles.RepeatButton.SliderHorizontalTrack}"
+    <Style x:Key="MahApps.Styles.RepeatButton.Slider.VerticalTrack"
+           BasedOn="{StaticResource MahApps.Styles.RepeatButton.Slider.HorizontalTrack}"
            TargetType="{x:Type RepeatButton}">
         <Setter Property="Template">
             <Setter.Value>
@@ -69,8 +69,8 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.RepeatButton.SliderVerticalTrackValue"
-           BasedOn="{StaticResource MahApps.Styles.RepeatButton.SliderVerticalTrack}"
+    <Style x:Key="MahApps.Styles.RepeatButton.Slider.VerticalTrackValue"
+           BasedOn="{StaticResource MahApps.Styles.RepeatButton.Slider.VerticalTrack}"
            TargetType="{x:Type RepeatButton}">
         <Setter Property="Template">
             <Setter.Value>
@@ -110,18 +110,18 @@
                     <RepeatButton x:Name="HorizontalTrackDecrease"
                                   Command="{x:Static Slider.DecreaseLarge}"
                                   Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillBrush)}"
-                                  Style="{DynamicResource MahApps.Styles.RepeatButton.SliderHorizontalTrackValue}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.Slider.HorizontalTrackValue}" />
                 </Track.DecreaseRepeatButton>
                 <Track.IncreaseRepeatButton>
                     <RepeatButton x:Name="HorizontalTrackIncrease"
                                   Command="{x:Static Slider.IncreaseLarge}"
                                   Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillBrush)}"
-                                  Style="{DynamicResource MahApps.Styles.RepeatButton.SliderHorizontalTrack}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.Slider.HorizontalTrack}" />
                 </Track.IncreaseRepeatButton>
                 <Track.Thumb>
                     <Controls:MetroThumb x:Name="HorizontalThumb"
-                                         Width="{DynamicResource MahApps.Sizes.Slider.HorizontalThumbWidth}"
-                                         Height="{DynamicResource MahApps.Sizes.Slider.HorizontalThumbHeight}"
+                                         Width="{DynamicResource MahApps.Sizes.Slider.HorizontalThumb.Width}"
+                                         Height="{DynamicResource MahApps.Sizes.Slider.HorizontalThumb.Height}"
                                          Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillBrush)}"
                                          BorderThickness="1 0"
                                          IsTabStop="True"
@@ -196,18 +196,18 @@
                     <RepeatButton x:Name="VerticalTrackDecrease"
                                   Command="{x:Static Slider.DecreaseLarge}"
                                   Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillBrush)}"
-                                  Style="{DynamicResource MahApps.Styles.RepeatButton.SliderVerticalTrackValue}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.Slider.VerticalTrackValue}" />
                 </Track.DecreaseRepeatButton>
                 <Track.IncreaseRepeatButton>
                     <RepeatButton x:Name="VerticalTrackIncrease"
                                   Command="{x:Static Slider.IncreaseLarge}"
                                   Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillBrush)}"
-                                  Style="{DynamicResource MahApps.Styles.RepeatButton.SliderVerticalTrack}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.Slider.VerticalTrack}" />
                 </Track.IncreaseRepeatButton>
                 <Track.Thumb>
                     <Controls:MetroThumb x:Name="VerticalThumb"
-                                         Width="{DynamicResource MahApps.Sizes.Slider.VerticalThumbWidth}"
-                                         Height="{DynamicResource MahApps.Sizes.Slider.VerticalThumbHeight}"
+                                         Width="{DynamicResource MahApps.Sizes.Slider.VerticalThumb.Width}"
+                                         Height="{DynamicResource MahApps.Sizes.Slider.VerticalThumb.Height}"
                                          Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillBrush)}"
                                          BorderThickness="0 1"
                                          IsTabStop="True"
@@ -304,7 +304,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.RepeatButton.SliderHorizontalTrack.Win10" TargetType="{x:Type RepeatButton}">
+    <Style x:Key="MahApps.Styles.RepeatButton.Slider.HorizontalTrack.Win10" TargetType="{x:Type RepeatButton}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="IsTabStop" Value="False" />
@@ -320,8 +320,8 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.RepeatButton.SliderVerticalTrack.Win10"
-           BasedOn="{StaticResource MahApps.Styles.RepeatButton.SliderHorizontalTrack.Win10}"
+    <Style x:Key="MahApps.Styles.RepeatButton.Slider.VerticalTrack.Win10"
+           BasedOn="{StaticResource MahApps.Styles.RepeatButton.Slider.HorizontalTrack.Win10}"
            TargetType="{x:Type RepeatButton}">
         <Setter Property="Template">
             <Setter.Value>
@@ -363,13 +363,13 @@
                     <RepeatButton x:Name="HorizontalTrackDecrease"
                                   Command="{x:Static Slider.DecreaseLarge}"
                                   Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillBrush)}"
-                                  Style="{DynamicResource MahApps.Styles.RepeatButton.SliderHorizontalTrack.Win10}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.Slider.HorizontalTrack.Win10}" />
                 </Track.DecreaseRepeatButton>
                 <Track.IncreaseRepeatButton>
                     <RepeatButton x:Name="HorizontalTrackIncrease"
                                   Command="{x:Static Slider.IncreaseLarge}"
                                   Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillBrush)}"
-                                  Style="{DynamicResource MahApps.Styles.RepeatButton.SliderHorizontalTrack.Win10}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.Slider.HorizontalTrack.Win10}" />
                 </Track.IncreaseRepeatButton>
                 <Track.Thumb>
                     <Controls:MetroThumb x:Name="HorizontalThumb"
@@ -450,13 +450,13 @@
                     <RepeatButton x:Name="VerticalTrackDecrease"
                                   Command="{x:Static Slider.DecreaseLarge}"
                                   Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillBrush)}"
-                                  Style="{DynamicResource MahApps.Styles.RepeatButton.SliderVerticalTrack.Win10}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.Slider.VerticalTrack.Win10}" />
                 </Track.DecreaseRepeatButton>
                 <Track.IncreaseRepeatButton>
                     <RepeatButton x:Name="VerticalTrackIncrease"
                                   Command="{x:Static Slider.IncreaseLarge}"
                                   Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillBrush)}"
-                                  Style="{DynamicResource MahApps.Styles.RepeatButton.SliderVerticalTrack.Win10}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.Slider.VerticalTrack.Win10}" />
                 </Track.IncreaseRepeatButton>
                 <Track.Thumb>
                     <Controls:MetroThumb x:Name="VerticalThumb"
diff --git a/src/MahApps.Metro/Styles/Controls.StatusBar.xaml b/src/MahApps.Metro/Styles/Controls.StatusBar.xaml
index beba968252..118dee02c2 100644
--- a/src/MahApps.Metro/Styles/Controls.StatusBar.xaml
+++ b/src/MahApps.Metro/Styles/Controls.StatusBar.xaml
@@ -29,7 +29,7 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.Separator.MetroStatusBar" TargetType="{x:Type Separator}">
+    <Style x:Key="MahApps.Styles.Separator.StatusBar.Metro" TargetType="{x:Type Separator}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.IdealForeground}" />
         <Setter Property="MinHeight" Value="1" />
         <Setter Property="MinWidth" Value="1" />
diff --git a/src/MahApps.Metro/Styles/Controls.TextBlock.xaml b/src/MahApps.Metro/Styles/Controls.TextBlock.xaml
index bcbf5ed27d..28de39dc5c 100644
--- a/src/MahApps.Metro/Styles/Controls.TextBlock.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TextBlock.xaml
@@ -4,14 +4,14 @@
     <!--  never ever make a default style for TextBlock in App.xaml !!!  -->
     <Style x:Key="MahApps.Styles.TextBlock.Metro" TargetType="{x:Type TextBlock}" />
 
-    <Style x:Key="MahApps.Styles.TextBlock.MetroWatermark"
+    <Style x:Key="MahApps.Styles.TextBlock.Watermark.Metro"
            BasedOn="{StaticResource MahApps.Styles.TextBlock.Metro}"
            TargetType="{x:Type TextBlock}">
         <Setter Property="IsHitTestVisible" Value="False" />
         <Setter Property="Opacity" Value="0.6" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.TextBlock.MetroAutoCollapsing"
+    <Style x:Key="MahApps.Styles.TextBlock.AutoCollapsing.Metro"
            BasedOn="{StaticResource MahApps.Styles.TextBlock.Metro}"
            TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.FloatingWatermark}" />
diff --git a/src/MahApps.Metro/Styles/Controls.TextBox.xaml b/src/MahApps.Metro/Styles/Controls.TextBox.xaml
index 10d3efe782..e7e5322f44 100644
--- a/src/MahApps.Metro/Styles/Controls.TextBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TextBox.xaml
@@ -100,7 +100,7 @@
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
-                                       Style="{DynamicResource MahApps.Styles.TextBlock.MetroWatermark}"
+                                       Style="{DynamicResource MahApps.Styles.TextBlock.Watermark.Metro}"
                                        Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                        TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                        TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
@@ -124,7 +124,7 @@
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
-                                           Style="{DynamicResource MahApps.Styles.TextBlock.MetroAutoCollapsing}"
+                                           Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing.Metro}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                            TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                            TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
@@ -270,7 +270,7 @@
         <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource MahApps.Templates.ValidationError}" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.TextBox.MetroButton"
+    <Style x:Key="MahApps.Styles.TextBox.Button.Metro"
            BasedOn="{StaticResource MahApps.Styles.TextBox.Metro}"
            TargetType="{x:Type TextBox}">
         <Setter Property="Controls:TextBoxHelper.ButtonTemplate" Value="{DynamicResource MahApps.Templates.ButtonBase.Chromeless}" />
@@ -345,7 +345,7 @@
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
-                                       Style="{DynamicResource MahApps.Styles.TextBlock.MetroWatermark}"
+                                       Style="{DynamicResource MahApps.Styles.TextBlock.Watermark.Metro}"
                                        Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                        TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                        TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
@@ -369,7 +369,7 @@
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
-                                           Style="{DynamicResource MahApps.Styles.TextBlock.MetroAutoCollapsing}"
+                                           Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing.Metro}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                            TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                            TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
@@ -497,8 +497,8 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.TextBox.MetroSearch"
-           BasedOn="{StaticResource MahApps.Styles.TextBox.MetroButton}"
+    <Style x:Key="MahApps.Styles.TextBox.Search.Metro"
+           BasedOn="{StaticResource MahApps.Styles.TextBox.Button.Metro}"
            TargetType="{x:Type TextBox}">
         <Setter Property="Controls:TextBoxHelper.ButtonContentTemplate">
             <Setter.Value>
@@ -624,7 +624,7 @@
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
-                                       Style="{DynamicResource MahApps.Styles.TextBlock.MetroWatermark}"
+                                       Style="{DynamicResource MahApps.Styles.TextBlock.Watermark.Metro}"
                                        Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                        TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                        TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
@@ -650,7 +650,7 @@
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
-                                           Style="{DynamicResource MahApps.Styles.TextBlock.MetroAutoCollapsing}"
+                                           Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing.Metro}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                            TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                            TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
@@ -782,7 +782,7 @@
         <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource MahApps.Templates.ValidationError}" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.RichTextBox.MetroButton"
+    <Style x:Key="MahApps.Styles.RichTextBox.Button.Metro"
            BasedOn="{StaticResource MahApps.Styles.RichTextBox.Metro}"
            TargetType="{x:Type RichTextBox}">
         <Setter Property="Controls:TextBoxHelper.ButtonCommandParameter" Value="{Binding RelativeSource={RelativeSource Self}}" />
@@ -826,7 +826,7 @@
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
-                                       Style="{DynamicResource MahApps.Styles.TextBlock.MetroWatermark}"
+                                       Style="{DynamicResource MahApps.Styles.TextBlock.Watermark.Metro}"
                                        Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                        TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                        TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
@@ -852,7 +852,7 @@
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
-                                           Style="{DynamicResource MahApps.Styles.TextBlock.MetroAutoCollapsing}"
+                                           Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing.Metro}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                            TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                            TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
diff --git a/src/MahApps.Metro/Styles/FlatSlider.xaml b/src/MahApps.Metro/Styles/FlatSlider.xaml
index 0942a6edc5..fc0105b18b 100644
--- a/src/MahApps.Metro/Styles/FlatSlider.xaml
+++ b/src/MahApps.Metro/Styles/FlatSlider.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="clr-namespace:MahApps.Metro.Controls">
 
-    <Style x:Key="MahApps.Styles.RepeatButton.FlatSliderTrack" TargetType="{x:Type RepeatButton}">
+    <Style x:Key="MahApps.Styles.RepeatButton.SliderTrack.Flat" TargetType="{x:Type RepeatButton}">
         <Setter Property="Focusable" Value="False" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="OverridesDefaultStyle" Value="True" />
@@ -16,7 +16,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.Thumb.FlatSlider" TargetType="{x:Type Thumb}">
+    <Style x:Key="MahApps.Styles.Thumb.Slider.Flat" TargetType="{x:Type Thumb}">
         <Setter Property="OverridesDefaultStyle" Value="True" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
@@ -28,7 +28,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.TickBar.FlatSlider" TargetType="TickBar">
+    <Style x:Key="MahApps.Styles.TickBar.Slider.Flat" TargetType="TickBar">
         <Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.SliderThumb.Disabled}" />
         <Setter Property="Visibility" Value="Collapsed" />
         <Style.Triggers>
@@ -52,7 +52,7 @@
         </Style.Triggers>
     </Style>
 
-    <ControlTemplate x:Key="MahApps.Templates.Slider.FlatHorizontal" TargetType="{x:Type Slider}">
+    <ControlTemplate x:Key="MahApps.Templates.Slider.Horizontal.Flat" TargetType="{x:Type Slider}">
         <Grid VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
@@ -62,26 +62,26 @@
             <TickBar x:Name="TopTick"
                      Grid.Row="0"
                      Placement="Top"
-                     Style="{DynamicResource MahApps.Styles.TickBar.FlatSlider}" />
+                     Style="{DynamicResource MahApps.Styles.TickBar.Slider.Flat}" />
             <TickBar x:Name="BottomTick"
                      Grid.Row="2"
                      Placement="Bottom"
-                     Style="{DynamicResource MahApps.Styles.TickBar.FlatSlider}" />
+                     Style="{DynamicResource MahApps.Styles.TickBar.Slider.Flat}" />
             <Track x:Name="PART_Track" Grid.Row="1">
                 <Track.DecreaseRepeatButton>
                     <RepeatButton Background="{TemplateBinding Slider.Foreground}"
                                   Command="Slider.DecreaseLarge"
-                                  Style="{DynamicResource MahApps.Styles.RepeatButton.FlatSliderTrack}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.SliderTrack.Flat}" />
                 </Track.DecreaseRepeatButton>
                 <Track.Thumb>
                     <controls:MetroThumb Width="{TemplateBinding Slider.MinHeight}"
                                          Background="{TemplateBinding Slider.BorderBrush}"
-                                         Style="{DynamicResource MahApps.Styles.Thumb.FlatSlider}" />
+                                         Style="{DynamicResource MahApps.Styles.Thumb.Slider.Flat}" />
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
                     <RepeatButton Background="{TemplateBinding Slider.Background}"
                                   Command="Slider.IncreaseLarge"
-                                  Style="{DynamicResource MahApps.Styles.RepeatButton.FlatSliderTrack}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.SliderTrack.Flat}" />
                 </Track.IncreaseRepeatButton>
             </Track>
         </Grid>
@@ -99,7 +99,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <ControlTemplate x:Key="MahApps.Templates.Slider.FlatVertical" TargetType="{x:Type Slider}">
+    <ControlTemplate x:Key="MahApps.Templates.Slider.Vertical.Flat" TargetType="{x:Type Slider}">
         <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
@@ -109,26 +109,26 @@
             <TickBar x:Name="TopTick"
                      Grid.Column="0"
                      Placement="Left"
-                     Style="{DynamicResource MahApps.Styles.TickBar.FlatSlider}" />
+                     Style="{DynamicResource MahApps.Styles.TickBar.Slider.Flat}" />
             <TickBar x:Name="BottomTick"
                      Grid.Column="2"
                      Placement="Right"
-                     Style="{DynamicResource MahApps.Styles.TickBar.FlatSlider}" />
+                     Style="{DynamicResource MahApps.Styles.TickBar.Slider.Flat}" />
             <Track x:Name="PART_Track" Grid.Column="1">
                 <Track.DecreaseRepeatButton>
                     <RepeatButton Background="{TemplateBinding Slider.Foreground}"
                                   Command="Slider.DecreaseLarge"
-                                  Style="{DynamicResource MahApps.Styles.RepeatButton.FlatSliderTrack}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.SliderTrack.Flat}" />
                 </Track.DecreaseRepeatButton>
                 <Track.Thumb>
                     <controls:MetroThumb Height="{TemplateBinding Slider.MinWidth}"
                                          Background="{TemplateBinding Slider.BorderBrush}"
-                                         Style="{DynamicResource MahApps.Styles.Thumb.FlatSlider}" />
+                                         Style="{DynamicResource MahApps.Styles.Thumb.Slider.Flat}" />
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
                     <RepeatButton Background="{TemplateBinding Slider.Background}"
                                   Command="Slider.IncreaseLarge"
-                                  Style="{DynamicResource MahApps.Styles.RepeatButton.FlatSliderTrack}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.SliderTrack.Flat}" />
                 </Track.IncreaseRepeatButton>
             </Track>
         </Grid>
@@ -171,12 +171,12 @@
             <Trigger Property="Orientation" Value="Horizontal">
                 <Setter Property="MinHeight" Value="12" />
                 <Setter Property="MinWidth" Value="0" />
-                <Setter Property="Template" Value="{DynamicResource MahApps.Templates.Slider.FlatHorizontal}" />
+                <Setter Property="Template" Value="{DynamicResource MahApps.Templates.Slider.Horizontal.Flat}" />
             </Trigger>
             <Trigger Property="Orientation" Value="Vertical">
                 <Setter Property="MinHeight" Value="0" />
                 <Setter Property="MinWidth" Value="12" />
-                <Setter Property="Template" Value="{DynamicResource MahApps.Templates.Slider.FlatVertical}" />
+                <Setter Property="Template" Value="{DynamicResource MahApps.Templates.Slider.Vertical.Flat}" />
             </Trigger>
         </Style.Triggers>
     </Style>
diff --git a/src/MahApps.Metro/Styles/Sizes.xaml b/src/MahApps.Metro/Styles/Sizes.xaml
index 55eaf5235b..b1f0293743 100644
--- a/src/MahApps.Metro/Styles/Sizes.xaml
+++ b/src/MahApps.Metro/Styles/Sizes.xaml
@@ -5,7 +5,7 @@
     <System:Double x:Key="MahApps.Sizes.ScrollBar.Height.Metro">14</System:Double>
     <System:Double x:Key="MahApps.Sizes.ScrollBar.Width.Metro">14</System:Double>
 
-    <System:Double x:Key="MahApps.Sizes.ScrollBar.HorizontalRepeatButtonWidth">14</System:Double>
-    <System:Double x:Key="MahApps.Sizes.ScrollBar.VerticalRepeatButtonHeight">14</System:Double>
+    <System:Double x:Key="MahApps.Sizes.ScrollBar.HorizontalRepeatButton.Width">14</System:Double>
+    <System:Double x:Key="MahApps.Sizes.ScrollBar.VerticalRepeatButton.Height">14</System:Double>
 
 </ResourceDictionary>
diff --git a/src/MahApps.Metro/Styles/VS/Button.xaml b/src/MahApps.Metro/Styles/VS/Button.xaml
index 215022377b..a3d96a4f4d 100644
--- a/src/MahApps.Metro/Styles/VS/Button.xaml
+++ b/src/MahApps.Metro/Styles/VS/Button.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <Style x:Key="MahApps.Styles.Button.VisualStudioWindowStandard" TargetType="Button">
+    <Style x:Key="MahApps.Styles.Button.Window.Standard.VisualStudio" TargetType="Button">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Background.Normal}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Normal}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Foreground}" />
@@ -34,7 +34,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.Button.VisualStudioWindowLink" TargetType="Button">
+    <Style x:Key="MahApps.Styles.Button.Window.Link.VisualStudio" TargetType="Button">
         <Setter Property="Cursor" Value="Hand" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.LinkButton.Foreground}" />
         <Setter Property="Template">
diff --git a/src/MahApps.Metro/Styles/VS/Expander.xaml b/src/MahApps.Metro/Styles/VS/Expander.xaml
index 0ece6af9d2..53682057a4 100644
--- a/src/MahApps.Metro/Styles/VS/Expander.xaml
+++ b/src/MahApps.Metro/Styles/VS/Expander.xaml
@@ -10,7 +10,7 @@
     <sys:Double x:Key="ExpanderHeaderThemeFontSize">16</sys:Double>
     <sys:Double x:Key="ExpanderToggleButtonThemeSize">18</sys:Double>
 
-    <Style x:Key="MahApps.Styles.ToggleButton.ExpanderBaseHeader" TargetType="{x:Type ToggleButton}">
+    <Style x:Key="MahApps.Styles.ToggleButton.ExpanderHeader.Base.VisualStudio" TargetType="{x:Type ToggleButton}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderBrush" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />
@@ -20,8 +20,8 @@
         <Setter Property="SnapsToDevicePixels" Value="True" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.ToggleButton.ExpanderRightHeader"
-           BasedOn="{StaticResource MahApps.Styles.ToggleButton.ExpanderBaseHeader}"
+    <Style x:Key="MahApps.Styles.ToggleButton.ExpanderHeader.Right.VisualStudio"
+           BasedOn="{StaticResource MahApps.Styles.ToggleButton.ExpanderHeader.Base.VisualStudio}"
            TargetType="{x:Type ToggleButton}">
         <Setter Property="BorderThickness" Value="0 0 2 0" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
@@ -95,8 +95,8 @@
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.ToggleButton.ExpanderUpHeader"
-           BasedOn="{StaticResource MahApps.Styles.ToggleButton.ExpanderBaseHeader}"
+    <Style x:Key="MahApps.Styles.ToggleButton.ExpanderHeader.Up.VisualStudio"
+           BasedOn="{StaticResource MahApps.Styles.ToggleButton.ExpanderHeader.Base.VisualStudio}"
            TargetType="{x:Type ToggleButton}">
         <Setter Property="BorderThickness" Value="0 2 0 0" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
@@ -169,8 +169,8 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.ToggleButton.ExpanderLeftHeader"
-           BasedOn="{StaticResource MahApps.Styles.ToggleButton.ExpanderRightHeader}"
+    <Style x:Key="MahApps.Styles.ToggleButton.ExpanderHeader.Left.VisualStudio"
+           BasedOn="{StaticResource MahApps.Styles.ToggleButton.ExpanderHeader.Right.VisualStudio}"
            TargetType="{x:Type ToggleButton}">
         <Setter Property="BorderThickness" Value="2 0 0 0" />
         <Setter Property="Template">
@@ -240,8 +240,8 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.ToggleButton.ExpanderDownHeader"
-           BasedOn="{StaticResource MahApps.Styles.ToggleButton.ExpanderUpHeader}"
+    <Style x:Key="MahApps.Styles.ToggleButton.ExpanderHeader.Down.VisualStudio"
+           BasedOn="{StaticResource MahApps.Styles.ToggleButton.ExpanderHeader.Up.VisualStudio}"
            TargetType="{x:Type ToggleButton}">
         <Setter Property="BorderThickness" Value="0 0 0 2" />
         <Setter Property="Template">
@@ -323,16 +323,16 @@
         </ObjectAnimationUsingKeyFrames>
     </Storyboard>
 
-    <Style x:Key="MahApps.Styles.Expander.VisualStudioStandard" TargetType="{x:Type Expander}">
+    <Style x:Key="MahApps.Styles.Expander.Standard.VisualStudio" TargetType="{x:Type Expander}">
         <Setter Property="Background" Value="{x:Null}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Normal}" />
         <Setter Property="BorderThickness" Value="2" />
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Normal" />
         <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource ExpanderHeaderThemeFontSize}" />
-        <Setter Property="Controls:ExpanderHelper.HeaderDownStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderDownHeader}" />
-        <Setter Property="Controls:ExpanderHelper.HeaderLeftStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderLeftHeader}" />
-        <Setter Property="Controls:ExpanderHelper.HeaderRightStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderRightHeader}" />
-        <Setter Property="Controls:ExpanderHelper.HeaderUpStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderUpHeader}" />
+        <Setter Property="Controls:ExpanderHelper.HeaderDownStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderHeader.Down.VisualStudio}" />
+        <Setter Property="Controls:ExpanderHelper.HeaderLeftStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderHeader.Left.VisualStudio}" />
+        <Setter Property="Controls:ExpanderHelper.HeaderRightStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderHeader.Right.VisualStudio}" />
+        <Setter Property="Controls:ExpanderHelper.HeaderUpStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderHeader.Up.VisualStudio}" />
         <Setter Property="Controls:GroupBoxHelper.HeaderForeground" Value="{DynamicResource MahApps.Brushes.Foreground}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Foreground}" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
diff --git a/src/MahApps.Metro/Styles/VS/GroupBox.xaml b/src/MahApps.Metro/Styles/VS/GroupBox.xaml
index 18f562a032..35e6046370 100644
--- a/src/MahApps.Metro/Styles/VS/GroupBox.xaml
+++ b/src/MahApps.Metro/Styles/VS/GroupBox.xaml
@@ -6,7 +6,7 @@
     <Thickness x:Key="GroupBoxHeaderThemePadding">2</Thickness>
     <System:Double x:Key="MahApps.Sizes.GroupBox.HeaderThemeFont">16</System:Double>
 
-    <Style x:Key="MahApps.Styles.GroupBox.Standard" TargetType="{x:Type GroupBox}">
+    <Style x:Key="MahApps.Styles.GroupBox.Standard.VisualStudio" TargetType="{x:Type GroupBox}">
         <Setter Property="Background" Value="{x:Null}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Normal}" />
         <Setter Property="BorderThickness" Value="2" />
diff --git a/src/MahApps.Metro/Styles/VS/ListBox.xaml b/src/MahApps.Metro/Styles/VS/ListBox.xaml
index 2c18141f15..94bf601cf8 100644
--- a/src/MahApps.Metro/Styles/VS/ListBox.xaml
+++ b/src/MahApps.Metro/Styles/VS/ListBox.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <Style x:Key="MahApps.Styles.ListBox.Standard" TargetType="{x:Type ListBox}">
+    <Style x:Key="MahApps.Styles.ListBox.Standard.VisualStudio" TargetType="{x:Type ListBox}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />
         <Style.Resources>
diff --git a/src/MahApps.Metro/Styles/VS/Menu.xaml b/src/MahApps.Metro/Styles/VS/Menu.xaml
index 602c670447..e20977c1f4 100644
--- a/src/MahApps.Metro/Styles/VS/Menu.xaml
+++ b/src/MahApps.Metro/Styles/VS/Menu.xaml
@@ -14,12 +14,12 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.Menu.Standard" TargetType="{x:Type Menu}">
+    <Style x:Key="MahApps.Styles.Menu.Standard.VisualStudio" TargetType="{x:Type Menu}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.LightBackground}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Foreground}" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.MenuItem.Standard" TargetType="{x:Type MenuItem}">
+    <Style x:Key="MahApps.Styles.MenuItem.Standard.VisualStudio" TargetType="{x:Type MenuItem}">
         <Setter Property="Foreground" Value="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Menu}}}" />
         <Setter Property="Template">
             <Setter.Value>
diff --git a/src/MahApps.Metro/Styles/VS/ScrollBar.xaml b/src/MahApps.Metro/Styles/VS/ScrollBar.xaml
index b9dc3d8176..50c07ad36f 100644
--- a/src/MahApps.Metro/Styles/VS/ScrollBar.xaml
+++ b/src/MahApps.Metro/Styles/VS/ScrollBar.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
-    <Style x:Key="MahApps.Styles.RepeatButton.VisualStudioScrollBarLine" TargetType="{x:Type RepeatButton}">
+    <Style x:Key="MahApps.Styles.RepeatButton.ScrollBarLine.VisualStudio" TargetType="{x:Type RepeatButton}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Background.Normal}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Normal}" />
         <Setter Property="Focusable" Value="false" />
@@ -33,7 +33,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.RepeatButton.VisualStudioScrollBarPage" TargetType="{x:Type RepeatButton}">
+    <Style x:Key="MahApps.Styles.RepeatButton.ScrollBarPage.VisualStudio" TargetType="{x:Type RepeatButton}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
@@ -50,7 +50,7 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="MahApps.Styles.Thumb.VisualStudioScrollBar" TargetType="{x:Type Thumb}">
+    <Style x:Key="MahApps.Styles.Thumb.ScrollBar.VisualStudio" TargetType="{x:Type Thumb}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Background.Normal}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Normal}" />
         <Setter Property="Focusable" Value="false" />
@@ -77,7 +77,7 @@
         </Setter>
     </Style>
 
-    <ControlTemplate x:Key="MahApps.Templates.ScrollBar.Horizontal" TargetType="{x:Type ScrollBar}">
+    <ControlTemplate x:Key="MahApps.Templates.ScrollBar.Horizontal.VisualStudio" TargetType="{x:Type ScrollBar}">
         <Grid>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="18" />
@@ -87,26 +87,26 @@
             <RepeatButton Grid.Column="0"
                           Command="ScrollBar.LineLeftCommand"
                           Content="M 0 4 L 4 8 L 4 0 Z"
-                          Style="{StaticResource MahApps.Styles.RepeatButton.VisualStudioScrollBarLine}" />
+                          Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBarLine.VisualStudio}" />
             <Track Name="PART_Track" Grid.Column="1">
                 <Track.DecreaseRepeatButton>
-                    <RepeatButton Command="ScrollBar.PageLeftCommand" Style="{StaticResource MahApps.Styles.RepeatButton.VisualStudioScrollBarPage}" />
+                    <RepeatButton Command="ScrollBar.PageLeftCommand" Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBarPage.VisualStudio}" />
                 </Track.DecreaseRepeatButton>
                 <Track.Thumb>
-                    <Controls:MetroThumb Style="{StaticResource MahApps.Styles.Thumb.VisualStudioScrollBar}" />
+                    <Controls:MetroThumb Style="{StaticResource MahApps.Styles.Thumb.ScrollBar.VisualStudio}" />
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
-                    <RepeatButton Command="ScrollBar.PageRightCommand" Style="{StaticResource MahApps.Styles.RepeatButton.VisualStudioScrollBarPage}" />
+                    <RepeatButton Command="ScrollBar.PageRightCommand" Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBarPage.VisualStudio}" />
                 </Track.IncreaseRepeatButton>
             </Track>
             <RepeatButton Grid.Column="2"
                           Command="ScrollBar.LineRightCommand"
                           Content="M 0 0 L 0 8 L 4 4 Z"
-                          Style="{StaticResource MahApps.Styles.RepeatButton.VisualStudioScrollBarLine}" />
+                          Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBarLine.VisualStudio}" />
         </Grid>
     </ControlTemplate>
 
-    <ControlTemplate x:Key="MahApps.Templates.ScrollBar.Vertical" TargetType="{x:Type ScrollBar}">
+    <ControlTemplate x:Key="MahApps.Templates.ScrollBar.Vertical.VisualStudio" TargetType="{x:Type ScrollBar}">
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="18" />
@@ -116,39 +116,39 @@
             <RepeatButton Grid.Row="0"
                           Command="ScrollBar.LineUpCommand"
                           Content="M 0 4 L 8 4 L 4 0 Z"
-                          Style="{StaticResource MahApps.Styles.RepeatButton.VisualStudioScrollBarLine}" />
+                          Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBarLine.VisualStudio}" />
             <Track Name="PART_Track"
                    Grid.Row="1"
                    IsDirectionReversed="true">
                 <Track.DecreaseRepeatButton>
-                    <RepeatButton Command="ScrollBar.PageUpCommand" Style="{StaticResource MahApps.Styles.RepeatButton.VisualStudioScrollBarPage}" />
+                    <RepeatButton Command="ScrollBar.PageUpCommand" Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBarPage.VisualStudio}" />
                 </Track.DecreaseRepeatButton>
                 <Track.Thumb>
-                    <Controls:MetroThumb Style="{StaticResource MahApps.Styles.Thumb.VisualStudioScrollBar}" />
+                    <Controls:MetroThumb Style="{StaticResource MahApps.Styles.Thumb.ScrollBar.VisualStudio}" />
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
-                    <RepeatButton Command="ScrollBar.PageDownCommand" Style="{StaticResource MahApps.Styles.RepeatButton.VisualStudioScrollBarPage}" />
+                    <RepeatButton Command="ScrollBar.PageDownCommand" Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBarPage.VisualStudio}" />
                 </Track.IncreaseRepeatButton>
             </Track>
             <RepeatButton Grid.Row="2"
                           Command="ScrollBar.LineDownCommand"
                           Content="M 0 0 L 4 4 L 8 0 Z"
-                          Style="{StaticResource MahApps.Styles.RepeatButton.VisualStudioScrollBarLine}" />
+                          Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBarLine.VisualStudio}" />
         </Grid>
     </ControlTemplate>
 
-    <Style x:Key="MahApps.Styles.ScrollBar.VisualStudioStandard" TargetType="{x:Type ScrollBar}">
+    <Style x:Key="MahApps.Styles.ScrollBar.Standard.VisualStudio" TargetType="{x:Type ScrollBar}">
         <Setter Property="OverridesDefaultStyle" Value="true" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Style.Triggers>
             <Trigger Property="Orientation" Value="Vertical">
                 <Setter Property="Height" Value="Auto" />
-                <Setter Property="Template" Value="{StaticResource MahApps.Templates.ScrollBar.Vertical}" />
+                <Setter Property="Template" Value="{StaticResource MahApps.Templates.ScrollBar.Vertical.VisualStudio}" />
                 <Setter Property="Width" Value="18" />
             </Trigger>
             <Trigger Property="Orientation" Value="Horizontal">
                 <Setter Property="Height" Value="18" />
-                <Setter Property="Template" Value="{StaticResource MahApps.Templates.ScrollBar.Horizontal}" />
+                <Setter Property="Template" Value="{StaticResource MahApps.Templates.ScrollBar.Horizontal.VisualStudio}" />
                 <Setter Property="Width" Value="Auto" />
             </Trigger>
         </Style.Triggers>
diff --git a/src/MahApps.Metro/Styles/VS/Styles.xaml b/src/MahApps.Metro/Styles/VS/Styles.xaml
index 2ccb4e9027..0a19f9eacd 100644
--- a/src/MahApps.Metro/Styles/VS/Styles.xaml
+++ b/src/MahApps.Metro/Styles/VS/Styles.xaml
@@ -13,15 +13,15 @@
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/VS/Expander.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <Style BasedOn="{StaticResource MahApps.Styles.Button.VisualStudioWindowStandard}" TargetType="Button" />
-    <Style BasedOn="{StaticResource MahApps.Styles.ListBox.Standard}" TargetType="ListBox" />
-    <Style BasedOn="{StaticResource MahApps.Styles.MenuItem.Standard}" TargetType="MenuItem" />
-    <Style BasedOn="{StaticResource MahApps.Styles.Menu.Standard}" TargetType="Menu" />
-    <Style BasedOn="{StaticResource MahApps.Styles.ScrollBar.VisualStudioStandard}" TargetType="ScrollBar" />
-    <Style BasedOn="{StaticResource MahApps.Styles.TabItem.VisualStudioStandard}" TargetType="TabItem" />
-    <Style BasedOn="{StaticResource MahApps.Styles.TabControl.VisualStudioStandard}" TargetType="TabControl" />
-    <Style BasedOn="{StaticResource MahApps.Styles.TextBox.VisualStudioStandard}" TargetType="TextBox" />
-    <Style BasedOn="{StaticResource MahApps.Styles.GroupBox.Standard}" TargetType="GroupBox" />
-    <Style BasedOn="{StaticResource MahApps.Styles.Expander.VisualStudioStandard}" TargetType="Expander" />
+    <Style BasedOn="{StaticResource MahApps.Styles.Button.Window.Standard.VisualStudio}" TargetType="Button" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ListBox.Standard.VisualStudio}" TargetType="ListBox" />
+    <Style BasedOn="{StaticResource MahApps.Styles.MenuItem.Standard.VisualStudio}" TargetType="MenuItem" />
+    <Style BasedOn="{StaticResource MahApps.Styles.Menu.Standard.VisualStudio}" TargetType="Menu" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ScrollBar.Standard.VisualStudio}" TargetType="ScrollBar" />
+    <Style BasedOn="{StaticResource MahApps.Styles.TabItem.Standard.VisualStudio}" TargetType="TabItem" />
+    <Style BasedOn="{StaticResource MahApps.Styles.TabControl.Standard.VisualStudio}" TargetType="TabControl" />
+    <Style BasedOn="{StaticResource MahApps.Styles.TextBox.Standard.VisualStudio}" TargetType="TextBox" />
+    <Style BasedOn="{StaticResource MahApps.Styles.GroupBox.Standard.VisualStudio}" TargetType="GroupBox" />
+    <Style BasedOn="{StaticResource MahApps.Styles.Expander.Standard.VisualStudio}" TargetType="Expander" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/VS/TabControl.xaml b/src/MahApps.Metro/Styles/VS/TabControl.xaml
index c913395a7f..d536d4c5ca 100644
--- a/src/MahApps.Metro/Styles/VS/TabControl.xaml
+++ b/src/MahApps.Metro/Styles/VS/TabControl.xaml
@@ -11,7 +11,7 @@
 
     <System:Double x:Key="MahApps.Sizes.Font.TabItem">12</System:Double>
 
-    <Style x:Key="MahApps.Styles.TabControl.VisualStudioStandard"
+    <Style x:Key="MahApps.Styles.TabControl.Standard.VisualStudio"
            BasedOn="{StaticResource MahApps.Styles.TabControl.Metro}"
            TargetType="{x:Type TabControl}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Background}" />
@@ -99,7 +99,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.Button.VisualStudioWindowMahApps.Styles.TabItem.VisualStudioStandardClose" TargetType="{x:Type Button}">
+    <Style x:Key="MahApps.Styles.Button.TabItemClose.Standard.VisualStudio" TargetType="{x:Type Button}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Cursor" Value="Hand" />
         <Setter Property="Focusable" Value="False" />
@@ -139,7 +139,7 @@
         <Setter Property="Width" Value="15" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.TabItem.VisualStudioStandard"
+    <Style x:Key="MahApps.Styles.TabItem.Standard.VisualStudio"
            BasedOn="{StaticResource MahApps.Styles.TabItem.Metro}"
            TargetType="{x:Type TabItem}">
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Normal}" />
@@ -176,7 +176,7 @@
                             <Button x:Name="PART_CloseButton"
                                     VerticalAlignment="Center"
                                     IsTabStop="False"
-                                    Style="{DynamicResource MahApps.Styles.Button.VisualStudioWindowMahApps.Styles.TabItem.VisualStudioStandardClose}"
+                                    Style="{DynamicResource MahApps.Styles.Button.TabItemClose.Standard.VisualStudio}"
                                     Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TabControlHelper.CloseButtonEnabled), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}">
                                 <i:Interaction.Triggers>
                                     <i:EventTrigger EventName="Click">
@@ -241,7 +241,7 @@
         </Setter>
     </Style>
 
-    <DataTemplate x:Key="MahApps.Templates.TabItem.Closable">
+    <DataTemplate x:Key="MahApps.Templates.TabItem.Closable.VisualStudio">
         <DockPanel>
             <ContentPresenter VerticalAlignment="Center" Content="{Binding DisplayName}">
                 <ContentPresenter.Resources>
@@ -255,12 +255,12 @@
     </DataTemplate>
 
     <!--  This template explains how to render the 'Workspace' content area in the main window.  -->
-    <DataTemplate x:Key="MahApps.Templates.TabControl.Workspaces">
+    <DataTemplate x:Key="MahApps.Templates.TabControl.Workspaces.VisualStudio">
         <TabControl Margin="0"
                     IsSynchronizedWithCurrentItem="True"
-                    ItemTemplate="{StaticResource MahApps.Templates.TabItem.Closable}"
+                    ItemTemplate="{StaticResource MahApps.Templates.TabItem.Closable.VisualStudio}"
                     ItemsSource="{Binding}"
-                    Style="{DynamicResource MahApps.Styles.TabControl.VisualStudioStandard}" />
+                    Style="{DynamicResource MahApps.Styles.TabControl.Standard.VisualStudio}" />
     </DataTemplate>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/VS/TextBox.xaml b/src/MahApps.Metro/Styles/VS/TextBox.xaml
index 74d72fd4b6..0e00d91c38 100644
--- a/src/MahApps.Metro/Styles/VS/TextBox.xaml
+++ b/src/MahApps.Metro/Styles/VS/TextBox.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <Style x:Key="MahApps.Styles.TextBox.VisualStudioStandard" TargetType="{x:Type TextBox}">
+    <Style x:Key="MahApps.Styles.TextBox.Standard.VisualStudio" TargetType="{x:Type TextBox}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TextBox.Background}" />
         <Setter Property="CaretBrush" Value="{DynamicResource MahApps.Brushes.Foreground}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Foreground}" />
@@ -27,8 +27,8 @@
         <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource MahApps.Templates.ValidationError}" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.TextBox.VisualStudioSearch"
-           BasedOn="{StaticResource MahApps.Styles.TextBox.VisualStudioStandard}"
+    <Style x:Key="MahApps.Styles.TextBox.Search.VisualStudio"
+           BasedOn="{StaticResource MahApps.Styles.TextBox.Standard.VisualStudio}"
            TargetType="{x:Type TextBox}">
         <Setter Property="Template">
             <Setter.Value>
diff --git a/src/MahApps.Metro/Styles/VS/Window.xaml b/src/MahApps.Metro/Styles/VS/Window.xaml
index a7a310998d..b2f55239de 100644
--- a/src/MahApps.Metro/Styles/VS/Window.xaml
+++ b/src/MahApps.Metro/Styles/VS/Window.xaml
@@ -13,7 +13,7 @@
         <Setter Property="TitleForeground" Value="{DynamicResource MahApps.Brushes.WindowTitle.Foreground}" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.Button.VisualStudioWindow"
+    <Style x:Key="MahApps.Styles.Button.Window.VisualStudio"
            BasedOn="{StaticResource MahApps.Styles.Button.MetroWindow.Light}"
            TargetType="{x:Type Button}">
         <Style.Triggers>
@@ -25,15 +25,15 @@
     </Style>
 
     <Style TargetType="{x:Type Controls:WindowButtonCommands}">
-        <Setter Property="DarkCloseButtonStyle" Value="{StaticResource MahApps.Styles.Button.VisualStudioWindow}" />
-        <Setter Property="DarkMaxButtonStyle" Value="{StaticResource MahApps.Styles.Button.VisualStudioWindow}" />
-        <Setter Property="DarkMinButtonStyle" Value="{StaticResource MahApps.Styles.Button.VisualStudioWindow}" />
-        <Setter Property="LightCloseButtonStyle" Value="{StaticResource MahApps.Styles.Button.VisualStudioWindow}" />
-        <Setter Property="LightMaxButtonStyle" Value="{StaticResource MahApps.Styles.Button.VisualStudioWindow}" />
-        <Setter Property="LightMinButtonStyle" Value="{StaticResource MahApps.Styles.Button.VisualStudioWindow}" />
+        <Setter Property="DarkCloseButtonStyle" Value="{StaticResource MahApps.Styles.Button.Window.VisualStudio}" />
+        <Setter Property="DarkMaxButtonStyle" Value="{StaticResource MahApps.Styles.Button.Window.VisualStudio}" />
+        <Setter Property="DarkMinButtonStyle" Value="{StaticResource MahApps.Styles.Button.Window.VisualStudio}" />
+        <Setter Property="LightCloseButtonStyle" Value="{StaticResource MahApps.Styles.Button.Window.VisualStudio}" />
+        <Setter Property="LightMaxButtonStyle" Value="{StaticResource MahApps.Styles.Button.Window.VisualStudio}" />
+        <Setter Property="LightMinButtonStyle" Value="{StaticResource MahApps.Styles.Button.Window.VisualStudio}" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.Button.VisualStudioWindowNotification"
+    <Style x:Key="MahApps.Styles.Button.Window.Notification.VisualStudio"
            BasedOn="{StaticResource MahApps.Styles.Button.Flat}"
            TargetType="{x:Type Button}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.NotificationButton.Background}" />
@@ -51,8 +51,8 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="MahApps.Styles.TextBox.VisualStudioWindowQuickLaunch"
-           BasedOn="{StaticResource MahApps.Styles.TextBox.MetroButton}"
+    <Style x:Key="MahApps.Styles.TextBox.WindowQuickLaunch.VisualStudio"
+           BasedOn="{StaticResource MahApps.Styles.TextBox.Button.Metro}"
            TargetType="{x:Type TextBox}">
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.QuickLaunchTextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
diff --git a/src/MahApps.Metro/Themes/DateTimePicker.xaml b/src/MahApps.Metro/Themes/DateTimePicker.xaml
index 968b9a4d04..cd5e1df0ba 100644
--- a/src/MahApps.Metro/Themes/DateTimePicker.xaml
+++ b/src/MahApps.Metro/Themes/DateTimePicker.xaml
@@ -181,7 +181,7 @@
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
-                                           Style="{DynamicResource MahApps.Styles.TextBlock.MetroAutoCollapsing}"
+                                           Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing.Metro}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                            TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                            TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
diff --git a/src/MahApps.Metro/Themes/RangeSlider.xaml b/src/MahApps.Metro/Themes/RangeSlider.xaml
index 50b3aba44b..23a49d89ea 100644
--- a/src/MahApps.Metro/Themes/RangeSlider.xaml
+++ b/src/MahApps.Metro/Themes/RangeSlider.xaml
@@ -75,11 +75,11 @@
                         Orientation="Horizontal">
                 <RepeatButton x:Name="PART_LeftEdge"
                               Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillBrush)}"
-                              Style="{DynamicResource MahApps.Styles.RepeatButton.SliderHorizontalTrack}" />
+                              Style="{DynamicResource MahApps.Styles.RepeatButton.Slider.HorizontalTrack}" />
 
                 <Controls:MetroThumb x:Name="PART_LeftThumb"
                                      Width="{DynamicResource HorizontalThumbWidth}"
-                                     Height="{DynamicResource MahApps.Sizes.Slider.HorizontalThumbHeight}"
+                                     Height="{DynamicResource MahApps.Sizes.Slider.HorizontalThumb.Height}"
                                      Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillBrush)}"
                                      BorderThickness="1 0"
                                      Cursor="Arrow"
@@ -91,7 +91,7 @@
                                      Style="{DynamicResource MahApps.Styles.MetroThumb.RangeSliderHorizontalMiddleThumb}" />
                 <Controls:MetroThumb x:Name="PART_RightThumb"
                                      Width="{DynamicResource HorizontalThumbWidth}"
-                                     Height="{DynamicResource MahApps.Sizes.Slider.HorizontalThumbHeight}"
+                                     Height="{DynamicResource MahApps.Sizes.Slider.HorizontalThumb.Height}"
                                      Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillBrush)}"
                                      BorderThickness="1 0"
                                      Cursor="Arrow"
@@ -99,7 +99,7 @@
 
                 <RepeatButton x:Name="PART_RightEdge"
                               Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillBrush)}"
-                              Style="{DynamicResource MahApps.Styles.RepeatButton.SliderHorizontalTrack}" />
+                              Style="{DynamicResource MahApps.Styles.RepeatButton.Slider.HorizontalTrack}" />
             </StackPanel>
         </Grid>
         <ControlTemplate.Triggers>
@@ -195,7 +195,7 @@
                         Orientation="Vertical">
                 <RepeatButton x:Name="PART_RightEdge"
                               Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillBrush)}"
-                              Style="{DynamicResource MahApps.Styles.RepeatButton.SliderVerticalTrack}" />
+                              Style="{DynamicResource MahApps.Styles.RepeatButton.Slider.VerticalTrack}" />
 
                 <Controls:MetroThumb x:Name="PART_RightThumb"
                                      Width="{DynamicResource VerticalThumbWidth}"
@@ -219,7 +219,7 @@
 
                 <RepeatButton x:Name="PART_LeftEdge"
                               Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillBrush)}"
-                              Style="{DynamicResource MahApps.Styles.RepeatButton.SliderVerticalTrack}" />
+                              Style="{DynamicResource MahApps.Styles.RepeatButton.Slider.VerticalTrack}" />
             </StackPanel>
         </Grid>
         <ControlTemplate.Triggers>
@@ -373,7 +373,7 @@
                         Orientation="Horizontal">
                 <RepeatButton x:Name="PART_LeftEdge"
                               Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillBrush)}"
-                              Style="{DynamicResource MahApps.Styles.RepeatButton.SliderHorizontalTrack.Win10}" />
+                              Style="{DynamicResource MahApps.Styles.RepeatButton.Slider.HorizontalTrack.Win10}" />
 
                 <Controls:MetroThumb x:Name="PART_LeftThumb"
                                      Width="8"
@@ -395,7 +395,7 @@
 
                 <RepeatButton x:Name="PART_RightEdge"
                               Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillBrush)}"
-                              Style="{DynamicResource MahApps.Styles.RepeatButton.SliderHorizontalTrack.Win10}" />
+                              Style="{DynamicResource MahApps.Styles.RepeatButton.Slider.HorizontalTrack.Win10}" />
             </StackPanel>
         </Grid>
         <ControlTemplate.Triggers>
@@ -508,7 +508,7 @@
                         Orientation="Vertical">
                 <RepeatButton x:Name="PART_RightEdge"
                               Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillBrush)}"
-                              Style="{DynamicResource MahApps.Styles.RepeatButton.SliderVerticalTrack.Win10}" />
+                              Style="{DynamicResource MahApps.Styles.RepeatButton.Slider.VerticalTrack.Win10}" />
 
                 <Controls:MetroThumb x:Name="PART_RightThumb"
                                      Width="24"
@@ -530,7 +530,7 @@
 
                 <RepeatButton x:Name="PART_LeftEdge"
                               Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillBrush)}"
-                              Style="{DynamicResource MahApps.Styles.RepeatButton.SliderVerticalTrack.Win10}" />
+                              Style="{DynamicResource MahApps.Styles.RepeatButton.Slider.VerticalTrack.Win10}" />
             </StackPanel>
         </Grid>
         <ControlTemplate.Triggers>
diff --git a/src/Mahapps.Metro.Tests/Views/TextBoxHelperTestWindow.xaml b/src/Mahapps.Metro.Tests/Views/TextBoxHelperTestWindow.xaml
index 2aab9fbca9..ce822b8443 100644
--- a/src/Mahapps.Metro.Tests/Views/TextBoxHelperTestWindow.xaml
+++ b/src/Mahapps.Metro.Tests/Views/TextBoxHelperTestWindow.xaml
@@ -9,10 +9,10 @@
                       mc:Ignorable="d">
     <StackPanel>
         <TextBox x:Name="TestTextBox" />
-        <TextBox x:Name="TestButtonTextBox" Style="{DynamicResource MahApps.Styles.TextBox.MetroButton}" />
+        <TextBox x:Name="TestButtonTextBox" Style="{DynamicResource MahApps.Styles.TextBox.Button.Metro}" />
         <PasswordBox x:Name="TestPasswordBox" />
-        <PasswordBox x:Name="TestButtonPasswordBox" Style="{DynamicResource MahApps.Styles.PasswordBox.MetroButton}" />
-        <PasswordBox x:Name="TestButtonRevealedPasswordBox" Style="{DynamicResource MahApps.Styles.PasswordBox.MetroButtonRevealed}" />
+        <PasswordBox x:Name="TestButtonPasswordBox" Style="{DynamicResource MahApps.Styles.PasswordBox.Button.Metro}" />
+        <PasswordBox x:Name="TestButtonRevealedPasswordBox" Style="{DynamicResource MahApps.Styles.PasswordBox.ButtonRevealed.Metro}" />
         <ComboBox x:Name="TestComboBox" />
         <ComboBox x:Name="TestEditableComboBox" IsEditable="True" />
         <controls:NumericUpDown x:Name="TestNumericUpDown" />

From 81adbdacdf964c7b863ee8940a1896e257ed2307 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Fri, 19 Jul 2019 14:11:49 +0200
Subject: [PATCH 20/46] Fix search and replace for Context Menu key

---
 src/MahApps.Metro/Styles/Controls.ContextMenu.xaml | 2 +-
 src/MahApps.Metro/Styles/Controls.DatePicker.xaml  | 4 ++--
 src/MahApps.Metro/Styles/Controls.PasswordBox.xaml | 2 +-
 src/MahApps.Metro/Styles/Controls.TextBox.xaml     | 4 ++--
 src/MahApps.Metro/Themes/DateTimePicker.xaml       | 2 +-
 src/MahApps.Metro/Themes/HotKeyBox.xaml            | 2 +-
 src/MahApps.Metro/Themes/NumericUpDown.xaml        | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml b/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml
index 7344416307..54a87ee3eb 100644
--- a/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml
@@ -172,7 +172,7 @@
            BasedOn="{StaticResource {x:Static MenuItem.SeparatorStyleKey}}"
            TargetType="{x:Type Separator}" />
 
-    <ContextMenu x:Key="TextBoxMahApps.Styles.ContextMenu.Metro" Style="{StaticResource MahApps.Styles.ContextMenu.Metro}">
+    <ContextMenu x:Key="TextBoxMetroContextMenu" Style="{StaticResource MahApps.Styles.ContextMenu.Metro}">
         <MenuItem Command="ApplicationCommands.Cut" Style="{DynamicResource MahApps.Styles.MenuItem.Metro}" />
         <MenuItem Command="ApplicationCommands.Copy" Style="{DynamicResource MahApps.Styles.MenuItem.Metro}" />
         <MenuItem Command="ApplicationCommands.Paste" Style="{DynamicResource MahApps.Styles.MenuItem.Metro}" />
diff --git a/src/MahApps.Metro/Styles/Controls.DatePicker.xaml b/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
index 4df4a1acbd..d5b7176673 100644
--- a/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
+++ b/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
@@ -14,7 +14,7 @@
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="CalendarStyle" Value="{DynamicResource MahApps.Styles.Calendar.Base.Metro}" />
-        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMahApps.Styles.ContextMenu.Metro}" />
+        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
         <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="22" />
@@ -184,7 +184,7 @@
 
     <Style x:Key="MahApps.Styles.DatePickerTextBox.Metro" TargetType="{x:Type DatePickerTextBox}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
-        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMahApps.Styles.ContextMenu.Metro}" />
+        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
         <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Content}" />
diff --git a/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml b/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
index f4cf6e10e1..fa1feae9cf 100644
--- a/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
@@ -82,7 +82,7 @@
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="CaretBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
-        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMahApps.Styles.ContextMenu.Metro}" />
+        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
         <Setter Property="Controls:PasswordBoxHelper.CapsLockIcon" Value="{StaticResource MahApps.Controls.Grid.DefaultCapsLockIcon}" />
diff --git a/src/MahApps.Metro/Styles/Controls.TextBox.xaml b/src/MahApps.Metro/Styles/Controls.TextBox.xaml
index e7e5322f44..33a86947da 100644
--- a/src/MahApps.Metro/Styles/Controls.TextBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TextBox.xaml
@@ -15,7 +15,7 @@
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="CaretBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
-        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMahApps.Styles.ContextMenu.Metro}" />
+        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
         <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Sizes.Font.ClearTextButton}" />
@@ -565,7 +565,7 @@
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="CaretBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
-        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMahApps.Styles.ContextMenu.Metro}" />
+        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
         <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Sizes.Font.ClearTextButton}" />
diff --git a/src/MahApps.Metro/Themes/DateTimePicker.xaml b/src/MahApps.Metro/Themes/DateTimePicker.xaml
index cd5e1df0ba..9c59559e76 100644
--- a/src/MahApps.Metro/Themes/DateTimePicker.xaml
+++ b/src/MahApps.Metro/Themes/DateTimePicker.xaml
@@ -112,7 +112,7 @@
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMahApps.Styles.ContextMenu.Metro}" />
+        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
         <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="22" />
diff --git a/src/MahApps.Metro/Themes/HotKeyBox.xaml b/src/MahApps.Metro/Themes/HotKeyBox.xaml
index ec45110681..c4ff66ade3 100644
--- a/src/MahApps.Metro/Themes/HotKeyBox.xaml
+++ b/src/MahApps.Metro/Themes/HotKeyBox.xaml
@@ -7,7 +7,7 @@
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMahApps.Styles.ContextMenu.Metro}" />
+        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Upper" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
diff --git a/src/MahApps.Metro/Themes/NumericUpDown.xaml b/src/MahApps.Metro/Themes/NumericUpDown.xaml
index 3a2b6f80ea..e217bcb583 100644
--- a/src/MahApps.Metro/Themes/NumericUpDown.xaml
+++ b/src/MahApps.Metro/Themes/NumericUpDown.xaml
@@ -13,7 +13,7 @@
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMahApps.Styles.ContextMenu.Metro}" />
+        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
         <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Sizes.Font.ClearTextButton}" />

From adbb83595236dcbb9f545658091a06e142cc5c23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Fri, 19 Jul 2019 15:31:36 +0200
Subject: [PATCH 21/46] Remove the .Metro suffix

---
 .../MahApps.Metro.Demo/App.xaml               |  2 +-
 .../ExampleViews/ButtonsExample.xaml          |  8 +--
 .../ExampleViews/DataGridExamples.xaml        | 12 ++--
 .../ExampleViews/ProgressBars.xaml            |  2 +-
 .../ExampleViews/SelectionExamples.xaml       | 20 +++---
 .../ExampleViews/Sliders.xaml                 |  2 +-
 .../ExampleViews/TextExamples.xaml            | 22 +++---
 .../ExampleWindows/CleanWindowDemo.xaml       |  4 +-
 .../ExampleWindows/ShowcaseFlyout.xaml        |  4 +-
 .../MahApps.Metro.Demo/MainWindow.xaml        |  6 +-
 .../Navigation/HomePage.xaml                  |  2 +-
 .../Navigation/InterestingPage.xaml           |  2 +-
 .../Controls/Helper/TextBoxHelper.cs          |  6 +-
 .../Styles/Clean/CleanStatusBar.xaml          |  4 +-
 .../Controls.AnimatedSingleRowTabControl.xaml |  2 +-
 .../Styles/Controls.AnimatedTabControl.xaml   |  2 +-
 .../Styles/Controls.Buttons.xaml              |  4 +-
 .../Styles/Controls.Calendar.xaml             | 18 ++---
 .../Styles/Controls.CheckBox.xaml             |  2 +-
 .../Styles/Controls.ComboBox.xaml             | 22 +++---
 .../Styles/Controls.ContextMenu.xaml          | 20 +++---
 .../Styles/Controls.DataGrid.xaml             | 44 ++++++------
 .../Styles/Controls.DatePicker.xaml           | 10 +--
 .../Styles/Controls.Expander.xaml             |  2 +-
 .../Styles/Controls.GroupBox.xaml             |  2 +-
 src/MahApps.Metro/Styles/Controls.Label.xaml  |  2 +-
 .../Styles/Controls.ListBox.xaml              |  8 +--
 .../Styles/Controls.ListView.xaml             | 14 ++--
 src/MahApps.Metro/Styles/Controls.Page.xaml   |  2 +-
 .../Styles/Controls.PasswordBox.xaml          | 24 +++----
 .../Styles/Controls.ProgressBar.xaml          |  2 +-
 .../Styles/Controls.RadioButton.xaml          |  2 +-
 .../Styles/Controls.Scrollbars.xaml           | 34 ++++-----
 src/MahApps.Metro/Styles/Controls.Slider.xaml |  2 +-
 .../Styles/Controls.StatusBar.xaml            |  6 +-
 .../Styles/Controls.TabControl.xaml           |  4 +-
 .../Styles/Controls.TextBlock.xaml            | 10 +--
 .../Styles/Controls.TextBox.xaml              | 32 ++++-----
 .../Styles/Controls.ToggleSwitch.xaml         |  4 +-
 .../Styles/Controls.Toolbar.xaml              |  4 +-
 .../Styles/Controls.Tooltip.xaml              |  2 +-
 .../Styles/Controls.TreeView.xaml             |  8 +--
 src/MahApps.Metro/Styles/Controls.xaml        | 70 +++++++++----------
 src/MahApps.Metro/Styles/Sizes.xaml           |  4 +-
 src/MahApps.Metro/Styles/VS/TabControl.xaml   |  4 +-
 src/MahApps.Metro/Styles/VS/Window.xaml       |  2 +-
 .../Styles/ValidationErrorTemplate.xaml       |  2 +-
 .../Themes/ContentControlEx.xaml              |  6 +-
 src/MahApps.Metro/Themes/DateTimePicker.xaml  |  8 +--
 .../Themes/Dialogs/BaseMetroDialog.xaml       |  2 +-
 src/MahApps.Metro/Themes/DropDownButton.xaml  |  2 +-
 src/MahApps.Metro/Themes/Generic.xaml         | 24 +++----
 src/MahApps.Metro/Themes/HamburgerMenu.xaml   |  2 +-
 .../Themes/HamburgerMenuTemplate.xaml         |  6 +-
 .../MetroAnimatedSingleRowTabControl.xaml     |  8 +--
 .../Themes/MetroAnimatedTabControl.xaml       |  2 +-
 src/MahApps.Metro/Themes/MetroHeader.xaml     |  2 +-
 .../Themes/MetroProgressBar.xaml              |  2 +-
 src/MahApps.Metro/Themes/MetroTabControl.xaml |  2 +-
 src/MahApps.Metro/Themes/MetroTabItem.xaml    |  2 +-
 src/MahApps.Metro/Themes/RangeSlider.xaml     |  2 +-
 src/MahApps.Metro/Themes/SplitButton.xaml     |  2 +-
 src/MahApps.Metro/Themes/ToggleSwitch.xaml    |  6 +-
 .../Themes/WindowButtonCommands.xaml          |  4 +-
 src/MahApps.Metro/Themes/WindowCommands.xaml  |  4 +-
 .../Views/TextBoxHelperTestWindow.xaml        |  6 +-
 66 files changed, 279 insertions(+), 279 deletions(-)

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/App.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/App.xaml
index ed62b5fd17..73865c7537 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/App.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/App.xaml
@@ -17,7 +17,7 @@
                 <Setter Property="HorizontalAlignment" Value="Center" />
             </Style>
 
-            <Style BasedOn="{StaticResource MahApps.Styles.CustomValidationPopup.Metro}" TargetType="{x:Type controls:CustomValidationPopup}">
+            <Style BasedOn="{StaticResource MahApps.Styles.CustomValidationPopup}" TargetType="{x:Type controls:CustomValidationPopup}">
                 <Setter Property="CloseOnMouseLeftButtonDown" Value="False" />
                 <Setter Property="ShowValidationErrorOnMouseOver" Value="False" />
             </Style>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
index c697ce90ff..d6c6209420 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
@@ -102,7 +102,7 @@
                 <ToggleButton Width="48"
                               Height="48"
                               Margin="4"
-                              Style="{DynamicResource MahApps.Styles.ToggleButton.MetroCircle}">
+                              Style="{DynamicResource MahApps.Styles.ToggleButton.Circle}">
                     <iconPacks:PackIconModern Width="20"
                                               Height="20"
                                               Kind="City" />
@@ -111,7 +111,7 @@
                               Height="48"
                               Margin="4"
                               IsEnabled="False"
-                              Style="{DynamicResource MahApps.Styles.ToggleButton.MetroCircle}">
+                              Style="{DynamicResource MahApps.Styles.ToggleButton.Circle}">
                     <iconPacks:PackIconModern Width="20"
                                               Height="20"
                                               Kind="City" />
@@ -196,7 +196,7 @@
                     HorizontalAlignment="Center">
             <StackPanel.Resources>
                 <Style x:Key="CustomMetroToggleSwitch"
-                       BasedOn="{StaticResource MahApps.Styles.ToggleSwitch.Metro}"
+                       BasedOn="{StaticResource MahApps.Styles.ToggleSwitch}"
                        TargetType="{x:Type Controls:ToggleSwitch}">
                     <Setter Property="OffLabel" Value="False" />
                     <Setter Property="OffSwitchBrush" Value="Red" />
@@ -204,7 +204,7 @@
                     <Setter Property="OnSwitchBrush" Value="Green" />
                 </Style>
                 <Style x:Key="CustomMetroToggleSwitchButton"
-                       BasedOn="{StaticResource MahApps.Styles.ToggleSwitchButton.Metro}"
+                       BasedOn="{StaticResource MahApps.Styles.ToggleSwitchButton}"
                        TargetType="{x:Type Controls:ToggleSwitchButton}">
                     <Setter Property="OffSwitchBrush" Value="DarkRed" />
                     <Setter Property="OnSwitchBrush" Value="DarkGreen" />
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DataGridExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DataGridExamples.xaml
index b662ca5d3c..1ca93a0f00 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DataGridExamples.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DataGridExamples.xaml
@@ -170,12 +170,12 @@
                   SelectionUnit="FullRow">
             <DataGrid.Columns>
                 <DataGridCheckBoxColumn Binding="{Binding RelativeSource={RelativeSource AncestorType=DataGridRow}, Path=IsSelected, Mode=OneWay}"
-                                        EditingElementStyle="{DynamicResource MahApps.Styles.CheckBox.DataGrid.Metro}"
-                                        ElementStyle="{DynamicResource MahApps.Styles.CheckBox.DataGrid.Metro}"
+                                        EditingElementStyle="{DynamicResource MahApps.Styles.CheckBox.DataGrid}"
+                                        ElementStyle="{DynamicResource MahApps.Styles.CheckBox.DataGrid}"
                                         Header="Row Selected" />
                 <DataGridCheckBoxColumn Binding="{Binding IsSelected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                        EditingElementStyle="{DynamicResource MahApps.Styles.CheckBox.DataGrid.Metro}"
-                                        ElementStyle="{DynamicResource MahApps.Styles.CheckBox.DataGrid.Metro}"
+                                        EditingElementStyle="{DynamicResource MahApps.Styles.CheckBox.DataGrid}"
+                                        ElementStyle="{DynamicResource MahApps.Styles.CheckBox.DataGrid}"
                                         Header="Album Selected" />
                 <DataGridTextColumn Binding="{Binding Title}" Header="Title" />
                 <DataGridTextColumn Binding="{Binding Artist.Name}" Header="Artist" />
@@ -186,12 +186,12 @@
                                                       StringFormat="{}{0:C}" />
             </DataGrid.Columns>
             <DataGrid.Style>
-                <Style BasedOn="{StaticResource MahApps.Styles.DataGrid.Metro}" TargetType="{x:Type DataGrid}">
+                <Style BasedOn="{StaticResource MahApps.Styles.DataGrid}" TargetType="{x:Type DataGrid}">
                     <Setter Property="AlternatingRowBackground" Value="{DynamicResource MahApps.Brushes.Gray10}" />
                 </Style>
             </DataGrid.Style>
             <DataGrid.RowStyle>
-                <Style BasedOn="{StaticResource MahApps.Styles.DataGridRow.Metro}" TargetType="{x:Type DataGridRow}">
+                <Style BasedOn="{StaticResource MahApps.Styles.DataGridRow}" TargetType="{x:Type DataGridRow}">
                     <Style.Triggers>
                         <DataTrigger Binding="{Binding Price, Mode=OneWay, Converter={StaticResource AlbumPriceIsTooMuchConverter}}" Value="True">
                             <Setter Property="Background" Value="#FF8B8B" />
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ProgressBars.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ProgressBars.xaml
index dd8bf4d4cf..2c53be7229 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ProgressBars.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ProgressBars.xaml
@@ -12,7 +12,7 @@
 
     <UserControl.Resources>
         <ResourceDictionary>
-            <Style BasedOn="{StaticResource MahApps.Styles.MetroHeader.Metro}" TargetType="{x:Type Controls:MetroHeader}">
+            <Style BasedOn="{StaticResource MahApps.Styles.MetroHeader}" TargetType="{x:Type Controls:MetroHeader}">
                 <Setter Property="HeaderTemplate">
                     <Setter.Value>
                         <DataTemplate>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SelectionExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SelectionExamples.xaml
index dac11cc31f..3a91ddaec8 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SelectionExamples.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SelectionExamples.xaml
@@ -22,14 +22,14 @@
                              DisplayMemberPath="Name"
                              ItemsSource="{Binding Artists}"
                              SelectedIndex="0"
-                             Style="{StaticResource MahApps.Styles.ListBox.Virtualized.Metro}" />
+                             Style="{StaticResource MahApps.Styles.ListBox.Virtualized}" />
                     <ListBox Margin="2"
                              BorderThickness="1"
                              DisplayMemberPath="Title"
                              IsEnabled="False"
                              ItemsSource="{Binding Albums}"
                              SelectedIndex="0"
-                             Style="{StaticResource MahApps.Styles.ListBox.Virtualized.Metro}" />
+                             Style="{StaticResource MahApps.Styles.ListBox.Virtualized}" />
 
                     <ListBox Margin="2" SelectedIndex="0">
                         <ListBoxItem Content="Item 1" />
@@ -56,7 +56,7 @@
                               BorderThickness="1"
                               ItemsSource="{Binding Artists}"
                               SelectedIndex="0"
-                              Style="{StaticResource MahApps.Styles.ListView.Virtualized.Metro}">
+                              Style="{StaticResource MahApps.Styles.ListView.Virtualized}">
                         <ListView.View>
                             <GridView>
                                 <GridViewColumn DisplayMemberBinding="{Binding ArtistId}" Header="ID" />
@@ -69,7 +69,7 @@
                               IsEnabled="False"
                               ItemsSource="{Binding Artists}"
                               SelectedIndex="0"
-                              Style="{StaticResource MahApps.Styles.ListView.Virtualized.Metro}">
+                              Style="{StaticResource MahApps.Styles.ListView.Virtualized}">
                         <ListView.View>
                             <GridView>
                                 <GridViewColumn DisplayMemberBinding="{Binding ArtistId}" Header="ID" />
@@ -80,7 +80,7 @@
 
                     <ListView Margin="2"
                               SelectedIndex="0"
-                              Style="{StaticResource MahApps.Styles.ListView.Virtualized.Metro}">
+                              Style="{StaticResource MahApps.Styles.ListView.Virtualized}">
                         <ListViewItem>Test 1</ListViewItem>
                         <ListViewItem>Test 2</ListViewItem>
                         <ListViewItem>Test 3</ListViewItem>
@@ -89,7 +89,7 @@
                     <ListView Margin="2"
                               IsEnabled="False"
                               SelectedIndex="0"
-                              Style="{StaticResource MahApps.Styles.ListView.Virtualized.Metro}">
+                              Style="{StaticResource MahApps.Styles.ListView.Virtualized}">
                         <ListViewItem>Test 1</ListViewItem>
                         <ListViewItem>Test 2</ListViewItem>
                         <ListViewItem>Test 3</ListViewItem>
@@ -107,7 +107,7 @@
                     <TreeView Margin="2"
                               BorderThickness="1"
                               ItemsSource="{Binding Artists}"
-                              Style="{StaticResource MahApps.Styles.TreeView.Virtualized.Metro}">
+                              Style="{StaticResource MahApps.Styles.TreeView.Virtualized}">
                         <TreeView.ItemTemplate>
                             <HierarchicalDataTemplate ItemsSource="{Binding Albums}">
                                 <TextBlock Text="{Binding Name}" />
@@ -123,7 +123,7 @@
                               BorderThickness="1"
                               IsEnabled="False"
                               ItemsSource="{Binding Artists}"
-                              Style="{StaticResource MahApps.Styles.TreeView.Virtualized.Metro}">
+                              Style="{StaticResource MahApps.Styles.TreeView.Virtualized}">
                         <TreeView.ItemTemplate>
                             <HierarchicalDataTemplate ItemsSource="{Binding Albums}">
                                 <TextBlock Text="{Binding Name}" />
@@ -257,7 +257,7 @@
                               IsEditable="True"
                               ItemsSource="{Binding Albums}"
                               MaxDropDownHeight="125"
-                              Style="{DynamicResource MahApps.Styles.ComboBox.Virtualized.Metro}"
+                              Style="{DynamicResource MahApps.Styles.ComboBox.Virtualized}"
                               Text="{Binding Path=Title}" />
                     <ComboBox x:Name="groupingComboBox"
                               Width="200"
@@ -267,7 +267,7 @@
                               IsEditable="True"
                               IsEnabled="True"
                               ItemsSource="{Binding Albums}"
-                              Style="{DynamicResource MahApps.Styles.ComboBox.Virtualized.Metro}"
+                              Style="{DynamicResource MahApps.Styles.ComboBox.Virtualized}"
                               Text="{Binding Path=Title}">
                         <ComboBox.GroupStyle>
                             <GroupStyle>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/Sliders.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/Sliders.xaml
index a2cb3b43b7..5b06b13c57 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/Sliders.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/Sliders.xaml
@@ -12,7 +12,7 @@
 
     <UserControl.Resources>
         <ResourceDictionary>
-            <Style BasedOn="{StaticResource MahApps.Styles.MetroHeader.Metro}" TargetType="{x:Type Controls:MetroHeader}">
+            <Style BasedOn="{StaticResource MahApps.Styles.MetroHeader}" TargetType="{x:Type Controls:MetroHeader}">
                 <Setter Property="HeaderTemplate">
                     <Setter.Value>
                         <DataTemplate>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml
index cb58b4e3b6..75fe319762 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml
@@ -74,9 +74,9 @@
                         <ContextMenu>
                             <MenuItem Header="Custom Item" />
                             <Separator />
-                            <MenuItem Command="ApplicationCommands.Cut" Style="{DynamicResource MahApps.Styles.MenuItem.Metro}" />
-                            <MenuItem Command="ApplicationCommands.Copy" Style="{DynamicResource MahApps.Styles.MenuItem.Metro}" />
-                            <MenuItem Command="ApplicationCommands.Paste" Style="{DynamicResource MahApps.Styles.MenuItem.Metro}" />
+                            <MenuItem Command="ApplicationCommands.Cut" Style="{DynamicResource MahApps.Styles.MenuItem}" />
+                            <MenuItem Command="ApplicationCommands.Copy" Style="{DynamicResource MahApps.Styles.MenuItem}" />
+                            <MenuItem Command="ApplicationCommands.Paste" Style="{DynamicResource MahApps.Styles.MenuItem}" />
                         </ContextMenu>
                     </TextBox.ContextMenu>
                 </TextBox>
@@ -85,7 +85,7 @@
                          ContextMenu="{x:Null}"
                          Text="Clear button and no ContextMenu">
                     <TextBox.Style>
-                        <Style BasedOn="{StaticResource MahApps.Styles.TextBox.Metro}" TargetType="{x:Type TextBox}">
+                        <Style BasedOn="{StaticResource MahApps.Styles.TextBox}" TargetType="{x:Type TextBox}">
                             <Setter Property="Controls:TextBoxHelper.ClearTextButton" Value="True" />
                             <Style.Triggers>
                                 <Trigger Property="Controls:TextBoxHelper.HasText" Value="False">
@@ -110,7 +110,7 @@
                                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=TextBox}, Path=Text, Mode=OneWay}" />
                     </TextBox.InputBindings>
                     <TextBox.Style>
-                        <Style BasedOn="{StaticResource MahApps.Styles.TextBox.Search.Metro}" TargetType="{x:Type TextBox}">
+                        <Style BasedOn="{StaticResource MahApps.Styles.TextBox.Search}" TargetType="{x:Type TextBox}">
                             <Style.Triggers>
                                 <Trigger Property="Controls:TextBoxHelper.HasText" Value="True">
                                     <Setter Property="Controls:TextBoxHelper.ButtonContent" Value="r" />
@@ -125,12 +125,12 @@
                          Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmdWithParameter, Mode=OneWay}"
                          Controls:TextBoxHelper.ButtonCommandParameter="{Binding ElementName=test2, Path=Text}"
                          Controls:TextBoxHelper.Watermark="Enter parameter"
-                         Style="{DynamicResource MahApps.Styles.TextBox.Search.Metro}" />
+                         Style="{DynamicResource MahApps.Styles.TextBox.Search}" />
                 <TextBox Margin="{StaticResource ControlMargin}"
                          Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd, Mode=OneWay}"
                          Controls:TextBoxHelper.ButtonContent="s"
                          Controls:TextBoxHelper.Watermark="Custom icon style"
-                         Style="{DynamicResource MahApps.Styles.TextBox.Button.Metro}" />
+                         Style="{DynamicResource MahApps.Styles.TextBox.Button}" />
                 <TextBox Margin="{StaticResource ControlMargin}"
                          Controls:TextBoxHelper.Watermark="Number smaller than 10"
                          Text="{Binding IntegerGreater10Property, ValidatesOnDataErrors=True, UpdateSourceTrigger=PropertyChanged, NotifyOnValidationError=True}" />
@@ -151,7 +151,7 @@
                 <TextBox Margin="{StaticResource ControlMargin}"
                          Controls:TextBoxHelper.Watermark="Search style"
                          IsEnabled="False"
-                         Style="{DynamicResource MahApps.Styles.TextBox.Search.Metro}" />
+                         Style="{DynamicResource MahApps.Styles.TextBox.Search}" />
                 <TextBox Margin="{StaticResource ControlMargin}"
                          Controls:TextBoxHelper.Watermark="Number smaller than 10"
                          IsEnabled="False"
@@ -178,7 +178,7 @@
                              Controls:TextBoxHelper.ButtonContent="s"
                              IsDocumentEnabled="True"
                              SpellCheck.IsEnabled="True"
-                             Style="{StaticResource MahApps.Styles.RichTextBox.Button.Metro}" />
+                             Style="{StaticResource MahApps.Styles.RichTextBox.Button}" />
                 <RichTextBox Height="120"
                              Margin="{StaticResource ControlMargin}"
                              Padding="5"
@@ -250,7 +250,7 @@
                              Controls:TextBoxHelper.IsWaitingForData="True"
                              Controls:TextBoxHelper.UseFloatingWatermark="True"
                              Controls:TextBoxHelper.Watermark="Revealed PasswordBox"
-                             Style="{StaticResource MahApps.Styles.PasswordBox.ButtonRevealed.Metro}" />
+                             Style="{StaticResource MahApps.Styles.PasswordBox.ButtonRevealed}" />
                 <PasswordBox Margin="{StaticResource ControlMargin}"
                              Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd, Mode=OneWay}"
                              Controls:TextBoxHelper.ClearTextButton="True"
@@ -263,7 +263,7 @@
                              Controls:TextBoxHelper.ButtonContent="4"
                              Controls:TextBoxHelper.UseFloatingWatermark="True"
                              Controls:TextBoxHelper.Watermark="Custom icon style"
-                             Style="{DynamicResource MahApps.Styles.PasswordBox.Button.Metro}">
+                             Style="{DynamicResource MahApps.Styles.PasswordBox.Button}">
                     <Controls:PasswordBoxHelper.CapsLockWarningToolTip>
                         <TextBlock>
                             <Run Text="This is a custom Warning to show you that" />
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/CleanWindowDemo.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/CleanWindowDemo.xaml
index 4381a91fce..bda0d33c1b 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/CleanWindowDemo.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/CleanWindowDemo.xaml
@@ -121,7 +121,7 @@
                       Header="artists">
                 <ListBox x:Name="artist"
                          ItemsSource="{x:Static models:SampleData.Artists}"
-                         Style="{DynamicResource MahApps.Styles.ListBox.Virtualized.Metro}">
+                         Style="{DynamicResource MahApps.Styles.ListBox.Virtualized}">
                     <ListBox.ItemTemplate>
                         <DataTemplate DataType="{x:Type models:Artist}">
                             <TextBlock>
@@ -147,7 +147,7 @@
                 <Controls:MetroTabItem Header="albums">
                     <ListBox x:Name="albums"
                              ItemsSource="{Binding ElementName=artist, Path=SelectedItem.Albums}"
-                             Style="{DynamicResource MahApps.Styles.ListBox.Virtualized.Metro}">
+                             Style="{DynamicResource MahApps.Styles.ListBox.Virtualized}">
                         <ListBox.ItemTemplate>
                             <DataTemplate DataType="{x:Type models:Album}">
                                 <TextBlock>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/ShowcaseFlyout.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/ShowcaseFlyout.xaml
index dab02a4344..bbf32edda5 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/ShowcaseFlyout.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/ShowcaseFlyout.xaml
@@ -151,7 +151,7 @@
                               BorderThickness="0"
                               ItemsSource="{Binding Artists, Mode=OneWay}"
                               SelectedIndex="0"
-                              Style="{StaticResource MahApps.Styles.ListView.Virtualized.Metro}">
+                              Style="{StaticResource MahApps.Styles.ListView.Virtualized}">
                         <ListView.View>
                             <GridView>
                                 <GridViewColumn DisplayMemberBinding="{Binding ArtistId}" Header="ID" />
@@ -166,7 +166,7 @@
                              DisplayMemberPath="Title"
                              ItemsSource="{Binding Albums, Mode=OneWay}"
                              SelectedIndex="0"
-                             Style="{StaticResource MahApps.Styles.ListBox.Virtualized.Metro}" />
+                             Style="{StaticResource MahApps.Styles.ListBox.Virtualized}" />
                 </TabItem>
                 <TabItem Header="Slider">
                     <StackPanel Orientation="Vertical">
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml
index a503f35ae8..0902244c7c 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml
@@ -47,7 +47,7 @@
                      Fill="{Binding ColorBrush, Mode=OneWay}" />
 
             <Style x:Key="AppThemeMenuItemStyle"
-                   BasedOn="{StaticResource MahApps.Styles.MenuItem.Metro}"
+                   BasedOn="{StaticResource MahApps.Styles.MenuItem}"
                    TargetType="{x:Type MenuItem}">
                 <Setter Property="Command" Value="{Binding ChangeAccentCommand}" />
                 <Setter Property="Header" Value="{Binding Name, Mode=OneWay}" />
@@ -55,7 +55,7 @@
             </Style>
 
             <Style x:Key="AccentColorMenuItemStyle"
-                   BasedOn="{StaticResource MahApps.Styles.MenuItem.Metro}"
+                   BasedOn="{StaticResource MahApps.Styles.MenuItem}"
                    TargetType="{x:Type MenuItem}">
                 <Setter Property="Command" Value="{Binding ChangeAccentCommand}" />
                 <Setter Property="Header" Value="{Binding Name, Mode=OneWay}" />
@@ -320,7 +320,7 @@
 
         <StatusBar Grid.Row="2">
             <StatusBarItem>MahApps.Metro DEMO Application</StatusBarItem>
-            <Separator Style="{StaticResource MahApps.Styles.Separator.StatusBar.Metro}" />
+            <Separator Style="{StaticResource MahApps.Styles.Separator.StatusBar}" />
             <StatusBarItem>Selected Tab:</StatusBarItem>
             <StatusBarItem Content="{Binding ElementName=MainTabControl, Path=SelectedItem.Header, Mode=OneWay}" />
         </StatusBar>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/Navigation/HomePage.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/Navigation/HomePage.xaml
index 0f31d23f7b..ed9813fe8e 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/Navigation/HomePage.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/Navigation/HomePage.xaml
@@ -6,7 +6,7 @@
       Title="Home Page"
       d:DesignHeight="300"
       d:DesignWidth="300"
-      Style="{DynamicResource MahApps.Styles.Page.Metro}"
+      Style="{DynamicResource MahApps.Styles.Page}"
       mc:Ignorable="d">
 
     <StackPanel Margin="2">
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/Navigation/InterestingPage.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/Navigation/InterestingPage.xaml
index 052f0896d1..e3704ed575 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/Navigation/InterestingPage.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/Navigation/InterestingPage.xaml
@@ -6,7 +6,7 @@
       Title="Interesting Page"
       d:DesignHeight="300"
       d:DesignWidth="300"
-      Style="{DynamicResource MahApps.Styles.Page.Metro}"
+      Style="{DynamicResource MahApps.Styles.Page}"
       mc:Ignorable="d">
 
     <StackPanel Margin="10" Orientation="Vertical">
diff --git a/src/MahApps.Metro/Controls/Helper/TextBoxHelper.cs b/src/MahApps.Metro/Controls/Helper/TextBoxHelper.cs
index 20a9f72b13..7ef682c67e 100644
--- a/src/MahApps.Metro/Controls/Helper/TextBoxHelper.cs
+++ b/src/MahApps.Metro/Controls/Helper/TextBoxHelper.cs
@@ -339,11 +339,11 @@ private static void RemoveSpellCheckMenuItems([CanBeNull] ContextMenu contextMen
             var defaultMenu = new ContextMenu();
 
             var m1 = new MenuItem { Command = ApplicationCommands.Cut };
-            m1.SetResourceReference(FrameworkElement.StyleProperty, "MahApps.Styles.MenuItem.Metro");
+            m1.SetResourceReference(FrameworkElement.StyleProperty, "MahApps.Styles.MenuItem");
             var m2 = new MenuItem { Command = ApplicationCommands.Copy };
-            m2.SetResourceReference(FrameworkElement.StyleProperty, "MahApps.Styles.MenuItem.Metro");
+            m2.SetResourceReference(FrameworkElement.StyleProperty, "MahApps.Styles.MenuItem");
             var m3 = new MenuItem { Command = ApplicationCommands.Paste };
-            m3.SetResourceReference(FrameworkElement.StyleProperty, "MahApps.Styles.MenuItem.Metro");
+            m3.SetResourceReference(FrameworkElement.StyleProperty, "MahApps.Styles.MenuItem");
 
             defaultMenu.Items.Add(m1);
             defaultMenu.Items.Add(m2);
diff --git a/src/MahApps.Metro/Styles/Clean/CleanStatusBar.xaml b/src/MahApps.Metro/Styles/Clean/CleanStatusBar.xaml
index 75d04d3145..65d60cbcf9 100644
--- a/src/MahApps.Metro/Styles/Clean/CleanStatusBar.xaml
+++ b/src/MahApps.Metro/Styles/Clean/CleanStatusBar.xaml
@@ -6,13 +6,13 @@
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="MahApps.Styles.StatusBar.Clean"
-           BasedOn="{StaticResource MahApps.Styles.StatusBar.Metro}"
+           BasedOn="{StaticResource MahApps.Styles.StatusBar}"
            TargetType="{x:Type StatusBar}">
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
     </Style>
 
     <Style x:Key="MahApps.Styles.Separator.Clean"
-           BasedOn="{StaticResource MahApps.Styles.Separator.StatusBar.Metro}"
+           BasedOn="{StaticResource MahApps.Styles.Separator.StatusBar}"
            TargetType="{x:Type Separator}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Black}" />
     </Style>
diff --git a/src/MahApps.Metro/Styles/Controls.AnimatedSingleRowTabControl.xaml b/src/MahApps.Metro/Styles/Controls.AnimatedSingleRowTabControl.xaml
index 843c40de26..3022753d4c 100644
--- a/src/MahApps.Metro/Styles/Controls.AnimatedSingleRowTabControl.xaml
+++ b/src/MahApps.Metro/Styles/Controls.AnimatedSingleRowTabControl.xaml
@@ -273,7 +273,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style BasedOn="{StaticResource MahApps.Styles.TabControl.Metro}" TargetType="{x:Type TabControl}">
+    <Style BasedOn="{StaticResource MahApps.Styles.TabControl}" TargetType="{x:Type TabControl}">
         <Setter Property="Controls:ScrollViewerHelper.IsHorizontalScrollWheelEnabled" Value="True" />
         <Setter Property="Controls:TabControlHelper.Transition" Value="Left" />
         <Setter Property="Template" Value="{StaticResource MahApps.Templates.TabControl.HorizontalAnimatedSingleRow}" />
diff --git a/src/MahApps.Metro/Styles/Controls.AnimatedTabControl.xaml b/src/MahApps.Metro/Styles/Controls.AnimatedTabControl.xaml
index 556f651b55..be78cdd600 100644
--- a/src/MahApps.Metro/Styles/Controls.AnimatedTabControl.xaml
+++ b/src/MahApps.Metro/Styles/Controls.AnimatedTabControl.xaml
@@ -7,7 +7,7 @@
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.TabControl.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <Style BasedOn="{StaticResource MahApps.Styles.TabControl.Metro}" TargetType="{x:Type TabControl}">
+    <Style BasedOn="{StaticResource MahApps.Styles.TabControl}" TargetType="{x:Type TabControl}">
         <Setter Property="Controls:TabControlHelper.Transition" Value="Left" />
         <Setter Property="Template">
             <Setter.Value>
diff --git a/src/MahApps.Metro/Styles/Controls.Buttons.xaml b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
index 571ca302d9..469162b0fc 100644
--- a/src/MahApps.Metro/Styles/Controls.Buttons.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
@@ -602,7 +602,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.ToggleButton.MetroCircle" TargetType="{x:Type ToggleButton}">
+    <Style x:Key="MahApps.Styles.ToggleButton.Circle" TargetType="{x:Type ToggleButton}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray3}" />
         <Setter Property="BorderThickness" Value="2" />
@@ -673,7 +673,7 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.ToggleButton.Metro" TargetType="{x:Type ToggleButton}">
+    <Style x:Key="MahApps.Styles.ToggleButton" TargetType="{x:Type ToggleButton}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Gray10}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
diff --git a/src/MahApps.Metro/Styles/Controls.Calendar.xaml b/src/MahApps.Metro/Styles/Controls.Calendar.xaml
index 5306b571fb..2a8fcac672 100644
--- a/src/MahApps.Metro/Styles/Controls.Calendar.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Calendar.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <Style x:Key="MahApps.Styles.CalendarDayButton.Metro" TargetType="{x:Type CalendarDayButton}">
+    <Style x:Key="MahApps.Styles.CalendarDayButton" TargetType="{x:Type CalendarDayButton}">
         <Setter Property="FontFamily" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Calendar}}, Path=FontFamily, Mode=OneWay}" />
         <Setter Property="FontSize" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Calendar}}, Path=FontSize, Mode=OneWay}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
@@ -145,7 +145,7 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.CalendarItem.Metro" TargetType="{x:Type CalendarItem}">
+    <Style x:Key="MahApps.Styles.CalendarItem" TargetType="{x:Type CalendarItem}">
         <Setter Property="Margin" Value="0 3" />
         <Setter Property="Padding" Value="2" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -409,7 +409,7 @@
     </Style>
 
     <!--  Style for Month and Year buttons  -->
-    <Style x:Key="MahApps.Styles.CalendarButton.Metro" TargetType="{x:Type CalendarButton}">
+    <Style x:Key="MahApps.Styles.CalendarButton" TargetType="{x:Type CalendarButton}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Accent4}" />
         <Setter Property="FontFamily" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Calendar}}, Path=FontFamily, Mode=OneWay}" />
         <Setter Property="FontSize" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Calendar}}, Path=FontSize, Mode=OneWay}" />
@@ -532,13 +532,13 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.Calendar.Base.Metro" TargetType="{x:Type Calendar}">
+    <Style x:Key="MahApps.Styles.Calendar.Base" TargetType="{x:Type Calendar}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="CalendarButtonStyle" Value="{DynamicResource MahApps.Styles.CalendarButton.Metro}" />
-        <Setter Property="CalendarDayButtonStyle" Value="{DynamicResource MahApps.Styles.CalendarDayButton.Metro}" />
-        <Setter Property="CalendarItemStyle" Value="{DynamicResource MahApps.Styles.CalendarItem.Metro}" />
+        <Setter Property="CalendarButtonStyle" Value="{DynamicResource MahApps.Styles.CalendarButton}" />
+        <Setter Property="CalendarDayButtonStyle" Value="{DynamicResource MahApps.Styles.CalendarDayButton}" />
+        <Setter Property="CalendarItemStyle" Value="{DynamicResource MahApps.Styles.CalendarItem}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -560,8 +560,8 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.Calendar.Metro"
-           BasedOn="{StaticResource MahApps.Styles.Calendar.Base.Metro}"
+    <Style x:Key="MahApps.Styles.Calendar"
+           BasedOn="{StaticResource MahApps.Styles.Calendar.Base}"
            TargetType="{x:Type Calendar}">
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Content}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
diff --git a/src/MahApps.Metro/Styles/Controls.CheckBox.xaml b/src/MahApps.Metro/Styles/Controls.CheckBox.xaml
index ea0b3d6387..b3a9015354 100644
--- a/src/MahApps.Metro/Styles/Controls.CheckBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.CheckBox.xaml
@@ -4,7 +4,7 @@
 
     <!--  ********************************** CheckBoxStyle **********************************  -->
     <!--  adapted from http://brianlagunas.com/free-metro-light-and-dark-themes-for-wpf-and-silverlight-microsoft-controls/  -->
-    <Style x:Key="MahApps.Styles.CheckBox.Metro" TargetType="CheckBox">
+    <Style x:Key="MahApps.Styles.CheckBox" TargetType="CheckBox">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.CheckBox}" />
         <Setter Property="BorderThickness" Value="1" />
diff --git a/src/MahApps.Metro/Styles/Controls.ComboBox.xaml b/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
index 1123977a31..03a3550d61 100644
--- a/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
@@ -12,7 +12,7 @@
     <Thickness x:Key="ComboBoxPopupBorderThemePadding">1</Thickness>
 
     <Style x:Key="MahApps.Styles.TextBox.Editable"
-           BasedOn="{StaticResource MahApps.Styles.TextBox.Metro}"
+           BasedOn="{StaticResource MahApps.Styles.TextBox}"
            TargetType="{x:Type TextBox}">
         <Setter Property="MinHeight" Value="0" />
         <Setter Property="Template">
@@ -71,7 +71,7 @@
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
-                                       Style="{DynamicResource MahApps.Styles.TextBlock.Watermark.Metro}"
+                                       Style="{DynamicResource MahApps.Styles.TextBlock.Watermark}"
                                        Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                        TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                        TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
@@ -94,7 +94,7 @@
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
-                                           Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing.Metro}"
+                                           Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                            TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                            TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
@@ -198,7 +198,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.ToggleButton.ComboBoxDropDown.Metro" TargetType="{x:Type ToggleButton}">
+    <Style x:Key="MahApps.Styles.ToggleButton.ComboBoxDropDown" TargetType="{x:Type ToggleButton}">
         <Setter Property="ClickMode" Value="Press" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="IsTabStop" Value="False" />
@@ -263,7 +263,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.ComboBox.Metro" TargetType="{x:Type ComboBox}">
+    <Style x:Key="MahApps.Styles.ComboBox" TargetType="{x:Type ComboBox}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="{DynamicResource ComboBoxBorderThemeThickness}" />
@@ -351,7 +351,7 @@
                                           IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
                                           KeyboardNavigation.IsTabStop="False"
                                           SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                          Style="{DynamicResource MahApps.Styles.ToggleButton.ComboBoxDropDown.Metro}" />
+                                          Style="{DynamicResource MahApps.Styles.ToggleButton.ComboBoxDropDown}" />
 
                             <TextBox x:Name="PART_EditableTextBox"
                                      Grid.Row="1"
@@ -392,7 +392,7 @@
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
-                                       Style="{DynamicResource MahApps.Styles.TextBlock.Watermark.Metro}"
+                                       Style="{DynamicResource MahApps.Styles.TextBlock.Watermark}"
                                        Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                        TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                        TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
@@ -416,7 +416,7 @@
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
-                                           Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing.Metro}"
+                                           Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                            TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                            TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
@@ -630,8 +630,8 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="MahApps.Styles.ComboBox.Virtualized.Metro"
-           BasedOn="{StaticResource MahApps.Styles.ComboBox.Metro}"
+    <Style x:Key="MahApps.Styles.ComboBox.Virtualized"
+           BasedOn="{StaticResource MahApps.Styles.ComboBox}"
            TargetType="{x:Type ComboBox}">
         <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
         <Setter Property="VirtualizingStackPanel.IsVirtualizing" Value="True" />
@@ -639,7 +639,7 @@
         <Setter Property="VirtualizingStackPanel.VirtualizationMode" Value="Recycling" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.ComboBoxItem.Metro" TargetType="ComboBoxItem">
+    <Style x:Key="MahApps.Styles.ComboBoxItem" TargetType="ComboBoxItem">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="Controls:ItemHelper.ActiveSelectionBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
diff --git a/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml b/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml
index 54a87ee3eb..8a2671d956 100644
--- a/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml
@@ -34,7 +34,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.Menu.Metro" TargetType="{x:Type Menu}">
+    <Style x:Key="MahApps.Styles.Menu" TargetType="{x:Type Menu}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Menu.Background}" />
         <Setter Property="FontFamily" Value="{DynamicResource {x:Static SystemFonts.MenuFontFamilyKey}}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Menu}" />
@@ -59,7 +59,7 @@
         <Setter Property="TextOptions.TextFormattingMode" Value="Ideal" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.ContextMenu.Metro" TargetType="{x:Type ContextMenu}">
+    <Style x:Key="MahApps.Styles.ContextMenu" TargetType="{x:Type ContextMenu}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ContextMenu.Background}" />
         <Setter Property="Block.TextAlignment" Value="Left" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ContextMenu.Border}" />
@@ -121,7 +121,7 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.MenuItem.Metro" TargetType="{x:Type MenuItem}">
+    <Style x:Key="MahApps.Styles.MenuItem" TargetType="{x:Type MenuItem}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.MenuItem.Background}" />
         <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
         <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
@@ -149,20 +149,20 @@
     </Style>
 
     <Style x:Key="{x:Static controls:Spelling.SuggestionMenuItemStyleKey}"
-           BasedOn="{StaticResource MahApps.Styles.MenuItem.Metro}"
+           BasedOn="{StaticResource MahApps.Styles.MenuItem}"
            TargetType="{x:Type MenuItem}">
         <Setter Property="FontWeight" Value="Bold" />
         <Setter Property="Header" Value="{Binding RelativeSource={RelativeSource Self}, Path=CommandParameter}" />
     </Style>
 
     <Style x:Key="{x:Static controls:Spelling.IgnoreAllMenuItemStyleKey}"
-           BasedOn="{StaticResource MahApps.Styles.MenuItem.Metro}"
+           BasedOn="{StaticResource MahApps.Styles.MenuItem}"
            TargetType="{x:Type MenuItem}">
         <Setter Property="Header" Value="Ignore All" />
     </Style>
 
     <Style x:Key="{x:Static controls:Spelling.NoSuggestionsMenuItemStyleKey}"
-           BasedOn="{StaticResource MahApps.Styles.MenuItem.Metro}"
+           BasedOn="{StaticResource MahApps.Styles.MenuItem}"
            TargetType="{x:Type MenuItem}">
         <Setter Property="Header" Value="(no spelling suggestions)" />
         <Setter Property="IsEnabled" Value="False" />
@@ -172,10 +172,10 @@
            BasedOn="{StaticResource {x:Static MenuItem.SeparatorStyleKey}}"
            TargetType="{x:Type Separator}" />
 
-    <ContextMenu x:Key="TextBoxMetroContextMenu" Style="{StaticResource MahApps.Styles.ContextMenu.Metro}">
-        <MenuItem Command="ApplicationCommands.Cut" Style="{DynamicResource MahApps.Styles.MenuItem.Metro}" />
-        <MenuItem Command="ApplicationCommands.Copy" Style="{DynamicResource MahApps.Styles.MenuItem.Metro}" />
-        <MenuItem Command="ApplicationCommands.Paste" Style="{DynamicResource MahApps.Styles.MenuItem.Metro}" />
+    <ContextMenu x:Key="TextBoxMetroContextMenu" Style="{StaticResource MahApps.Styles.ContextMenu}">
+        <MenuItem Command="ApplicationCommands.Cut" Style="{DynamicResource MahApps.Styles.MenuItem}" />
+        <MenuItem Command="ApplicationCommands.Copy" Style="{DynamicResource MahApps.Styles.MenuItem}" />
+        <MenuItem Command="ApplicationCommands.Paste" Style="{DynamicResource MahApps.Styles.MenuItem}" />
     </ContextMenu>
 
     <Style x:Key="MahApps.Styles.RepeatButton.MenuScroll"
diff --git a/src/MahApps.Metro/Styles/Controls.DataGrid.xaml b/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
index 311b627727..94b83ce74d 100644
--- a/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
+++ b/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
@@ -8,8 +8,8 @@
 
     <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
 
-    <Style x:Key="MahApps.Styles.CheckBox.DataGrid.Metro"
-           BasedOn="{StaticResource MahApps.Styles.CheckBox.Metro}"
+    <Style x:Key="MahApps.Styles.CheckBox.DataGrid"
+           BasedOn="{StaticResource MahApps.Styles.CheckBox}"
            TargetType="CheckBox">
         <Setter Property="HorizontalAlignment" Value="Center" />
         <Setter Property="Margin" Value="0" />
@@ -73,7 +73,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.Thumb.ColumnHeaderGripper.Metro" TargetType="{x:Type Thumb}">
+    <Style x:Key="MahApps.Styles.Thumb.ColumnHeaderGripper" TargetType="{x:Type Thumb}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Gray5}" />
         <Setter Property="Cursor" Value="SizeWE" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -91,7 +91,7 @@
         <Setter Property="Width" Value="8" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.Thumb.RowHeaderGripper.Metro" TargetType="{x:Type Thumb}">
+    <Style x:Key="MahApps.Styles.Thumb.RowHeaderGripper" TargetType="{x:Type Thumb}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Gray5}" />
         <Setter Property="Cursor" Value="SizeNS" />
         <Setter Property="Height" Value="6" />
@@ -109,7 +109,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.DataGridColumnHeader.Metro" TargetType="{x:Type DataGridColumnHeader}">
+    <Style x:Key="MahApps.Styles.DataGridColumnHeader" TargetType="{x:Type DataGridColumnHeader}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray5}" />
         <Setter Property="BorderThickness" Value="0 0 0 3" />
@@ -164,12 +164,12 @@
                         <Thumb x:Name="PART_LeftHeaderGripper"
                                HorizontalAlignment="Left"
                                Background="Transparent"
-                               Style="{StaticResource MahApps.Styles.Thumb.ColumnHeaderGripper.Metro}" />
+                               Style="{StaticResource MahApps.Styles.Thumb.ColumnHeaderGripper}" />
 
                         <Thumb x:Name="PART_RightHeaderGripper"
                                Grid.Column="1"
                                HorizontalAlignment="Right"
-                               Style="{StaticResource MahApps.Styles.Thumb.ColumnHeaderGripper.Metro}" />
+                               Style="{StaticResource MahApps.Styles.Thumb.ColumnHeaderGripper}" />
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="SortDirection" Value="Ascending">
@@ -203,7 +203,7 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="MahApps.Styles.DataGridRowHeader.Metro" TargetType="{x:Type DataGridRowHeader}">
+    <Style x:Key="MahApps.Styles.DataGridRowHeader" TargetType="{x:Type DataGridRowHeader}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray5}" />
         <Setter Property="BorderThickness" Value="0 0 1 0" />
@@ -238,10 +238,10 @@
                         <Thumb x:Name="PART_TopHeaderGripper"
                                VerticalAlignment="Top"
                                Background="Transparent"
-                               Style="{StaticResource MahApps.Styles.Thumb.RowHeaderGripper.Metro}" />
+                               Style="{StaticResource MahApps.Styles.Thumb.RowHeaderGripper}" />
                         <Thumb x:Name="PART_BottomHeaderGripper"
                                VerticalAlignment="Bottom"
-                               Style="{StaticResource MahApps.Styles.Thumb.RowHeaderGripper.Metro}" />
+                               Style="{StaticResource MahApps.Styles.Thumb.RowHeaderGripper}" />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
@@ -255,7 +255,7 @@
     </Style>
 
     <!--  ____________________ Metro CellStyle ____________________  -->
-    <Style x:Key="MahApps.Styles.DataGridCell.Metro" TargetType="{x:Type DataGridCell}">
+    <Style x:Key="MahApps.Styles.DataGridCell" TargetType="{x:Type DataGridCell}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderBrush" Value="Transparent" />
         <Setter Property="Controls:DataGridCellHelper.SelectionUnit" Value="{Binding Path=(Controls:DataGridRowHelper.SelectionUnit), Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}}" />
@@ -380,7 +380,7 @@
 
     <!--  ____________________ Metro RowStyle ____________________  -->
     <!--  Don't set the MinHeight or Height property, use the MinRowHeight or RowHeight property on DataGrid style!  -->
-    <Style x:Key="MahApps.Styles.DataGridRow.Metro" TargetType="{x:Type DataGridRow}">
+    <Style x:Key="MahApps.Styles.DataGridRow" TargetType="{x:Type DataGridRow}">
         <Setter Property="Controls:DataGridRowHelper.SelectionUnit" Value="{Binding Path=SelectionUnit, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
         <Setter Property="Margin" Value="0 0 0 0" />
         <Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
@@ -443,12 +443,12 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="MahApps.Styles.DataGrid.Metro" TargetType="{x:Type DataGrid}">
+    <Style x:Key="MahApps.Styles.DataGrid" TargetType="{x:Type DataGrid}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="BorderThickness" Value="0 0 0 0" />
-        <Setter Property="CellStyle" Value="{StaticResource MahApps.Styles.DataGridCell.Metro}" />
-        <Setter Property="ColumnHeaderStyle" Value="{StaticResource MahApps.Styles.DataGridColumnHeader.Metro}" />
+        <Setter Property="CellStyle" Value="{StaticResource MahApps.Styles.DataGridCell}" />
+        <Setter Property="ColumnHeaderStyle" Value="{StaticResource MahApps.Styles.DataGridColumnHeader}" />
         <Setter Property="DropLocationIndicatorStyle">
             <Setter.Value>
                 <Style TargetType="Separator">
@@ -470,8 +470,8 @@
         <Setter Property="HeadersVisibility" Value="Column" />
         <Setter Property="HorizontalGridLinesBrush" Value="{DynamicResource MahApps.Brushes.Gray7}" />
         <Setter Property="MinRowHeight" Value="25" />
-        <Setter Property="RowHeaderStyle" Value="{StaticResource MahApps.Styles.DataGridRowHeader.Metro}" />
-        <Setter Property="RowStyle" Value="{StaticResource MahApps.Styles.DataGridRow.Metro}" />
+        <Setter Property="RowHeaderStyle" Value="{StaticResource MahApps.Styles.DataGridRowHeader}" />
+        <Setter Property="RowStyle" Value="{StaticResource MahApps.Styles.DataGridRow}" />
         <Setter Property="ScrollViewer.CanContentScroll" Value="true" />
         <Setter Property="Template">
             <Setter.Value>
@@ -551,20 +551,20 @@
     </Style>
 
     <Style x:Key="MahApps.Styles.DataGridColumnHeader.Azure"
-           BasedOn="{StaticResource MahApps.Styles.DataGridColumnHeader.Metro}"
+           BasedOn="{StaticResource MahApps.Styles.DataGridColumnHeader}"
            TargetType="{x:Type DataGridColumnHeader}">
         <Setter Property="Margin" Value="0 0 0 10" />
     </Style>
 
     <Style x:Key="MahApps.Styles.DataGridRowHeader.Azure"
-           BasedOn="{StaticResource MahApps.Styles.DataGridRowHeader.Metro}"
+           BasedOn="{StaticResource MahApps.Styles.DataGridRowHeader}"
            TargetType="{x:Type DataGridRowHeader}">
         <Setter Property="BorderThickness" Value="0" />
     </Style>
 
     <!--  ____________________ Azure CellStyle ____________________  -->
     <Style x:Key="MahApps.Styles.DataGridCell.Azure"
-           BasedOn="{StaticResource MahApps.Styles.DataGridCell.Metro}"
+           BasedOn="{StaticResource MahApps.Styles.DataGridCell}"
            TargetType="{x:Type DataGridCell}">
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="Template">
@@ -601,7 +601,7 @@
 
     <!--  ____________________ Azure RowStyle ____________________  -->
     <Style x:Key="MahApps.Styles.DataGridRow.Azure"
-           BasedOn="{StaticResource MahApps.Styles.DataGridRow.Metro}"
+           BasedOn="{StaticResource MahApps.Styles.DataGridRow}"
            TargetType="{x:Type DataGridRow}" />
     <Style x:Key="MahApps.Styles.DataGridRow.AzureWithMargin"
            BasedOn="{StaticResource MahApps.Styles.DataGridRow.Azure}"
@@ -610,7 +610,7 @@
     </Style>
 
     <Style x:Key="MahApps.Styles.DataGrid.Azure"
-           BasedOn="{StaticResource MahApps.Styles.DataGrid.Metro}"
+           BasedOn="{StaticResource MahApps.Styles.DataGrid}"
            TargetType="{x:Type DataGrid}">
         <Setter Property="CellStyle" Value="{StaticResource MahApps.Styles.DataGridCell.Azure}" />
         <Setter Property="ColumnHeaderStyle" Value="{StaticResource MahApps.Styles.DataGridColumnHeader.Azure}" />
diff --git a/src/MahApps.Metro/Styles/Controls.DatePicker.xaml b/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
index d5b7176673..65da5253b3 100644
--- a/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
+++ b/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
@@ -9,11 +9,11 @@
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Shared.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <Style x:Key="MahApps.Styles.DatePicker.Metro" TargetType="{x:Type DatePicker}">
+    <Style x:Key="MahApps.Styles.DatePicker" TargetType="{x:Type DatePicker}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="CalendarStyle" Value="{DynamicResource MahApps.Styles.Calendar.Base.Metro}" />
+        <Setter Property="CalendarStyle" Value="{DynamicResource MahApps.Styles.Calendar.Base}" />
         <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
@@ -97,7 +97,7 @@
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
-                                           Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing.Metro}"
+                                           Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                            TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                            TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
@@ -182,7 +182,7 @@
         <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource MahApps.Templates.ValidationError}" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.DatePickerTextBox.Metro" TargetType="{x:Type DatePickerTextBox}">
+    <Style x:Key="MahApps.Styles.DatePickerTextBox" TargetType="{x:Type DatePickerTextBox}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
         <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
         <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True" />
@@ -270,7 +270,7 @@
                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                    Foreground="{TemplateBinding Foreground}"
-                                   Style="{DynamicResource MahApps.Styles.TextBlock.Watermark.Metro}"
+                                   Style="{DynamicResource MahApps.Styles.TextBlock.Watermark}"
                                    Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                    TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                    TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}" />
diff --git a/src/MahApps.Metro/Styles/Controls.Expander.xaml b/src/MahApps.Metro/Styles/Controls.Expander.xaml
index 942bfd3405..af6eeca30e 100644
--- a/src/MahApps.Metro/Styles/Controls.Expander.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Expander.xaml
@@ -323,7 +323,7 @@
         </ObjectAnimationUsingKeyFrames>
     </Storyboard>
 
-    <Style x:Key="MahApps.Styles.Expander.Metro" TargetType="{x:Type Expander}">
+    <Style x:Key="MahApps.Styles.Expander" TargetType="{x:Type Expander}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="BorderThickness" Value="1" />
diff --git a/src/MahApps.Metro/Styles/Controls.GroupBox.xaml b/src/MahApps.Metro/Styles/Controls.GroupBox.xaml
index 9fc7c52d40..e542d3ebc0 100644
--- a/src/MahApps.Metro/Styles/Controls.GroupBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.GroupBox.xaml
@@ -7,7 +7,7 @@
 
     <Thickness x:Key="GroupBoxHeaderThemePadding">4</Thickness>
 
-    <Style x:Key="MahApps.Styles.GroupBox.Metro" TargetType="{x:Type GroupBox}">
+    <Style x:Key="MahApps.Styles.GroupBox" TargetType="{x:Type GroupBox}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="BorderThickness" Value="1" />
diff --git a/src/MahApps.Metro/Styles/Controls.Label.xaml b/src/MahApps.Metro/Styles/Controls.Label.xaml
index 073cbcdf3a..bdeea2af2c 100644
--- a/src/MahApps.Metro/Styles/Controls.Label.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Label.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <Style x:Key="MahApps.Styles.Label.Metro" TargetType="{x:Type Label}">
+    <Style x:Key="MahApps.Styles.Label" TargetType="{x:Type Label}">
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Label.Text}" />
     </Style>
 
diff --git a/src/MahApps.Metro/Styles/Controls.ListBox.xaml b/src/MahApps.Metro/Styles/Controls.ListBox.xaml
index ea0bf7f5b0..4c3a9a0aeb 100644
--- a/src/MahApps.Metro/Styles/Controls.ListBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ListBox.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
-    <Style x:Key="MahApps.Styles.ListBox.Metro" TargetType="{x:Type ListBox}">
+    <Style x:Key="MahApps.Styles.ListBox" TargetType="{x:Type ListBox}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
         <!--  default to 0  -->
@@ -63,8 +63,8 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="MahApps.Styles.ListBox.Virtualized.Metro"
-           BasedOn="{StaticResource MahApps.Styles.ListBox.Metro}"
+    <Style x:Key="MahApps.Styles.ListBox.Virtualized"
+           BasedOn="{StaticResource MahApps.Styles.ListBox}"
            TargetType="{x:Type ListBox}">
         <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
         <Setter Property="VirtualizingStackPanel.IsVirtualizing" Value="True" />
@@ -72,7 +72,7 @@
         <Setter Property="VirtualizingStackPanel.VirtualizationMode" Value="Recycling" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.ListBoxItem.Metro" TargetType="{x:Type ListBoxItem}">
+    <Style x:Key="MahApps.Styles.ListBoxItem" TargetType="{x:Type ListBoxItem}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="Controls:ItemHelper.ActiveSelectionBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
diff --git a/src/MahApps.Metro/Styles/Controls.ListView.xaml b/src/MahApps.Metro/Styles/Controls.ListView.xaml
index 605640d4ac..4158b9c48e 100644
--- a/src/MahApps.Metro/Styles/Controls.ListView.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ListView.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
-    <Style x:Key="MahApps.Styles.ScrollViewer.GridView.Metro"
+    <Style x:Key="MahApps.Styles.ScrollViewer.GridView"
            BasedOn="{StaticResource {x:Static GridView.GridViewScrollViewerStyleKey}}"
            TargetType="{x:Type ScrollViewer}">
         <Setter Property="Focusable" Value="False" />
@@ -93,7 +93,7 @@
         It also (setting True) has the ugly side effect of scrolling the entire group and not the items. The downside is we lose
         virtualisation http://serialseb.blogspot.com/2007/09/wpf-tips-7-smooth-scrolling.html
     -->
-    <Style x:Key="MahApps.Styles.ListView.Metro" TargetType="{x:Type ListView}">
+    <Style x:Key="MahApps.Styles.ListView" TargetType="{x:Type ListView}">
         <Setter Property="AlternationCount" Value="2" />
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
@@ -116,7 +116,7 @@
                                       Focusable="False"
                                       HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                      Style="{DynamicResource MahApps.Styles.ScrollViewer.GridView.Metro}"
+                                      Style="{DynamicResource MahApps.Styles.ScrollViewer.GridView}"
                                       VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
                             <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </ScrollViewer>
@@ -139,8 +139,8 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.ListView.Virtualized.Metro"
-           BasedOn="{StaticResource MahApps.Styles.ListView.Metro}"
+    <Style x:Key="MahApps.Styles.ListView.Virtualized"
+           BasedOn="{StaticResource MahApps.Styles.ListView}"
            TargetType="{x:Type ListView}">
         <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
         <Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="True" />
@@ -149,7 +149,7 @@
         <Setter Property="VirtualizingStackPanel.VirtualizationMode" Value="Recycling" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.ListViewItem.Metro" TargetType="{x:Type ListViewItem}">
+    <Style x:Key="MahApps.Styles.ListViewItem" TargetType="{x:Type ListViewItem}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="Controls:ItemHelper.ActiveSelectionBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
@@ -300,7 +300,7 @@
         <Setter Property="Width" Value="18" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.GridViewColumnHeader.Metro" TargetType="GridViewColumnHeader">
+    <Style x:Key="MahApps.Styles.GridViewColumnHeader" TargetType="GridViewColumnHeader">
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Upper" />
         <Setter Property="FontWeight" Value="SemiBold" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
diff --git a/src/MahApps.Metro/Styles/Controls.Page.xaml b/src/MahApps.Metro/Styles/Controls.Page.xaml
index 3726c1e3d4..87fdcc7d96 100644
--- a/src/MahApps.Metro/Styles/Controls.Page.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Page.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <Style x:Key="MahApps.Styles.Page.Metro" TargetType="{x:Type Page}">
+    <Style x:Key="MahApps.Styles.Page" TargetType="{x:Type Page}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="TextElement.FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
diff --git a/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml b/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
index fa1feae9cf..875c78f50d 100644
--- a/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
@@ -70,7 +70,7 @@
     </Grid>
 
     <!--  PasswordBox Style  -->
-    <Style x:Key="MahApps.Styles.PasswordBox.Metro" TargetType="{x:Type PasswordBox}">
+    <Style x:Key="MahApps.Styles.PasswordBox" TargetType="{x:Type PasswordBox}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
         <Setter Property="Behaviors:StylizedBehaviors.Behaviors">
             <Setter.Value>
@@ -167,7 +167,7 @@
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
-                                       Style="{DynamicResource MahApps.Styles.TextBlock.Watermark.Metro}"
+                                       Style="{DynamicResource MahApps.Styles.TextBlock.Watermark}"
                                        Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                        TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                        TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
@@ -190,7 +190,7 @@
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
-                                           Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing.Metro}"
+                                           Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                            TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                            TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
@@ -338,8 +338,8 @@
     </Style>
 
     <!--  Button Command PasswordBox Style  -->
-    <Style x:Key="MahApps.Styles.PasswordBox.Button.Metro"
-           BasedOn="{StaticResource MahApps.Styles.PasswordBox.Metro}"
+    <Style x:Key="MahApps.Styles.PasswordBox.Button"
+           BasedOn="{StaticResource MahApps.Styles.PasswordBox}"
            TargetType="{x:Type PasswordBox}">
         <Setter Property="Controls:TextBoxHelper.ButtonTemplate" Value="{DynamicResource MahApps.Templates.ButtonBase.Chromeless}" />
         <Setter Property="Controls:TextBoxHelper.TextButton" Value="True" />
@@ -413,7 +413,7 @@
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
-                                       Style="{DynamicResource MahApps.Styles.TextBlock.Watermark.Metro}"
+                                       Style="{DynamicResource MahApps.Styles.TextBlock.Watermark}"
                                        Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                        TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                        TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
@@ -436,7 +436,7 @@
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
-                                           Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing.Metro}"
+                                           Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                            TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                            TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
@@ -599,8 +599,8 @@
     </Style>
 
     <!--  Button Revealed PasswordBox Style  -->
-    <Style x:Key="MahApps.Styles.PasswordBox.ButtonRevealed.Metro"
-           BasedOn="{StaticResource MahApps.Styles.PasswordBox.Metro}"
+    <Style x:Key="MahApps.Styles.PasswordBox.ButtonRevealed"
+           BasedOn="{StaticResource MahApps.Styles.PasswordBox}"
            TargetType="{x:Type PasswordBox}">
         <Setter Property="Controls:PasswordBoxHelper.RevealButtonContent" Value="{DynamicResource MahApps.Controls.DefaultRevealButtonIcon}" />
         <Setter Property="Controls:TextBoxHelper.ButtonTemplate" Value="{DynamicResource MahApps.Templates.ButtonBase.Chromeless}" />
@@ -694,7 +694,7 @@
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
-                                       Style="{DynamicResource MahApps.Styles.TextBlock.Watermark.Metro}"
+                                       Style="{DynamicResource MahApps.Styles.TextBlock.Watermark}"
                                        Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                        TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                        TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
@@ -717,7 +717,7 @@
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
-                                           Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing.Metro}"
+                                           Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                            TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                            TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
@@ -890,7 +890,7 @@
 
     <!--  MahApps.Styles.PasswordBox.Win8 Style  -->
     <Style x:Key="MahApps.Styles.PasswordBox.Win8"
-           BasedOn="{StaticResource MahApps.Styles.PasswordBox.ButtonRevealed.Metro}"
+           BasedOn="{StaticResource MahApps.Styles.PasswordBox.ButtonRevealed}"
            TargetType="{x:Type PasswordBox}">
         <Setter Property="AllowDrop" Value="true" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
diff --git a/src/MahApps.Metro/Styles/Controls.ProgressBar.xaml b/src/MahApps.Metro/Styles/Controls.ProgressBar.xaml
index c54bf3fef2..c457d7afdb 100644
--- a/src/MahApps.Metro/Styles/Controls.ProgressBar.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ProgressBar.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <!--  ProgressBar Style  -->
-    <Style x:Key="MahApps.Styles.ProgressBar.Metro" TargetType="ProgressBar">
+    <Style x:Key="MahApps.Styles.ProgressBar" TargetType="ProgressBar">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Gray5}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Controls.Border}" />
         <Setter Property="BorderThickness" Value="1" />
diff --git a/src/MahApps.Metro/Styles/Controls.RadioButton.xaml b/src/MahApps.Metro/Styles/Controls.RadioButton.xaml
index bb1c9508b5..97e8fa336e 100644
--- a/src/MahApps.Metro/Styles/Controls.RadioButton.xaml
+++ b/src/MahApps.Metro/Styles/Controls.RadioButton.xaml
@@ -5,7 +5,7 @@
 
     <!--  ********************************** RadioButton Style **********************************  -->
     <!--  adapted from http://brianlagunas.com/free-metro-light-and-dark-themes-for-wpf-and-silverlight-microsoft-controls/  -->
-    <Style x:Key="MahApps.Styles.RadioButton.Metro" TargetType="RadioButton">
+    <Style x:Key="MahApps.Styles.RadioButton" TargetType="RadioButton">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.CheckBox}" />
         <Setter Property="BorderThickness" Value="1" />
diff --git a/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml b/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
index cedc8fe5e7..5d4d5f7f3a 100644
--- a/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
@@ -16,7 +16,7 @@
         </DoubleAnimationUsingKeyFrames>
     </Storyboard>
 
-    <Style x:Key="MahApps.Styles.RepeatButton.ScrollBarSmall.Metro" TargetType="{x:Type RepeatButton}">
+    <Style x:Key="MahApps.Styles.RepeatButton.ScrollBarSmall" TargetType="{x:Type RepeatButton}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="Height" Value="{DynamicResource MahApps.Templates.ScrollBar.VerticalRepeatButtonHeight}" />
@@ -64,7 +64,7 @@
         <Setter Property="Width" Value="{DynamicResource MahApps.Templates.ScrollBar.HorizontalRepeatButtonWidth}" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.RepeatButton.ScrollBarLarge.Metro" TargetType="{x:Type RepeatButton}">
+    <Style x:Key="MahApps.Styles.RepeatButton.ScrollBarLarge" TargetType="{x:Type RepeatButton}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="Interval" Value="50" />
@@ -81,7 +81,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.Thumb.ScrollBar.Metro" TargetType="{x:Type Thumb}">
+    <Style x:Key="MahApps.Styles.Thumb.ScrollBar" TargetType="{x:Type Thumb}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Thumb}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="IsTabStop" Value="False" />
@@ -135,29 +135,29 @@
                           Grid.Column="0"
                           Command="ScrollBar.LineLeftCommand"
                           Content="M54,14.9765625L54,74.9765625 24,44.9765625 54,14.9765625z"
-                          Style="{DynamicResource MahApps.Styles.RepeatButton.ScrollBarSmall.Metro}" />
+                          Style="{DynamicResource MahApps.Styles.RepeatButton.ScrollBarSmall}" />
             <Track x:Name="PART_Track"
                    Grid.Column="1"
                    IsDirectionReversed="False">
                 <Track.DecreaseRepeatButton>
                     <RepeatButton x:Name="HorizontalLargeDecrease"
                                   Command="ScrollBar.PageLeftCommand"
-                                  Style="{DynamicResource MahApps.Styles.RepeatButton.ScrollBarLarge.Metro}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.ScrollBarLarge}" />
                 </Track.DecreaseRepeatButton>
                 <Track.Thumb>
-                    <Controls:MetroThumb Margin="0 1 0 1" Style="{DynamicResource MahApps.Styles.Thumb.ScrollBar.Metro}" />
+                    <Controls:MetroThumb Margin="0 1 0 1" Style="{DynamicResource MahApps.Styles.Thumb.ScrollBar}" />
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
                     <RepeatButton x:Name="HorizontalLargeIncrease"
                                   Command="ScrollBar.PageRightCommand"
-                                  Style="{DynamicResource MahApps.Styles.RepeatButton.ScrollBarLarge.Metro}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.ScrollBarLarge}" />
                 </Track.IncreaseRepeatButton>
             </Track>
             <RepeatButton x:Name="HorizontalSmallIncrease"
                           Grid.Column="2"
                           Command="ScrollBar.LineRightCommand"
                           Content="M192,79.875L352,239.875 192,399.875 192,79.875z"
-                          Style="{DynamicResource MahApps.Styles.RepeatButton.ScrollBarSmall.Metro}" />
+                          Style="{DynamicResource MahApps.Styles.RepeatButton.ScrollBarSmall}" />
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsEnabled" Value="False">
@@ -177,7 +177,7 @@
                           Grid.Row="0"
                           Command="ScrollBar.LineUpCommand"
                           Content="M240.125,160L400.125,320 80.125,320 240.125,160z"
-                          Style="{DynamicResource MahApps.Styles.RepeatButton.ScrollBarSmall.Metro}" />
+                          Style="{DynamicResource MahApps.Styles.RepeatButton.ScrollBarSmall}" />
             <Track x:Name="PART_Track"
                    Grid.Row="1"
                    IsDirectionReversed="True">
@@ -187,22 +187,22 @@
                 <Track.DecreaseRepeatButton>
                     <RepeatButton x:Name="VerticalLargeDecrease"
                                   Command="ScrollBar.PageUpCommand"
-                                  Style="{DynamicResource MahApps.Styles.RepeatButton.ScrollBarLarge.Metro}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.ScrollBarLarge}" />
                 </Track.DecreaseRepeatButton>
                 <Track.Thumb>
-                    <Controls:MetroThumb Margin="1 0 1 0" Style="{DynamicResource MahApps.Styles.Thumb.ScrollBar.Metro}" />
+                    <Controls:MetroThumb Margin="1 0 1 0" Style="{DynamicResource MahApps.Styles.Thumb.ScrollBar}" />
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
                     <RepeatButton x:Name="VerticalLargeIncrease"
                                   Command="ScrollBar.PageDownCommand"
-                                  Style="{DynamicResource MahApps.Styles.RepeatButton.ScrollBarLarge.Metro}" />
+                                  Style="{DynamicResource MahApps.Styles.RepeatButton.ScrollBarLarge}" />
                 </Track.IncreaseRepeatButton>
             </Track>
             <RepeatButton x:Name="VerticalSmallIncrease"
                           Grid.Row="2"
                           Command="ScrollBar.LineDownCommand"
                           Content="M80.125,192L400.125,192 240.125,352 80.125,192z"
-                          Style="{DynamicResource MahApps.Styles.RepeatButton.ScrollBarSmall.Metro}" />
+                          Style="{DynamicResource MahApps.Styles.RepeatButton.ScrollBarSmall}" />
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsEnabled" Value="False">
@@ -212,24 +212,24 @@
     </ControlTemplate>
 
     <!--  Style for overall  ScrollBar  -->
-    <Style x:Key="MahApps.Styles.ScrollBar.Metro" TargetType="{x:Type ScrollBar}">
+    <Style x:Key="MahApps.Styles.ScrollBar" TargetType="{x:Type ScrollBar}">
         <Setter Property="OverridesDefaultStyle" Value="True" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Style.Triggers>
             <Trigger Property="Orientation" Value="Horizontal">
-                <Setter Property="Height" Value="{DynamicResource MahApps.Sizes.ScrollBar.Height.Metro}" />
+                <Setter Property="Height" Value="{DynamicResource MahApps.Sizes.ScrollBar.Height}" />
                 <Setter Property="Template" Value="{DynamicResource MahApps.Templates.ScrollBar.Horizontal}" />
                 <Setter Property="Width" Value="Auto" />
             </Trigger>
             <Trigger Property="Orientation" Value="Vertical">
                 <Setter Property="Height" Value="Auto" />
                 <Setter Property="Template" Value="{DynamicResource MahApps.Templates.ScrollBar.Vertical}" />
-                <Setter Property="Width" Value="{DynamicResource MahApps.Sizes.ScrollBar.Width.Metro}" />
+                <Setter Property="Width" Value="{DynamicResource MahApps.Sizes.ScrollBar.Width}" />
             </Trigger>
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="MahApps.Styles.ScrollViewer.Metro" TargetType="{x:Type ScrollViewer}">
+    <Style x:Key="MahApps.Styles.ScrollViewer" TargetType="{x:Type ScrollViewer}">
         <Setter Property="Controls:ScrollViewerHelper.VerticalScrollBarOnLeftSide" Value="False" />
         <Setter Property="Template">
             <Setter.Value>
diff --git a/src/MahApps.Metro/Styles/Controls.Slider.xaml b/src/MahApps.Metro/Styles/Controls.Slider.xaml
index ac8bf03cf8..611d2cce45 100644
--- a/src/MahApps.Metro/Styles/Controls.Slider.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Slider.xaml
@@ -256,7 +256,7 @@
     </ControlTemplate>
 
     <!--  Slider Style  -->
-    <Style x:Key="MahApps.Styles.Slider.Metro" TargetType="{x:Type Slider}">
+    <Style x:Key="MahApps.Styles.Slider" TargetType="{x:Type Slider}">
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Controls.Border}" />
         <Setter Property="BorderThickness" Value="2" />
         <Setter Property="Controls:SliderHelper.ThumbFillBrush" Value="{DynamicResource MahApps.Brushes.Gray2}" />
diff --git a/src/MahApps.Metro/Styles/Controls.StatusBar.xaml b/src/MahApps.Metro/Styles/Controls.StatusBar.xaml
index 118dee02c2..20c5eada18 100644
--- a/src/MahApps.Metro/Styles/Controls.StatusBar.xaml
+++ b/src/MahApps.Metro/Styles/Controls.StatusBar.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
-    <Style x:Key="MahApps.Styles.StatusBarItem.Metro" TargetType="{x:Type StatusBarItem}">
+    <Style x:Key="MahApps.Styles.StatusBarItem" TargetType="{x:Type StatusBarItem}">
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.IdealForeground}" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="Padding" Value="3" />
@@ -29,7 +29,7 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.Separator.StatusBar.Metro" TargetType="{x:Type Separator}">
+    <Style x:Key="MahApps.Styles.Separator.StatusBar" TargetType="{x:Type Separator}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.IdealForeground}" />
         <Setter Property="MinHeight" Value="1" />
         <Setter Property="MinWidth" Value="1" />
@@ -48,7 +48,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.StatusBar.Metro" TargetType="{x:Type StatusBar}">
+    <Style x:Key="MahApps.Styles.StatusBar" TargetType="{x:Type StatusBar}">
         <Setter Property="FontFamily" Value="{DynamicResource {x:Static SystemFonts.StatusFontFamilyKey}}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.StatusBar}" />
         <Setter Property="FontStyle" Value="{DynamicResource {x:Static SystemFonts.StatusFontStyleKey}}" />
diff --git a/src/MahApps.Metro/Styles/Controls.TabControl.xaml b/src/MahApps.Metro/Styles/Controls.TabControl.xaml
index 68e9f9f90d..ce985662be 100644
--- a/src/MahApps.Metro/Styles/Controls.TabControl.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TabControl.xaml
@@ -5,7 +5,7 @@
 
     <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
 
-    <Style x:Key="MahApps.Styles.TabControl.Metro" TargetType="{x:Type TabControl}">
+    <Style x:Key="MahApps.Styles.TabControl" TargetType="{x:Type TabControl}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderBrush" Value="{x:Null}" />
         <!--  special property for header font size  -->
@@ -100,7 +100,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.TabItem.Metro" TargetType="TabItem">
+    <Style x:Key="MahApps.Styles.TabItem" TargetType="TabItem">
         <Setter Property="Background" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=Background, Mode=OneWay, FallbackValue=Transparent}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="BorderThickness" Value="0" />
diff --git a/src/MahApps.Metro/Styles/Controls.TextBlock.xaml b/src/MahApps.Metro/Styles/Controls.TextBlock.xaml
index 28de39dc5c..a432b96c1a 100644
--- a/src/MahApps.Metro/Styles/Controls.TextBlock.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TextBlock.xaml
@@ -2,17 +2,17 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <!--  never ever make a default style for TextBlock in App.xaml !!!  -->
-    <Style x:Key="MahApps.Styles.TextBlock.Metro" TargetType="{x:Type TextBlock}" />
+    <Style x:Key="MahApps.Styles.TextBlock" TargetType="{x:Type TextBlock}" />
 
-    <Style x:Key="MahApps.Styles.TextBlock.Watermark.Metro"
-           BasedOn="{StaticResource MahApps.Styles.TextBlock.Metro}"
+    <Style x:Key="MahApps.Styles.TextBlock.Watermark"
+           BasedOn="{StaticResource MahApps.Styles.TextBlock}"
            TargetType="{x:Type TextBlock}">
         <Setter Property="IsHitTestVisible" Value="False" />
         <Setter Property="Opacity" Value="0.6" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.TextBlock.AutoCollapsing.Metro"
-           BasedOn="{StaticResource MahApps.Styles.TextBlock.Metro}"
+    <Style x:Key="MahApps.Styles.TextBlock.AutoCollapsing"
+           BasedOn="{StaticResource MahApps.Styles.TextBlock}"
            TargetType="{x:Type TextBlock}">
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.FloatingWatermark}" />
         <Setter Property="Opacity" Value="0.6" />
diff --git a/src/MahApps.Metro/Styles/Controls.TextBox.xaml b/src/MahApps.Metro/Styles/Controls.TextBox.xaml
index 33a86947da..0c88a5bd9c 100644
--- a/src/MahApps.Metro/Styles/Controls.TextBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TextBox.xaml
@@ -10,7 +10,7 @@
     <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
 
     <!--  TextBox Style  -->
-    <Style x:Key="MahApps.Styles.TextBox.Metro" TargetType="{x:Type TextBox}">
+    <Style x:Key="MahApps.Styles.TextBox" TargetType="{x:Type TextBox}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
@@ -100,7 +100,7 @@
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
-                                       Style="{DynamicResource MahApps.Styles.TextBlock.Watermark.Metro}"
+                                       Style="{DynamicResource MahApps.Styles.TextBlock.Watermark}"
                                        Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                        TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                        TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
@@ -124,7 +124,7 @@
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
-                                           Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing.Metro}"
+                                           Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                            TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                            TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
@@ -270,8 +270,8 @@
         <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource MahApps.Templates.ValidationError}" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.TextBox.Button.Metro"
-           BasedOn="{StaticResource MahApps.Styles.TextBox.Metro}"
+    <Style x:Key="MahApps.Styles.TextBox.Button"
+           BasedOn="{StaticResource MahApps.Styles.TextBox}"
            TargetType="{x:Type TextBox}">
         <Setter Property="Controls:TextBoxHelper.ButtonTemplate" Value="{DynamicResource MahApps.Templates.ButtonBase.Chromeless}" />
         <Setter Property="Controls:TextBoxHelper.TextButton" Value="True" />
@@ -345,7 +345,7 @@
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
-                                       Style="{DynamicResource MahApps.Styles.TextBlock.Watermark.Metro}"
+                                       Style="{DynamicResource MahApps.Styles.TextBlock.Watermark}"
                                        Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                        TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                        TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
@@ -369,7 +369,7 @@
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
-                                           Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing.Metro}"
+                                           Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                            TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                            TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
@@ -497,8 +497,8 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.TextBox.Search.Metro"
-           BasedOn="{StaticResource MahApps.Styles.TextBox.Button.Metro}"
+    <Style x:Key="MahApps.Styles.TextBox.Search"
+           BasedOn="{StaticResource MahApps.Styles.TextBox.Button}"
            TargetType="{x:Type TextBox}">
         <Setter Property="Controls:TextBoxHelper.ButtonContentTemplate">
             <Setter.Value>
@@ -517,7 +517,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.RichTextBox.Metro" TargetType="{x:Type RichTextBox}">
+    <Style x:Key="MahApps.Styles.RichTextBox" TargetType="{x:Type RichTextBox}">
         <Style.Resources>
             <Storyboard x:Key="enterGotFocus">
                 <DoubleAnimation Storyboard.TargetName="PART_Message"
@@ -624,7 +624,7 @@
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
-                                       Style="{DynamicResource MahApps.Styles.TextBlock.Watermark.Metro}"
+                                       Style="{DynamicResource MahApps.Styles.TextBlock.Watermark}"
                                        Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                        TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                        TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
@@ -650,7 +650,7 @@
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
-                                           Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing.Metro}"
+                                           Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                            TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                            TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
@@ -782,8 +782,8 @@
         <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource MahApps.Templates.ValidationError}" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.RichTextBox.Button.Metro"
-           BasedOn="{StaticResource MahApps.Styles.RichTextBox.Metro}"
+    <Style x:Key="MahApps.Styles.RichTextBox.Button"
+           BasedOn="{StaticResource MahApps.Styles.RichTextBox}"
            TargetType="{x:Type RichTextBox}">
         <Setter Property="Controls:TextBoxHelper.ButtonCommandParameter" Value="{Binding RelativeSource={RelativeSource Self}}" />
         <Setter Property="Controls:TextBoxHelper.ButtonTemplate" Value="{DynamicResource MahApps.Templates.ButtonBase.Chromeless}" />
@@ -826,7 +826,7 @@
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
-                                       Style="{DynamicResource MahApps.Styles.TextBlock.Watermark.Metro}"
+                                       Style="{DynamicResource MahApps.Styles.TextBlock.Watermark}"
                                        Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                        TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                        TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
@@ -852,7 +852,7 @@
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
-                                           Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing.Metro}"
+                                           Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                            TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                            TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
diff --git a/src/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml b/src/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
index c8f89f3351..f24b95817b 100644
--- a/src/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ToggleSwitch.xaml
@@ -12,7 +12,7 @@
     <converters:ThicknessToDoubleConverter x:Key="ThicknessToDouble" TakeThicknessSide="Left" />
 
     <Style x:Key="MahApps.Styles.ToggleSwitchButton.Win10"
-           BasedOn="{StaticResource MahApps.Styles.ToggleSwitchButton.Metro}"
+           BasedOn="{StaticResource MahApps.Styles.ToggleSwitchButton}"
            TargetType="{x:Type Controls:ToggleSwitchButton}">
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ToggleSwitchButton.OffBorder.Win10}" />
         <Setter Property="BorderThickness" Value="2" />
@@ -136,7 +136,7 @@
     </Style>
 
     <Style x:Key="MahApps.Styles.ToggleSwitch.Win10"
-           BasedOn="{StaticResource MahApps.Styles.ToggleSwitch.Metro}"
+           BasedOn="{StaticResource MahApps.Styles.ToggleSwitch}"
            TargetType="{x:Type Controls:ToggleSwitch}">
         <Setter Property="ContentDirection" Value="RightToLeft" />
         <Setter Property="ContentPadding" Value="0 0 10 0" />
diff --git a/src/MahApps.Metro/Styles/Controls.Toolbar.xaml b/src/MahApps.Metro/Styles/Controls.Toolbar.xaml
index d8efdcd103..92ea098776 100644
--- a/src/MahApps.Metro/Styles/Controls.Toolbar.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Toolbar.xaml
@@ -74,11 +74,11 @@
 
     <!--  Style for text box inside a toolbar if needed  -->
     <Style x:Key="{x:Static ToolBar.TextBoxStyleKey}"
-           BasedOn="{StaticResource MahApps.Styles.TextBox.Metro}"
+           BasedOn="{StaticResource MahApps.Styles.TextBox}"
            TargetType="{x:Type TextBox}" />
 
     <Style x:Key="{x:Static ToolBar.ComboBoxStyleKey}"
-           BasedOn="{StaticResource MahApps.Styles.ComboBox.Metro}"
+           BasedOn="{StaticResource MahApps.Styles.ComboBox}"
            TargetType="{x:Type ComboBox}" />
 
     <!--  Style the toolbar thumb  -->
diff --git a/src/MahApps.Metro/Styles/Controls.Tooltip.xaml b/src/MahApps.Metro/Styles/Controls.Tooltip.xaml
index 989fc5143c..c2539a1260 100644
--- a/src/MahApps.Metro/Styles/Controls.Tooltip.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Tooltip.xaml
@@ -3,7 +3,7 @@
                     xmlns:controls="clr-namespace:MahApps.Metro.Controls">
 
     <!--  Tooltip Style  -->
-    <Style x:Key="MahApps.Styles.ToolTip.Metro" TargetType="ToolTip">
+    <Style x:Key="MahApps.Styles.ToolTip" TargetType="ToolTip">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray7}" />
         <Setter Property="BorderThickness" Value="1" />
diff --git a/src/MahApps.Metro/Styles/Controls.TreeView.xaml b/src/MahApps.Metro/Styles/Controls.TreeView.xaml
index 3984243969..82d1578969 100644
--- a/src/MahApps.Metro/Styles/Controls.TreeView.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TreeView.xaml
@@ -66,7 +66,7 @@
 
     <Converters:TreeViewMarginConverter x:Key="LengthConverter" Length="12" />
 
-    <Style x:Key="MahApps.Styles.TreeViewItem.Metro" TargetType="{x:Type TreeViewItem}">
+    <Style x:Key="MahApps.Styles.TreeViewItem" TargetType="{x:Type TreeViewItem}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="Controls:ItemHelper.ActiveSelectionBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="Controls:ItemHelper.ActiveSelectionForegroundBrush" Value="{DynamicResource MahApps.Brushes.AccentSelectedColor}" />
@@ -182,7 +182,7 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="MahApps.Styles.TreeView.Metro" TargetType="{x:Type TreeView}">
+    <Style x:Key="MahApps.Styles.TreeView" TargetType="{x:Type TreeView}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
         <!--  default to 0  -->
@@ -229,8 +229,8 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="MahApps.Styles.TreeView.Virtualized.Metro"
-           BasedOn="{StaticResource MahApps.Styles.TreeView.Metro}"
+    <Style x:Key="MahApps.Styles.TreeView.Virtualized"
+           BasedOn="{StaticResource MahApps.Styles.TreeView}"
            TargetType="{x:Type TreeView}">
         <Setter Property="VirtualizingStackPanel.IsVirtualizing" Value="True" />
         <Setter Property="VirtualizingStackPanel.VirtualizationMode" Value="Recycling" />
diff --git a/src/MahApps.Metro/Styles/Controls.xaml b/src/MahApps.Metro/Styles/Controls.xaml
index fe30e3bfee..a6ae75b22c 100644
--- a/src/MahApps.Metro/Styles/Controls.xaml
+++ b/src/MahApps.Metro/Styles/Controls.xaml
@@ -79,42 +79,42 @@
 
     <!--  note: default style for textblock is now in MetroWindow !!!  -->
 
-    <Style BasedOn="{StaticResource MahApps.Styles.CustomValidationPopup.Metro}" TargetType="{x:Type Controls:CustomValidationPopup}" />
-    <Style BasedOn="{StaticResource MahApps.Styles.ToolTip.Metro}" TargetType="ToolTip" />
+    <Style BasedOn="{StaticResource MahApps.Styles.CustomValidationPopup}" TargetType="{x:Type Controls:CustomValidationPopup}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ToolTip}" TargetType="ToolTip" />
     <Style BasedOn="{StaticResource MahApps.Styles.ButtonBase.Metro}" TargetType="Button" />
     <Style BasedOn="{StaticResource MahApps.Styles.ButtonBase.Metro}" TargetType="RepeatButton" />
-    <Style BasedOn="{StaticResource MahApps.Styles.ToggleButton.Metro}" TargetType="ToggleButton" />
-    <Style BasedOn="{StaticResource MahApps.Styles.TextBox.Metro}" TargetType="TextBox" />
-    <Style BasedOn="{StaticResource MahApps.Styles.RichTextBox.Metro}" TargetType="RichTextBox" />
-    <Style BasedOn="{StaticResource MahApps.Styles.Slider.Metro}" TargetType="Slider" />
-    <Style BasedOn="{StaticResource MahApps.Styles.Label.Metro}" TargetType="Label" />
-    <Style BasedOn="{StaticResource MahApps.Styles.TabItem.Metro}" TargetType="TabItem" />
-    <Style BasedOn="{StaticResource MahApps.Styles.TabControl.Metro}" TargetType="TabControl" />
-    <Style BasedOn="{StaticResource MahApps.Styles.ScrollBar.Metro}" TargetType="ScrollBar" />
-    <Style BasedOn="{StaticResource MahApps.Styles.RadioButton.Metro}" TargetType="RadioButton" />
-    <Style BasedOn="{StaticResource MahApps.Styles.ProgressBar.Metro}" TargetType="ProgressBar" />
-    <Style BasedOn="{StaticResource MahApps.Styles.PasswordBox.Metro}" TargetType="PasswordBox" />
-    <Style BasedOn="{StaticResource MahApps.Styles.CheckBox.Metro}" TargetType="CheckBox" />
-    <Style BasedOn="{StaticResource MahApps.Styles.ComboBox.Metro}" TargetType="ComboBox" />
-    <Style BasedOn="{StaticResource MahApps.Styles.ComboBoxItem.Metro}" TargetType="ComboBoxItem" />
-    <Style BasedOn="{StaticResource MahApps.Styles.MenuItem.Metro}" TargetType="MenuItem" />
-    <Style BasedOn="{StaticResource MahApps.Styles.Menu.Metro}" TargetType="Menu" />
-    <Style BasedOn="{StaticResource MahApps.Styles.ContextMenu.Metro}" TargetType="ContextMenu" />
-    <Style BasedOn="{StaticResource MahApps.Styles.Expander.Metro}" TargetType="Expander" />
-    <Style BasedOn="{StaticResource MahApps.Styles.GroupBox.Metro}" TargetType="GroupBox" />
-    <Style BasedOn="{StaticResource MahApps.Styles.ListBox.Metro}" TargetType="ListBox" />
-    <Style BasedOn="{StaticResource MahApps.Styles.ListBoxItem.Metro}" TargetType="ListBoxItem" />
-    <Style BasedOn="{StaticResource MahApps.Styles.GridViewColumnHeader.Metro}" TargetType="GridViewColumnHeader" />
-    <Style BasedOn="{StaticResource MahApps.Styles.ListView.Metro}" TargetType="ListView" />
-    <Style BasedOn="{StaticResource MahApps.Styles.ListViewItem.Metro}" TargetType="ListViewItem" />
-    <Style BasedOn="{StaticResource MahApps.Styles.TreeView.Metro}" TargetType="TreeView" />
-    <Style BasedOn="{StaticResource MahApps.Styles.TreeViewItem.Metro}" TargetType="TreeViewItem" />
-    <Style BasedOn="{StaticResource MahApps.Styles.DatePicker.Metro}" TargetType="DatePicker" />
-    <Style BasedOn="{StaticResource MahApps.Styles.DatePickerTextBox.Metro}" TargetType="DatePickerTextBox" />
-    <Style BasedOn="{StaticResource MahApps.Styles.Calendar.Metro}" TargetType="Calendar" />
-    <Style BasedOn="{StaticResource MahApps.Styles.DataGrid.Metro}" TargetType="DataGrid" />
-    <Style BasedOn="{StaticResource MahApps.Styles.StatusBar.Metro}" TargetType="StatusBar" />
-    <Style BasedOn="{StaticResource MahApps.Styles.StatusBarItem.Metro}" TargetType="StatusBarItem" />
-    <Style BasedOn="{StaticResource MahApps.Styles.ScrollViewer.Metro}" TargetType="ScrollViewer" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ToggleButton}" TargetType="ToggleButton" />
+    <Style BasedOn="{StaticResource MahApps.Styles.TextBox}" TargetType="TextBox" />
+    <Style BasedOn="{StaticResource MahApps.Styles.RichTextBox}" TargetType="RichTextBox" />
+    <Style BasedOn="{StaticResource MahApps.Styles.Slider}" TargetType="Slider" />
+    <Style BasedOn="{StaticResource MahApps.Styles.Label}" TargetType="Label" />
+    <Style BasedOn="{StaticResource MahApps.Styles.TabItem}" TargetType="TabItem" />
+    <Style BasedOn="{StaticResource MahApps.Styles.TabControl}" TargetType="TabControl" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ScrollBar}" TargetType="ScrollBar" />
+    <Style BasedOn="{StaticResource MahApps.Styles.RadioButton}" TargetType="RadioButton" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ProgressBar}" TargetType="ProgressBar" />
+    <Style BasedOn="{StaticResource MahApps.Styles.PasswordBox}" TargetType="PasswordBox" />
+    <Style BasedOn="{StaticResource MahApps.Styles.CheckBox}" TargetType="CheckBox" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ComboBox}" TargetType="ComboBox" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ComboBoxItem}" TargetType="ComboBoxItem" />
+    <Style BasedOn="{StaticResource MahApps.Styles.MenuItem}" TargetType="MenuItem" />
+    <Style BasedOn="{StaticResource MahApps.Styles.Menu}" TargetType="Menu" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ContextMenu}" TargetType="ContextMenu" />
+    <Style BasedOn="{StaticResource MahApps.Styles.Expander}" TargetType="Expander" />
+    <Style BasedOn="{StaticResource MahApps.Styles.GroupBox}" TargetType="GroupBox" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ListBox}" TargetType="ListBox" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ListBoxItem}" TargetType="ListBoxItem" />
+    <Style BasedOn="{StaticResource MahApps.Styles.GridViewColumnHeader}" TargetType="GridViewColumnHeader" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ListView}" TargetType="ListView" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ListViewItem}" TargetType="ListViewItem" />
+    <Style BasedOn="{StaticResource MahApps.Styles.TreeView}" TargetType="TreeView" />
+    <Style BasedOn="{StaticResource MahApps.Styles.TreeViewItem}" TargetType="TreeViewItem" />
+    <Style BasedOn="{StaticResource MahApps.Styles.DatePicker}" TargetType="DatePicker" />
+    <Style BasedOn="{StaticResource MahApps.Styles.DatePickerTextBox}" TargetType="DatePickerTextBox" />
+    <Style BasedOn="{StaticResource MahApps.Styles.Calendar}" TargetType="Calendar" />
+    <Style BasedOn="{StaticResource MahApps.Styles.DataGrid}" TargetType="DataGrid" />
+    <Style BasedOn="{StaticResource MahApps.Styles.StatusBar}" TargetType="StatusBar" />
+    <Style BasedOn="{StaticResource MahApps.Styles.StatusBarItem}" TargetType="StatusBarItem" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ScrollViewer}" TargetType="ScrollViewer" />
 
 </ResourceDictionary>
diff --git a/src/MahApps.Metro/Styles/Sizes.xaml b/src/MahApps.Metro/Styles/Sizes.xaml
index b1f0293743..94f009359d 100644
--- a/src/MahApps.Metro/Styles/Sizes.xaml
+++ b/src/MahApps.Metro/Styles/Sizes.xaml
@@ -2,8 +2,8 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:System="clr-namespace:System;assembly=mscorlib">
 
-    <System:Double x:Key="MahApps.Sizes.ScrollBar.Height.Metro">14</System:Double>
-    <System:Double x:Key="MahApps.Sizes.ScrollBar.Width.Metro">14</System:Double>
+    <System:Double x:Key="MahApps.Sizes.ScrollBar.Height">14</System:Double>
+    <System:Double x:Key="MahApps.Sizes.ScrollBar.Width">14</System:Double>
 
     <System:Double x:Key="MahApps.Sizes.ScrollBar.HorizontalRepeatButton.Width">14</System:Double>
     <System:Double x:Key="MahApps.Sizes.ScrollBar.VerticalRepeatButton.Height">14</System:Double>
diff --git a/src/MahApps.Metro/Styles/VS/TabControl.xaml b/src/MahApps.Metro/Styles/VS/TabControl.xaml
index d536d4c5ca..2567cb280f 100644
--- a/src/MahApps.Metro/Styles/VS/TabControl.xaml
+++ b/src/MahApps.Metro/Styles/VS/TabControl.xaml
@@ -12,7 +12,7 @@
     <System:Double x:Key="MahApps.Sizes.Font.TabItem">12</System:Double>
 
     <Style x:Key="MahApps.Styles.TabControl.Standard.VisualStudio"
-           BasedOn="{StaticResource MahApps.Styles.TabControl.Metro}"
+           BasedOn="{StaticResource MahApps.Styles.TabControl}"
            TargetType="{x:Type TabControl}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Background}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.BackgroundSelected}" />
@@ -140,7 +140,7 @@
     </Style>
 
     <Style x:Key="MahApps.Styles.TabItem.Standard.VisualStudio"
-           BasedOn="{StaticResource MahApps.Styles.TabItem.Metro}"
+           BasedOn="{StaticResource MahApps.Styles.TabItem}"
            TargetType="{x:Type TabItem}">
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Normal}" />
         <Setter Property="Controls:TabControlHelper.CloseButtonEnabled" Value="True" />
diff --git a/src/MahApps.Metro/Styles/VS/Window.xaml b/src/MahApps.Metro/Styles/VS/Window.xaml
index b2f55239de..9b69c990b0 100644
--- a/src/MahApps.Metro/Styles/VS/Window.xaml
+++ b/src/MahApps.Metro/Styles/VS/Window.xaml
@@ -52,7 +52,7 @@
     </Style>
 
     <Style x:Key="MahApps.Styles.TextBox.WindowQuickLaunch.VisualStudio"
-           BasedOn="{StaticResource MahApps.Styles.TextBox.Button.Metro}"
+           BasedOn="{StaticResource MahApps.Styles.TextBox.Button}"
            TargetType="{x:Type TextBox}">
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.QuickLaunchTextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
diff --git a/src/MahApps.Metro/Styles/ValidationErrorTemplate.xaml b/src/MahApps.Metro/Styles/ValidationErrorTemplate.xaml
index da26d6d264..93aed1f954 100644
--- a/src/MahApps.Metro/Styles/ValidationErrorTemplate.xaml
+++ b/src/MahApps.Metro/Styles/ValidationErrorTemplate.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
-    <Style x:Key="MahApps.Styles.CustomValidationPopup.Metro" TargetType="{x:Type mah:CustomValidationPopup}">
+    <Style x:Key="MahApps.Styles.CustomValidationPopup" TargetType="{x:Type mah:CustomValidationPopup}">
         <Setter Property="HorizontalAlignment" Value="Right" />
         <Setter Property="HorizontalOffset" Value="0" />
         <Setter Property="Placement" Value="Right" />
diff --git a/src/MahApps.Metro/Themes/ContentControlEx.xaml b/src/MahApps.Metro/Themes/ContentControlEx.xaml
index 3d147e20c9..f2c8978cbc 100644
--- a/src/MahApps.Metro/Themes/ContentControlEx.xaml
+++ b/src/MahApps.Metro/Themes/ContentControlEx.xaml
@@ -3,7 +3,7 @@
                     xmlns:controls="clr-namespace:MahApps.Metro.Controls"
                     xmlns:converters="clr-namespace:MahApps.Metro.Converters">
 
-    <Style x:Key="MahApps.Styles.ContentControlEx.Metro" TargetType="{x:Type controls:ContentControlEx}">
+    <Style x:Key="MahApps.Styles.ContentControlEx" TargetType="{x:Type controls:ContentControlEx}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
@@ -43,8 +43,8 @@
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.MetroThumbContentControl.Metro"
-           BasedOn="{StaticResource MahApps.Styles.ContentControlEx.Metro}"
+    <Style x:Key="MahApps.Styles.MetroThumbContentControl"
+           BasedOn="{StaticResource MahApps.Styles.ContentControlEx}"
            TargetType="{x:Type controls:MetroThumbContentControl}" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Themes/DateTimePicker.xaml b/src/MahApps.Metro/Themes/DateTimePicker.xaml
index 9c59559e76..a2d5a9533e 100644
--- a/src/MahApps.Metro/Themes/DateTimePicker.xaml
+++ b/src/MahApps.Metro/Themes/DateTimePicker.xaml
@@ -108,7 +108,7 @@
         <system:Int32>59</system:Int32>
     </x:Array>
 
-    <Style x:Key="MahApps.Styles.TimePickerBase.Metro" TargetType="{x:Type Controls:TimePickerBase}">
+    <Style x:Key="MahApps.Styles.TimePickerBase" TargetType="{x:Type Controls:TimePickerBase}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
@@ -181,7 +181,7 @@
                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
-                                           Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing.Metro}"
+                                           Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing}"
                                            Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
                                            TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
                                            TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
@@ -431,12 +431,12 @@
         <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource MahApps.Templates.ValidationError}" />
     </Style>
 
-    <Style BasedOn="{StaticResource MahApps.Styles.TimePickerBase.Metro}" TargetType="{x:Type Controls:DateTimePicker}">
+    <Style BasedOn="{StaticResource MahApps.Styles.TimePickerBase}" TargetType="{x:Type Controls:DateTimePicker}">
         <Setter Property="Controls:TextBoxHelper.Watermark" Value="Select a date" />
         <Setter Property="IsTodayHighlighted" Value="True" />
     </Style>
 
-    <Style BasedOn="{StaticResource MahApps.Styles.TimePickerBase.Metro}" TargetType="{x:Type Controls:TimePicker}">
+    <Style BasedOn="{StaticResource MahApps.Styles.TimePickerBase}" TargetType="{x:Type Controls:TimePicker}">
         <Setter Property="Controls:TextBoxHelper.Watermark" Value="Select a time" />
     </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml b/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml
index 6107f5cc4c..5a2ff70372 100644
--- a/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml
+++ b/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml
@@ -108,7 +108,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style x:Key="MahApps.Styles.BaseMetroDialog.Metro" TargetType="{x:Type Dialogs:BaseMetroDialog}">
+    <Style x:Key="MahApps.Styles.BaseMetroDialog" TargetType="{x:Type Dialogs:BaseMetroDialog}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.WhiteColor}" />
         <Setter Property="DialogMessageFontSize" Value="{DynamicResource MahApps.Sizes.Font.DialogMessage}" />
         <Setter Property="DialogTitleFontSize" Value="{DynamicResource MahApps.Sizes.Font.DialogTitle}" />
diff --git a/src/MahApps.Metro/Themes/DropDownButton.xaml b/src/MahApps.Metro/Themes/DropDownButton.xaml
index 96cf0689d1..7275380386 100644
--- a/src/MahApps.Metro/Themes/DropDownButton.xaml
+++ b/src/MahApps.Metro/Themes/DropDownButton.xaml
@@ -30,7 +30,7 @@
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.BlackColor}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
-        <Setter Property="MenuStyle" Value="{DynamicResource MahApps.Styles.ContextMenu.Metro}" />
+        <Setter Property="MenuStyle" Value="{DynamicResource MahApps.Styles.ContextMenu}" />
         <Setter Property="MinHeight" Value="26" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
diff --git a/src/MahApps.Metro/Themes/Generic.xaml b/src/MahApps.Metro/Themes/Generic.xaml
index 2fd2e92bc2..1f558fdb3a 100644
--- a/src/MahApps.Metro/Themes/Generic.xaml
+++ b/src/MahApps.Metro/Themes/Generic.xaml
@@ -40,17 +40,17 @@
 
     <!--  set up default styles for our custom controls  -->
 
-    <Style BasedOn="{StaticResource MahApps.Styles.ToggleSwitchButton.Metro}" TargetType="{x:Type Controls:ToggleSwitchButton}" />
-    <Style BasedOn="{StaticResource MahApps.Styles.ToggleSwitch.Metro}" TargetType="{x:Type Controls:ToggleSwitch}" />
-    <Style BasedOn="{StaticResource MahApps.Styles.ContentControlEx.Metro}" TargetType="{x:Type Controls:ContentControlEx}" />
-    <Style BasedOn="{StaticResource MahApps.Styles.MetroThumbContentControl.Metro}" TargetType="{x:Type Controls:MetroThumbContentControl}" />
-    <Style BasedOn="{StaticResource MahApps.Styles.WindowCommandsItem.Metro}" TargetType="{x:Type Controls:WindowCommandsItem}" />
-    <Style BasedOn="{StaticResource MahApps.Styles.WindowCommands.Metro}" TargetType="{x:Type Controls:WindowCommands}" />
-    <Style BasedOn="{StaticResource MahApps.Styles.WindowButtonCommands.Metro}" TargetType="{x:Type Controls:WindowButtonCommands}" />
-    <Style BasedOn="{StaticResource MahApps.Styles.HamburgerMenu.Metro}" TargetType="{x:Type Controls:HamburgerMenu}" />
-    <Style BasedOn="{StaticResource MahApps.Styles.MetroHeader.Metro}" TargetType="{x:Type Controls:MetroHeader}" />
-    <Style BasedOn="{StaticResource MahApps.Styles.BaseMetroDialog.Metro}" TargetType="{x:Type Dialogs:BaseMetroDialog}" />
-    <Style BasedOn="{StaticResource MahApps.Styles.RangeSlider.Metro}" TargetType="{x:Type Controls:RangeSlider}" />
-    <Style BasedOn="{StaticResource MahApps.Styles.MetroProgressBar.Metro}" TargetType="{x:Type Controls:MetroProgressBar}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ToggleSwitchButton}" TargetType="{x:Type Controls:ToggleSwitchButton}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ToggleSwitch}" TargetType="{x:Type Controls:ToggleSwitch}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ContentControlEx}" TargetType="{x:Type Controls:ContentControlEx}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.MetroThumbContentControl}" TargetType="{x:Type Controls:MetroThumbContentControl}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.WindowCommandsItem}" TargetType="{x:Type Controls:WindowCommandsItem}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.WindowCommands}" TargetType="{x:Type Controls:WindowCommands}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.WindowButtonCommands}" TargetType="{x:Type Controls:WindowButtonCommands}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.HamburgerMenu}" TargetType="{x:Type Controls:HamburgerMenu}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.MetroHeader}" TargetType="{x:Type Controls:MetroHeader}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.BaseMetroDialog}" TargetType="{x:Type Dialogs:BaseMetroDialog}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.RangeSlider}" TargetType="{x:Type Controls:RangeSlider}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.MetroProgressBar}" TargetType="{x:Type Controls:MetroProgressBar}" />
 
 </ResourceDictionary>
diff --git a/src/MahApps.Metro/Themes/HamburgerMenu.xaml b/src/MahApps.Metro/Themes/HamburgerMenu.xaml
index 174316bdf7..5e7e8bbb00 100644
--- a/src/MahApps.Metro/Themes/HamburgerMenu.xaml
+++ b/src/MahApps.Metro/Themes/HamburgerMenu.xaml
@@ -6,7 +6,7 @@
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Themes/HamburgerMenuTemplate.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <Style x:Key="MahApps.Styles.HamburgerMenu.Metro" TargetType="{x:Type Controls:HamburgerMenu}">
+    <Style x:Key="MahApps.Styles.HamburgerMenu" TargetType="{x:Type Controls:HamburgerMenu}">
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="HamburgerButtonStyle" Value="{DynamicResource MahApps.Styles.Button.Hamburger}" />
diff --git a/src/MahApps.Metro/Themes/HamburgerMenuTemplate.xaml b/src/MahApps.Metro/Themes/HamburgerMenuTemplate.xaml
index 4f24994714..5972243bbc 100644
--- a/src/MahApps.Metro/Themes/HamburgerMenuTemplate.xaml
+++ b/src/MahApps.Metro/Themes/HamburgerMenuTemplate.xaml
@@ -65,7 +65,7 @@
                  options:Freeze="true" />
 
     <Style x:Key="MahApps.Styles.ScrollViewer.Hamburger"
-           BasedOn="{StaticResource MahApps.Styles.ScrollViewer.Metro}"
+           BasedOn="{StaticResource MahApps.Styles.ScrollViewer}"
            TargetType="{x:Type ScrollViewer}">
         <Setter Property="Template">
             <Setter.Value>
@@ -180,7 +180,7 @@
     </ControlTemplate>
 
     <Style x:Key="MahApps.Styles.ListBoxItem.HamburgerBase"
-           BasedOn="{StaticResource MahApps.Styles.ListBoxItem.Metro}"
+           BasedOn="{StaticResource MahApps.Styles.ListBoxItem}"
            TargetType="{x:Type ListBoxItem}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />
@@ -296,7 +296,7 @@
     </Style>
 
     <Style x:Key="MahApps.Styles.ListBox.HamburgerMenu"
-           BasedOn="{StaticResource MahApps.Styles.ListBox.Metro}"
+           BasedOn="{StaticResource MahApps.Styles.ListBox}"
            TargetType="{x:Type ListBox}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />
diff --git a/src/MahApps.Metro/Themes/MetroAnimatedSingleRowTabControl.xaml b/src/MahApps.Metro/Themes/MetroAnimatedSingleRowTabControl.xaml
index e7677415c8..5dcd198e46 100644
--- a/src/MahApps.Metro/Themes/MetroAnimatedSingleRowTabControl.xaml
+++ b/src/MahApps.Metro/Themes/MetroAnimatedSingleRowTabControl.xaml
@@ -5,7 +5,7 @@
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.AnimatedSingleRowTabControl.xaml" />
-        <!--  MahApps.Styles.ScrollViewer.Metro  -->
+        <!--  MahApps.Styles.ScrollViewer  -->
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.Scrollbars.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
@@ -21,7 +21,7 @@
                           Panel.ZIndex="1"
                           Controls:ScrollViewerHelper.IsHorizontalScrollWheelEnabled="{TemplateBinding Controls:ScrollViewerHelper.IsHorizontalScrollWheelEnabled}"
                           HorizontalScrollBarVisibility="Auto"
-                          Style="{DynamicResource MahApps.Styles.ScrollViewer.Metro}"
+                          Style="{DynamicResource MahApps.Styles.ScrollViewer}"
                           VerticalScrollBarVisibility="Disabled">
                 <Grid x:Name="HeaderPanelGrid">
                     <Controls:Underline x:Name="Underline"
@@ -81,7 +81,7 @@
                           Margin="{TemplateBinding TabStripMargin}"
                           Panel.ZIndex="1"
                           HorizontalScrollBarVisibility="Disabled"
-                          Style="{DynamicResource MahApps.Styles.ScrollViewer.Metro}"
+                          Style="{DynamicResource MahApps.Styles.ScrollViewer}"
                           VerticalScrollBarVisibility="Auto">
                 <Grid x:Name="HeaderPanelGrid">
                     <Controls:Underline x:Name="Underline"
@@ -130,7 +130,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style BasedOn="{StaticResource MahApps.Styles.TabControl.Metro}" TargetType="{x:Type Controls:MetroAnimatedSingleRowTabControl}">
+    <Style BasedOn="{StaticResource MahApps.Styles.TabControl}" TargetType="{x:Type Controls:MetroAnimatedSingleRowTabControl}">
         <Setter Property="Controls:ScrollViewerHelper.IsHorizontalScrollWheelEnabled" Value="True" />
         <Setter Property="Controls:TabControlHelper.Transition" Value="Left" />
         <Setter Property="Template" Value="{StaticResource MahApps.Templates.MetroAnimatedSingleRowTabControl.Horizontal}" />
diff --git a/src/MahApps.Metro/Themes/MetroAnimatedTabControl.xaml b/src/MahApps.Metro/Themes/MetroAnimatedTabControl.xaml
index 4c46b00229..3c7d526e4d 100644
--- a/src/MahApps.Metro/Themes/MetroAnimatedTabControl.xaml
+++ b/src/MahApps.Metro/Themes/MetroAnimatedTabControl.xaml
@@ -7,7 +7,7 @@
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.TabControl.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <Style BasedOn="{StaticResource MahApps.Styles.TabControl.Metro}" TargetType="{x:Type Controls:MetroAnimatedTabControl}">
+    <Style BasedOn="{StaticResource MahApps.Styles.TabControl}" TargetType="{x:Type Controls:MetroAnimatedTabControl}">
         <Setter Property="Controls:TabControlHelper.Transition" Value="Left" />
         <Setter Property="Template">
             <Setter.Value>
diff --git a/src/MahApps.Metro/Themes/MetroHeader.xaml b/src/MahApps.Metro/Themes/MetroHeader.xaml
index e254bf94cf..49267d46ca 100644
--- a/src/MahApps.Metro/Themes/MetroHeader.xaml
+++ b/src/MahApps.Metro/Themes/MetroHeader.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
-    <Style x:Key="MahApps.Styles.MetroHeader.Metro" TargetType="{x:Type Controls:MetroHeader}">
+    <Style x:Key="MahApps.Styles.MetroHeader" TargetType="{x:Type Controls:MetroHeader}">
         <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource MahApps.Sizes.Font.Normal}" />
         <Setter Property="Controls:ControlsHelper.HeaderMargin" Value="0 0 0 2" />
         <Setter Property="Controls:GroupBoxHelper.HeaderForeground" Value="{Binding RelativeSource={RelativeSource Self}, Path=Foreground, Mode=OneWay}" />
diff --git a/src/MahApps.Metro/Themes/MetroProgressBar.xaml b/src/MahApps.Metro/Themes/MetroProgressBar.xaml
index 05eda9c188..138f57f157 100644
--- a/src/MahApps.Metro/Themes/MetroProgressBar.xaml
+++ b/src/MahApps.Metro/Themes/MetroProgressBar.xaml
@@ -5,7 +5,7 @@
 
     <System:Double x:Key="MahApps.Sizes.ProgressBar.MinHeight">6</System:Double>
 
-    <Style x:Key="MahApps.Styles.MetroProgressBar.Metro" TargetType="{x:Type Controls:MetroProgressBar}">
+    <Style x:Key="MahApps.Styles.MetroProgressBar" TargetType="{x:Type Controls:MetroProgressBar}">
         <Setter Property="Background" Value="#1FFFFFFF" />
         <Setter Property="BorderBrush" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />
diff --git a/src/MahApps.Metro/Themes/MetroTabControl.xaml b/src/MahApps.Metro/Themes/MetroTabControl.xaml
index 42cafa1de0..a68aabf206 100644
--- a/src/MahApps.Metro/Themes/MetroTabControl.xaml
+++ b/src/MahApps.Metro/Themes/MetroTabControl.xaml
@@ -160,7 +160,7 @@
     </ControlTemplate>
 
     <Style x:Key="{x:Type Controls:MetroTabControl}"
-           BasedOn="{StaticResource MahApps.Styles.TabControl.Metro}"
+           BasedOn="{StaticResource MahApps.Styles.TabControl}"
            TargetType="{x:Type Controls:MetroTabControl}">
         <Setter Property="Template" Value="{StaticResource MahApps.Templates.MetroTabControl.DoNotKeepVisualTreeInMemoryWhenChangingTabs}" />
         <Style.Triggers>
diff --git a/src/MahApps.Metro/Themes/MetroTabItem.xaml b/src/MahApps.Metro/Themes/MetroTabItem.xaml
index eedf2f2cf0..1a44fbce6a 100644
--- a/src/MahApps.Metro/Themes/MetroTabItem.xaml
+++ b/src/MahApps.Metro/Themes/MetroTabItem.xaml
@@ -11,7 +11,7 @@
 
     <Converters:MetroTabItemCloseButtonWidthConverter x:Key="MetroTabItemCloseButtonWidthConverter" />
 
-    <Style BasedOn="{StaticResource MahApps.Styles.TabItem.Metro}" TargetType="{x:Type Controls:MetroTabItem}">
+    <Style BasedOn="{StaticResource MahApps.Styles.TabItem}" TargetType="{x:Type Controls:MetroTabItem}">
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Controls:MetroTabItem}">
diff --git a/src/MahApps.Metro/Themes/RangeSlider.xaml b/src/MahApps.Metro/Themes/RangeSlider.xaml
index 23a49d89ea..bd97010e32 100644
--- a/src/MahApps.Metro/Themes/RangeSlider.xaml
+++ b/src/MahApps.Metro/Themes/RangeSlider.xaml
@@ -272,7 +272,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style x:Key="MahApps.Styles.RangeSlider.Metro" TargetType="{x:Type Controls:RangeSlider}">
+    <Style x:Key="MahApps.Styles.RangeSlider" TargetType="{x:Type Controls:RangeSlider}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Controls:SliderHelper.ThumbFillBrush" Value="{DynamicResource MahApps.Brushes.Gray2}" />
         <Setter Property="Controls:SliderHelper.ThumbFillDisabledBrush" Value="{DynamicResource MahApps.Brushes.Gray6}" />
diff --git a/src/MahApps.Metro/Themes/SplitButton.xaml b/src/MahApps.Metro/Themes/SplitButton.xaml
index 45e86acfd5..de96b44ae3 100644
--- a/src/MahApps.Metro/Themes/SplitButton.xaml
+++ b/src/MahApps.Metro/Themes/SplitButton.xaml
@@ -287,7 +287,7 @@
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Sizes.Font.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.BlackColor}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
-        <Setter Property="ListBoxStyle" Value="{DynamicResource MahApps.Styles.ListBox.Virtualized.Metro}" />
+        <Setter Property="ListBoxStyle" Value="{DynamicResource MahApps.Styles.ListBox.Virtualized}" />
         <Setter Property="MinHeight" Value="26" />
         <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
diff --git a/src/MahApps.Metro/Themes/ToggleSwitch.xaml b/src/MahApps.Metro/Themes/ToggleSwitch.xaml
index b4f3817c46..45f91d72aa 100644
--- a/src/MahApps.Metro/Themes/ToggleSwitch.xaml
+++ b/src/MahApps.Metro/Themes/ToggleSwitch.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
-    <Style x:Key="MahApps.Styles.ToggleSwitchButton.Metro" TargetType="{x:Type Controls:ToggleSwitchButton}">
+    <Style x:Key="MahApps.Styles.ToggleSwitchButton" TargetType="{x:Type Controls:ToggleSwitchButton}">
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray4}" />
         <Setter Property="BorderThickness" Value="2" />
         <Setter Property="Height" Value="35" />
@@ -88,7 +88,7 @@
         <Setter Property="Width" Value="70" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.ToggleSwitch.Metro" TargetType="{x:Type Controls:ToggleSwitch}">
+    <Style x:Key="MahApps.Styles.ToggleSwitch" TargetType="{x:Type Controls:ToggleSwitch}">
         <Setter Property="ContentPadding" Value="0 0 4 0" />
         <Setter Property="Controls:ControlsHelper.HeaderFontSize" Value="{DynamicResource MahApps.Sizes.Font.ToggleSwitchHeader}" />
         <Setter Property="Controls:ControlsHelper.HeaderMargin" Value="0 0 0 5" />
@@ -222,7 +222,7 @@
         <Setter Property="ThumbIndicatorBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="ThumbIndicatorDisabledBrush" Value="{DynamicResource MahApps.Brushes.Gray4}" />
         <Setter Property="ThumbIndicatorWidth" Value="13" />
-        <Setter Property="ToggleSwitchButtonStyle" Value="{DynamicResource MahApps.Styles.ToggleSwitchButton.Metro}" />
+        <Setter Property="ToggleSwitchButtonStyle" Value="{DynamicResource MahApps.Styles.ToggleSwitchButton}" />
         <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource MahApps.Templates.ValidationError}" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
diff --git a/src/MahApps.Metro/Themes/WindowButtonCommands.xaml b/src/MahApps.Metro/Themes/WindowButtonCommands.xaml
index 10b71a9413..0c8e29937c 100644
--- a/src/MahApps.Metro/Themes/WindowButtonCommands.xaml
+++ b/src/MahApps.Metro/Themes/WindowButtonCommands.xaml
@@ -222,7 +222,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style x:Key="MahApps.Styles.WindowButtonCommands.Metro" TargetType="{x:Type Controls:WindowButtonCommands}">
+    <Style x:Key="MahApps.Styles.WindowButtonCommands" TargetType="{x:Type Controls:WindowButtonCommands}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TransparentWhite}" />
         <Setter Property="DarkCloseButtonStyle" Value="{DynamicResource MahApps.Styles.Button.MetroWindow.Dark}" />
         <Setter Property="DarkMaxButtonStyle" Value="{DynamicResource MahApps.Styles.Button.MetroWindow.Dark}" />
@@ -243,7 +243,7 @@
     </Style>
 
     <Style x:Key="MahApps.Styles.WindowButtonCommands.Win10"
-           BasedOn="{StaticResource MahApps.Styles.WindowButtonCommands.Metro}"
+           BasedOn="{StaticResource MahApps.Styles.WindowButtonCommands}"
            TargetType="{x:Type Controls:WindowButtonCommands}">
         <Setter Property="DarkCloseButtonStyle" Value="{DynamicResource MahApps.Styles.Button.MetroWindowClose.Dark.Win10}" />
         <Setter Property="LightCloseButtonStyle" Value="{DynamicResource MahApps.Styles.Button.MetroWindowClose.Light.Win10}" />
diff --git a/src/MahApps.Metro/Themes/WindowCommands.xaml b/src/MahApps.Metro/Themes/WindowCommands.xaml
index a09d36b0be..9c30fc9c0f 100644
--- a/src/MahApps.Metro/Themes/WindowCommands.xaml
+++ b/src/MahApps.Metro/Themes/WindowCommands.xaml
@@ -250,7 +250,7 @@
         </ControlTemplate.Resources>
     </ControlTemplate>
 
-    <Style x:Key="MahApps.Styles.WindowCommandsItem.Metro" TargetType="{x:Type Controls:WindowCommandsItem}">
+    <Style x:Key="MahApps.Styles.WindowCommandsItem" TargetType="{x:Type Controls:WindowCommandsItem}">
         <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentWindowCommands.Foreground, Mode=OneWay}" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="MinHeight" Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentWindowCommands.ParentWindow.TitleBarHeight, Mode=OneWay}" />
@@ -287,7 +287,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.WindowCommands.Metro" TargetType="{x:Type Controls:WindowCommands}">
+    <Style x:Key="MahApps.Styles.WindowCommands" TargetType="{x:Type Controls:WindowCommands}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TransparentWhite}" />
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Normal" />
         <Setter Property="DarkTemplate" Value="{StaticResource MahApps.Templates.WindowCommands.Dark}" />
diff --git a/src/Mahapps.Metro.Tests/Views/TextBoxHelperTestWindow.xaml b/src/Mahapps.Metro.Tests/Views/TextBoxHelperTestWindow.xaml
index ce822b8443..f1f7b091d2 100644
--- a/src/Mahapps.Metro.Tests/Views/TextBoxHelperTestWindow.xaml
+++ b/src/Mahapps.Metro.Tests/Views/TextBoxHelperTestWindow.xaml
@@ -9,10 +9,10 @@
                       mc:Ignorable="d">
     <StackPanel>
         <TextBox x:Name="TestTextBox" />
-        <TextBox x:Name="TestButtonTextBox" Style="{DynamicResource MahApps.Styles.TextBox.Button.Metro}" />
+        <TextBox x:Name="TestButtonTextBox" Style="{DynamicResource MahApps.Styles.TextBox.Button}" />
         <PasswordBox x:Name="TestPasswordBox" />
-        <PasswordBox x:Name="TestButtonPasswordBox" Style="{DynamicResource MahApps.Styles.PasswordBox.Button.Metro}" />
-        <PasswordBox x:Name="TestButtonRevealedPasswordBox" Style="{DynamicResource MahApps.Styles.PasswordBox.ButtonRevealed.Metro}" />
+        <PasswordBox x:Name="TestButtonPasswordBox" Style="{DynamicResource MahApps.Styles.PasswordBox.Button}" />
+        <PasswordBox x:Name="TestButtonRevealedPasswordBox" Style="{DynamicResource MahApps.Styles.PasswordBox.ButtonRevealed}" />
         <ComboBox x:Name="TestComboBox" />
         <ComboBox x:Name="TestEditableComboBox" IsEditable="True" />
         <controls:NumericUpDown x:Name="TestNumericUpDown" />

From ea1545fd007125cbbdffb1fd34581ab220a795ec Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Sat, 20 Jul 2019 21:45:07 +0200
Subject: [PATCH 22/46] Rename TextBoxMetroContextMenu into
 MahApps.TextBox.ContextMenu

---
 src/MahApps.Metro/Styles/Controls.ContextMenu.xaml | 2 +-
 src/MahApps.Metro/Styles/Controls.DatePicker.xaml  | 4 ++--
 src/MahApps.Metro/Styles/Controls.PasswordBox.xaml | 2 +-
 src/MahApps.Metro/Styles/Controls.TextBox.xaml     | 4 ++--
 src/MahApps.Metro/Themes/DateTimePicker.xaml       | 2 +-
 src/MahApps.Metro/Themes/HotKeyBox.xaml            | 2 +-
 src/MahApps.Metro/Themes/NumericUpDown.xaml        | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml b/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml
index 8a2671d956..82a4fd6563 100644
--- a/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ContextMenu.xaml
@@ -172,7 +172,7 @@
            BasedOn="{StaticResource {x:Static MenuItem.SeparatorStyleKey}}"
            TargetType="{x:Type Separator}" />
 
-    <ContextMenu x:Key="TextBoxMetroContextMenu" Style="{StaticResource MahApps.Styles.ContextMenu}">
+    <ContextMenu x:Key="MahApps.TextBox.ContextMenu" Style="{StaticResource MahApps.Styles.ContextMenu}">
         <MenuItem Command="ApplicationCommands.Cut" Style="{DynamicResource MahApps.Styles.MenuItem}" />
         <MenuItem Command="ApplicationCommands.Copy" Style="{DynamicResource MahApps.Styles.MenuItem}" />
         <MenuItem Command="ApplicationCommands.Paste" Style="{DynamicResource MahApps.Styles.MenuItem}" />
diff --git a/src/MahApps.Metro/Styles/Controls.DatePicker.xaml b/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
index 65da5253b3..9c6cad452f 100644
--- a/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
+++ b/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
@@ -14,7 +14,7 @@
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="CalendarStyle" Value="{DynamicResource MahApps.Styles.Calendar.Base}" />
-        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
+        <Setter Property="ContextMenu" Value="{DynamicResource MahApps.TextBox.ContextMenu}" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
         <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="22" />
@@ -184,7 +184,7 @@
 
     <Style x:Key="MahApps.Styles.DatePickerTextBox" TargetType="{x:Type DatePickerTextBox}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
-        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
+        <Setter Property="ContextMenu" Value="{DynamicResource MahApps.TextBox.ContextMenu}" />
         <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Content}" />
diff --git a/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml b/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
index 875c78f50d..817031352b 100644
--- a/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
@@ -82,7 +82,7 @@
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="CaretBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
-        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
+        <Setter Property="ContextMenu" Value="{DynamicResource MahApps.TextBox.ContextMenu}" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
         <Setter Property="Controls:PasswordBoxHelper.CapsLockIcon" Value="{StaticResource MahApps.Controls.Grid.DefaultCapsLockIcon}" />
diff --git a/src/MahApps.Metro/Styles/Controls.TextBox.xaml b/src/MahApps.Metro/Styles/Controls.TextBox.xaml
index 0c88a5bd9c..09039d1c98 100644
--- a/src/MahApps.Metro/Styles/Controls.TextBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TextBox.xaml
@@ -15,7 +15,7 @@
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="CaretBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
-        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
+        <Setter Property="ContextMenu" Value="{DynamicResource MahApps.TextBox.ContextMenu}" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
         <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Sizes.Font.ClearTextButton}" />
@@ -565,7 +565,7 @@
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="CaretBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
-        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
+        <Setter Property="ContextMenu" Value="{DynamicResource MahApps.TextBox.ContextMenu}" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
         <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Sizes.Font.ClearTextButton}" />
diff --git a/src/MahApps.Metro/Themes/DateTimePicker.xaml b/src/MahApps.Metro/Themes/DateTimePicker.xaml
index a2d5a9533e..cfce4c5d05 100644
--- a/src/MahApps.Metro/Themes/DateTimePicker.xaml
+++ b/src/MahApps.Metro/Themes/DateTimePicker.xaml
@@ -112,7 +112,7 @@
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
+        <Setter Property="ContextMenu" Value="{DynamicResource MahApps.TextBox.ContextMenu}" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
         <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="22" />
diff --git a/src/MahApps.Metro/Themes/HotKeyBox.xaml b/src/MahApps.Metro/Themes/HotKeyBox.xaml
index c4ff66ade3..b7d2e6919c 100644
--- a/src/MahApps.Metro/Themes/HotKeyBox.xaml
+++ b/src/MahApps.Metro/Themes/HotKeyBox.xaml
@@ -7,7 +7,7 @@
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
+        <Setter Property="ContextMenu" Value="{DynamicResource MahApps.TextBox.ContextMenu}" />
         <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Upper" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
diff --git a/src/MahApps.Metro/Themes/NumericUpDown.xaml b/src/MahApps.Metro/Themes/NumericUpDown.xaml
index e217bcb583..37e70e4961 100644
--- a/src/MahApps.Metro/Themes/NumericUpDown.xaml
+++ b/src/MahApps.Metro/Themes/NumericUpDown.xaml
@@ -13,7 +13,7 @@
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="ContextMenu" Value="{DynamicResource TextBoxMetroContextMenu}" />
+        <Setter Property="ContextMenu" Value="{DynamicResource MahApps.TextBox.ContextMenu}" />
         <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.FocusBorder}" />
         <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.MouseOverBorder}" />
         <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Sizes.Font.ClearTextButton}" />

From 54384e5e5ba1da225c28b0d5befdfe21dba929f9 Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Mon, 22 Jul 2019 09:13:46 +0200
Subject: [PATCH 23/46] Rename MahApps.Styles.ButtonBase.MetroCircle into
 MahApps.Styles.ButtonBase.Circle

---
 .../Views/Flyouts/FlyoutBottomView.xaml                     | 2 +-
 .../Views/Flyouts/FlyoutTopView.xaml                        | 2 +-
 .../MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml     | 6 +++---
 .../MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml       | 4 ++--
 .../MahApps.Metro.Demo/ExampleWindows/ShowcaseFlyout.xaml   | 2 +-
 src/MahApps.Metro/Controls/MetroNavigationWindow.xaml       | 4 ++--
 src/MahApps.Metro/Styles/Controls.Buttons.xaml              | 2 +-
 src/MahApps.Metro/Themes/Flyout.xaml                        | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/Flyouts/FlyoutBottomView.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/Flyouts/FlyoutBottomView.xaml
index 58fc19e467..2d98a401f6 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/Flyouts/FlyoutBottomView.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/Flyouts/FlyoutBottomView.xaml
@@ -16,7 +16,7 @@
                 Height="36"
                 FontFamily="Segoe UI Symbol"
                 FontSize="16"
-                Style="{DynamicResource MahApps.Styles.ButtonBase.MetroCircle}">
+                Style="{DynamicResource MahApps.Styles.ButtonBase.Circle}">
             <iconPacks:PackIconModern Kind="Add" />
         </Button>
     </StackPanel>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/Flyouts/FlyoutTopView.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/Flyouts/FlyoutTopView.xaml
index 3463e9d87f..bf4cc9672a 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/Flyouts/FlyoutTopView.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/Flyouts/FlyoutTopView.xaml
@@ -18,7 +18,7 @@
                 FontFamily="Segoe UI Symbol"
                 FontSize="16"
                 Foreground="{Binding RelativeSource={RelativeSource AncestorType={x:Type Controls:Flyout}}, Path=Foreground}"
-                Style="{DynamicResource MahApps.Styles.ButtonBase.MetroCircle}">
+                Style="{DynamicResource MahApps.Styles.ButtonBase.Circle}">
             <iconPacks:PackIconModern Kind="Add" />
         </Button>
     </StackPanel>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
index d6c6209420..1376269866 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
@@ -144,7 +144,7 @@
                         Orientation="Horizontal">
                 <StackPanel.Resources>
                     <Style x:Key="AccentCircleButtonStyle"
-                           BasedOn="{StaticResource MahApps.Styles.ButtonBase.MetroCircle}"
+                           BasedOn="{StaticResource MahApps.Styles.ButtonBase.Circle}"
                            TargetType="{x:Type ButtonBase}">
                         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                         <Style.Triggers>
@@ -179,7 +179,7 @@
                         Margin="4"
                         Foreground="{DynamicResource MahApps.Brushes.Accent}"
                         IsEnabled="False"
-                        Style="{StaticResource MahApps.Styles.ButtonBase.MetroCircle}">
+                        Style="{StaticResource MahApps.Styles.ButtonBase.Circle}">
                     <Button.ContentTemplate>
                         <DataTemplate>
                             <iconPacks:PackIconModern Width="20"
@@ -318,7 +318,7 @@
                        TargetType="Controls:DropDownButton">
                     <Setter Property="ArrowVisibility" Value="Collapsed" />
                     <Setter Property="BorderThickness" Value="0" />
-                    <Setter Property="ButtonStyle" Value="{DynamicResource MahApps.Styles.ButtonBase.MetroCircle}" />
+                    <Setter Property="ButtonStyle" Value="{DynamicResource MahApps.Styles.ButtonBase.Circle}" />
                     <Setter Property="FocusVisualStyle" Value="{DynamicResource MahApps.Metro.Styles.MetroCircleFocusVisual}" />
                     <Setter Property="Height" Value="48" />
                     <Setter Property="Width" Value="48" />
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml
index 81b80084fe..251cc9bf0c 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml
@@ -291,7 +291,7 @@
                             Orientation="Horizontal">
                     <Button Width="36"
                             Height="36"
-                            Style="{DynamicResource MahApps.Styles.ButtonBase.MetroCircle}">
+                            Style="{DynamicResource MahApps.Styles.ButtonBase.Circle}">
                         <iconPacks:PackIconModern Kind="Alert" />
                     </Button>
                 </StackPanel>
@@ -306,7 +306,7 @@
                             Height="36"
                             FontFamily="Segoe UI Symbol"
                             FontSize="16"
-                            Style="{DynamicResource MahApps.Styles.ButtonBase.MetroCircle}">
+                            Style="{DynamicResource MahApps.Styles.ButtonBase.Circle}">
                         <iconPacks:PackIconModern Kind="Add" />
                     </Button>
                 </StackPanel>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/ShowcaseFlyout.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/ShowcaseFlyout.xaml
index bbf32edda5..ab5195d9a6 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/ShowcaseFlyout.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/ShowcaseFlyout.xaml
@@ -46,7 +46,7 @@
                         FontSize="16"
                         Foreground="{Binding RelativeSource={RelativeSource AncestorType={x:Type controls:Flyout}}, Path=Foreground}"
                         IsCancel="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:Flyout}}, Path=CloseButtonIsCancel}"
-                        Style="{DynamicResource MahApps.Styles.ButtonBase.MetroCircle}"
+                        Style="{DynamicResource MahApps.Styles.ButtonBase.Circle}"
                         Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:Flyout}}, Path=CloseButtonVisibility}">
                     <i:Interaction.Triggers>
                         <i:EventTrigger EventName="Click">
diff --git a/src/MahApps.Metro/Controls/MetroNavigationWindow.xaml b/src/MahApps.Metro/Controls/MetroNavigationWindow.xaml
index 332a34674a..a481e932cf 100644
--- a/src/MahApps.Metro/Controls/MetroNavigationWindow.xaml
+++ b/src/MahApps.Metro/Controls/MetroNavigationWindow.xaml
@@ -16,7 +16,7 @@
                     Height="34"
                     Margin="4 2 2 2"
                     VerticalAlignment="Center"
-                    Style="{DynamicResource MahApps.Styles.ButtonBase.MetroCircle}">
+                    Style="{DynamicResource MahApps.Styles.ButtonBase.Circle}">
                 <ContentControl Width="20"
                                 Height="20"
                                 Content="M57,42V34H32.25L42.25,24H31.75L17.75,38L31.75,52H42.25L32.25,42H57Z"
@@ -28,7 +28,7 @@
                     Margin="2 2 4 2"
                     VerticalAlignment="Center"
                     IsEnabled="False"
-                    Style="{DynamicResource MahApps.Styles.ButtonBase.MetroCircle}">
+                    Style="{DynamicResource MahApps.Styles.ButtonBase.Circle}">
                 <ContentControl Width="20"
                                 Height="20"
                                 Content="M19,34V42H43.75L33.75,52H44.25L58.25,38L44.25,24H33.75L43.75,34H19Z"
diff --git a/src/MahApps.Metro/Styles/Controls.Buttons.xaml b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
index 469162b0fc..57081aa155 100644
--- a/src/MahApps.Metro/Styles/Controls.Buttons.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
@@ -160,7 +160,7 @@
     </Style>
 
     <!--  style for WP7/Circle button  -->
-    <Style x:Key="MahApps.Styles.ButtonBase.MetroCircle" TargetType="{x:Type ButtonBase}">
+    <Style x:Key="MahApps.Styles.ButtonBase.Circle" TargetType="{x:Type ButtonBase}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray3}" />
         <Setter Property="BorderThickness" Value="2" />
diff --git a/src/MahApps.Metro/Themes/Flyout.xaml b/src/MahApps.Metro/Themes/Flyout.xaml
index b8885e71a9..a11c0af46c 100644
--- a/src/MahApps.Metro/Themes/Flyout.xaml
+++ b/src/MahApps.Metro/Themes/Flyout.xaml
@@ -16,7 +16,7 @@
                     DockPanel.Dock="Left"
                     Foreground="{Binding RelativeSource={RelativeSource AncestorType={x:Type Controls:Flyout}}, Path=Foreground}"
                     IsCancel="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:Flyout}}, Path=CloseButtonIsCancel}"
-                    Style="{DynamicResource MahApps.Styles.ButtonBase.MetroCircle}"
+                    Style="{DynamicResource MahApps.Styles.ButtonBase.Circle}"
                     Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:Flyout}}, Path=CloseButtonVisibility}">
                 <i:Interaction.Triggers>
                     <i:EventTrigger EventName="Click">

From 120607e80f7d43bd17a9d15fcc213b63e0c54f61 Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Mon, 22 Jul 2019 09:19:42 +0200
Subject: [PATCH 24/46] Rename MahApps.Styles.Button.MetroWindowClose.XYZ into
 MahApps.Styles.Button.MetroWindow.Close.XYZ

---
 src/MahApps.Metro/Styles/Controls.Buttons.xaml     | 4 ++--
 src/MahApps.Metro/Themes/WindowButtonCommands.xaml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/MahApps.Metro/Styles/Controls.Buttons.xaml b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
index 57081aa155..ddbeafbe56 100644
--- a/src/MahApps.Metro/Styles/Controls.Buttons.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
@@ -349,7 +349,7 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="MahApps.Styles.Button.MetroWindowClose.Light.Win10"
+    <Style x:Key="MahApps.Styles.Button.MetroWindow.Close.Light.Win10"
            BasedOn="{StaticResource MahApps.Styles.Button.MetroWindow.Light}"
            TargetType="{x:Type Button}">
         <Style.Triggers>
@@ -366,7 +366,7 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="MahApps.Styles.Button.MetroWindowClose.Dark.Win10"
+    <Style x:Key="MahApps.Styles.Button.MetroWindow.Close.Dark.Win10"
            BasedOn="{StaticResource MahApps.Styles.Button.MetroWindow.Dark}"
            TargetType="{x:Type Button}">
         <Style.Triggers>
diff --git a/src/MahApps.Metro/Themes/WindowButtonCommands.xaml b/src/MahApps.Metro/Themes/WindowButtonCommands.xaml
index 0c8e29937c..ef10209364 100644
--- a/src/MahApps.Metro/Themes/WindowButtonCommands.xaml
+++ b/src/MahApps.Metro/Themes/WindowButtonCommands.xaml
@@ -245,8 +245,8 @@
     <Style x:Key="MahApps.Styles.WindowButtonCommands.Win10"
            BasedOn="{StaticResource MahApps.Styles.WindowButtonCommands}"
            TargetType="{x:Type Controls:WindowButtonCommands}">
-        <Setter Property="DarkCloseButtonStyle" Value="{DynamicResource MahApps.Styles.Button.MetroWindowClose.Dark.Win10}" />
-        <Setter Property="LightCloseButtonStyle" Value="{DynamicResource MahApps.Styles.Button.MetroWindowClose.Light.Win10}" />
+        <Setter Property="DarkCloseButtonStyle" Value="{DynamicResource MahApps.Styles.Button.MetroWindow.Close.Dark.Win10}" />
+        <Setter Property="LightCloseButtonStyle" Value="{DynamicResource MahApps.Styles.Button.MetroWindow.Close.Light.Win10}" />
         <Setter Property="Template" Value="{StaticResource MahApps.Templates.WindowButtonCommands.Win10}" />
     </Style>
 

From 712e5849b477a43a13986a9a647b6b0c58cc80bd Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Mon, 22 Jul 2019 09:28:22 +0200
Subject: [PATCH 25/46] Fix naming of MahApps.Styles.MetroThumb.RangeSlider.XYZ

---
 src/MahApps.Metro/Themes/RangeSlider.xaml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/MahApps.Metro/Themes/RangeSlider.xaml b/src/MahApps.Metro/Themes/RangeSlider.xaml
index bd97010e32..a70c9db469 100644
--- a/src/MahApps.Metro/Themes/RangeSlider.xaml
+++ b/src/MahApps.Metro/Themes/RangeSlider.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
 
-    <Style x:Key="MahApps.Styles.MetroThumb.RangeSliderHorizontalMiddleThumb" TargetType="{x:Type Controls:MetroThumb}">
+    <Style x:Key="MahApps.Styles.MetroThumb.RangeSlider.HorizontalMiddleThumb" TargetType="{x:Type Controls:MetroThumb}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="IsTabStop" Value="True" />
@@ -18,8 +18,8 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.MetroThumb.RangeSliderVerticalMiddleThumb"
-           BasedOn="{StaticResource MahApps.Styles.MetroThumb.RangeSliderHorizontalMiddleThumb}"
+    <Style x:Key="MahApps.Styles.MetroThumb.RangeSlider.VerticalMiddleThumb"
+           BasedOn="{StaticResource MahApps.Styles.MetroThumb.RangeSlider.HorizontalMiddleThumb}"
            TargetType="{x:Type Controls:MetroThumb}">
         <Setter Property="Template">
             <Setter.Value>
@@ -88,7 +88,7 @@
                                      MinWidth="{TemplateBinding MinRangeWidth}"
                                      Cursor="Hand"
                                      Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillBrush)}"
-                                     Style="{DynamicResource MahApps.Styles.MetroThumb.RangeSliderHorizontalMiddleThumb}" />
+                                     Style="{DynamicResource MahApps.Styles.MetroThumb.RangeSlider.HorizontalMiddleThumb}" />
                 <Controls:MetroThumb x:Name="PART_RightThumb"
                                      Width="{DynamicResource HorizontalThumbWidth}"
                                      Height="{DynamicResource MahApps.Sizes.Slider.HorizontalThumb.Height}"
@@ -208,7 +208,7 @@
                                      MinHeight="{TemplateBinding MinRangeWidth}"
                                      Cursor="Hand"
                                      Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillBrush)}"
-                                     Style="{StaticResource MahApps.Styles.MetroThumb.RangeSliderVerticalMiddleThumb}" />
+                                     Style="{StaticResource MahApps.Styles.MetroThumb.RangeSlider.VerticalMiddleThumb}" />
                 <Controls:MetroThumb x:Name="PART_LeftThumb"
                                      Width="{DynamicResource VerticalThumbWidth}"
                                      Height="{DynamicResource VerticalThumbHeight}"
@@ -299,7 +299,7 @@
 
     <!--  Win10 RangeSlider style  -->
 
-    <Style x:Key="MahApps.Styles.MetroThumb.RangeSliderHorizontalMiddleThumb.Win10" TargetType="{x:Type Controls:MetroThumb}">
+    <Style x:Key="MahApps.Styles.MetroThumb.RangeSlider.HorizontalMiddleThumb.Win10" TargetType="{x:Type Controls:MetroThumb}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="IsTabStop" Value="True" />
@@ -315,8 +315,8 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.MetroThumb.RangeSliderVerticalMiddleThumb.Win10"
-           BasedOn="{StaticResource MahApps.Styles.MetroThumb.RangeSliderHorizontalMiddleThumb.Win10}"
+    <Style x:Key="MahApps.Styles.MetroThumb.RangeSlider.VerticalMiddleThumb.Win10"
+           BasedOn="{StaticResource MahApps.Styles.MetroThumb.RangeSlider.HorizontalMiddleThumb.Win10}"
            TargetType="{x:Type Controls:MetroThumb}">
         <Setter Property="Template">
             <Setter.Value>
@@ -385,7 +385,7 @@
                                      MinWidth="{TemplateBinding MinRangeWidth}"
                                      Cursor="Hand"
                                      Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillBrush)}"
-                                     Style="{DynamicResource MahApps.Styles.MetroThumb.RangeSliderHorizontalMiddleThumb.Win10}" />
+                                     Style="{DynamicResource MahApps.Styles.MetroThumb.RangeSlider.HorizontalMiddleThumb.Win10}" />
                 <Controls:MetroThumb x:Name="PART_RightThumb"
                                      Width="8"
                                      Height="24"
@@ -520,7 +520,7 @@
                                      MinHeight="{TemplateBinding MinRangeWidth}"
                                      Cursor="Hand"
                                      Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillBrush)}"
-                                     Style="{StaticResource MahApps.Styles.MetroThumb.RangeSliderVerticalMiddleThumb.Win10}" />
+                                     Style="{StaticResource MahApps.Styles.MetroThumb.RangeSlider.VerticalMiddleThumb.Win10}" />
                 <Controls:MetroThumb x:Name="PART_LeftThumb"
                                      Width="24"
                                      Height="8"

From af2e0b5b4dafc44110e23eb935f67ddcb3b24de5 Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Mon, 22 Jul 2019 09:46:47 +0200
Subject: [PATCH 26/46] Rename
 MahApps.Styles.Button.Window.Standard.VisualStudio into
 MahApps.Styles.Button.Standard.VisualStudio

---
 src/MahApps.Metro/Styles/VS/Button.xaml | 2 +-
 src/MahApps.Metro/Styles/VS/Styles.xaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/MahApps.Metro/Styles/VS/Button.xaml b/src/MahApps.Metro/Styles/VS/Button.xaml
index a3d96a4f4d..c3b9d2130f 100644
--- a/src/MahApps.Metro/Styles/VS/Button.xaml
+++ b/src/MahApps.Metro/Styles/VS/Button.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <Style x:Key="MahApps.Styles.Button.Window.Standard.VisualStudio" TargetType="Button">
+    <Style x:Key="MahApps.Styles.Button.Standard.VisualStudio" TargetType="Button">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Background.Normal}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Normal}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Foreground}" />
diff --git a/src/MahApps.Metro/Styles/VS/Styles.xaml b/src/MahApps.Metro/Styles/VS/Styles.xaml
index 0a19f9eacd..bd127e81ca 100644
--- a/src/MahApps.Metro/Styles/VS/Styles.xaml
+++ b/src/MahApps.Metro/Styles/VS/Styles.xaml
@@ -13,7 +13,7 @@
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/VS/Expander.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <Style BasedOn="{StaticResource MahApps.Styles.Button.Window.Standard.VisualStudio}" TargetType="Button" />
+    <Style BasedOn="{StaticResource MahApps.Styles.Button.Standard.VisualStudio}" TargetType="Button" />
     <Style BasedOn="{StaticResource MahApps.Styles.ListBox.Standard.VisualStudio}" TargetType="ListBox" />
     <Style BasedOn="{StaticResource MahApps.Styles.MenuItem.Standard.VisualStudio}" TargetType="MenuItem" />
     <Style BasedOn="{StaticResource MahApps.Styles.Menu.Standard.VisualStudio}" TargetType="Menu" />

From fe1fee1c0fc9deb5efd35606a29689176aa2073e Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Mon, 22 Jul 2019 09:49:37 +0200
Subject: [PATCH 27/46] Rename MahApps.Styles.Button.Window.Link.VisualStudio
 into MahApps.Styles.Button.Link.VisualStudio

---
 .../MahApps.Metro.Demo/ExampleWindows/VSDemo.xaml         | 8 ++++----
 src/MahApps.Metro/Styles/VS/Button.xaml                   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/VSDemo.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/VSDemo.xaml
index 319d9f6264..6dd85b1038 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/VSDemo.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/VSDemo.xaml
@@ -424,11 +424,11 @@
                 <Button Margin="0 10 0 3"
                         Content="Fire rocket..."
                         FontSize="14"
-                        Style="{StaticResource MahApps.Styles.Button.Window.Link.VisualStudio}" />
+                        Style="{StaticResource MahApps.Styles.Button.Link.VisualStudio}" />
                 <Button Margin="0 3 0 10"
                         Content="Throw something over board..."
                         FontSize="14"
-                        Style="{StaticResource MahApps.Styles.Button.Window.Link.VisualStudio}" />
+                        Style="{StaticResource MahApps.Styles.Button.Link.VisualStudio}" />
                 <Separator Background="#11FFFFFF" />
                 <TextBlock Margin="0 10 0 10"
                            FontSize="18"
@@ -438,11 +438,11 @@
                 <Button Margin="0 10 0 3"
                         Content="blastallenemies.cmd"
                         FontSize="14"
-                        Style="{StaticResource MahApps.Styles.Button.Window.Link.VisualStudio}" />
+                        Style="{StaticResource MahApps.Styles.Button.Link.VisualStudio}" />
                 <Button Margin="0 3 0 3"
                         Content="verysecretmessage.txt"
                         FontSize="14"
-                        Style="{StaticResource MahApps.Styles.Button.Window.Link.VisualStudio}" />
+                        Style="{StaticResource MahApps.Styles.Button.Link.VisualStudio}" />
             </StackPanel>
         </Grid>
     </DockPanel>
diff --git a/src/MahApps.Metro/Styles/VS/Button.xaml b/src/MahApps.Metro/Styles/VS/Button.xaml
index c3b9d2130f..2f53af0c1f 100644
--- a/src/MahApps.Metro/Styles/VS/Button.xaml
+++ b/src/MahApps.Metro/Styles/VS/Button.xaml
@@ -34,7 +34,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.Button.Window.Link.VisualStudio" TargetType="Button">
+    <Style x:Key="MahApps.Styles.Button.Link.VisualStudio" TargetType="Button">
         <Setter Property="Cursor" Value="Hand" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.LinkButton.Foreground}" />
         <Setter Property="Template">

From 7aef12579dee90d6cb0b78415effab85cb29e64d Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Mon, 22 Jul 2019 09:55:00 +0200
Subject: [PATCH 28/46] Introduce
 MahApps.Styles.ListBoxItem.Standard.VisualStudio

---
 src/MahApps.Metro/Styles/VS/ListBox.xaml | 61 ++++++++++++------------
 src/MahApps.Metro/Styles/VS/Styles.xaml  |  1 +
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/MahApps.Metro/Styles/VS/ListBox.xaml b/src/MahApps.Metro/Styles/VS/ListBox.xaml
index 94bf601cf8..c6f41fce07 100644
--- a/src/MahApps.Metro/Styles/VS/ListBox.xaml
+++ b/src/MahApps.Metro/Styles/VS/ListBox.xaml
@@ -4,40 +4,39 @@
     <Style x:Key="MahApps.Styles.ListBox.Standard.VisualStudio" TargetType="{x:Type ListBox}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />
-        <Style.Resources>
-            <Style TargetType="{x:Type ListBoxItem}">
-                <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Background.Normal}" />
-                <Setter Property="BorderBrush" Value="Transparent" />
-                <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type ListBoxItem}">
-                            <Grid Margin="4 0 4 4">
-                                <Border Background="{TemplateBinding Background}"
+    </Style>
+
+    <Style x:Key="MahApps.Styles.ListBoxItem.Standard.VisualStudio" TargetType="{x:Type ListBoxItem}">
+        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Background.Normal}" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ListBoxItem}">
+                    <Grid Margin="4 0 4 4">
+                        <Border Background="{TemplateBinding Background}"
                                         BorderBrush="{TemplateBinding BorderBrush}"
                                         BorderThickness="1"
                                         SnapsToDevicePixels="True" />
-                                <ContentPresenter Margin="8 5" />
-                            </Grid>
-                            <ControlTemplate.Triggers>
-                                <MultiTrigger>
-                                    <MultiTrigger.Conditions>
-                                        <Condition Property="IsMouseOver" Value="True" />
-                                        <Condition Property="IsSelected" Value="False" />
-                                    </MultiTrigger.Conditions>
-                                    <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.BackgroundHighlighted}" />
-                                    <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Highlighted}" />
-                                </MultiTrigger>
-                                <Trigger Property="IsSelected" Value="True">
-                                    <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.BackgroundSelected}" />
-                                    <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Selected}" />
-                                </Trigger>
-                            </ControlTemplate.Triggers>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
-        </Style.Resources>
+                        <ContentPresenter Margin="8 5" />
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsMouseOver" Value="True" />
+                                <Condition Property="IsSelected" Value="False" />
+                            </MultiTrigger.Conditions>
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.BackgroundHighlighted}" />
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Highlighted}" />
+                        </MultiTrigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.BackgroundSelected}" />
+                            <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Selected}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
     </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/VS/Styles.xaml b/src/MahApps.Metro/Styles/VS/Styles.xaml
index bd127e81ca..e1970f9505 100644
--- a/src/MahApps.Metro/Styles/VS/Styles.xaml
+++ b/src/MahApps.Metro/Styles/VS/Styles.xaml
@@ -15,6 +15,7 @@
 
     <Style BasedOn="{StaticResource MahApps.Styles.Button.Standard.VisualStudio}" TargetType="Button" />
     <Style BasedOn="{StaticResource MahApps.Styles.ListBox.Standard.VisualStudio}" TargetType="ListBox" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ListBoxItem.Standard.VisualStudio}" TargetType="ListBoxItem" />
     <Style BasedOn="{StaticResource MahApps.Styles.MenuItem.Standard.VisualStudio}" TargetType="MenuItem" />
     <Style BasedOn="{StaticResource MahApps.Styles.Menu.Standard.VisualStudio}" TargetType="Menu" />
     <Style BasedOn="{StaticResource MahApps.Styles.ScrollBar.Standard.VisualStudio}" TargetType="ScrollBar" />

From 297fde33bed0b21bf4e751538eb1d0bc84b37093 Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Mon, 22 Jul 2019 10:05:29 +0200
Subject: [PATCH 29/46] Rename .Standard.VisualStudio into .VisualStudio only

---
 src/MahApps.Metro/Styles/VS/Button.xaml     |  2 +-
 src/MahApps.Metro/Styles/VS/Expander.xaml   |  2 +-
 src/MahApps.Metro/Styles/VS/GroupBox.xaml   |  2 +-
 src/MahApps.Metro/Styles/VS/ListBox.xaml    |  4 ++--
 src/MahApps.Metro/Styles/VS/Menu.xaml       |  4 ++--
 src/MahApps.Metro/Styles/VS/ScrollBar.xaml  |  2 +-
 src/MahApps.Metro/Styles/VS/Styles.xaml     | 22 ++++++++++-----------
 src/MahApps.Metro/Styles/VS/TabControl.xaml | 10 +++++-----
 src/MahApps.Metro/Styles/VS/TextBox.xaml    |  4 ++--
 src/MahApps.Metro/Styles/VS/Window.xaml     |  1 +
 10 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/src/MahApps.Metro/Styles/VS/Button.xaml b/src/MahApps.Metro/Styles/VS/Button.xaml
index 2f53af0c1f..0d4742cfb9 100644
--- a/src/MahApps.Metro/Styles/VS/Button.xaml
+++ b/src/MahApps.Metro/Styles/VS/Button.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <Style x:Key="MahApps.Styles.Button.Standard.VisualStudio" TargetType="Button">
+    <Style x:Key="MahApps.Styles.Button.VisualStudio" TargetType="Button">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Background.Normal}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Normal}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Foreground}" />
diff --git a/src/MahApps.Metro/Styles/VS/Expander.xaml b/src/MahApps.Metro/Styles/VS/Expander.xaml
index 53682057a4..c494ffcbf1 100644
--- a/src/MahApps.Metro/Styles/VS/Expander.xaml
+++ b/src/MahApps.Metro/Styles/VS/Expander.xaml
@@ -323,7 +323,7 @@
         </ObjectAnimationUsingKeyFrames>
     </Storyboard>
 
-    <Style x:Key="MahApps.Styles.Expander.Standard.VisualStudio" TargetType="{x:Type Expander}">
+    <Style x:Key="MahApps.Styles.Expander.VisualStudio" TargetType="{x:Type Expander}">
         <Setter Property="Background" Value="{x:Null}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Normal}" />
         <Setter Property="BorderThickness" Value="2" />
diff --git a/src/MahApps.Metro/Styles/VS/GroupBox.xaml b/src/MahApps.Metro/Styles/VS/GroupBox.xaml
index 35e6046370..d12d674c2c 100644
--- a/src/MahApps.Metro/Styles/VS/GroupBox.xaml
+++ b/src/MahApps.Metro/Styles/VS/GroupBox.xaml
@@ -6,7 +6,7 @@
     <Thickness x:Key="GroupBoxHeaderThemePadding">2</Thickness>
     <System:Double x:Key="MahApps.Sizes.GroupBox.HeaderThemeFont">16</System:Double>
 
-    <Style x:Key="MahApps.Styles.GroupBox.Standard.VisualStudio" TargetType="{x:Type GroupBox}">
+    <Style x:Key="MahApps.Styles.GroupBox.VisualStudio" TargetType="{x:Type GroupBox}">
         <Setter Property="Background" Value="{x:Null}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Normal}" />
         <Setter Property="BorderThickness" Value="2" />
diff --git a/src/MahApps.Metro/Styles/VS/ListBox.xaml b/src/MahApps.Metro/Styles/VS/ListBox.xaml
index c6f41fce07..895ffa8114 100644
--- a/src/MahApps.Metro/Styles/VS/ListBox.xaml
+++ b/src/MahApps.Metro/Styles/VS/ListBox.xaml
@@ -1,12 +1,12 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <Style x:Key="MahApps.Styles.ListBox.Standard.VisualStudio" TargetType="{x:Type ListBox}">
+    <Style x:Key="MahApps.Styles.ListBox.VisualStudio" TargetType="{x:Type ListBox}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.ListBoxItem.Standard.VisualStudio" TargetType="{x:Type ListBoxItem}">
+    <Style x:Key="MahApps.Styles.ListBoxItem.VisualStudio" TargetType="{x:Type ListBoxItem}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Background.Normal}" />
         <Setter Property="BorderBrush" Value="Transparent" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
diff --git a/src/MahApps.Metro/Styles/VS/Menu.xaml b/src/MahApps.Metro/Styles/VS/Menu.xaml
index e20977c1f4..8c3256e6e0 100644
--- a/src/MahApps.Metro/Styles/VS/Menu.xaml
+++ b/src/MahApps.Metro/Styles/VS/Menu.xaml
@@ -14,12 +14,12 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.Menu.Standard.VisualStudio" TargetType="{x:Type Menu}">
+    <Style x:Key="MahApps.Styles.Menu.VisualStudio" TargetType="{x:Type Menu}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.LightBackground}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Foreground}" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.MenuItem.Standard.VisualStudio" TargetType="{x:Type MenuItem}">
+    <Style x:Key="MahApps.Styles.MenuItem.VisualStudio" TargetType="{x:Type MenuItem}">
         <Setter Property="Foreground" Value="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Menu}}}" />
         <Setter Property="Template">
             <Setter.Value>
diff --git a/src/MahApps.Metro/Styles/VS/ScrollBar.xaml b/src/MahApps.Metro/Styles/VS/ScrollBar.xaml
index 50c07ad36f..4800d05bbf 100644
--- a/src/MahApps.Metro/Styles/VS/ScrollBar.xaml
+++ b/src/MahApps.Metro/Styles/VS/ScrollBar.xaml
@@ -137,7 +137,7 @@
         </Grid>
     </ControlTemplate>
 
-    <Style x:Key="MahApps.Styles.ScrollBar.Standard.VisualStudio" TargetType="{x:Type ScrollBar}">
+    <Style x:Key="MahApps.Styles.ScrollBar.VisualStudio" TargetType="{x:Type ScrollBar}">
         <Setter Property="OverridesDefaultStyle" Value="true" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Style.Triggers>
diff --git a/src/MahApps.Metro/Styles/VS/Styles.xaml b/src/MahApps.Metro/Styles/VS/Styles.xaml
index e1970f9505..fed896f729 100644
--- a/src/MahApps.Metro/Styles/VS/Styles.xaml
+++ b/src/MahApps.Metro/Styles/VS/Styles.xaml
@@ -13,16 +13,16 @@
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/VS/Expander.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <Style BasedOn="{StaticResource MahApps.Styles.Button.Standard.VisualStudio}" TargetType="Button" />
-    <Style BasedOn="{StaticResource MahApps.Styles.ListBox.Standard.VisualStudio}" TargetType="ListBox" />
-    <Style BasedOn="{StaticResource MahApps.Styles.ListBoxItem.Standard.VisualStudio}" TargetType="ListBoxItem" />
-    <Style BasedOn="{StaticResource MahApps.Styles.MenuItem.Standard.VisualStudio}" TargetType="MenuItem" />
-    <Style BasedOn="{StaticResource MahApps.Styles.Menu.Standard.VisualStudio}" TargetType="Menu" />
-    <Style BasedOn="{StaticResource MahApps.Styles.ScrollBar.Standard.VisualStudio}" TargetType="ScrollBar" />
-    <Style BasedOn="{StaticResource MahApps.Styles.TabItem.Standard.VisualStudio}" TargetType="TabItem" />
-    <Style BasedOn="{StaticResource MahApps.Styles.TabControl.Standard.VisualStudio}" TargetType="TabControl" />
-    <Style BasedOn="{StaticResource MahApps.Styles.TextBox.Standard.VisualStudio}" TargetType="TextBox" />
-    <Style BasedOn="{StaticResource MahApps.Styles.GroupBox.Standard.VisualStudio}" TargetType="GroupBox" />
-    <Style BasedOn="{StaticResource MahApps.Styles.Expander.Standard.VisualStudio}" TargetType="Expander" />
+    <Style BasedOn="{StaticResource MahApps.Styles.Button.VisualStudio}" TargetType="Button" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ListBox.VisualStudio}" TargetType="ListBox" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ListBoxItem.VisualStudio}" TargetType="ListBoxItem" />
+    <Style BasedOn="{StaticResource MahApps.Styles.MenuItem.VisualStudio}" TargetType="MenuItem" />
+    <Style BasedOn="{StaticResource MahApps.Styles.Menu.VisualStudio}" TargetType="Menu" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ScrollBar.VisualStudio}" TargetType="ScrollBar" />
+    <Style BasedOn="{StaticResource MahApps.Styles.TabItem.VisualStudio}" TargetType="TabItem" />
+    <Style BasedOn="{StaticResource MahApps.Styles.TabControl.VisualStudio}" TargetType="TabControl" />
+    <Style BasedOn="{StaticResource MahApps.Styles.TextBox.VisualStudio}" TargetType="TextBox" />
+    <Style BasedOn="{StaticResource MahApps.Styles.GroupBox.VisualStudio}" TargetType="GroupBox" />
+    <Style BasedOn="{StaticResource MahApps.Styles.Expander.VisualStudio}" TargetType="Expander" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/VS/TabControl.xaml b/src/MahApps.Metro/Styles/VS/TabControl.xaml
index 2567cb280f..c8a714ba5b 100644
--- a/src/MahApps.Metro/Styles/VS/TabControl.xaml
+++ b/src/MahApps.Metro/Styles/VS/TabControl.xaml
@@ -11,7 +11,7 @@
 
     <System:Double x:Key="MahApps.Sizes.Font.TabItem">12</System:Double>
 
-    <Style x:Key="MahApps.Styles.TabControl.Standard.VisualStudio"
+    <Style x:Key="MahApps.Styles.TabControl.VisualStudio"
            BasedOn="{StaticResource MahApps.Styles.TabControl}"
            TargetType="{x:Type TabControl}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Background}" />
@@ -99,7 +99,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.Button.TabItemClose.Standard.VisualStudio" TargetType="{x:Type Button}">
+    <Style x:Key="MahApps.Styles.Button.TabItemClose.VisualStudio" TargetType="{x:Type Button}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Cursor" Value="Hand" />
         <Setter Property="Focusable" Value="False" />
@@ -139,7 +139,7 @@
         <Setter Property="Width" Value="15" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.TabItem.Standard.VisualStudio"
+    <Style x:Key="MahApps.Styles.TabItem.VisualStudio"
            BasedOn="{StaticResource MahApps.Styles.TabItem}"
            TargetType="{x:Type TabItem}">
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Border.Normal}" />
@@ -176,7 +176,7 @@
                             <Button x:Name="PART_CloseButton"
                                     VerticalAlignment="Center"
                                     IsTabStop="False"
-                                    Style="{DynamicResource MahApps.Styles.Button.TabItemClose.Standard.VisualStudio}"
+                                    Style="{DynamicResource MahApps.Styles.Button.TabItemClose.VisualStudio}"
                                     Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TabControlHelper.CloseButtonEnabled), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}">
                                 <i:Interaction.Triggers>
                                     <i:EventTrigger EventName="Click">
@@ -260,7 +260,7 @@
                     IsSynchronizedWithCurrentItem="True"
                     ItemTemplate="{StaticResource MahApps.Templates.TabItem.Closable.VisualStudio}"
                     ItemsSource="{Binding}"
-                    Style="{DynamicResource MahApps.Styles.TabControl.Standard.VisualStudio}" />
+                    Style="{DynamicResource MahApps.Styles.TabControl.VisualStudio}" />
     </DataTemplate>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/VS/TextBox.xaml b/src/MahApps.Metro/Styles/VS/TextBox.xaml
index 0e00d91c38..558ca41d6e 100644
--- a/src/MahApps.Metro/Styles/VS/TextBox.xaml
+++ b/src/MahApps.Metro/Styles/VS/TextBox.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <Style x:Key="MahApps.Styles.TextBox.Standard.VisualStudio" TargetType="{x:Type TextBox}">
+    <Style x:Key="MahApps.Styles.TextBox.VisualStudio" TargetType="{x:Type TextBox}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TextBox.Background}" />
         <Setter Property="CaretBrush" Value="{DynamicResource MahApps.Brushes.Foreground}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Foreground}" />
@@ -28,7 +28,7 @@
     </Style>
 
     <Style x:Key="MahApps.Styles.TextBox.Search.VisualStudio"
-           BasedOn="{StaticResource MahApps.Styles.TextBox.Standard.VisualStudio}"
+           BasedOn="{StaticResource MahApps.Styles.TextBox.VisualStudio}"
            TargetType="{x:Type TextBox}">
         <Setter Property="Template">
             <Setter.Value>
diff --git a/src/MahApps.Metro/Styles/VS/Window.xaml b/src/MahApps.Metro/Styles/VS/Window.xaml
index 9b69c990b0..4b4c55d5ff 100644
--- a/src/MahApps.Metro/Styles/VS/Window.xaml
+++ b/src/MahApps.Metro/Styles/VS/Window.xaml
@@ -4,6 +4,7 @@
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.Buttons.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.TextBox.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="MahApps.Styles.MetroWindow.VisualStudio" TargetType="{x:Type Controls:MetroWindow}">

From c63a73b8c639d9664a760e3ae4428202d97a20c7 Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Mon, 22 Jul 2019 10:06:39 +0200
Subject: [PATCH 30/46] Fix overriding MahApps.Storyboard.MetroExpanderCollapse

---
 src/MahApps.Metro.Samples/MahApps.Metro.Demo/App.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/App.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/App.xaml
index 73865c7537..27e59517f8 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/App.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/App.xaml
@@ -23,7 +23,7 @@
             </Style>
 
             <!--  quick change of the collapse storyboard duration  -->
-            <Storyboard x:Key="MetroExpanderCollapseStoryboard">
+            <Storyboard x:Key="MahApps.Storyboard.MetroExpanderCollapse">
                 <DoubleAnimation Storyboard.TargetName="ExpandSite"
                                  Storyboard.TargetProperty="(UIElement.Opacity)"
                                  To="0"

From ea610120a7f8ce9f7553c3336ee7c6aeef45c237 Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Mon, 22 Jul 2019 10:08:55 +0200
Subject: [PATCH 31/46] Rename
 MahApps.Styles.ButtonBase.FocusVisualStyle.MetroCircle into
 MahApps.Styles.ButtonBase.FocusVisualStyle.Circle

---
 src/MahApps.Metro/Styles/Controls.Buttons.xaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/MahApps.Metro/Styles/Controls.Buttons.xaml b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
index ddbeafbe56..da1a1029d2 100644
--- a/src/MahApps.Metro/Styles/Controls.Buttons.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
@@ -144,7 +144,7 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="MahApps.Styles.ButtonBase.FocusVisualStyle.MetroCircle">
+    <Style x:Key="MahApps.Styles.ButtonBase.FocusVisualStyle.Circle">
         <Setter Property="Control.Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Control}">
@@ -164,7 +164,7 @@
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray3}" />
         <Setter Property="BorderThickness" Value="2" />
-        <Setter Property="FocusVisualStyle" Value="{StaticResource MahApps.Styles.ButtonBase.FocusVisualStyle.MetroCircle}" />
+        <Setter Property="FocusVisualStyle" Value="{StaticResource MahApps.Styles.ButtonBase.FocusVisualStyle.Circle}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="Padding" Value="1" />
         <Setter Property="Template">
@@ -606,7 +606,7 @@
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray3}" />
         <Setter Property="BorderThickness" Value="2" />
-        <Setter Property="FocusVisualStyle" Value="{StaticResource MahApps.Styles.ButtonBase.FocusVisualStyle.MetroCircle}" />
+        <Setter Property="FocusVisualStyle" Value="{StaticResource MahApps.Styles.ButtonBase.FocusVisualStyle.Circle}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="Padding" Value="1" />

From d75713e6c4e116686b79935db66f8caa33f810c9 Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Mon, 22 Jul 2019 10:13:43 +0200
Subject: [PATCH 32/46] Rename MahApps.Styles.ButtonBase.Metro into
 MahApps.Styles.ButtonBase

---
 src/MahApps.Metro/Styles/Controls.Buttons.xaml | 2 +-
 src/MahApps.Metro/Styles/Controls.xaml         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/MahApps.Metro/Styles/Controls.Buttons.xaml b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
index da1a1029d2..0b0f96e17f 100644
--- a/src/MahApps.Metro/Styles/Controls.Buttons.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
@@ -384,7 +384,7 @@
     </Style>
 
     <!--  style for default button  -->
-    <Style x:Key="MahApps.Styles.ButtonBase.Metro" TargetType="{x:Type ButtonBase}">
+    <Style x:Key="MahApps.Styles.ButtonBase" TargetType="{x:Type ButtonBase}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Gray10}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
diff --git a/src/MahApps.Metro/Styles/Controls.xaml b/src/MahApps.Metro/Styles/Controls.xaml
index a6ae75b22c..42d036758e 100644
--- a/src/MahApps.Metro/Styles/Controls.xaml
+++ b/src/MahApps.Metro/Styles/Controls.xaml
@@ -81,8 +81,8 @@
 
     <Style BasedOn="{StaticResource MahApps.Styles.CustomValidationPopup}" TargetType="{x:Type Controls:CustomValidationPopup}" />
     <Style BasedOn="{StaticResource MahApps.Styles.ToolTip}" TargetType="ToolTip" />
-    <Style BasedOn="{StaticResource MahApps.Styles.ButtonBase.Metro}" TargetType="Button" />
-    <Style BasedOn="{StaticResource MahApps.Styles.ButtonBase.Metro}" TargetType="RepeatButton" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ButtonBase}" TargetType="Button" />
+    <Style BasedOn="{StaticResource MahApps.Styles.ButtonBase}" TargetType="RepeatButton" />
     <Style BasedOn="{StaticResource MahApps.Styles.ToggleButton}" TargetType="ToggleButton" />
     <Style BasedOn="{StaticResource MahApps.Styles.TextBox}" TargetType="TextBox" />
     <Style BasedOn="{StaticResource MahApps.Styles.RichTextBox}" TargetType="RichTextBox" />

From 8227a4b5075a8b27150fa41626126c8a9cc9e5d0 Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Mon, 22 Jul 2019 10:16:53 +0200
Subject: [PATCH 33/46] Rename MahApps.Storyboard.MetroExpanderExpand into
 MahApps.Storyboard.ExpanderExpand

---
 src/MahApps.Metro/Styles/Controls.Expander.xaml | 4 ++--
 src/MahApps.Metro/Styles/VS/Expander.xaml       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/MahApps.Metro/Styles/Controls.Expander.xaml b/src/MahApps.Metro/Styles/Controls.Expander.xaml
index af6eeca30e..8041cfb88c 100644
--- a/src/MahApps.Metro/Styles/Controls.Expander.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Expander.xaml
@@ -303,7 +303,7 @@
         </Setter>
     </Style>
 
-    <Storyboard x:Key="MahApps.Storyboard.MetroExpanderExpand">
+    <Storyboard x:Key="MahApps.Storyboard.ExpanderExpand">
         <DoubleAnimation Storyboard.TargetName="ExpandSite"
                          Storyboard.TargetProperty="(UIElement.Opacity)"
                          To="1"
@@ -418,7 +418,7 @@
                         <Trigger Property="IsExpanded" Value="true">
                             <Setter TargetName="ExpandSite" Property="Visibility" Value="Visible" />
                             <Trigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.MetroExpanderExpand}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.ExpanderExpand}" />
                             </Trigger.EnterActions>
                             <Trigger.ExitActions>
                                 <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.MetroExpanderCollapse}" />
diff --git a/src/MahApps.Metro/Styles/VS/Expander.xaml b/src/MahApps.Metro/Styles/VS/Expander.xaml
index c494ffcbf1..26db5b3bfb 100644
--- a/src/MahApps.Metro/Styles/VS/Expander.xaml
+++ b/src/MahApps.Metro/Styles/VS/Expander.xaml
@@ -303,7 +303,7 @@
         </Setter>
     </Style>
 
-    <Storyboard x:Key="MahApps.Storyboard.MetroExpanderExpand">
+    <Storyboard x:Key="MahApps.Storyboard.ExpanderExpand">
         <DoubleAnimation Storyboard.TargetName="ExpandSite"
                          Storyboard.TargetProperty="(UIElement.Opacity)"
                          To="1"
@@ -401,7 +401,7 @@
                         <Trigger Property="IsExpanded" Value="True">
                             <Setter TargetName="ExpandSite" Property="Visibility" Value="Visible" />
                             <Trigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.MetroExpanderExpand}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.ExpanderExpand}" />
                             </Trigger.EnterActions>
                             <Trigger.ExitActions>
                                 <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.MetroExpanderCollapse}" />

From 13b992ab3bbc662c29ec174c44689f085c0d563a Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Mon, 22 Jul 2019 10:17:44 +0200
Subject: [PATCH 34/46] Rename MahApps.Storyboard.MetroExpanderCollapse into
 MahApps.Storyboard.ExpanderCollapse

---
 src/MahApps.Metro.Samples/MahApps.Metro.Demo/App.xaml | 2 +-
 src/MahApps.Metro/Styles/Controls.Expander.xaml       | 4 ++--
 src/MahApps.Metro/Styles/VS/Expander.xaml             | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/App.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/App.xaml
index 27e59517f8..90fef7dc62 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/App.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/App.xaml
@@ -23,7 +23,7 @@
             </Style>
 
             <!--  quick change of the collapse storyboard duration  -->
-            <Storyboard x:Key="MahApps.Storyboard.MetroExpanderCollapse">
+            <Storyboard x:Key="MahApps.Storyboard.ExpanderCollapse">
                 <DoubleAnimation Storyboard.TargetName="ExpandSite"
                                  Storyboard.TargetProperty="(UIElement.Opacity)"
                                  To="0"
diff --git a/src/MahApps.Metro/Styles/Controls.Expander.xaml b/src/MahApps.Metro/Styles/Controls.Expander.xaml
index 8041cfb88c..48f5c7a739 100644
--- a/src/MahApps.Metro/Styles/Controls.Expander.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Expander.xaml
@@ -313,7 +313,7 @@
         </ObjectAnimationUsingKeyFrames>
     </Storyboard>
 
-    <Storyboard x:Key="MahApps.Storyboard.MetroExpanderCollapse">
+    <Storyboard x:Key="MahApps.Storyboard.ExpanderCollapse">
         <DoubleAnimation Storyboard.TargetName="ExpandSite"
                          Storyboard.TargetProperty="(UIElement.Opacity)"
                          To="0"
@@ -421,7 +421,7 @@
                                 <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.ExpanderExpand}" />
                             </Trigger.EnterActions>
                             <Trigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.MetroExpanderCollapse}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.ExpanderCollapse}" />
                             </Trigger.ExitActions>
                         </Trigger>
                         <Trigger Property="ExpandDirection" Value="Right">
diff --git a/src/MahApps.Metro/Styles/VS/Expander.xaml b/src/MahApps.Metro/Styles/VS/Expander.xaml
index 26db5b3bfb..1dfddd223b 100644
--- a/src/MahApps.Metro/Styles/VS/Expander.xaml
+++ b/src/MahApps.Metro/Styles/VS/Expander.xaml
@@ -313,7 +313,7 @@
         </ObjectAnimationUsingKeyFrames>
     </Storyboard>
 
-    <Storyboard x:Key="MahApps.Storyboard.MetroExpanderCollapse">
+    <Storyboard x:Key="MahApps.Storyboard.ExpanderCollapse">
         <DoubleAnimation Storyboard.TargetName="ExpandSite"
                          Storyboard.TargetProperty="(UIElement.Opacity)"
                          To="0"
@@ -404,7 +404,7 @@
                                 <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.ExpanderExpand}" />
                             </Trigger.EnterActions>
                             <Trigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.MetroExpanderCollapse}" />
+                                <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.ExpanderCollapse}" />
                             </Trigger.ExitActions>
                         </Trigger>
                         <Trigger Property="ExpandDirection" Value="Right">

From f75cd1ad486fa91313abb1da14ea980c8881258c Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Mon, 22 Jul 2019 10:19:20 +0200
Subject: [PATCH 35/46] Rename MahApps.Storyboard.MetroScrollBarThumbMouseOver
 into MahApps.Storyboard.ScrollBarThumbMouseOver

---
 src/MahApps.Metro/Styles/Controls.Scrollbars.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml b/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
index 5d4d5f7f3a..23a1de6793 100644
--- a/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
@@ -4,7 +4,7 @@
                     xmlns:System="clr-namespace:System;assembly=mscorlib"
                     xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options">
 
-    <Storyboard x:Key="MahApps.Storyboard.MetroScrollBarThumbMouseOver" po:Freeze="True">
+    <Storyboard x:Key="MahApps.Storyboard.ScrollBarThumbMouseOver" po:Freeze="True">
         <DoubleAnimationUsingKeyFrames Storyboard.TargetName="MouseOverRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
             <EasingDoubleKeyFrame KeyTime="0:0:0.15" Value="0.6" />
         </DoubleAnimationUsingKeyFrames>
@@ -107,7 +107,7 @@
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualState x:Name="Normal" />
-                                <VisualState x:Name="MouseOver" Storyboard="{StaticResource MahApps.Storyboard.MetroScrollBarThumbMouseOver}" />
+                                <VisualState x:Name="MouseOver" Storyboard="{StaticResource MahApps.Storyboard.ScrollBarThumbMouseOver}" />
                                 <VisualState x:Name="Pressed" Storyboard="{StaticResource MahApps.Storyboard.MetroScrollBarThumbPressed}" />
                                 <VisualState x:Name="Disabled" />
                             </VisualStateGroup>

From 4a800622ff878baa80c23527a9866b3747b00b4e Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Mon, 22 Jul 2019 10:19:51 +0200
Subject: [PATCH 36/46] Rename MahApps.Storyboard.MetroScrollBarThumbPressed
 into MahApps.Storyboard.ScrollBarThumbPressed

---
 src/MahApps.Metro/Styles/Controls.Scrollbars.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml b/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
index 23a1de6793..0463a2d516 100644
--- a/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
@@ -10,7 +10,7 @@
         </DoubleAnimationUsingKeyFrames>
     </Storyboard>
 
-    <Storyboard x:Key="MahApps.Storyboard.MetroScrollBarThumbPressed" po:Freeze="True">
+    <Storyboard x:Key="MahApps.Storyboard.ScrollBarThumbPressed" po:Freeze="True">
         <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PressedRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
             <EasingDoubleKeyFrame KeyTime="0:0:0.15" Value="0.8" />
         </DoubleAnimationUsingKeyFrames>
@@ -108,7 +108,7 @@
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualState x:Name="Normal" />
                                 <VisualState x:Name="MouseOver" Storyboard="{StaticResource MahApps.Storyboard.ScrollBarThumbMouseOver}" />
-                                <VisualState x:Name="Pressed" Storyboard="{StaticResource MahApps.Storyboard.MetroScrollBarThumbPressed}" />
+                                <VisualState x:Name="Pressed" Storyboard="{StaticResource MahApps.Storyboard.ScrollBarThumbPressed}" />
                                 <VisualState x:Name="Disabled" />
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>

From 77fe7fe3b159072ed4b7503dc648e097cc156751 Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Mon, 22 Jul 2019 10:34:34 +0200
Subject: [PATCH 37/46] Rename MahApps.Styles.ButtonBase.DialogsAccent into
 MahApps.Styles.Button.Dialogs.Accent

---
 src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml      | 2 +-
 src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml      | 2 +-
 src/MahApps.Metro/Controls/Dialogs/MessageDialog.xaml.cs | 2 +-
 src/MahApps.Metro/Controls/Dialogs/ProgressDialog.xaml   | 2 +-
 src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml    | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml b/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml
index 435c7b14fa..ab1affc1d5 100644
--- a/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml
+++ b/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml
@@ -32,7 +32,7 @@
             <Button x:Name="PART_AffirmativeButton"
                     Margin="0 0 5 0"
                     Content="{Binding AffirmativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:InputDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
-                    Style="{DynamicResource MahApps.Styles.ButtonBase.DialogsAccent}" />
+                    Style="{DynamicResource MahApps.Styles.Button.Dialogs.Accent}" />
             <Button x:Name="PART_NegativeButton"
                     Margin="5 0 5 0"
                     Content="{Binding NegativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:InputDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
diff --git a/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml b/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml
index 50539873c3..6e65385735 100644
--- a/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml
+++ b/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml
@@ -51,7 +51,7 @@
             <Button x:Name="PART_AffirmativeButton"
                     Margin="0 0 5 0"
                     Content="{Binding AffirmativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
-                    Style="{DynamicResource MahApps.Styles.ButtonBase.DialogsAccent}" />
+                    Style="{DynamicResource MahApps.Styles.Button.Dialogs.Accent}" />
             <Button x:Name="PART_NegativeButton"
                     Margin="5 0 5 0"
                     Content="{Binding NegativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
diff --git a/src/MahApps.Metro/Controls/Dialogs/MessageDialog.xaml.cs b/src/MahApps.Metro/Controls/Dialogs/MessageDialog.xaml.cs
index f59269c4ea..0b3184f3e3 100644
--- a/src/MahApps.Metro/Controls/Dialogs/MessageDialog.xaml.cs
+++ b/src/MahApps.Metro/Controls/Dialogs/MessageDialog.xaml.cs
@@ -11,7 +11,7 @@ namespace MahApps.Metro.Controls.Dialogs
     /// </summary>
     public partial class MessageDialog : BaseMetroDialog
     {
-        private const string ACCENT_BUTTON_STYLE = "MahApps.Styles.ButtonBase.DialogsAccent";
+        private const string ACCENT_BUTTON_STYLE = "MahApps.Styles.Button.Dialogs.Accent";
         private const string ACCENT_HIGHLIGHT_BUTTON_STYLE = "MahApps.Styles.ButtonBase.DialogsAccentHighlight";
 
         /// <summary>Identifies the <see cref="Message"/> dependency property.</summary>
diff --git a/src/MahApps.Metro/Controls/Dialogs/ProgressDialog.xaml b/src/MahApps.Metro/Controls/Dialogs/ProgressDialog.xaml
index 20127f86bc..31e2d22f11 100644
--- a/src/MahApps.Metro/Controls/Dialogs/ProgressDialog.xaml
+++ b/src/MahApps.Metro/Controls/Dialogs/ProgressDialog.xaml
@@ -25,7 +25,7 @@
                         Margin="5 0 0 0"
                         Content="{Binding NegativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:ProgressDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                         Cursor="Arrow"
-                        Style="{DynamicResource MahApps.Styles.ButtonBase.DialogsAccent}"
+                        Style="{DynamicResource MahApps.Styles.Button.Dialogs.Accent}"
                         Visibility="Hidden" />
             </StackPanel>
         </Grid>
diff --git a/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml b/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml
index 5a2ff70372..e3ea65637e 100644
--- a/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml
+++ b/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml
@@ -9,14 +9,14 @@
 
     <Style x:Key="MahApps.Styles.Button.Dialogs"
            BasedOn="{StaticResource MahApps.Styles.ButtonBase.Square}"
-           TargetType="{x:Type Button}">
+           TargetType="{x:Type ButtonBase}">
         <Setter Property="MinHeight" Value="35" />
         <Setter Property="MinWidth" Value="80" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="controls:ControlsHelper.ContentCharacterCasing" Value="Normal" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.ButtonBase.DialogsAccent"
+    <Style x:Key="MahApps.Styles.Button.Dialogs.Accent"
            BasedOn="{StaticResource MahApps.Styles.ButtonBase.AccentedSquare}"
            TargetType="{x:Type ButtonBase}">
         <Setter Property="MinHeight" Value="35" />

From 365e215a4ccbaba6802995c8651dbae86d38f439 Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Mon, 22 Jul 2019 10:36:51 +0200
Subject: [PATCH 38/46] Rename MahApps.Styles.ButtonBase.DialogsAccentHighlight
 into MahApps.Styles.Button.Dialogs.AccentHighlight

---
 src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml.cs   | 2 +-
 src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml.cs   | 2 +-
 src/MahApps.Metro/Controls/Dialogs/MessageDialog.xaml.cs | 2 +-
 src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml.cs b/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml.cs
index cf2f424018..dac9b35467 100644
--- a/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml.cs
+++ b/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml.cs
@@ -169,7 +169,7 @@ protected override void OnLoaded()
             switch (this.DialogSettings.ColorScheme)
             {
                 case MetroDialogColorScheme.Accented:
-                    this.PART_NegativeButton.SetResourceReference(StyleProperty, "MahApps.Styles.ButtonBase.DialogsAccentHighlight");
+                    this.PART_NegativeButton.SetResourceReference(StyleProperty, "MahApps.Styles.Button.Dialogs.AccentHighlight");
                     this.PART_TextBox.SetResourceReference(ForegroundProperty, "MahApps.Brushes.BlackColor");
                     this.PART_TextBox.SetResourceReference(ControlsHelper.FocusBorderBrushProperty, "MahApps.Brushes.TextBox.FocusBorder");
                     break;
diff --git a/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml.cs b/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml.cs
index c446ba1681..7bade76412 100644
--- a/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml.cs
+++ b/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml.cs
@@ -291,7 +291,7 @@ protected override void OnLoaded()
             switch (this.DialogSettings.ColorScheme)
             {
                 case MetroDialogColorScheme.Accented:
-                    this.PART_NegativeButton.SetResourceReference(StyleProperty, "MahApps.Styles.ButtonBase.DialogsAccentHighlight");
+                    this.PART_NegativeButton.SetResourceReference(StyleProperty, "MahApps.Styles.Button.Dialogs.AccentHighlight");
                     this.PART_TextBox.SetResourceReference(ForegroundProperty, "MahApps.Brushes.BlackColor");
                     this.PART_TextBox2.SetResourceReference(ForegroundProperty, "MahApps.Brushes.BlackColor");
                     break;
diff --git a/src/MahApps.Metro/Controls/Dialogs/MessageDialog.xaml.cs b/src/MahApps.Metro/Controls/Dialogs/MessageDialog.xaml.cs
index 0b3184f3e3..ef7b2beabd 100644
--- a/src/MahApps.Metro/Controls/Dialogs/MessageDialog.xaml.cs
+++ b/src/MahApps.Metro/Controls/Dialogs/MessageDialog.xaml.cs
@@ -12,7 +12,7 @@ namespace MahApps.Metro.Controls.Dialogs
     public partial class MessageDialog : BaseMetroDialog
     {
         private const string ACCENT_BUTTON_STYLE = "MahApps.Styles.Button.Dialogs.Accent";
-        private const string ACCENT_HIGHLIGHT_BUTTON_STYLE = "MahApps.Styles.ButtonBase.DialogsAccentHighlight";
+        private const string ACCENT_HIGHLIGHT_BUTTON_STYLE = "MahApps.Styles.Button.Dialogs.AccentHighlight";
 
         /// <summary>Identifies the <see cref="Message"/> dependency property.</summary>
         public static readonly DependencyProperty MessageProperty = DependencyProperty.Register(nameof(Message), typeof(string), typeof(MessageDialog), new PropertyMetadata(default(string)));
diff --git a/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml b/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml
index e3ea65637e..7b7ccc4934 100644
--- a/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml
+++ b/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml
@@ -25,7 +25,7 @@
         <Setter Property="controls:ControlsHelper.ContentCharacterCasing" Value="Normal" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.ButtonBase.DialogsAccentHighlight"
+    <Style x:Key="MahApps.Styles.Button.Dialogs.AccentHighlight"
            BasedOn="{StaticResource MahApps.Styles.ButtonBase.HighlightedSquare}"
            TargetType="{x:Type ButtonBase}">
         <Setter Property="MinHeight" Value="35" />

From 4d7d9dd032e1a813aa6f87e578f437eec0fa3712 Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Mon, 22 Jul 2019 10:37:53 +0200
Subject: [PATCH 39/46] Rename
 MahApps.Styles.ButtonBase.FocusVisualStyle.Circle into
 MahApps.Styles.Button.FocusVisualStyle.Circle

---
 src/MahApps.Metro/Styles/Controls.Buttons.xaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/MahApps.Metro/Styles/Controls.Buttons.xaml b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
index 0b0f96e17f..a4faf80822 100644
--- a/src/MahApps.Metro/Styles/Controls.Buttons.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
@@ -144,7 +144,7 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="MahApps.Styles.ButtonBase.FocusVisualStyle.Circle">
+    <Style x:Key="MahApps.Styles.Button.FocusVisualStyle.Circle">
         <Setter Property="Control.Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Control}">
@@ -164,7 +164,7 @@
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray3}" />
         <Setter Property="BorderThickness" Value="2" />
-        <Setter Property="FocusVisualStyle" Value="{StaticResource MahApps.Styles.ButtonBase.FocusVisualStyle.Circle}" />
+        <Setter Property="FocusVisualStyle" Value="{StaticResource MahApps.Styles.Button.FocusVisualStyle.Circle}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="Padding" Value="1" />
         <Setter Property="Template">
@@ -606,7 +606,7 @@
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray3}" />
         <Setter Property="BorderThickness" Value="2" />
-        <Setter Property="FocusVisualStyle" Value="{StaticResource MahApps.Styles.ButtonBase.FocusVisualStyle.Circle}" />
+        <Setter Property="FocusVisualStyle" Value="{StaticResource MahApps.Styles.Button.FocusVisualStyle.Circle}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="Padding" Value="1" />

From 3107b5db01f68bbf6b53356c909b0fc9b3398b6f Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Mon, 22 Jul 2019 10:38:53 +0200
Subject: [PATCH 40/46] Rename MahApps.Styles.ButtonBase.Circle into
 MahApps.Styles.Button.Circle

---
 .../Views/Flyouts/FlyoutBottomView.xaml                     | 2 +-
 .../Views/Flyouts/FlyoutTopView.xaml                        | 2 +-
 .../MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml     | 6 +++---
 .../MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml       | 4 ++--
 .../MahApps.Metro.Demo/ExampleWindows/ShowcaseFlyout.xaml   | 2 +-
 src/MahApps.Metro/Controls/MetroNavigationWindow.xaml       | 4 ++--
 src/MahApps.Metro/Styles/Controls.Buttons.xaml              | 2 +-
 src/MahApps.Metro/Themes/Flyout.xaml                        | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/Flyouts/FlyoutBottomView.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/Flyouts/FlyoutBottomView.xaml
index 2d98a401f6..ca20e57714 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/Flyouts/FlyoutBottomView.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/Flyouts/FlyoutBottomView.xaml
@@ -16,7 +16,7 @@
                 Height="36"
                 FontFamily="Segoe UI Symbol"
                 FontSize="16"
-                Style="{DynamicResource MahApps.Styles.ButtonBase.Circle}">
+                Style="{DynamicResource MahApps.Styles.Button.Circle}">
             <iconPacks:PackIconModern Kind="Add" />
         </Button>
     </StackPanel>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/Flyouts/FlyoutTopView.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/Flyouts/FlyoutTopView.xaml
index bf4cc9672a..a5fcadc079 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/Flyouts/FlyoutTopView.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/Flyouts/FlyoutTopView.xaml
@@ -18,7 +18,7 @@
                 FontFamily="Segoe UI Symbol"
                 FontSize="16"
                 Foreground="{Binding RelativeSource={RelativeSource AncestorType={x:Type Controls:Flyout}}, Path=Foreground}"
-                Style="{DynamicResource MahApps.Styles.ButtonBase.Circle}">
+                Style="{DynamicResource MahApps.Styles.Button.Circle}">
             <iconPacks:PackIconModern Kind="Add" />
         </Button>
     </StackPanel>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
index 1376269866..1199634dc0 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
@@ -144,7 +144,7 @@
                         Orientation="Horizontal">
                 <StackPanel.Resources>
                     <Style x:Key="AccentCircleButtonStyle"
-                           BasedOn="{StaticResource MahApps.Styles.ButtonBase.Circle}"
+                           BasedOn="{StaticResource MahApps.Styles.Button.Circle}"
                            TargetType="{x:Type ButtonBase}">
                         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
                         <Style.Triggers>
@@ -179,7 +179,7 @@
                         Margin="4"
                         Foreground="{DynamicResource MahApps.Brushes.Accent}"
                         IsEnabled="False"
-                        Style="{StaticResource MahApps.Styles.ButtonBase.Circle}">
+                        Style="{StaticResource MahApps.Styles.Button.Circle}">
                     <Button.ContentTemplate>
                         <DataTemplate>
                             <iconPacks:PackIconModern Width="20"
@@ -318,7 +318,7 @@
                        TargetType="Controls:DropDownButton">
                     <Setter Property="ArrowVisibility" Value="Collapsed" />
                     <Setter Property="BorderThickness" Value="0" />
-                    <Setter Property="ButtonStyle" Value="{DynamicResource MahApps.Styles.ButtonBase.Circle}" />
+                    <Setter Property="ButtonStyle" Value="{DynamicResource MahApps.Styles.Button.Circle}" />
                     <Setter Property="FocusVisualStyle" Value="{DynamicResource MahApps.Metro.Styles.MetroCircleFocusVisual}" />
                     <Setter Property="Height" Value="48" />
                     <Setter Property="Width" Value="48" />
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml
index 251cc9bf0c..41aaea6b50 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml
@@ -291,7 +291,7 @@
                             Orientation="Horizontal">
                     <Button Width="36"
                             Height="36"
-                            Style="{DynamicResource MahApps.Styles.ButtonBase.Circle}">
+                            Style="{DynamicResource MahApps.Styles.Button.Circle}">
                         <iconPacks:PackIconModern Kind="Alert" />
                     </Button>
                 </StackPanel>
@@ -306,7 +306,7 @@
                             Height="36"
                             FontFamily="Segoe UI Symbol"
                             FontSize="16"
-                            Style="{DynamicResource MahApps.Styles.ButtonBase.Circle}">
+                            Style="{DynamicResource MahApps.Styles.Button.Circle}">
                         <iconPacks:PackIconModern Kind="Add" />
                     </Button>
                 </StackPanel>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/ShowcaseFlyout.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/ShowcaseFlyout.xaml
index ab5195d9a6..ade828ee37 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/ShowcaseFlyout.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/ShowcaseFlyout.xaml
@@ -46,7 +46,7 @@
                         FontSize="16"
                         Foreground="{Binding RelativeSource={RelativeSource AncestorType={x:Type controls:Flyout}}, Path=Foreground}"
                         IsCancel="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:Flyout}}, Path=CloseButtonIsCancel}"
-                        Style="{DynamicResource MahApps.Styles.ButtonBase.Circle}"
+                        Style="{DynamicResource MahApps.Styles.Button.Circle}"
                         Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:Flyout}}, Path=CloseButtonVisibility}">
                     <i:Interaction.Triggers>
                         <i:EventTrigger EventName="Click">
diff --git a/src/MahApps.Metro/Controls/MetroNavigationWindow.xaml b/src/MahApps.Metro/Controls/MetroNavigationWindow.xaml
index a481e932cf..c8ac702271 100644
--- a/src/MahApps.Metro/Controls/MetroNavigationWindow.xaml
+++ b/src/MahApps.Metro/Controls/MetroNavigationWindow.xaml
@@ -16,7 +16,7 @@
                     Height="34"
                     Margin="4 2 2 2"
                     VerticalAlignment="Center"
-                    Style="{DynamicResource MahApps.Styles.ButtonBase.Circle}">
+                    Style="{DynamicResource MahApps.Styles.Button.Circle}">
                 <ContentControl Width="20"
                                 Height="20"
                                 Content="M57,42V34H32.25L42.25,24H31.75L17.75,38L31.75,52H42.25L32.25,42H57Z"
@@ -28,7 +28,7 @@
                     Margin="2 2 4 2"
                     VerticalAlignment="Center"
                     IsEnabled="False"
-                    Style="{DynamicResource MahApps.Styles.ButtonBase.Circle}">
+                    Style="{DynamicResource MahApps.Styles.Button.Circle}">
                 <ContentControl Width="20"
                                 Height="20"
                                 Content="M19,34V42H43.75L33.75,52H44.25L58.25,38L44.25,24H33.75L43.75,34H19Z"
diff --git a/src/MahApps.Metro/Styles/Controls.Buttons.xaml b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
index a4faf80822..2b42cc4a3e 100644
--- a/src/MahApps.Metro/Styles/Controls.Buttons.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
@@ -160,7 +160,7 @@
     </Style>
 
     <!--  style for WP7/Circle button  -->
-    <Style x:Key="MahApps.Styles.ButtonBase.Circle" TargetType="{x:Type ButtonBase}">
+    <Style x:Key="MahApps.Styles.Button.Circle" TargetType="{x:Type ButtonBase}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray3}" />
         <Setter Property="BorderThickness" Value="2" />
diff --git a/src/MahApps.Metro/Themes/Flyout.xaml b/src/MahApps.Metro/Themes/Flyout.xaml
index a11c0af46c..27200f6ff9 100644
--- a/src/MahApps.Metro/Themes/Flyout.xaml
+++ b/src/MahApps.Metro/Themes/Flyout.xaml
@@ -16,7 +16,7 @@
                     DockPanel.Dock="Left"
                     Foreground="{Binding RelativeSource={RelativeSource AncestorType={x:Type Controls:Flyout}}, Path=Foreground}"
                     IsCancel="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:Flyout}}, Path=CloseButtonIsCancel}"
-                    Style="{DynamicResource MahApps.Styles.ButtonBase.Circle}"
+                    Style="{DynamicResource MahApps.Styles.Button.Circle}"
                     Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:Flyout}}, Path=CloseButtonVisibility}">
                 <i:Interaction.Triggers>
                     <i:EventTrigger EventName="Click">

From 5fe7feb8c6ed5db2457467234db6ce456c26a9bc Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Mon, 22 Jul 2019 10:41:15 +0200
Subject: [PATCH 41/46] Rename MahApps.Templates.ButtonBase.Chromeless into
 MahApps.Templates.Button.Chromeless

---
 src/MahApps.Metro/Styles/Controls.Buttons.xaml     | 4 ++--
 src/MahApps.Metro/Styles/Controls.PasswordBox.xaml | 4 ++--
 src/MahApps.Metro/Styles/Controls.TextBox.xaml     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/MahApps.Metro/Styles/Controls.Buttons.xaml b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
index 2b42cc4a3e..e8fc38ac43 100644
--- a/src/MahApps.Metro/Styles/Controls.Buttons.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
@@ -229,7 +229,7 @@
     </Style>
 
     <!--  "Chromeless" style for buttons  -->
-    <ControlTemplate x:Key="MahApps.Templates.ButtonBase.Chromeless" TargetType="{x:Type ButtonBase}">
+    <ControlTemplate x:Key="MahApps.Templates.Button.Chromeless" TargetType="{x:Type ButtonBase}">
         <Grid Background="{TemplateBinding Background}">
             <ContentPresenter x:Name="PART_ContentPresenter"
                               Margin="{TemplateBinding Padding}"
@@ -257,7 +257,7 @@
         <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="Padding" Value="0" />
-        <Setter Property="Template" Value="{StaticResource MahApps.Templates.ButtonBase.Chromeless}" />
+        <Setter Property="Template" Value="{StaticResource MahApps.Templates.Button.Chromeless}" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
diff --git a/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml b/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
index 817031352b..a8aef425ed 100644
--- a/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
@@ -341,7 +341,7 @@
     <Style x:Key="MahApps.Styles.PasswordBox.Button"
            BasedOn="{StaticResource MahApps.Styles.PasswordBox}"
            TargetType="{x:Type PasswordBox}">
-        <Setter Property="Controls:TextBoxHelper.ButtonTemplate" Value="{DynamicResource MahApps.Templates.ButtonBase.Chromeless}" />
+        <Setter Property="Controls:TextBoxHelper.ButtonTemplate" Value="{DynamicResource MahApps.Templates.Button.Chromeless}" />
         <Setter Property="Controls:TextBoxHelper.TextButton" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
@@ -603,7 +603,7 @@
            BasedOn="{StaticResource MahApps.Styles.PasswordBox}"
            TargetType="{x:Type PasswordBox}">
         <Setter Property="Controls:PasswordBoxHelper.RevealButtonContent" Value="{DynamicResource MahApps.Controls.DefaultRevealButtonIcon}" />
-        <Setter Property="Controls:TextBoxHelper.ButtonTemplate" Value="{DynamicResource MahApps.Templates.ButtonBase.Chromeless}" />
+        <Setter Property="Controls:TextBoxHelper.ButtonTemplate" Value="{DynamicResource MahApps.Templates.Button.Chromeless}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type PasswordBox}">
diff --git a/src/MahApps.Metro/Styles/Controls.TextBox.xaml b/src/MahApps.Metro/Styles/Controls.TextBox.xaml
index 09039d1c98..a34ff91649 100644
--- a/src/MahApps.Metro/Styles/Controls.TextBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TextBox.xaml
@@ -273,7 +273,7 @@
     <Style x:Key="MahApps.Styles.TextBox.Button"
            BasedOn="{StaticResource MahApps.Styles.TextBox}"
            TargetType="{x:Type TextBox}">
-        <Setter Property="Controls:TextBoxHelper.ButtonTemplate" Value="{DynamicResource MahApps.Templates.ButtonBase.Chromeless}" />
+        <Setter Property="Controls:TextBoxHelper.ButtonTemplate" Value="{DynamicResource MahApps.Templates.Button.Chromeless}" />
         <Setter Property="Controls:TextBoxHelper.TextButton" Value="True" />
         <!--  change SnapsToDevicePixels to True to view a better border and validation error  -->
         <Setter Property="Template">
@@ -786,7 +786,7 @@
            BasedOn="{StaticResource MahApps.Styles.RichTextBox}"
            TargetType="{x:Type RichTextBox}">
         <Setter Property="Controls:TextBoxHelper.ButtonCommandParameter" Value="{Binding RelativeSource={RelativeSource Self}}" />
-        <Setter Property="Controls:TextBoxHelper.ButtonTemplate" Value="{DynamicResource MahApps.Templates.ButtonBase.Chromeless}" />
+        <Setter Property="Controls:TextBoxHelper.ButtonTemplate" Value="{DynamicResource MahApps.Templates.Button.Chromeless}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TextBoxBase}">

From 81268f45bfa4c28e57fdd7b353b86426c51e9751 Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Mon, 22 Jul 2019 10:42:31 +0200
Subject: [PATCH 42/46] Rename MahApps.Styles.ButtonBase.Chromeless into
 MahApps.Styles.Button.Chromeless

---
 src/MahApps.Metro/Styles/Controls.Buttons.xaml      | 2 +-
 src/MahApps.Metro/Styles/Controls.ComboBox.xaml     | 4 ++--
 src/MahApps.Metro/Styles/Controls.DatePicker.xaml   | 2 +-
 src/MahApps.Metro/Styles/Controls.PasswordBox.xaml  | 8 ++++----
 src/MahApps.Metro/Styles/Controls.TextBox.xaml      | 8 ++++----
 src/MahApps.Metro/Themes/DateTimePicker.xaml        | 2 +-
 src/MahApps.Metro/Themes/HamburgerMenuTemplate.xaml | 2 +-
 src/MahApps.Metro/Themes/MetroTabItem.xaml          | 2 +-
 src/MahApps.Metro/Themes/NumericUpDown.xaml         | 4 ++--
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/MahApps.Metro/Styles/Controls.Buttons.xaml b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
index e8fc38ac43..c5703aff5c 100644
--- a/src/MahApps.Metro/Styles/Controls.Buttons.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
@@ -252,7 +252,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style x:Key="MahApps.Styles.ButtonBase.Chromeless" TargetType="{x:Type ButtonBase}">
+    <Style x:Key="MahApps.Styles.Button.Chromeless" TargetType="{x:Type ButtonBase}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.TransparentWhite}" />
         <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
diff --git a/src/MahApps.Metro/Styles/Controls.ComboBox.xaml b/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
index 03a3550d61..beb18d6f52 100644
--- a/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
@@ -127,7 +127,7 @@
                                     FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
                                     Foreground="{TemplateBinding Foreground}"
                                     IsTabStop="False"
-                                    Style="{DynamicResource MahApps.Styles.ButtonBase.Chromeless}"
+                                    Style="{DynamicResource MahApps.Styles.Button.Chromeless}"
                                     Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ClearTextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
                         </Grid>
                     </Grid>
@@ -223,7 +223,7 @@
                                 FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
                                 Foreground="{TemplateBinding Foreground}"
                                 IsTabStop="False"
-                                Style="{DynamicResource MahApps.Styles.ButtonBase.Chromeless}"
+                                Style="{DynamicResource MahApps.Styles.Button.Chromeless}"
                                 Visibility="{Binding RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}, Path=(Controls:TextBoxHelper.ClearTextButton), Converter={StaticResource BooleanToVisibilityConverter}}" />
                         <Grid x:Name="BtnArrowBackground"
                               Grid.Column="2"
diff --git a/src/MahApps.Metro/Styles/Controls.DatePicker.xaml b/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
index 9c6cad452f..256ee46db4 100644
--- a/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
+++ b/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
@@ -51,7 +51,7 @@
                                     Grid.Column="1"
                                     Foreground="{TemplateBinding Foreground}"
                                     IsTabStop="False"
-                                    Style="{DynamicResource MahApps.Styles.ButtonBase.Chromeless}">
+                                    Style="{DynamicResource MahApps.Styles.Button.Chromeless}">
                                 <!--  PackIconModern - Calendar14  -->
                                 <ContentControl Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
                                                 Height="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
diff --git a/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml b/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
index a8aef425ed..2349a2cc3f 100644
--- a/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
@@ -15,7 +15,7 @@
 
     <!--  Button Style for MahApps.Styles.PasswordBox.Win8  -->
     <Style x:Key="MahApps.Styles.ButtonBase.Reveal"
-           BasedOn="{StaticResource MahApps.Styles.ButtonBase.Chromeless}"
+           BasedOn="{StaticResource MahApps.Styles.Button.Chromeless}"
            TargetType="{x:Type ButtonBase}">
         <Setter Property="Template">
             <Setter.Value>
@@ -234,7 +234,7 @@
                                     FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
                                     Foreground="{TemplateBinding Foreground}"
                                     IsTabStop="False"
-                                    Style="{DynamicResource MahApps.Styles.ButtonBase.Chromeless}"
+                                    Style="{DynamicResource MahApps.Styles.Button.Chromeless}"
                                     Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ClearTextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
                         </Grid>
                         <Border x:Name="DisabledVisualElement"
@@ -480,7 +480,7 @@
                                     FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
                                     Foreground="{TemplateBinding Foreground}"
                                     IsTabStop="False"
-                                    Style="{DynamicResource MahApps.Styles.ButtonBase.Chromeless}"
+                                    Style="{DynamicResource MahApps.Styles.Button.Chromeless}"
                                     Template="{TemplateBinding Controls:TextBoxHelper.ButtonTemplate}"
                                     Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.TextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
                         </Grid>
@@ -773,7 +773,7 @@
                                     FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
                                     Foreground="{TemplateBinding Foreground}"
                                     IsTabStop="False"
-                                    Style="{DynamicResource MahApps.Styles.ButtonBase.Chromeless}"
+                                    Style="{DynamicResource MahApps.Styles.Button.Chromeless}"
                                     Template="{TemplateBinding Controls:TextBoxHelper.ButtonTemplate}"
                                     Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ClearTextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
                         </Grid>
diff --git a/src/MahApps.Metro/Styles/Controls.TextBox.xaml b/src/MahApps.Metro/Styles/Controls.TextBox.xaml
index a34ff91649..12f707e5c5 100644
--- a/src/MahApps.Metro/Styles/Controls.TextBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TextBox.xaml
@@ -157,7 +157,7 @@
                                     FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
                                     Foreground="{TemplateBinding Foreground}"
                                     IsTabStop="False"
-                                    Style="{DynamicResource MahApps.Styles.ButtonBase.Chromeless}"
+                                    Style="{DynamicResource MahApps.Styles.Button.Chromeless}"
                                     Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ClearTextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
                         </Grid>
                         <Border x:Name="DisabledVisualElement"
@@ -402,7 +402,7 @@
                                     FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
                                     Foreground="{TemplateBinding Foreground}"
                                     IsTabStop="False"
-                                    Style="{DynamicResource MahApps.Styles.ButtonBase.Chromeless}"
+                                    Style="{DynamicResource MahApps.Styles.Button.Chromeless}"
                                     Template="{TemplateBinding Controls:TextBoxHelper.ButtonTemplate}"
                                     Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.TextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
                         </Grid>
@@ -684,7 +684,7 @@
                                     FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
                                     Foreground="{TemplateBinding Foreground}"
                                     IsTabStop="False"
-                                    Style="{DynamicResource MahApps.Styles.ButtonBase.Chromeless}"
+                                    Style="{DynamicResource MahApps.Styles.Button.Chromeless}"
                                     Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ClearTextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
                         </Grid>
 
@@ -888,7 +888,7 @@
                                     FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
                                     Foreground="{TemplateBinding Foreground}"
                                     IsTabStop="False"
-                                    Style="{DynamicResource MahApps.Styles.ButtonBase.Chromeless}"
+                                    Style="{DynamicResource MahApps.Styles.Button.Chromeless}"
                                     Template="{TemplateBinding Controls:TextBoxHelper.ButtonTemplate}"
                                     Visibility="Visible" />
                         </Grid>
diff --git a/src/MahApps.Metro/Themes/DateTimePicker.xaml b/src/MahApps.Metro/Themes/DateTimePicker.xaml
index cfce4c5d05..aca2bff2a6 100644
--- a/src/MahApps.Metro/Themes/DateTimePicker.xaml
+++ b/src/MahApps.Metro/Themes/DateTimePicker.xaml
@@ -206,7 +206,7 @@
                                     Grid.RowSpan="2"
                                     Grid.Column="1"
                                     IsTabStop="False"
-                                    Style="{DynamicResource MahApps.Styles.ButtonBase.Chromeless}">
+                                    Style="{DynamicResource MahApps.Styles.Button.Chromeless}">
                                 <!--  PackIconModern - Calendar14  -->
                                 <ContentControl x:Name="PART_ButtonIcon"
                                                 Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
diff --git a/src/MahApps.Metro/Themes/HamburgerMenuTemplate.xaml b/src/MahApps.Metro/Themes/HamburgerMenuTemplate.xaml
index 5972243bbc..0ec488b9f8 100644
--- a/src/MahApps.Metro/Themes/HamburgerMenuTemplate.xaml
+++ b/src/MahApps.Metro/Themes/HamburgerMenuTemplate.xaml
@@ -20,7 +20,7 @@
     <Controls:HamburgerMenuItemStyleSelector x:Key="HamburgerMenuItemOptionsStyleSelector" IsItemOptions="True" />
 
     <Style x:Key="MahApps.Styles.Button.Hamburger"
-           BasedOn="{StaticResource MahApps.Styles.ButtonBase.Chromeless}"
+           BasedOn="{StaticResource MahApps.Styles.Button.Chromeless}"
            TargetType="{x:Type Button}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="BorderThickness" Value="0" />
diff --git a/src/MahApps.Metro/Themes/MetroTabItem.xaml b/src/MahApps.Metro/Themes/MetroTabItem.xaml
index 1a44fbce6a..fee96b6a63 100644
--- a/src/MahApps.Metro/Themes/MetroTabItem.xaml
+++ b/src/MahApps.Metro/Themes/MetroTabItem.xaml
@@ -64,7 +64,7 @@
                                         VerticalAlignment="Top"
                                         Background="{DynamicResource MahApps.Brushes.GrayNormal}"
                                         IsTabStop="False"
-                                        Style="{DynamicResource MahApps.Styles.ButtonBase.Chromeless}"
+                                        Style="{DynamicResource MahApps.Styles.Button.Chromeless}"
                                         Visibility="Collapsed">
                                     <i:Interaction.Triggers>
                                         <i:EventTrigger EventName="Click">
diff --git a/src/MahApps.Metro/Themes/NumericUpDown.xaml b/src/MahApps.Metro/Themes/NumericUpDown.xaml
index 37e70e4961..cdc11ae647 100644
--- a/src/MahApps.Metro/Themes/NumericUpDown.xaml
+++ b/src/MahApps.Metro/Themes/NumericUpDown.xaml
@@ -91,7 +91,7 @@
                                           Focusable="{TemplateBinding UpDownButtonsFocusable}"
                                           Foreground="{TemplateBinding Foreground}"
                                           IsTabStop="False"
-                                          Style="{DynamicResource MahApps.Styles.ButtonBase.Chromeless}">
+                                          Style="{DynamicResource MahApps.Styles.Button.Chromeless}">
                                 <Path x:Name="PolygonUp"
                                       Width="14"
                                       Height="14"
@@ -108,7 +108,7 @@
                                           Focusable="{TemplateBinding UpDownButtonsFocusable}"
                                           Foreground="{TemplateBinding Foreground}"
                                           IsTabStop="False"
-                                          Style="{DynamicResource MahApps.Styles.ButtonBase.Chromeless}">
+                                          Style="{DynamicResource MahApps.Styles.Button.Chromeless}">
                                 <Path x:Name="PolygonDown"
                                       Width="14"
                                       Height="3"

From 4daa04ce3ba0f5c9dc0b3827feb4105899e5b0cd Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Mon, 22 Jul 2019 10:47:35 +0200
Subject: [PATCH 43/46] Rename MahApps.Styles.ButtonBase into
 MahApps.Styles.Button

---
 .../ExampleViews/ButtonsExample.xaml           |  8 ++++----
 .../ExampleWindows/CleanWindowDemo.xaml        |  4 ++--
 .../ExampleWindows/DynamicFlyout.xaml          |  4 ++--
 .../ExampleWindows/FlyoutDemo.xaml             |  8 ++++----
 src/MahApps.Metro/Styles/Controls.Buttons.xaml | 18 +++++++++---------
 .../Styles/Controls.PasswordBox.xaml           |  4 ++--
 src/MahApps.Metro/Styles/Controls.Toolbar.xaml | 10 +++++-----
 src/MahApps.Metro/Styles/Controls.xaml         |  4 ++--
 .../Themes/Dialogs/BaseMetroDialog.xaml        |  6 +++---
 .../Views/ButtonWindow.xaml                    |  2 +-
 10 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
index 1199634dc0..738c9deae0 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
@@ -61,21 +61,21 @@
             <Button Width="100"
                     Margin="{StaticResource ControlMargin}"
                     Content="Enabled"
-                    Style="{DynamicResource MahApps.Styles.ButtonBase.Square}" />
+                    Style="{DynamicResource MahApps.Styles.Button.Square}" />
             <Button Width="100"
                     Margin="{StaticResource ControlMargin}"
                     Content="Enabled"
-                    Style="{DynamicResource MahApps.Styles.ButtonBase.AccentedSquare}" />
+                    Style="{DynamicResource MahApps.Styles.Button.AccentedSquare}" />
             <Button Width="100"
                     Margin="{StaticResource ControlMargin}"
                     Content="Disabled"
                     IsEnabled="False"
-                    Style="{DynamicResource MahApps.Styles.ButtonBase.Square}" />
+                    Style="{DynamicResource MahApps.Styles.Button.Square}" />
             <Button Width="100"
                     Margin="{StaticResource ControlMargin}"
                     Content="Disabled"
                     IsEnabled="False"
-                    Style="{DynamicResource MahApps.Styles.ButtonBase.AccentedSquare}" />
+                    Style="{DynamicResource MahApps.Styles.Button.AccentedSquare}" />
         </StackPanel>
 
         <StackPanel Grid.Row="0" Grid.Column="2">
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/CleanWindowDemo.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/CleanWindowDemo.xaml
index bda0d33c1b..903f7c0f1b 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/CleanWindowDemo.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/CleanWindowDemo.xaml
@@ -86,10 +86,10 @@
                                  Columns="2">
                         <Button Margin="10"
                                 Content="Create"
-                                Style="{DynamicResource MahApps.Styles.ButtonBase.Square}" />
+                                Style="{DynamicResource MahApps.Styles.Button.Square}" />
                         <Button Margin="10"
                                 Content="Cancel"
-                                Style="{DynamicResource MahApps.Styles.ButtonBase.Square}" />
+                                Style="{DynamicResource MahApps.Styles.Button.Square}" />
                     </UniformGrid>
 
                 </Grid>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/DynamicFlyout.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/DynamicFlyout.xaml
index ad663064c9..b6cd361225 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/DynamicFlyout.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/DynamicFlyout.xaml
@@ -42,11 +42,11 @@
             <Button Margin="10"
                     Click="CloseFlyoutClick"
                     Content="OK"
-                    Style="{DynamicResource MahApps.Styles.ButtonBase.Square}" />
+                    Style="{DynamicResource MahApps.Styles.Button.Square}" />
             <Button Margin="10"
                     Click="CloseFlyoutClick"
                     Content="Cancel"
-                    Style="{DynamicResource MahApps.Styles.ButtonBase.Square}" />
+                    Style="{DynamicResource MahApps.Styles.Button.Square}" />
         </UniformGrid>
     </Grid>
 </Controls:Flyout>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml
index 41aaea6b50..34904938b1 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml
@@ -134,10 +134,10 @@
                                  Columns="2">
                         <Button Margin="10"
                                 Content="Create"
-                                Style="{DynamicResource MahApps.Styles.ButtonBase.Square}" />
+                                Style="{DynamicResource MahApps.Styles.Button.Square}" />
                         <Button Margin="10"
                                 Content="Cancel"
-                                Style="{DynamicResource MahApps.Styles.ButtonBase.Square}" />
+                                Style="{DynamicResource MahApps.Styles.Button.Square}" />
                     </UniformGrid>
                 </Grid>
             </Controls:Flyout>
@@ -228,11 +228,11 @@
                         <Button Margin="10"
                                 Click="ShowSettingsLeft"
                                 Content="Left"
-                                Style="{DynamicResource MahApps.Styles.ButtonBase.Square}" />
+                                Style="{DynamicResource MahApps.Styles.Button.Square}" />
                         <Button Margin="10"
                                 Click="ShowSettingsRight"
                                 Content="Right"
-                                Style="{DynamicResource MahApps.Styles.ButtonBase.Square}" />
+                                Style="{DynamicResource MahApps.Styles.Button.Square}" />
                     </UniformGrid>
                 </Grid>
             </Controls:Flyout>
diff --git a/src/MahApps.Metro/Styles/Controls.Buttons.xaml b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
index c5703aff5c..88bd3eab90 100644
--- a/src/MahApps.Metro/Styles/Controls.Buttons.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
@@ -384,7 +384,7 @@
     </Style>
 
     <!--  style for default button  -->
-    <Style x:Key="MahApps.Styles.ButtonBase" TargetType="{x:Type ButtonBase}">
+    <Style x:Key="MahApps.Styles.Button" TargetType="{x:Type ButtonBase}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Gray10}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
@@ -449,7 +449,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.ButtonBase.Square" TargetType="{x:Type ButtonBase}">
+    <Style x:Key="MahApps.Styles.Button.Square" TargetType="{x:Type ButtonBase}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="BorderThickness" Value="2" />
@@ -525,15 +525,15 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.ButtonBase.AccentedSquare"
-           BasedOn="{StaticResource MahApps.Styles.ButtonBase.Square}"
+    <Style x:Key="MahApps.Styles.Button.AccentedSquare"
+           BasedOn="{StaticResource MahApps.Styles.Button.Square}"
            TargetType="{x:Type ButtonBase}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.IdealForeground}" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.ButtonBase.HighlightedSquare"
-           BasedOn="{StaticResource MahApps.Styles.ButtonBase.Square}"
+    <Style x:Key="MahApps.Styles.Button.HighlightedSquare"
+           BasedOn="{StaticResource MahApps.Styles.Button.Square}"
            TargetType="{x:Type ButtonBase}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Highlight}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.IdealForeground}" />
@@ -758,7 +758,7 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="MahApps.Styles.ButtonBase.MetroSquare" TargetType="{x:Type ButtonBase}">
+    <Style x:Key="MahApps.Styles.Button.MetroSquare" TargetType="{x:Type ButtonBase}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Black}" />
         <Setter Property="BorderThickness" Value="2" />
@@ -871,8 +871,8 @@
         <Setter Property="VerticalAlignment" Value="Center" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.ButtonBase.MetroAccentSquare"
-           BasedOn="{StaticResource MahApps.Styles.ButtonBase.MetroSquare}"
+    <Style x:Key="MahApps.Styles.Button.MetroAccentSquare"
+           BasedOn="{StaticResource MahApps.Styles.Button.MetroSquare}"
            TargetType="{x:Type ButtonBase}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.AccentSelectedColor}" />
diff --git a/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml b/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
index 2349a2cc3f..f8228afa52 100644
--- a/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
@@ -14,7 +14,7 @@
     <Converters:StringToVisibilityConverter x:Key="StringToVisibilityConverter" />
 
     <!--  Button Style for MahApps.Styles.PasswordBox.Win8  -->
-    <Style x:Key="MahApps.Styles.ButtonBase.Reveal"
+    <Style x:Key="MahApps.Styles.Button.Reveal"
            BasedOn="{StaticResource MahApps.Styles.Button.Chromeless}"
            TargetType="{x:Type ButtonBase}">
         <Setter Property="Template">
@@ -758,7 +758,7 @@
                                     Focusable="False"
                                     Foreground="{TemplateBinding Foreground}"
                                     IsTabStop="False"
-                                    Style="{DynamicResource MahApps.Styles.ButtonBase.Reveal}"
+                                    Style="{DynamicResource MahApps.Styles.Button.Reveal}"
                                     Visibility="{Binding ElementName=RevealedPassword, Path=Text, Converter={StaticResource StringToVisibilityConverter}}" />
                             <Button x:Name="PART_ClearText"
                                     Grid.Row="0"
diff --git a/src/MahApps.Metro/Styles/Controls.Toolbar.xaml b/src/MahApps.Metro/Styles/Controls.Toolbar.xaml
index 92ea098776..2a32395731 100644
--- a/src/MahApps.Metro/Styles/Controls.Toolbar.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Toolbar.xaml
@@ -7,7 +7,7 @@
     </ResourceDictionary.MergedDictionaries>
 
     <!--  Style for toolbar buttons  -->
-    <Style x:Key="MahApps.Styles.ButtonBase.ToolBar" TargetType="{x:Type ButtonBase}">
+    <Style x:Key="MahApps.Styles.Button.ToolBar" TargetType="{x:Type ButtonBase}">
         <Style.Resources>
             <!--  Disabled all images placed inside a button - most common scenario  -->
             <Style TargetType="Image">
@@ -60,16 +60,16 @@
 
     <!--  Style for all types of regular buttons  -->
     <Style x:Key="{x:Static ToolBar.ButtonStyleKey}"
-           BasedOn="{StaticResource MahApps.Styles.ButtonBase.ToolBar}"
+           BasedOn="{StaticResource MahApps.Styles.Button.ToolBar}"
            TargetType="{x:Type Button}" />
     <Style x:Key="{x:Static ToolBar.ToggleButtonStyleKey}"
-           BasedOn="{StaticResource MahApps.Styles.ButtonBase.ToolBar}"
+           BasedOn="{StaticResource MahApps.Styles.Button.ToolBar}"
            TargetType="{x:Type ToggleButton}" />
     <Style x:Key="{x:Static ToolBar.CheckBoxStyleKey}"
-           BasedOn="{StaticResource MahApps.Styles.ButtonBase.ToolBar}"
+           BasedOn="{StaticResource MahApps.Styles.Button.ToolBar}"
            TargetType="{x:Type CheckBox}" />
     <Style x:Key="{x:Static ToolBar.RadioButtonStyleKey}"
-           BasedOn="{StaticResource MahApps.Styles.ButtonBase.ToolBar}"
+           BasedOn="{StaticResource MahApps.Styles.Button.ToolBar}"
            TargetType="{x:Type RadioButton}" />
 
     <!--  Style for text box inside a toolbar if needed  -->
diff --git a/src/MahApps.Metro/Styles/Controls.xaml b/src/MahApps.Metro/Styles/Controls.xaml
index 42d036758e..118ede09f0 100644
--- a/src/MahApps.Metro/Styles/Controls.xaml
+++ b/src/MahApps.Metro/Styles/Controls.xaml
@@ -81,8 +81,8 @@
 
     <Style BasedOn="{StaticResource MahApps.Styles.CustomValidationPopup}" TargetType="{x:Type Controls:CustomValidationPopup}" />
     <Style BasedOn="{StaticResource MahApps.Styles.ToolTip}" TargetType="ToolTip" />
-    <Style BasedOn="{StaticResource MahApps.Styles.ButtonBase}" TargetType="Button" />
-    <Style BasedOn="{StaticResource MahApps.Styles.ButtonBase}" TargetType="RepeatButton" />
+    <Style BasedOn="{StaticResource MahApps.Styles.Button}" TargetType="Button" />
+    <Style BasedOn="{StaticResource MahApps.Styles.Button}" TargetType="RepeatButton" />
     <Style BasedOn="{StaticResource MahApps.Styles.ToggleButton}" TargetType="ToggleButton" />
     <Style BasedOn="{StaticResource MahApps.Styles.TextBox}" TargetType="TextBox" />
     <Style BasedOn="{StaticResource MahApps.Styles.RichTextBox}" TargetType="RichTextBox" />
diff --git a/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml b/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml
index 7b7ccc4934..1f285a0780 100644
--- a/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml
+++ b/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml
@@ -8,7 +8,7 @@
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="MahApps.Styles.Button.Dialogs"
-           BasedOn="{StaticResource MahApps.Styles.ButtonBase.Square}"
+           BasedOn="{StaticResource MahApps.Styles.Button.Square}"
            TargetType="{x:Type ButtonBase}">
         <Setter Property="MinHeight" Value="35" />
         <Setter Property="MinWidth" Value="80" />
@@ -17,7 +17,7 @@
     </Style>
 
     <Style x:Key="MahApps.Styles.Button.Dialogs.Accent"
-           BasedOn="{StaticResource MahApps.Styles.ButtonBase.AccentedSquare}"
+           BasedOn="{StaticResource MahApps.Styles.Button.AccentedSquare}"
            TargetType="{x:Type ButtonBase}">
         <Setter Property="MinHeight" Value="35" />
         <Setter Property="MinWidth" Value="80" />
@@ -26,7 +26,7 @@
     </Style>
 
     <Style x:Key="MahApps.Styles.Button.Dialogs.AccentHighlight"
-           BasedOn="{StaticResource MahApps.Styles.ButtonBase.HighlightedSquare}"
+           BasedOn="{StaticResource MahApps.Styles.Button.HighlightedSquare}"
            TargetType="{x:Type ButtonBase}">
         <Setter Property="MinHeight" Value="35" />
         <Setter Property="MinWidth" Value="80" />
diff --git a/src/Mahapps.Metro.Tests/Views/ButtonWindow.xaml b/src/Mahapps.Metro.Tests/Views/ButtonWindow.xaml
index 249126a87c..da42d7f610 100644
--- a/src/Mahapps.Metro.Tests/Views/ButtonWindow.xaml
+++ b/src/Mahapps.Metro.Tests/Views/ButtonWindow.xaml
@@ -11,6 +11,6 @@
         <Button Name="DefaultButton" Content="SomeText" />
         <Button Name="SquareButton"
                 Content="SomeText"
-                Style="{DynamicResource MahApps.Styles.ButtonBase.Square}" />
+                Style="{DynamicResource MahApps.Styles.Button.Square}" />
     </StackPanel>
 </controls:MetroWindow>
\ No newline at end of file

From afaff0439fe736f1ae72b4fdbab86ae7914ba13a Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Mon, 22 Jul 2019 10:58:31 +0200
Subject: [PATCH 44/46] Fix using scrollbar repeat button sizes broken by
 search and replace

---
 src/MahApps.Metro/Styles/Controls.Scrollbars.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml b/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
index 0463a2d516..4a2b0f5123 100644
--- a/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
@@ -19,7 +19,7 @@
     <Style x:Key="MahApps.Styles.RepeatButton.ScrollBarSmall" TargetType="{x:Type RepeatButton}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Focusable" Value="False" />
-        <Setter Property="Height" Value="{DynamicResource MahApps.Templates.ScrollBar.VerticalRepeatButtonHeight}" />
+        <Setter Property="Height" Value="{DynamicResource MahApps.Sizes.ScrollBar.VerticalRepeatButton.Height}" />
         <Setter Property="HorizontalAlignment" Value="Center" />
         <Setter Property="Interval" Value="50" />
         <Setter Property="IsTabStop" Value="False" />
@@ -61,7 +61,7 @@
             </Setter.Value>
         </Setter>
         <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="Width" Value="{DynamicResource MahApps.Templates.ScrollBar.HorizontalRepeatButtonWidth}" />
+        <Setter Property="Width" Value="{DynamicResource MahApps.Sizes.ScrollBar.HorizontalRepeatButton.Width}" />
     </Style>
 
     <Style x:Key="MahApps.Styles.RepeatButton.ScrollBarLarge" TargetType="{x:Type RepeatButton}">

From a4112f571a6066d8d3d03b7c7bbf2a84de5a86ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <evangelink@gmail.com>
Date: Tue, 23 Jul 2019 13:18:12 +0200
Subject: [PATCH 45/46] Rename MahApps.Brushes into MahApps.Colors in the
 generator

---
 .../Styles/Themes/GeneratorParameters.json    | 88 +++++++++----------
 .../Styles/Themes/Theme.Template.xaml         | 44 +++++-----
 2 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/src/MahApps.Metro/Styles/Themes/GeneratorParameters.json b/src/MahApps.Metro/Styles/Themes/GeneratorParameters.json
index b1b4d33023..ecef8c76bd 100644
--- a/src/MahApps.Metro/Styles/Themes/GeneratorParameters.json
+++ b/src/MahApps.Metro/Styles/Themes/GeneratorParameters.json
@@ -25,28 +25,28 @@
         "MahApps.Colors.GrayHover": "#FFAAAAAA",
         "MahApps.Colors.Flyout": "#FF2B2B2B",
         "MahApps.Colors.MenuShadow": "#FFFFFFFF",
-        "MahApps.Brushes.MenuItem.DisabledForeground": "{StaticResource MahApps.Colors.Gray7}",
-        "MahApps.Brushes.SliderValue.Disabled": "#FF535353",
-        "MahApps.Brushes.SliderTrack.Disabled": "#FF383838",
-        "MahApps.Brushes.SliderThumb.Disabled": "#FF7E7E7E",
-        "MahApps.Brushes.SliderTrack.Hover": "#FF737373",
-        "MahApps.Brushes.SliderTrack.Normal": "#FF6C6C6C",
-        "MahApps.Brushes.FlatButton.PressedBackground": "#444444",
-        "MahApps.Brushes.MenuItem.SelectionFill": "#313131",
-        "MahApps.Brushes.MenuItem.SelectionStroke": "#313131",
-        "MahApps.Brushes.TopMenuItem.PressedFill": "#313131",
-        "MahApps.Brushes.TopMenuItem.PressedStroke": "#E0717070",
-        "MahApps.Brushes.TopMenuItem.SelectionStroke": "#90717070",
-        "MahApps.Brushes.ToggleSwitchButton.Pressed.Win10": "#FF999999",
-        "MahApps.Brushes.ToggleSwitchButton.OffBorder.Win10": "#FFCCCCCC",
-        "MahApps.Brushes.ToggleSwitchButton.OffMouseOverBorder.Win10": "#FFFFFFFF",
-        "MahApps.Brushes.ToggleSwitchButton.OffDisabledBorder.Win10": "#FF666666",
-        "MahApps.Brushes.ToggleSwitchButton.OnSwitchDisabled.Win10": "#FF444444",
-        "MahApps.Brushes.ToggleSwitchButton.ThumbIndicator.Win10": "#FFCCCCCC",
-        "MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorMouseOver.Win10": "#FFFFFFFF",
-        "MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorPressed.Win10": "#FFFFFFFF",
-        "MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorDisabled.Win10": "#FF666666",
-        "MahApps.Brushes.Badged.DisabledBackground": "#FF666666"
+        "MahApps.Colors.MenuItem.DisabledForeground": "{StaticResource MahApps.Colors.Gray7}",
+        "MahApps.Colors.SliderValue.Disabled": "#FF535353",
+        "MahApps.Colors.SliderTrack.Disabled": "#FF383838",
+        "MahApps.Colors.SliderThumb.Disabled": "#FF7E7E7E",
+        "MahApps.Colors.SliderTrack.Hover": "#FF737373",
+        "MahApps.Colors.SliderTrack.Normal": "#FF6C6C6C",
+        "MahApps.Colors.FlatButton.PressedBackground": "#444444",
+        "MahApps.Colors.MenuItem.SelectionFill": "#313131",
+        "MahApps.Colors.MenuItem.SelectionStroke": "#313131",
+        "MahApps.Colors.TopMenuItem.PressedFill": "#313131",
+        "MahApps.Colors.TopMenuItem.PressedStroke": "#E0717070",
+        "MahApps.Colors.TopMenuItem.SelectionStroke": "#90717070",
+        "MahApps.Colors.ToggleSwitchButton.Pressed.Win10": "#FF999999",
+        "MahApps.Colors.ToggleSwitchButton.OffBorder.Win10": "#FFCCCCCC",
+        "MahApps.Colors.ToggleSwitchButton.OffMouseOverBorder.Win10": "#FFFFFFFF",
+        "MahApps.Colors.ToggleSwitchButton.OffDisabledBorder.Win10": "#FF666666",
+        "MahApps.Colors.ToggleSwitchButton.OnSwitchDisabled.Win10": "#FF444444",
+        "MahApps.Colors.ToggleSwitchButton.ThumbIndicator.Win10": "#FFCCCCCC",
+        "MahApps.Colors.ToggleSwitchButton.ThumbIndicatorMouseOver.Win10": "#FFFFFFFF",
+        "MahApps.Colors.ToggleSwitchButton.ThumbIndicatorPressed.Win10": "#FFFFFFFF",
+        "MahApps.Colors.ToggleSwitchButton.ThumbIndicatorDisabled.Win10": "#FF666666",
+        "MahApps.Colors.Badged.DisabledBackground": "#FF666666"
       }
     },
     {
@@ -70,28 +70,28 @@
         "MahApps.Colors.GrayHover": "#FF333333",
         "MahApps.Colors.Flyout": "#FFFFFFFF",
         "MahApps.Colors.MenuShadow": "#FF000000",
-        "MahApps.Brushes.MenuItem.DisabledForeground": "{StaticResource MahApps.Colors.Gray2}",
-        "MahApps.Brushes.SliderValue.Disabled": "#FFBABABA",
-        "MahApps.Brushes.SliderTrack.Disabled": "#FFDBDBDB",
-        "MahApps.Brushes.SliderThumb.Disabled": "#FFA0A0A0",
-        "MahApps.Brushes.SliderTrack.Hover": "#FFD0D0D0",
-        "MahApps.Brushes.SliderTrack.Normal": "#FFC6C6C6",
-        "MahApps.Brushes.FlatButton.PressedBackground": "#222222",
-        "MahApps.Brushes.MenuItem.SelectionFill": "#DEDEDE",
-        "MahApps.Brushes.MenuItem.SelectionStroke": "#DEDEDE",
-        "MahApps.Brushes.TopMenuItem.PressedFill": "#DEDEDE",
-        "MahApps.Brushes.TopMenuItem.PressedStroke": "#E0717070",
-        "MahApps.Brushes.TopMenuItem.SelectionStroke": "#90717070",
-        "MahApps.Brushes.ToggleSwitchButton.Pressed.Win10": "#FF666666",
-        "MahApps.Brushes.ToggleSwitchButton.OffBorder.Win10": "#FF333333",
-        "MahApps.Brushes.ToggleSwitchButton.OffMouseOverBorder.Win10": "#FF000000",
-        "MahApps.Brushes.ToggleSwitchButton.OffDisabledBorder.Win10": "#FF999999",
-        "MahApps.Brushes.ToggleSwitchButton.OnSwitchDisabled.Win10": "#FFCCCCCC",
-        "MahApps.Brushes.ToggleSwitchButton.ThumbIndicator.Win10": "#FF333333",
-        "MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorMouseOver.Win10": "#FF000000",
-        "MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorPressed.Win10": "#FFFFFFFF",
-        "MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorDisabled.Win10": "#FF999999",
-        "MahApps.Brushes.Badged.DisabledBackground": "#FF999999"
+        "MahApps.Colors.MenuItem.DisabledForeground": "{StaticResource MahApps.Colors.Gray2}",
+        "MahApps.Colors.SliderValue.Disabled": "#FFBABABA",
+        "MahApps.Colors.SliderTrack.Disabled": "#FFDBDBDB",
+        "MahApps.Colors.SliderThumb.Disabled": "#FFA0A0A0",
+        "MahApps.Colors.SliderTrack.Hover": "#FFD0D0D0",
+        "MahApps.Colors.SliderTrack.Normal": "#FFC6C6C6",
+        "MahApps.Colors.FlatButton.PressedBackground": "#222222",
+        "MahApps.Colors.MenuItem.SelectionFill": "#DEDEDE",
+        "MahApps.Colors.MenuItem.SelectionStroke": "#DEDEDE",
+        "MahApps.Colors.TopMenuItem.PressedFill": "#DEDEDE",
+        "MahApps.Colors.TopMenuItem.PressedStroke": "#E0717070",
+        "MahApps.Colors.TopMenuItem.SelectionStroke": "#90717070",
+        "MahApps.Colors.ToggleSwitchButton.Pressed.Win10": "#FF666666",
+        "MahApps.Colors.ToggleSwitchButton.OffBorder.Win10": "#FF333333",
+        "MahApps.Colors.ToggleSwitchButton.OffMouseOverBorder.Win10": "#FF000000",
+        "MahApps.Colors.ToggleSwitchButton.OffDisabledBorder.Win10": "#FF999999",
+        "MahApps.Colors.ToggleSwitchButton.OnSwitchDisabled.Win10": "#FFCCCCCC",
+        "MahApps.Colors.ToggleSwitchButton.ThumbIndicator.Win10": "#FF333333",
+        "MahApps.Colors.ToggleSwitchButton.ThumbIndicatorMouseOver.Win10": "#FF000000",
+        "MahApps.Colors.ToggleSwitchButton.ThumbIndicatorPressed.Win10": "#FFFFFFFF",
+        "MahApps.Colors.ToggleSwitchButton.ThumbIndicatorDisabled.Win10": "#FF999999",
+        "MahApps.Colors.Badged.DisabledBackground": "#FF999999"
       }
     }
   ],
diff --git a/src/MahApps.Metro/Styles/Themes/Theme.Template.xaml b/src/MahApps.Metro/Styles/Themes/Theme.Template.xaml
index 6d6990f4a2..4578049175 100644
--- a/src/MahApps.Metro/Styles/Themes/Theme.Template.xaml
+++ b/src/MahApps.Metro/Styles/Themes/Theme.Template.xaml
@@ -123,11 +123,11 @@
         <GradientStop Offset="1" Color="{StaticResource MahApps.Colors.Accent3}" />
     </LinearGradientBrush>
 
-    <SolidColorBrush x:Key="MahApps.Brushes.SliderValue.Disabled" Color="{{MahApps.Brushes.SliderValue.Disabled}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Brushes.SliderTrack.Disabled" Color="{{MahApps.Brushes.SliderTrack.Disabled}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Brushes.SliderThumb.Disabled" Color="{{MahApps.Brushes.SliderThumb.Disabled}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Brushes.SliderTrack.Hover" Color="{{MahApps.Brushes.SliderTrack.Hover}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Brushes.SliderTrack.Normal" Color="{{MahApps.Brushes.SliderTrack.Normal}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SliderValue.Disabled" Color="{{MahApps.Colors.SliderValue.Disabled}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SliderTrack.Disabled" Color="{{MahApps.Colors.SliderTrack.Disabled}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SliderThumb.Disabled" Color="{{MahApps.Colors.SliderThumb.Disabled}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SliderTrack.Hover" Color="{{MahApps.Colors.SliderTrack.Hover}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SliderTrack.Normal" Color="{{MahApps.Colors.SliderTrack.Normal}}" options:Freeze="True" />
 
     <SolidColorBrush x:Key="MahApps.Brushes.Flyout.Background" Color="{StaticResource MahApps.Colors.Flyout}" options:Freeze="True" />
     <SolidColorBrush x:Key="MahApps.Brushes.Flyout.Foreground" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
@@ -137,7 +137,7 @@
 
     <SolidColorBrush x:Key="MahApps.Brushes.FlatButton.Background" Color="#D5D5D5" options:Freeze="True" />
     <SolidColorBrush x:Key="MahApps.Brushes.FlatButton.Foreground" Color="#222222" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Brushes.FlatButton.PressedBackground" Color="{{MahApps.Brushes.FlatButton.PressedBackground}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.FlatButton.PressedBackground" Color="{{MahApps.Colors.FlatButton.PressedBackground}}" options:Freeze="True" />
     <SolidColorBrush x:Key="MahApps.Brushes.FlatButton.PressedForeground" Color="White" options:Freeze="True" />
 
     <SolidColorBrush x:Key="MahApps.Brushes.DarkIdealForegroundDisabled" Color="#ADADAD" options:Freeze="True" />
@@ -175,15 +175,15 @@
     <SolidColorBrush x:Key="MahApps.Brushes.ContextMenu.Border" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
     <SolidColorBrush x:Key="MahApps.Brushes.SubMenu.Border" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
 
-    <SolidColorBrush x:Key="MahApps.Brushes.MenuItem.SelectionFill" Color="{{MahApps.Brushes.MenuItem.SelectionFill}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Brushes.MenuItem.SelectionStroke" Color="{{MahApps.Brushes.MenuItem.SelectionStroke}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.MenuItem.SelectionFill" Color="{{MahApps.Colors.MenuItem.SelectionFill}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.MenuItem.SelectionStroke" Color="{{MahApps.Colors.MenuItem.SelectionStroke}}" options:Freeze="True" />
 
-    <SolidColorBrush x:Key="MahApps.Brushes.TopMenuItem.PressedFill" Color="{{MahApps.Brushes.TopMenuItem.PressedFill}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Brushes.TopMenuItem.PressedStroke" Color="{{MahApps.Brushes.TopMenuItem.PressedStroke}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Brushes.TopMenuItem.SelectionStroke" Color="{{MahApps.Brushes.TopMenuItem.SelectionStroke}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.TopMenuItem.PressedFill" Color="{{MahApps.Colors.TopMenuItem.PressedFill}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.TopMenuItem.PressedStroke" Color="{{MahApps.Colors.TopMenuItem.PressedStroke}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.TopMenuItem.SelectionStroke" Color="{{MahApps.Colors.TopMenuItem.SelectionStroke}}" options:Freeze="True" />
 
     <!--  original #FF9A9A9A"  -->
-    <SolidColorBrush x:Key="MahApps.Brushes.MenuItem.DisabledForeground" Color="{{MahApps.Brushes.MenuItem.DisabledForeground}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.MenuItem.DisabledForeground" Color="{{MahApps.Colors.MenuItem.DisabledForeground}}" options:Freeze="True" />
     <SolidColorBrush x:Key="MahApps.Brushes.MenuItem.DisabledGlyphPanel" Color="#848589" options:Freeze="True" />
 
      <SolidColorBrush x:Key="{x:Static SystemColors.MenuTextBrushKey}" Color="{StaticResource MahApps.Colors.Black}" options:Freeze="True" />
@@ -209,21 +209,21 @@
     <SolidColorBrush x:Key="MahApps.Brushes.DataGrid.InactiveSelectionHighlight" Color="{StaticResource MahApps.Colors.Accent2}" options:Freeze="True" />
     <SolidColorBrush x:Key="MahApps.Brushes.DataGrid.InactiveSelectionHighlightText" Color="{StaticResource MahApps.Colors.IdealForeground}" options:Freeze="True" />
 
-    <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.Pressed.Win10" Color="{{MahApps.Brushes.ToggleSwitchButton.Pressed.Win10}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.OffBorder.Win10" Color="{{MahApps.Brushes.ToggleSwitchButton.OffBorder.Win10}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.OffMouseOverBorder.Win10" Color="{{MahApps.Brushes.ToggleSwitchButton.OffMouseOverBorder.Win10}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.OffDisabledBorder.Win10" Color="{{MahApps.Brushes.ToggleSwitchButton.OffDisabledBorder.Win10}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.Pressed.Win10" Color="{{MahApps.Colors.ToggleSwitchButton.Pressed.Win10}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.OffBorder.Win10" Color="{{MahApps.Colors.ToggleSwitchButton.OffBorder.Win10}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.OffMouseOverBorder.Win10" Color="{{MahApps.Colors.ToggleSwitchButton.OffMouseOverBorder.Win10}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.OffDisabledBorder.Win10" Color="{{MahApps.Colors.ToggleSwitchButton.OffDisabledBorder.Win10}}" options:Freeze="True" />
     <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.OffSwitch.Win10" Color="Transparent" options:Freeze="True" />
     <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.OnSwitch.Win10" Color="{StaticResource MahApps.Colors.Accent}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.OnSwitchDisabled.Win10" Color="{{MahApps.Brushes.ToggleSwitchButton.OnSwitchDisabled.Win10}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.OnSwitchDisabled.Win10" Color="{{MahApps.Colors.ToggleSwitchButton.OnSwitchDisabled.Win10}}" options:Freeze="True" />
     <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.OnSwitchMouseOver.Win10" Color="{StaticResource MahApps.Colors.Accent2}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.ThumbIndicator.Win10" Color="{{MahApps.Brushes.ToggleSwitchButton.ThumbIndicator.Win10}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorMouseOver.Win10" Color="{{MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorMouseOver.Win10}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.ThumbIndicator.Win10" Color="{{MahApps.Colors.ToggleSwitchButton.ThumbIndicator.Win10}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorMouseOver.Win10" Color="{{MahApps.Colors.ToggleSwitchButton.ThumbIndicatorMouseOver.Win10}}" options:Freeze="True" />
     <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorChecked.Win10" Color="{StaticResource MahApps.Colors.IdealForeground}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorPressed.Win10" Color="{{MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorPressed.Win10}}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorDisabled.Win10" Color="{{MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorDisabled.Win10}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorPressed.Win10" Color="{{MahApps.Colors.ToggleSwitchButton.ThumbIndicatorPressed.Win10}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ToggleSwitchButton.ThumbIndicatorDisabled.Win10" Color="{{MahApps.Colors.ToggleSwitchButton.ThumbIndicatorDisabled.Win10}}" options:Freeze="True" />
 
-    <SolidColorBrush x:Key="MahApps.Brushes.Badged.DisabledBackground" Color="{{MahApps.Brushes.Badged.DisabledBackground}}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Badged.DisabledBackground" Color="{{MahApps.Colors.Badged.DisabledBackground}}" options:Freeze="True" />
 
     <!--  HamburgerMenu  -->
 

From 58da447d9e4005ff4a5d6f2a4ffbc86fd752c6dc Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Fri, 26 Jul 2019 22:42:44 +0200
Subject: [PATCH 46/46] Use .NET Core 3.0 Preview 7

---
 appveyor.yml    | 5 -----
 src/global.json | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 4d9ca2248b..6e388b8d2d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -24,11 +24,6 @@ test: off
 
 install:
   - cinst netfx-4.7-devpack
-  #- ps: Start-FileDownload 'https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x64.exe'
-  #- ps: Start-Process .\dotnet-sdk-latest-win-x64.exe "/install /norestart /quiet /log sdkinstall.log" -NoNewWindow -Wait
-  #- ps: Start-FileDownload 'https://download.visualstudio.microsoft.com/download/pr/4032ceb5-61cd-495a-ab25-475aa2232f28/7eb614e777d87ef0d49f86be4fc8bbde/dotnet-sdk-3.0.100-preview4-011223-win-x64.exe'
-  #- ps: Start-Process .\dotnet-sdk-3.0.100-preview4-011223-win-x64.exe "/install /norestart /quiet /log sdkinstall.log" -NoNewWindow -Wait
-  # Install dotnet core 3.0 latest (alpha!!), as this is not provided on AppVeyor yet
   - cinst dotnetcore-sdk --pre
 
 pull_requests:
diff --git a/src/global.json b/src/global.json
index 2927e0d186..d79ad951a4 100644
--- a/src/global.json
+++ b/src/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "3.0.100-preview6"
+        "version": "3.0.100-preview"
     }
 }
\ No newline at end of file