From fbeb9a0b21a1865fa94663294ad39dc6fbca9e4a Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Sat, 7 Nov 2020 18:11:43 +0100
Subject: [PATCH 1/5] (GH-3963) Set Icon always hit test visible to chrome

---
 src/MahApps.Metro/Behaviors/BorderlessWindowBehavior.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/MahApps.Metro/Behaviors/BorderlessWindowBehavior.cs b/src/MahApps.Metro/Behaviors/BorderlessWindowBehavior.cs
index be1f21923d..7793ba6ca9 100644
--- a/src/MahApps.Metro/Behaviors/BorderlessWindowBehavior.cs
+++ b/src/MahApps.Metro/Behaviors/BorderlessWindowBehavior.cs
@@ -40,10 +40,10 @@ protected override void AssociatedObject_Loaded(object sender, RoutedEventArgs e
         {
             if (sender is MetroWindow window)
             {
+                window.SetIsHitTestVisibleInChromeProperty<UIElement>("PART_Icon");
+
                 if (window.ResizeMode != ResizeMode.NoResize)
                 {
-                    //window.SetIsHitTestVisibleInChromeProperty<Border>("PART_Border");
-                    window.SetIsHitTestVisibleInChromeProperty<UIElement>("PART_Icon");
                     window.SetWindowChromeResizeGripDirection("WindowResizeGrip", ResizeGripDirection.BottomRight);
                 }
             }

From 99f4dee8ed118162a137fbb433e51197c2b3500e Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Sat, 7 Nov 2020 18:13:36 +0100
Subject: [PATCH 2/5] (GH-3963) Fix template binding for inner grid background
 for ContentControlEx

---
 src/MahApps.Metro/Themes/ContentControlEx.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/MahApps.Metro/Themes/ContentControlEx.xaml b/src/MahApps.Metro/Themes/ContentControlEx.xaml
index f2c8978cbc..f33e3343ac 100644
--- a/src/MahApps.Metro/Themes/ContentControlEx.xaml
+++ b/src/MahApps.Metro/Themes/ContentControlEx.xaml
@@ -12,7 +12,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:ContentControlEx}">
-                    <Grid Background="Transparent">
+                    <Grid Background="{TemplateBinding Background}">
                         <ContentPresenter x:Name="PART_ContentPresenter"
                                           Margin="{TemplateBinding Padding}"
                                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"

From d6c8728b0eeb724989803838829f132971f4bac8 Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Sat, 7 Nov 2020 18:14:34 +0100
Subject: [PATCH 3/5] (GH-3963) Bind the IsHitTestVisibleInChromeProperty to
 the content of the ContentControlEx

---
 src/MahApps.Metro/Controls/ContentControlEx.cs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/MahApps.Metro/Controls/ContentControlEx.cs b/src/MahApps.Metro/Controls/ContentControlEx.cs
index 50f2965bd7..f4922b96ca 100644
--- a/src/MahApps.Metro/Controls/ContentControlEx.cs
+++ b/src/MahApps.Metro/Controls/ContentControlEx.cs
@@ -4,6 +4,8 @@
 
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Data;
+using ControlzEx.Windows.Shell;
 using MahApps.Metro.ValueBoxes;
 
 namespace MahApps.Metro.Controls
@@ -47,5 +49,20 @@ static ContentControlEx()
         {
             DefaultStyleKeyProperty.OverrideMetadata(typeof(ContentControlEx), new FrameworkPropertyMetadata(typeof(ContentControlEx)));
         }
+
+        protected override void OnContentChanged(object oldContent, object newContent)
+        {
+            if (oldContent is IInputElement && oldContent is DependencyObject oldInputElement)
+            {
+                BindingOperations.ClearBinding(oldInputElement, WindowChrome.IsHitTestVisibleInChromeProperty);
+            }
+
+            base.OnContentChanged(oldContent, newContent);
+
+            if (newContent is IInputElement && newContent is DependencyObject newInputElement)
+            {
+                BindingOperations.SetBinding(newInputElement, WindowChrome.IsHitTestVisibleInChromeProperty, new Binding { Path = new PropertyPath(WindowChrome.IsHitTestVisibleInChromeProperty), Source = this });
+            }
+        }
     }
 }
\ No newline at end of file

From b59a5037390a7df39acc0a33017f84e1277c12c9 Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Sat, 7 Nov 2020 18:15:16 +0100
Subject: [PATCH 4/5] (GH-3963) Bind the IsHitTestVisibleInChromeProperty to
 the content of the new ContentPresenterEx

---
 .../MahApps.Metro.Demo/MainWindow.xaml.cs     |   9 +-
 .../Controls/ContentPresenterEx.cs            |  32 +++++
 src/MahApps.Metro/Themes/MetroWindow.xaml     | 129 +++++++++++-------
 3 files changed, 119 insertions(+), 51 deletions(-)
 create mode 100644 src/MahApps.Metro/Controls/ContentPresenterEx.cs

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 57046181fd..d198fda0c0 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml.cs
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml.cs
@@ -438,7 +438,14 @@ private MetroWindow GetTestWindow()
                 testWindow.Close();
             }
 
-            testWindow = new MetroWindow() { Owner = this, WindowStartupLocation = WindowStartupLocation.CenterOwner, Title = "Another Test...", Width = 500, Height = 300 };
+            testWindow = new MetroWindow()
+                         {
+                             Owner = this,
+                             WindowStartupLocation = WindowStartupLocation.CenterOwner,
+                             Title = "Another Test...",
+                             Width = 500,
+                             Height = 300
+                         };
             testWindow.Closed += (o, args) => testWindow = null;
             return testWindow;
         }
diff --git a/src/MahApps.Metro/Controls/ContentPresenterEx.cs b/src/MahApps.Metro/Controls/ContentPresenterEx.cs
new file mode 100644
index 0000000000..8950e8c3da
--- /dev/null
+++ b/src/MahApps.Metro/Controls/ContentPresenterEx.cs
@@ -0,0 +1,32 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using ControlzEx.Windows.Shell;
+
+namespace MahApps.Metro.Controls
+{
+    public class ContentPresenterEx : ContentPresenter
+    {
+        static ContentPresenterEx()
+        {
+            ContentProperty.OverrideMetadata(typeof(ContentPresenterEx), new FrameworkPropertyMetadata(OnContentPropertyChanged));
+        }
+
+        private static void OnContentPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (e.OldValue is IInputElement && e.OldValue is DependencyObject oldInputElement)
+            {
+                BindingOperations.ClearBinding(oldInputElement, WindowChrome.IsHitTestVisibleInChromeProperty);
+            }
+
+            if (e.NewValue is IInputElement && e.NewValue is DependencyObject newInputElement)
+            {
+                BindingOperations.SetBinding(newInputElement, WindowChrome.IsHitTestVisibleInChromeProperty, new Binding { Path = new PropertyPath(WindowChrome.IsHitTestVisibleInChromeProperty), Source = d });
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/MahApps.Metro/Themes/MetroWindow.xaml b/src/MahApps.Metro/Themes/MetroWindow.xaml
index f1c250dad5..c859022c6e 100644
--- a/src/MahApps.Metro/Themes/MetroWindow.xaml
+++ b/src/MahApps.Metro/Themes/MetroWindow.xaml
@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:behaviors="clr-namespace:MahApps.Metro.Behaviors"
                     xmlns:controlzEx="urn:controlzex"
                     xmlns:converters="clr-namespace:MahApps.Metro.Converters"
                     xmlns:mah="clr-namespace:MahApps.Metro.Controls">
@@ -71,19 +72,21 @@
                                VerticalAlignment="Top"
                                Focusable="False">
                         <!--  the left window commands  -->
-                        <ContentPresenter x:Name="PART_LeftWindowCommands"
-                                          Height="{Binding TitleBarHeight, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                                          VerticalAlignment="Top"
-                                          Content="{Binding LeftWindowCommands, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                                          DockPanel.Dock="Left"
-                                          Focusable="False" />
+                        <mah:ContentPresenterEx x:Name="PART_LeftWindowCommands"
+                                                Height="{Binding TitleBarHeight, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                                VerticalAlignment="Top"
+                                                controlzEx:WindowChrome.IsHitTestVisibleInChrome="True"
+                                                Content="{Binding LeftWindowCommands, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                                DockPanel.Dock="Left"
+                                                Focusable="False" />
                         <!--  the right window commands  -->
-                        <ContentPresenter x:Name="PART_RightWindowCommands"
-                                          Height="{Binding TitleBarHeight, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                                          VerticalAlignment="Top"
-                                          Content="{Binding RightWindowCommands, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                                          DockPanel.Dock="Right"
-                                          Focusable="False" />
+                        <mah:ContentPresenterEx x:Name="PART_RightWindowCommands"
+                                                Height="{Binding TitleBarHeight, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                                VerticalAlignment="Top"
+                                                controlzEx:WindowChrome.IsHitTestVisibleInChrome="True"
+                                                Content="{Binding RightWindowCommands, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                                DockPanel.Dock="Right"
+                                                Focusable="False" />
                         <!--  the title bar  -->
                         <mah:MetroThumbContentControl x:Name="PART_TitleBar"
                                                       Height="{Binding TitleBarHeight, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
@@ -108,15 +111,16 @@
                     </DockPanel>
 
                     <!--  the window button commands  -->
-                    <ContentPresenter x:Name="PART_WindowButtonCommands"
-                                      Grid.Row="1"
-                                      Grid.RowSpan="2"
-                                      Grid.Column="3"
-                                      Height="{Binding TitleBarHeight, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                                      VerticalAlignment="Top"
-                                      Panel.ZIndex="1"
-                                      Content="{Binding WindowButtonCommands, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                                      Focusable="False" />
+                    <mah:ContentPresenterEx x:Name="PART_WindowButtonCommands"
+                                            Grid.Row="1"
+                                            Grid.RowSpan="2"
+                                            Grid.Column="3"
+                                            Height="{Binding TitleBarHeight, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                            VerticalAlignment="Top"
+                                            Panel.ZIndex="1"
+                                            controlzEx:WindowChrome.IsHitTestVisibleInChrome="True"
+                                            Content="{Binding WindowButtonCommands, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                            Focusable="False" />
 
                     <!--  the main window content  -->
                     <mah:MetroContentControl x:Name="PART_Content"
@@ -128,7 +132,10 @@
                                              OnlyLoadTransition="True"
                                              TransitionsEnabled="{TemplateBinding WindowTransitionsEnabled}"
                                              UseLayoutRounding="True">
-                        <ContentPresenter Margin="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={StaticResource ThicknessBindingConverter}, ConverterParameter={x:Static converters:ThicknessSideType.Top}}" UseLayoutRounding="False" />
+                        <mah:ContentPresenterEx x:Name="PART_ContentPresenter"
+                                                Margin="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={StaticResource ThicknessBindingConverter}, ConverterParameter={x:Static converters:ThicknessSideType.Top}}"
+                                                controlzEx:WindowChrome.IsHitTestVisibleInChrome="True"
+                                                UseLayoutRounding="False" />
                     </mah:MetroContentControl>
 
                     <!--  disables the main content when a modal flyout is shown  -->
@@ -244,11 +251,19 @@
             </MultiTrigger>
             <!--  HitTest visibility  -->
             <Trigger Property="GlowBrush" Value="{x:Null}">
-                <Setter TargetName="PART_Border" Property="controlzEx:WindowChrome.IsHitTestVisibleInChrome" Value="True" />
+                <Setter TargetName="PART_Border" Property="controlzEx:WindowChrome.IsHitTestVisibleInChrome" Value="False" />
+                <Setter TargetName="PART_ContentPresenter" Property="controlzEx:WindowChrome.IsHitTestVisibleInChrome" Value="False" />
+                <Setter TargetName="PART_LeftWindowCommands" Property="controlzEx:WindowChrome.IsHitTestVisibleInChrome" Value="False" />
+                <Setter TargetName="PART_RightWindowCommands" Property="controlzEx:WindowChrome.IsHitTestVisibleInChrome" Value="False" />
+                <Setter TargetName="PART_WindowButtonCommands" Property="controlzEx:WindowChrome.IsHitTestVisibleInChrome" Value="False" />
             </Trigger>
             <Trigger Property="ResizeMode" Value="NoResize">
-                <Setter Property="ResizeBorderThickness" Value="0" />
-                <Setter TargetName="PART_Border" Property="controlzEx:WindowChrome.IsHitTestVisibleInChrome" Value="False" />
+                <Setter TargetName="PART_Border" Property="controlzEx:WindowChrome.IsHitTestVisibleInChrome" Value="True" />
+                <Setter TargetName="PART_ContentPresenter" Property="controlzEx:WindowChrome.IsHitTestVisibleInChrome" Value="True" />
+                <Setter TargetName="PART_LeftWindowCommands" Property="controlzEx:WindowChrome.IsHitTestVisibleInChrome" Value="True" />
+                <Setter TargetName="PART_RightWindowCommands" Property="controlzEx:WindowChrome.IsHitTestVisibleInChrome" Value="True" />
+                <Setter TargetName="PART_TitleBar" Property="controlzEx:WindowChrome.IsHitTestVisibleInChrome" Value="True" />
+                <Setter TargetName="PART_WindowButtonCommands" Property="controlzEx:WindowChrome.IsHitTestVisibleInChrome" Value="True" />
             </Trigger>
             <!--  no icon and no icon content template -> collapse the icon content control  -->
             <MultiTrigger>
@@ -354,33 +369,36 @@
                                Panel.ZIndex="1"
                                Focusable="False">
                         <!--  the left window commands  -->
-                        <ContentPresenter x:Name="PART_LeftWindowCommands"
-                                          Height="{Binding TitleBarHeight, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                                          VerticalAlignment="Top"
-                                          Content="{Binding LeftWindowCommands, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                                          DockPanel.Dock="Left"
-                                          Focusable="False" />
+                        <mah:ContentPresenterEx x:Name="PART_LeftWindowCommands"
+                                                Height="{Binding TitleBarHeight, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                                VerticalAlignment="Top"
+                                                controlzEx:WindowChrome.IsHitTestVisibleInChrome="True"
+                                                Content="{Binding LeftWindowCommands, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                                DockPanel.Dock="Left"
+                                                Focusable="False" />
                         <!--  the right window commands  -->
-                        <ContentPresenter x:Name="PART_RightWindowCommands"
-                                          Height="{Binding TitleBarHeight, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                                          VerticalAlignment="Top"
-                                          Content="{Binding RightWindowCommands, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                                          DockPanel.Dock="Right"
-                                          Focusable="False" />
+                        <mah:ContentPresenterEx x:Name="PART_RightWindowCommands"
+                                                Height="{Binding TitleBarHeight, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                                VerticalAlignment="Top"
+                                                controlzEx:WindowChrome.IsHitTestVisibleInChrome="True"
+                                                Content="{Binding RightWindowCommands, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                                DockPanel.Dock="Right"
+                                                Focusable="False" />
                         <!--  the fake title bar  -->
                         <Grid />
                     </DockPanel>
 
                     <!--  the window button commands  -->
-                    <ContentPresenter x:Name="PART_WindowButtonCommands"
-                                      Grid.Row="1"
-                                      Grid.RowSpan="2"
-                                      Grid.Column="3"
-                                      Height="{Binding TitleBarHeight, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                                      VerticalAlignment="Top"
-                                      Panel.ZIndex="1"
-                                      Content="{Binding WindowButtonCommands, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                                      Focusable="False" />
+                    <mah:ContentPresenterEx x:Name="PART_WindowButtonCommands"
+                                            Grid.Row="1"
+                                            Grid.RowSpan="2"
+                                            Grid.Column="3"
+                                            Height="{Binding TitleBarHeight, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                            VerticalAlignment="Top"
+                                            Panel.ZIndex="1"
+                                            controlzEx:WindowChrome.IsHitTestVisibleInChrome="True"
+                                            Content="{Binding WindowButtonCommands, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                            Focusable="False" />
 
                     <!--  the main window content  -->
                     <mah:MetroContentControl x:Name="PART_Content"
@@ -392,7 +410,10 @@
                                              OnlyLoadTransition="True"
                                              TransitionsEnabled="{TemplateBinding WindowTransitionsEnabled}"
                                              UseLayoutRounding="True">
-                        <ContentPresenter Margin="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={StaticResource ThicknessBindingConverter}, ConverterParameter={x:Static converters:ThicknessSideType.Top}}" UseLayoutRounding="False" />
+                        <mah:ContentPresenterEx x:Name="PART_ContentPresenter"
+                                                Margin="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={StaticResource ThicknessBindingConverter}, ConverterParameter={x:Static converters:ThicknessSideType.Top}}"
+                                                controlzEx:WindowChrome.IsHitTestVisibleInChrome="True"
+                                                UseLayoutRounding="False" />
                     </mah:MetroContentControl>
 
                     <!--  disables the main content when a modal flyout is shown  -->
@@ -525,11 +546,19 @@
             </MultiTrigger>
             <!--  HitTest visibility  -->
             <Trigger Property="GlowBrush" Value="{x:Null}">
-                <Setter TargetName="PART_Border" Property="controlzEx:WindowChrome.IsHitTestVisibleInChrome" Value="True" />
+                <Setter TargetName="PART_Border" Property="controlzEx:WindowChrome.IsHitTestVisibleInChrome" Value="False" />
+                <Setter TargetName="PART_ContentPresenter" Property="controlzEx:WindowChrome.IsHitTestVisibleInChrome" Value="False" />
+                <Setter TargetName="PART_LeftWindowCommands" Property="controlzEx:WindowChrome.IsHitTestVisibleInChrome" Value="False" />
+                <Setter TargetName="PART_RightWindowCommands" Property="controlzEx:WindowChrome.IsHitTestVisibleInChrome" Value="False" />
+                <Setter TargetName="PART_WindowButtonCommands" Property="controlzEx:WindowChrome.IsHitTestVisibleInChrome" Value="False" />
             </Trigger>
             <Trigger Property="ResizeMode" Value="NoResize">
-                <Setter Property="ResizeBorderThickness" Value="0" />
-                <Setter TargetName="PART_Border" Property="controlzEx:WindowChrome.IsHitTestVisibleInChrome" Value="False" />
+                <Setter TargetName="PART_Border" Property="controlzEx:WindowChrome.IsHitTestVisibleInChrome" Value="True" />
+                <Setter TargetName="PART_ContentPresenter" Property="controlzEx:WindowChrome.IsHitTestVisibleInChrome" Value="True" />
+                <Setter TargetName="PART_LeftWindowCommands" Property="controlzEx:WindowChrome.IsHitTestVisibleInChrome" Value="True" />
+                <Setter TargetName="PART_RightWindowCommands" Property="controlzEx:WindowChrome.IsHitTestVisibleInChrome" Value="True" />
+                <Setter TargetName="PART_TitleBar" Property="controlzEx:WindowChrome.IsHitTestVisibleInChrome" Value="True" />
+                <Setter TargetName="PART_WindowButtonCommands" Property="controlzEx:WindowChrome.IsHitTestVisibleInChrome" Value="True" />
             </Trigger>
             <!--  no icon and no icon content template -> collapse the icon content control  -->
             <MultiTrigger>

From 86df8f9ae046d69d643602183ffb4a6ed71c3963 Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Sat, 7 Nov 2020 23:20:09 +0100
Subject: [PATCH 5/5] Update xmlns and XmlnsDefinition

---
 .../Views/Flyouts/Flyout1View.xaml            |  22 +-
 .../Views/Flyouts/FlyoutTopView.xaml          |   4 +-
 .../Views/ShellView.xaml                      |  60 +-
 .../MahApps.Metro.Demo/App.xaml               |  50 +-
 .../ExampleViews/ButtonsExample.xaml          | 188 ++---
 .../ExampleViews/ColorExample.xaml            |   8 +-
 .../ExampleViews/DataGridExamples.xaml        |  46 +-
 .../ExampleViews/DateExamples.xaml            | 161 ++--
 .../HamburgerMenuCreatorsUpdate.xaml          |   7 +-
 .../ExampleViews/HamburgerMenuDefault.xaml    |   7 +-
 .../ExampleViews/HamburgerMenuSample.xaml     |  12 +-
 .../ExampleViews/OtherExamples.xaml           | 121 ++-
 .../ExampleViews/ProgressBars.xaml            | 134 ++--
 .../ExampleViews/SelectionExamples.xaml       |  54 +-
 .../ExampleViews/Sliders.xaml                 | 730 +++++++++---------
 .../ExampleViews/SplitViewExamples.xaml       |  74 +-
 .../ExampleViews/TabControlExamples.xaml      | 184 ++---
 .../ExampleViews/TextExamples.xaml            | 229 +++---
 .../ExampleViews/TilesExample.xaml            |  86 +--
 .../ExampleWindows/CleanWindowDemo.xaml       | 102 +--
 .../ExampleWindows/DynamicFlyout.xaml         |  30 +-
 .../ExampleWindows/FlyoutDemo.xaml            | 250 +++---
 .../ExampleWindows/InteropDemo.xaml           |  22 +-
 .../ExampleWindows/ShowcaseFlyout.xaml        | 115 ++-
 .../ExampleWindows/SizeToContentDemo.xaml     |  20 +-
 .../ExampleWindows/VSDemo.xaml                |  40 +-
 .../HamburgerMenuRipple.xaml                  |  10 +-
 .../MahApps.Metro.Demo/MainWindow.xaml        |  99 ++-
 .../Controls/Dialogs/InputDialog.xaml         |  32 +-
 .../Controls/Dialogs/LoginDialog.xaml         |  58 +-
 .../Controls/Dialogs/MessageDialog.xaml       |  32 +-
 .../Controls/Dialogs/ProgressDialog.xaml      |  40 +-
 .../Controls/MetroNavigationWindow.xaml       |  14 +-
 src/MahApps.Metro/Properties/AssemblyInfo.cs  |  16 +-
 src/MahApps.Metro/Styles/Clean/Controls.xaml  |   8 +-
 src/MahApps.Metro/Styles/Clean/GroupBox.xaml  |  38 +-
 .../Styles/Clean/MetroWindow.xaml             |   4 +-
 .../Styles/Clean/WindowButtonCommands.xaml    |   6 +-
 .../Styles/Clean/WindowCommands.xaml          |   6 +-
 .../Styles/Controls.Buttons.xaml              | 458 +++++------
 .../Styles/Controls.CheckBox.xaml             | 596 +++++++-------
 .../Styles/Controls.ComboBox.xaml             | 196 ++---
 .../Styles/Controls.DatePicker.xaml           | 154 ++--
 .../Styles/Controls.Expander.xaml             | 176 ++---
 .../Styles/Controls.GroupBox.xaml             |  64 +-
 .../Styles/Controls.ListBox.xaml              |  63 +-
 .../Styles/Controls.ListView.xaml             | 106 +--
 .../Styles/Controls.MenuItem.xaml             |  10 +-
 .../Styles/Controls.PasswordBox.xaml          | 236 +++---
 .../Styles/Controls.RadioButton.xaml          | 236 +++---
 .../Styles/Controls.Scrollbars.xaml           |  26 +-
 .../Styles/Controls.Shadows.xaml              |   4 +-
 src/MahApps.Metro/Styles/Controls.Shared.xaml |   4 +-
 src/MahApps.Metro/Styles/Controls.Slider.xaml | 248 +++---
 .../Styles/Controls.StatusBar.xaml            |   6 +-
 .../Styles/Controls.TabControl.xaml           |  10 +-
 .../Styles/Controls.TextBox.xaml              | 290 +++----
 .../Styles/Controls.Toolbar.xaml              |  50 +-
 .../Styles/Controls.Tooltip.xaml              |  22 +-
 .../Styles/Controls.TreeView.xaml             |  70 +-
 .../Styles/Controls.ValidationError.xaml      |   6 +-
 src/MahApps.Metro/Styles/Fonts.xaml           |  42 +-
 src/MahApps.Metro/Styles/VS/Button.xaml       |  14 +-
 src/MahApps.Metro/Styles/VS/Colors.xaml       | 110 +--
 src/MahApps.Metro/Styles/VS/Expander.xaml     | 154 ++--
 src/MahApps.Metro/Styles/VS/GroupBox.xaml     |  48 +-
 src/MahApps.Metro/Styles/VS/MetroWindow.xaml  |   8 +-
 src/MahApps.Metro/Styles/VS/ScrollBar.xaml    |   6 +-
 src/MahApps.Metro/Styles/VS/Shadows.xaml      |   4 +-
 src/MahApps.Metro/Styles/VS/TabControl.xaml   |  48 +-
 src/MahApps.Metro/Themes/Badged.xaml          |   8 +-
 .../Themes/ContentControlEx.xaml              |  10 +-
 src/MahApps.Metro/Themes/DateTimePicker.xaml  | 140 ++--
 .../Themes/Dialogs/BaseMetroDialog.xaml       |  10 +-
 src/MahApps.Metro/Themes/DropDownButton.xaml  |  44 +-
 src/MahApps.Metro/Themes/Flyout.xaml          |  60 +-
 src/MahApps.Metro/Themes/FlyoutsControl.xaml  |   4 +-
 src/MahApps.Metro/Themes/FontIcon.xaml        |   6 +-
 src/MahApps.Metro/Themes/HamburgerMenu.xaml   |   6 +-
 .../Themes/HamburgerMenuTemplate.xaml         | 230 +++---
 src/MahApps.Metro/Themes/HotKeyBox.xaml       |  56 +-
 .../Themes/MetroAnimatedTabControl.xaml       |  36 +-
 .../Themes/MetroContentControl.xaml           |   6 +-
 src/MahApps.Metro/Themes/MetroHeader.xaml     |  50 +-
 .../Themes/MetroProgressBar.xaml              |  10 +-
 src/MahApps.Metro/Themes/MetroTabControl.xaml |  42 +-
 src/MahApps.Metro/Themes/MetroTabItem.xaml    | 144 ++--
 src/MahApps.Metro/Themes/MetroWindow.xaml     |   1 -
 src/MahApps.Metro/Themes/NumericUpDown.xaml   |  55 +-
 src/MahApps.Metro/Themes/Pivot.xaml           |  26 +-
 src/MahApps.Metro/Themes/ProgressRing.xaml    |   6 +-
 src/MahApps.Metro/Themes/RangeSlider.xaml     | 462 +++++------
 src/MahApps.Metro/Themes/SplitButton.xaml     |  88 +--
 src/MahApps.Metro/Themes/SplitView.xaml       | 129 ++--
 src/MahApps.Metro/Themes/Tile.xaml            |  14 +-
 .../Themes/TransitioningContentControl.xaml   |   8 +-
 src/MahApps.Metro/Themes/Underline.xaml       |  14 +-
 .../Themes/WindowButtonCommands.xaml          |  86 +--
 src/MahApps.Metro/Themes/WindowCommands.xaml  |  78 +-
 .../Views/AnimatedTabControlWindow.xaml       |  42 +-
 .../Views/AutoWatermarkTestWindow.xaml        |  48 +-
 .../Views/ButtonWindow.xaml                   |  32 +-
 .../Views/CleanWindow.xaml                    |  32 +-
 .../Views/DateAndTimePickerWindow.xaml        |  52 +-
 .../Views/DialogWindow.xaml                   |  29 +-
 .../Views/FlyoutWindow.xaml                   |  70 +-
 .../Views/HiddenMinMaxCloseButtonsWindow.xaml |  26 +-
 .../Views/NumericUpDownWindow.xaml            |  22 +-
 .../Views/TextBoxHelperTestWindow.xaml        |  24 +-
 109 files changed, 4399 insertions(+), 4391 deletions(-)

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/Flyouts/Flyout1View.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/Flyouts/Flyout1View.xaml
index 7dd378c3bd..c902b39f98 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/Flyouts/Flyout1View.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Views/Flyouts/Flyout1View.xaml
@@ -1,8 +1,8 @@
 <UserControl x:Class="Caliburn.Metro.Demo.Views.Flyouts.Flyout1View"
              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;assembly=MahApps.Metro"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              d:DesignHeight="300"
              d:DesignWidth="300"
@@ -18,16 +18,16 @@
 
         <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
             <StackPanel Orientation="Vertical">
-                <TextBox Controls:TextBoxHelper.Watermark="TextBox 01" />
-                <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 02" />
-                <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 03" />
-                <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 04" />
-                <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 05" />
-                <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 06" />
-                <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 07" />
-                <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 08" />
-                <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 09" />
-                <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 10" />
+                <TextBox mah:TextBoxHelper.Watermark="TextBox 01" />
+                <TextBox Margin="0 5 0 0" mah:TextBoxHelper.Watermark="TextBox 02" />
+                <TextBox Margin="0 5 0 0" mah:TextBoxHelper.Watermark="TextBox 03" />
+                <TextBox Margin="0 5 0 0" mah:TextBoxHelper.Watermark="TextBox 04" />
+                <TextBox Margin="0 5 0 0" mah:TextBoxHelper.Watermark="TextBox 05" />
+                <TextBox Margin="0 5 0 0" mah:TextBoxHelper.Watermark="TextBox 06" />
+                <TextBox Margin="0 5 0 0" mah:TextBoxHelper.Watermark="TextBox 07" />
+                <TextBox Margin="0 5 0 0" mah:TextBoxHelper.Watermark="TextBox 08" />
+                <TextBox Margin="0 5 0 0" mah:TextBoxHelper.Watermark="TextBox 09" />
+                <TextBox Margin="0 5 0 0" mah:TextBoxHelper.Watermark="TextBox 10" />
             </StackPanel>
         </ScrollViewer>
 
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 1efc0c0429..67de49433d 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
@@ -1,9 +1,9 @@
 <UserControl x:Class="Caliburn.Metro.Demo.Views.Flyouts.FlyoutTopView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:Controls="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
+             xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              d:DesignHeight="300"
              d:DesignWidth="300"
@@ -17,7 +17,7 @@
                 Height="36"
                 FontFamily="Segoe UI Symbol"
                 FontSize="16"
-                Foreground="{Binding RelativeSource={RelativeSource AncestorType={x:Type Controls:Flyout}}, Path=Foreground}"
+                Foreground="{Binding RelativeSource={RelativeSource AncestorType={x:Type mah:Flyout}}, Path=Foreground}"
                 Style="{DynamicResource MahApps.Styles.Button.Circle}">
             <iconPacks:PackIconModern Kind="Add" />
         </Button>
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 99cab47a17..07a2b220b2 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
@@ -1,33 +1,33 @@
-<Controls:MetroWindow x:Class="Caliburn.Metro.Demo.Views.ShellView"
-                      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;assembly=MahApps.Metro"
-                      xmlns:cal="http://www.caliburnproject.org"
-                      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                      Title="Flyouts Demo"
-                      Width="800"
-                      Height="600"
-                      BorderBrush="{DynamicResource MahApps.Brushes.Accent}"
-                      BorderThickness="1"
-                      SaveWindowPosition="True"
-                      WindowStartupLocation="CenterScreen"
-                      mc:Ignorable="d">
+<mah:MetroWindow x:Class="Caliburn.Metro.Demo.Views.ShellView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:caliburn="http://www.caliburnproject.org"
+                 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                 xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
+                 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                 Title="Flyouts Demo"
+                 Width="800"
+                 Height="600"
+                 BorderBrush="{DynamicResource MahApps.Brushes.Accent}"
+                 BorderThickness="1"
+                 SaveWindowPosition="True"
+                 WindowStartupLocation="CenterScreen"
+                 mc:Ignorable="d">
 
-    <Controls:MetroWindow.Resources>
+    <mah:MetroWindow.Resources>
         <Style x:Key="CustomFlyoutStyle"
-               BasedOn="{StaticResource {x:Type Controls:Flyout}}"
-               TargetType="{x:Type Controls:Flyout}">
+               BasedOn="{StaticResource {x:Type mah:Flyout}}"
+               TargetType="{x:Type mah:Flyout}">
             <Setter Property="Header" Value="{Binding Header}" />
             <Setter Property="IsOpen" Value="{Binding IsOpen}" />
             <Setter Property="Position" Value="{Binding Position}" />
             <Setter Property="Theme" Value="{Binding Theme}" />
         </Style>
-    </Controls:MetroWindow.Resources>
+    </mah:MetroWindow.Resources>
 
-    <Controls:MetroWindow.Flyouts>
-        <Controls:FlyoutsControl x:Name="FlyoutViewModels" ItemContainerStyle="{StaticResource CustomFlyoutStyle}" />
-    </Controls:MetroWindow.Flyouts>
+    <mah:MetroWindow.Flyouts>
+        <mah:FlyoutsControl x:Name="FlyoutViewModels" ItemContainerStyle="{StaticResource CustomFlyoutStyle}" />
+    </mah:MetroWindow.Flyouts>
 
     <Grid>
         <StackPanel Margin="10" HorizontalAlignment="Left">
@@ -36,19 +36,19 @@
                        Text="Some Flyout Tests..." />
             <Button MinWidth="90"
                     Margin="2"
-                    cal:Message.Attach="[Event Click] = [Action ToggleFlyout(0)]"
+                    caliburn:Message.Attach="[Event Click] = [Action ToggleFlyout(0)]"
                     Content="Show 1" />
             <Button MinWidth="90"
                     Margin="2"
-                    cal:Message.Attach="[Event Click] = [Action ToggleFlyout(1)]"
+                    caliburn:Message.Attach="[Event Click] = [Action ToggleFlyout(1)]"
                     Content="Show 2" />
             <Button MinWidth="90"
                     Margin="2"
-                    cal:Message.Attach="[Event Click] = [Action ToggleFlyout(2)]"
+                    caliburn:Message.Attach="[Event Click] = [Action ToggleFlyout(2)]"
                     Content="Show 3" />
             <Button MinWidth="90"
                     Margin="2"
-                    cal:Message.Attach="[Event Click] = [Action ToggleFlyout(3)]"
+                    caliburn:Message.Attach="[Event Click] = [Action ToggleFlyout(3)]"
                     Content="Settings" />
             <Button x:Name="Close"
                     MinWidth="90"
@@ -61,20 +61,20 @@
                     VerticalAlignment="Center">
             <Button MinWidth="90"
                     Margin="2"
-                    cal:Message.Attach="[Event Click] = [Action ToggleFlyout(5)]"
+                    caliburn:Message.Attach="[Event Click] = [Action ToggleFlyout(5)]"
                     Content="Show Top" />
             <Button MinWidth="90"
                     Margin="2"
-                    cal:Message.Attach="[Event Click] = [Action ToggleFlyout(6)]"
+                    caliburn:Message.Attach="[Event Click] = [Action ToggleFlyout(6)]"
                     Content="Show Bottom" />
         </StackPanel>
 
         <StackPanel Margin="10" HorizontalAlignment="Right">
             <Button MinWidth="90"
                     Margin="2"
-                    cal:Message.Attach="[Event Click] = [Action ToggleFlyout(4)]"
+                    caliburn:Message.Attach="[Event Click] = [Action ToggleFlyout(4)]"
                     Content="Show Left" />
         </StackPanel>
     </Grid>
 
-</Controls:MetroWindow>
\ No newline at end of file
+</mah:MetroWindow>
\ No newline at end of file
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/App.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/App.xaml
index 7a8f009f32..3c43995586 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/App.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/App.xaml
@@ -1,7 +1,7 @@
 <Application x:Class="MetroDemo.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
+             xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
              StartupUri="MainWindow.xaml">
 
     <Application.Resources>
@@ -19,7 +19,7 @@
                 <Setter Property="HorizontalAlignment" Value="Center" />
             </Style>
 
-            <Style BasedOn="{StaticResource MahApps.Styles.CustomValidationPopup}" TargetType="{x:Type controls:CustomValidationPopup}">
+            <Style BasedOn="{StaticResource MahApps.Styles.CustomValidationPopup}" TargetType="{x:Type mah:CustomValidationPopup}">
                 <Setter Property="CloseOnMouseLeftButtonDown" Value="False" />
                 <Setter Property="ShowValidationErrorOnMouseOver" Value="False" />
             </Style>
@@ -37,36 +37,36 @@
             </Storyboard>
 
             <Style BasedOn="{StaticResource MahApps.Styles.Expander}" TargetType="{x:Type Expander}">
-                <Setter Property="controls:ExpanderHelper.CollapseStoryboard" Value="{StaticResource MahApps.Storyboard.Expander.Collapse.Fast}" />
+                <Setter Property="mah:ExpanderHelper.CollapseStoryboard" Value="{StaticResource MahApps.Storyboard.Expander.Collapse.Fast}" />
             </Style>
 
-            <Style x:Key="MahApps.Styles.MetroHeader.Horizontal" TargetType="controls:MetroHeader">
+            <Style x:Key="MahApps.Styles.MetroHeader.Horizontal" TargetType="mah:MetroHeader">
                 <Setter Property="Template">
                     <Setter.Value>
-                        <ControlTemplate TargetType="controls:MetroHeader">
+                        <ControlTemplate TargetType="mah:MetroHeader">
                             <Grid>
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="Auto" SharedSizeGroup="HeaderGroup" />
                                     <ColumnDefinition Width="*" />
                                 </Grid.ColumnDefinitions>
-                                <Grid Grid.Column="0" Background="{TemplateBinding controls:HeaderedControlHelper.HeaderBackground}">
-                                    <controls:ContentControlEx x:Name="PART_Header"
-                                                               Margin="{TemplateBinding controls:HeaderedControlHelper.HeaderMargin}"
-                                                               HorizontalAlignment="{TemplateBinding controls:HeaderedControlHelper.HeaderHorizontalContentAlignment}"
-                                                               VerticalAlignment="{TemplateBinding controls:HeaderedControlHelper.HeaderVerticalContentAlignment}"
-                                                               Content="{TemplateBinding Header}"
-                                                               ContentCharacterCasing="{TemplateBinding controls:ControlsHelper.ContentCharacterCasing}"
-                                                               ContentStringFormat="{TemplateBinding HeaderStringFormat}"
-                                                               ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                                               ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
-                                                               FontFamily="{TemplateBinding controls:HeaderedControlHelper.HeaderFontFamily}"
-                                                               FontSize="{TemplateBinding controls:HeaderedControlHelper.HeaderFontSize}"
-                                                               FontStretch="{TemplateBinding controls:HeaderedControlHelper.HeaderFontStretch}"
-                                                               FontWeight="{TemplateBinding controls:HeaderedControlHelper.HeaderFontWeight}"
-                                                               Foreground="{TemplateBinding controls:HeaderedControlHelper.HeaderForeground}"
-                                                               IsTabStop="False"
-                                                               RecognizesAccessKey="{TemplateBinding controls:ControlsHelper.RecognizesAccessKey}"
-                                                               SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                <Grid Grid.Column="0" Background="{TemplateBinding mah:HeaderedControlHelper.HeaderBackground}">
+                                    <mah:ContentControlEx x:Name="PART_Header"
+                                                          Margin="{TemplateBinding mah:HeaderedControlHelper.HeaderMargin}"
+                                                          HorizontalAlignment="{TemplateBinding mah:HeaderedControlHelper.HeaderHorizontalContentAlignment}"
+                                                          VerticalAlignment="{TemplateBinding mah:HeaderedControlHelper.HeaderVerticalContentAlignment}"
+                                                          Content="{TemplateBinding Header}"
+                                                          ContentCharacterCasing="{TemplateBinding mah:ControlsHelper.ContentCharacterCasing}"
+                                                          ContentStringFormat="{TemplateBinding HeaderStringFormat}"
+                                                          ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                                          ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
+                                                          FontFamily="{TemplateBinding mah:HeaderedControlHelper.HeaderFontFamily}"
+                                                          FontSize="{TemplateBinding mah:HeaderedControlHelper.HeaderFontSize}"
+                                                          FontStretch="{TemplateBinding mah:HeaderedControlHelper.HeaderFontStretch}"
+                                                          FontWeight="{TemplateBinding mah:HeaderedControlHelper.HeaderFontWeight}"
+                                                          Foreground="{TemplateBinding mah:HeaderedControlHelper.HeaderForeground}"
+                                                          IsTabStop="False"
+                                                          RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
+                                                          SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                                 </Grid>
                                 <Grid Grid.Column="1" Background="{TemplateBinding Background}">
                                     <ContentPresenter x:Name="PART_Content"
@@ -80,8 +80,8 @@
                         </ControlTemplate>
                     </Setter.Value>
                 </Setter>
-                <Setter Property="controls:HeaderedControlHelper.HeaderMargin" Value="0 0 4 0" />
-                <Setter Property="controls:HeaderedControlHelper.HeaderVerticalContentAlignment" Value="Center" />
+                <Setter Property="mah:HeaderedControlHelper.HeaderMargin" Value="0 0 4 0" />
+                <Setter Property="mah:HeaderedControlHelper.HeaderVerticalContentAlignment" Value="Center" />
             </Style>
 
         </ResourceDictionary>
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 c626b39f17..f458486a20 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
@@ -1,13 +1,13 @@
 <UserControl x:Class="MetroDemo.ExampleViews.ButtonsExample"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:Controls="http://metro.mahapps.com/winfx/xaml/controls"
-             xmlns:MetroDemo="clr-namespace:MetroDemo"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
+             xmlns:local="clr-namespace:MetroDemo"
+             xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:models="clr-namespace:MetroDemo.Models"
-             d:DataContext="{d:DesignInstance MetroDemo:MainWindowViewModel}"
+             d:DataContext="{d:DesignInstance local:MainWindowViewModel}"
              d:DesignHeight="737.288"
              d:DesignWidth="800"
              mc:Ignorable="d">
@@ -31,29 +31,29 @@
 
         <StackPanel Grid.Column="0">
             <Label Content="Default button" Style="{DynamicResource DescriptionHeaderStyle}" />
-            <Controls:Badged Width="100"
-                             Margin="{StaticResource ControlMargin}"
-                             Badge="3">
+            <mah:Badged Width="100"
+                        Margin="{StaticResource ControlMargin}"
+                        Badge="3">
                 <Button Content="Mail" />
-            </Controls:Badged>
-            <Controls:Badged Width="100"
-                             Margin="{StaticResource ControlMargin}"
-                             Badge="2"
-                             IsEnabled="False">
+            </mah:Badged>
+            <mah:Badged Width="100"
+                        Margin="{StaticResource ControlMargin}"
+                        Badge="2"
+                        IsEnabled="False">
                 <Button Content="Print" />
-            </Controls:Badged>
-            <Controls:Badged x:Name="CountingBadge"
-                             Width="100"
-                             Margin="{StaticResource ControlMargin}"
-                             BadgeFontSize="12"
-                             BadgeMargin="4 0">
-                <Controls:Badged.BadgeTemplate>
+            </mah:Badged>
+            <mah:Badged x:Name="CountingBadge"
+                        Width="100"
+                        Margin="{StaticResource ControlMargin}"
+                        BadgeFontSize="12"
+                        BadgeMargin="4 0">
+                <mah:Badged.BadgeTemplate>
                     <DataTemplate>
                         <TextBlock Text="{Binding StringFormat='{}Click-count: {0:00}'}" />
                     </DataTemplate>
-                </Controls:Badged.BadgeTemplate>
+                </mah:Badged.BadgeTemplate>
                 <Button Click="CountingButton_OnClick" Content="Click Me" />
-            </Controls:Badged>
+            </mah:Badged>
             <Button Width="100"
                     Margin="{StaticResource ControlMargin}"
                     Content="Enabled" />
@@ -283,23 +283,23 @@
                     UseLayoutRounding="True">
             <Label Content="ToggleSwitch" Style="{DynamicResource DescriptionHeaderStyle}" />
 
-            <Controls:ToggleSwitch Margin="{StaticResource ControlMargin}"
-                                   Header="Header"
-                                   IsOn="{Binding CanUseToggleSwitch, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-            <Controls:ToggleSwitch Margin="{StaticResource ControlMargin}"
-                                   CommandParameter="{Binding}"
-                                   OffCommand="{Binding ToggleSwitchOffCommand}"
-                                   OnCommand="{Binding ToggleSwitchOnCommand}" />
-            <Controls:ToggleSwitch Margin="{StaticResource ControlMargin}"
-                                   Command="{Binding ToggleSwitchCommand}"
-                                   IsOn="True"
-                                   OffContent="Disabled"
-                                   OnContent="Enabled" />
-            <Controls:ToggleSwitch Margin="{StaticResource ControlMargin}"
-                                   IsEnabled="False"
-                                   IsOn="True"
-                                   OffContent="Disabled"
-                                   OnContent="Enabled" />
+            <mah:ToggleSwitch Margin="{StaticResource ControlMargin}"
+                              Header="Header"
+                              IsOn="{Binding CanUseToggleSwitch, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+            <mah:ToggleSwitch Margin="{StaticResource ControlMargin}"
+                              CommandParameter="{Binding}"
+                              OffCommand="{Binding ToggleSwitchOffCommand}"
+                              OnCommand="{Binding ToggleSwitchOnCommand}" />
+            <mah:ToggleSwitch Margin="{StaticResource ControlMargin}"
+                              Command="{Binding ToggleSwitchCommand}"
+                              IsOn="True"
+                              OffContent="Disabled"
+                              OnContent="Enabled" />
+            <mah:ToggleSwitch Margin="{StaticResource ControlMargin}"
+                              IsEnabled="False"
+                              IsOn="True"
+                              OffContent="Disabled"
+                              OnContent="Enabled" />
         </StackPanel>
 
         <StackPanel Grid.Row="1"
@@ -421,8 +421,8 @@
                     HorizontalAlignment="Stretch">
             <StackPanel.Resources>
                 <Style x:Key="CircleDropDownButton"
-                       BasedOn="{StaticResource {x:Type Controls:DropDownButton}}"
-                       TargetType="Controls:DropDownButton">
+                       BasedOn="{StaticResource {x:Type mah:DropDownButton}}"
+                       TargetType="mah:DropDownButton">
                     <Setter Property="ArrowVisibility" Value="Collapsed" />
                     <Setter Property="BorderThickness" Value="0" />
                     <Setter Property="ButtonStyle" Value="{DynamicResource MahApps.Styles.Button.Circle}" />
@@ -434,53 +434,53 @@
 
             <Label Content="DropDownButton" Style="{DynamicResource DescriptionHeaderStyle}" />
 
-            <Controls:DropDownButton Margin="5"
-                                     Command="{Binding ArtistsDropDownCommand}"
-                                     Content="Artists"
-                                     DisplayMemberPath="Name"
-                                     ItemsSource="{Binding Source={x:Static models:SampleData.Artists}}">
-                <Controls:DropDownButton.Icon>
+            <mah:DropDownButton Margin="5"
+                                Command="{Binding ArtistsDropDownCommand}"
+                                Content="Artists"
+                                DisplayMemberPath="Name"
+                                ItemsSource="{Binding Source={x:Static models:SampleData.Artists}}">
+                <mah:DropDownButton.Icon>
                     <iconPacks:PackIconMaterial Margin="6" Kind="AccountMusic" />
-                </Controls:DropDownButton.Icon>
-            </Controls:DropDownButton>
+                </mah:DropDownButton.Icon>
+            </mah:DropDownButton>
 
-            <Controls:DropDownButton Margin="5"
-                                     Content="Genres"
-                                     DisplayMemberPath="Name"
-                                     ItemsSource="{Binding Source={x:Static models:SampleData.Genres}}">
-                <Controls:DropDownButton.ItemContainerStyle>
+            <mah:DropDownButton Margin="5"
+                                Content="Genres"
+                                DisplayMemberPath="Name"
+                                ItemsSource="{Binding Source={x:Static models:SampleData.Genres}}">
+                <mah:DropDownButton.ItemContainerStyle>
                     <Style BasedOn="{StaticResource {x:Type MenuItem}}" TargetType="{x:Type MenuItem}">
-                        <Setter Property="Command" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:DropDownButton}}, Path=DataContext.GenreDropDownMenuItemCommand}" />
+                        <Setter Property="Command" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:DropDownButton}}, Path=DataContext.GenreDropDownMenuItemCommand}" />
                         <Setter Property="CommandParameter" Value="{Binding Name}" />
                     </Style>
-                </Controls:DropDownButton.ItemContainerStyle>
-                <Controls:DropDownButton.Icon>
+                </mah:DropDownButton.ItemContainerStyle>
+                <mah:DropDownButton.Icon>
                     <iconPacks:PackIconMaterial Margin="6" Kind="BookMusic" />
-                </Controls:DropDownButton.Icon>
-            </Controls:DropDownButton>
+                </mah:DropDownButton.Icon>
+            </mah:DropDownButton>
 
             <StackPanel Margin="{StaticResource ControlMargin}"
                         HorizontalAlignment="Center"
                         Orientation="Horizontal">
-                <Controls:DropDownButton Name="DownButton"
-                                         Margin="0 0 10 0"
-                                         DisplayMemberPath="Title"
-                                         ItemsSource="{Binding Albums}"
-                                         Style="{StaticResource CircleDropDownButton}">
-                    <Controls:DropDownButton.Icon>
+                <mah:DropDownButton Name="DownButton"
+                                    Margin="0 0 10 0"
+                                    DisplayMemberPath="Title"
+                                    ItemsSource="{Binding Albums}"
+                                    Style="{StaticResource CircleDropDownButton}">
+                    <mah:DropDownButton.Icon>
                         <iconPacks:PackIconModern Kind="Music" />
-                    </Controls:DropDownButton.Icon>
-                </Controls:DropDownButton>
-                <Controls:DropDownButton Name="DownButton1"
-                                         Width="100"
-                                         Content="The Content"
-                                         DisplayMemberPath="Title"
-                                         ItemsSource="{Binding ElementName=DownButton, Mode=TwoWay, Path=ItemsSource}"
-                                         Orientation="Vertical">
-                    <Controls:DropDownButton.Icon>
+                    </mah:DropDownButton.Icon>
+                </mah:DropDownButton>
+                <mah:DropDownButton Name="DownButton1"
+                                    Width="100"
+                                    Content="The Content"
+                                    DisplayMemberPath="Title"
+                                    ItemsSource="{Binding ElementName=DownButton, Mode=TwoWay, Path=ItemsSource}"
+                                    Orientation="Vertical">
+                    <mah:DropDownButton.Icon>
                         <iconPacks:PackIconModern Margin="6" Kind="Journal" />
-                    </Controls:DropDownButton.Icon>
-                </Controls:DropDownButton>
+                    </mah:DropDownButton.Icon>
+                </mah:DropDownButton>
             </StackPanel>
         </StackPanel>
 
@@ -489,29 +489,29 @@
                     HorizontalAlignment="Stretch">
             <Label Content="SplitButton" Style="{DynamicResource DescriptionHeaderStyle}" />
 
-            <Controls:SplitButton Margin="5"
-                                  HorizontalContentAlignment="Left"
-                                  Command="{Binding ArtistsDropDownCommand}"
-                                  DisplayMemberPath="Name"
-                                  ItemsSource="{Binding Source={x:Static models:SampleData.Artists}}"
-                                  SelectedIndex="2"
-                                  SelectionChanged="SplitButton_OnSelectionChanged">
-                <Controls:SplitButton.Icon>
+            <mah:SplitButton Margin="5"
+                             HorizontalContentAlignment="Left"
+                             Command="{Binding ArtistsDropDownCommand}"
+                             DisplayMemberPath="Name"
+                             ItemsSource="{Binding Source={x:Static models:SampleData.Artists}}"
+                             SelectedIndex="2"
+                             SelectionChanged="SplitButton_OnSelectionChanged">
+                <mah:SplitButton.Icon>
                     <iconPacks:PackIconMaterial Margin="6" Kind="BookMusic" />
-                </Controls:SplitButton.Icon>
-            </Controls:SplitButton>
+                </mah:SplitButton.Icon>
+            </mah:SplitButton>
 
-            <Controls:SplitButton Margin="5"
-                                  Command="{Binding GenreSplitButtonItemCommand}"
-                                  CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=SelectedItem.Name}"
-                                  DisplayMemberPath="Name"
-                                  ItemsSource="{Binding Source={x:Static models:SampleData.Genres}}"
-                                  Orientation="Vertical"
-                                  SelectedIndex="1">
-                <Controls:SplitButton.Icon>
+            <mah:SplitButton Margin="5"
+                             Command="{Binding GenreSplitButtonItemCommand}"
+                             CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=SelectedItem.Name}"
+                             DisplayMemberPath="Name"
+                             ItemsSource="{Binding Source={x:Static models:SampleData.Genres}}"
+                             Orientation="Vertical"
+                             SelectedIndex="1">
+                <mah:SplitButton.Icon>
                     <iconPacks:PackIconModern Margin="6" Kind="Book" />
-                </Controls:SplitButton.Icon>
-            </Controls:SplitButton>
+                </mah:SplitButton.Icon>
+            </mah:SplitButton>
         </StackPanel>
     </Grid>
 
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 1f6bb508ea..a67e789d2c 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ColorExample.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ColorExample.xaml
@@ -1,12 +1,12 @@
 <UserControl x:Class="MetroDemo.ExampleViews.ColorExample"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:MetroDemo="clr-namespace:MetroDemo"
-             xmlns:behaviors="http://metro.mahapps.com/winfx/xaml/shared"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+             xmlns:local="clr-namespace:MetroDemo"
+             xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             d:DataContext="{d:DesignInstance MetroDemo:MainWindowViewModel}"
+             d:DataContext="{d:DesignInstance local:MainWindowViewModel}"
              d:DesignHeight="600"
              d:DesignWidth="800"
              mc:Ignorable="d">
@@ -30,7 +30,7 @@
                              Height="30"
                              Stroke="{DynamicResource MahApps.Brushes.Gray2}">
                         <i:Interaction.Behaviors>
-                            <behaviors:BindableResourceBehavior ResourceName="{Binding}" Property="{x:Static Shape.FillProperty}" />
+                            <mah:BindableResourceBehavior ResourceName="{Binding}" Property="{x:Static Shape.FillProperty}" />
                         </i:Interaction.Behaviors>
                     </Ellipse>
                     <TextBlock Grid.Column="1"
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 4985ece1f4..dff04b2981 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DataGridExamples.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DataGridExamples.xaml
@@ -1,9 +1,9 @@
 <UserControl x:Class="MetroDemo.ExampleViews.DataGridExamples"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:local="clr-namespace:MetroDemo"
+             xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:models="clr-namespace:MetroDemo.Models"
              xmlns:vc="clr-namespace:MetroDemo.ValueConverter"
@@ -75,7 +75,7 @@
                               Margin="2"
                               HorizontalAlignment="Left"
                               VerticalAlignment="Center"
-                              IsChecked="{Binding Path=(controls:DataGridHelper.EnableCellEditAssist)}" />
+                              IsChecked="{Binding Path=(mah:DataGridHelper.EnableCellEditAssist)}" />
 
                     <TextBlock Grid.Row="2"
                                Grid.Column="0"
@@ -121,14 +121,14 @@
                                Margin="2"
                                VerticalAlignment="Center"
                                Text="RowHeaderWidth" />
-                    <controls:NumericUpDown Grid.Row="5"
-                                            Grid.Column="1"
-                                            Width="100"
-                                            Margin="2"
-                                            VerticalAlignment="Center"
-                                            Maximum="40"
-                                            Minimum="0"
-                                            Value="{Binding RowHeaderWidth, UpdateSourceTrigger=PropertyChanged}" />
+                    <mah:NumericUpDown Grid.Row="5"
+                                       Grid.Column="1"
+                                       Width="100"
+                                       Margin="2"
+                                       VerticalAlignment="Center"
+                                       Maximum="40"
+                                       Minimum="0"
+                                       Value="{Binding RowHeaderWidth, UpdateSourceTrigger=PropertyChanged}" />
                 </Grid>
             </ControlTemplate>
 
@@ -204,10 +204,10 @@
                                         ItemsSource="{x:Static models:SampleData.Artists}"
                                         SelectedItemBinding="{Binding Artist}" />
                 <DataGridTextColumn Binding="{Binding Genre.Name}" Header="Genre" />
-                <controls:DataGridNumericUpDownColumn Binding="{Binding Price}"
-                                                      Header="Price"
-                                                      Minimum="0"
-                                                      StringFormat="{}{0:C}" />
+                <mah:DataGridNumericUpDownColumn Binding="{Binding Price}"
+                                                 Header="Price"
+                                                 Minimum="0"
+                                                 StringFormat="{}{0:C}" />
             </DataGrid.Columns>
             <DataGrid.Style>
                 <Style BasedOn="{StaticResource MahApps.Styles.DataGrid}" TargetType="{x:Type DataGrid}">
@@ -264,15 +264,15 @@
                 <DataGridTemplateColumn Header="Price">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
-                            <controls:MetroProgressBar x:Name="PriceProgressBar"
-                                                       Height="20"
-                                                       Margin="5 2"
-                                                       VerticalAlignment="Center"
-                                                       Background="Transparent"
-                                                       Foreground="{DynamicResource MahApps.Brushes.Accent}"
-                                                       Maximum="20"
-                                                       Minimum="0"
-                                                       Value="{Binding Price}" />
+                            <mah:MetroProgressBar x:Name="PriceProgressBar"
+                                                  Height="20"
+                                                  Margin="5 2"
+                                                  VerticalAlignment="Center"
+                                                  Background="Transparent"
+                                                  Foreground="{DynamicResource MahApps.Brushes.Accent}"
+                                                  Maximum="20"
+                                                  Minimum="0"
+                                                  Value="{Binding Price}" />
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DateExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DateExamples.xaml
index 0265b0c3c5..576242aa0b 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DateExamples.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DateExamples.xaml
@@ -1,16 +1,15 @@
 <UserControl x:Class="MetroDemo.ExampleViews.DateExamples"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:Controls="http://metro.mahapps.com/winfx/xaml/controls"
-             xmlns:Converters="http://metro.mahapps.com/winfx/xaml/shared"
-             xmlns:MetroDemo="clr-namespace:MetroDemo"
              xmlns:behaviors="clr-namespace:MetroDemo.Behaviors"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:globalization="clr-namespace:System.Globalization;assembly=mscorlib"
              xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+             xmlns:local="clr-namespace:MetroDemo"
+             xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:system="clr-namespace:System;assembly=mscorlib"
-             d:DataContext="{d:DesignInstance MetroDemo:MainWindowViewModel}"
+             d:DataContext="{d:DesignInstance local:MainWindowViewModel}"
              d:DesignHeight="600"
              d:DesignWidth="800"
              mc:Ignorable="d">
@@ -34,46 +33,46 @@
                 <DatePicker Width="200"
                             Margin="{StaticResource ControlMargin}"
                             HorizontalContentAlignment="Stretch"
-                            Controls:TextBoxHelper.ClearTextButton="True"
-                            Controls:TextBoxHelper.UseFloatingWatermark="True"
-                            Controls:TextBoxHelper.Watermark="Please select a date"
-                            Controls:TextBoxHelper.WatermarkAlignment="Right" />
+                            mah:TextBoxHelper.ClearTextButton="True"
+                            mah:TextBoxHelper.UseFloatingWatermark="True"
+                            mah:TextBoxHelper.Watermark="Please select a date"
+                            mah:TextBoxHelper.WatermarkAlignment="Right" />
                 <DatePicker Width="200"
                             Margin="{StaticResource ControlMargin}"
-                            Controls:ControlsHelper.IsReadOnly="True"
-                            Controls:TextBoxHelper.ClearTextButton="True"
+                            mah:ControlsHelper.IsReadOnly="True"
+                            mah:TextBoxHelper.ClearTextButton="True"
                             SelectedDate="{x:Static system:DateTime.Now}" />
                 <DatePicker Width="200"
                             Margin="{StaticResource ControlMargin}"
-                            Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd}"
-                            Controls:TextBoxHelper.ButtonCommandParameter="{Binding RelativeSource={RelativeSource Self}}"
-                            Controls:TextBoxHelper.Watermark="" />
+                            mah:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd}"
+                            mah:TextBoxHelper.ButtonCommandParameter="{Binding RelativeSource={RelativeSource Self}}"
+                            mah:TextBoxHelper.Watermark="" />
                 <DatePicker Width="200"
                             Margin="{StaticResource ControlMargin}"
-                            Controls:TextBoxHelper.ButtonsAlignment="Left"
-                            Controls:TextBoxHelper.ClearTextButton="True"
-                            Controls:TextBoxHelper.Watermark="{x:Null}" />
+                            mah:TextBoxHelper.ButtonsAlignment="Left"
+                            mah:TextBoxHelper.ClearTextButton="True"
+                            mah:TextBoxHelper.Watermark="{x:Null}" />
                 <DatePicker Width="200"
                             Margin="{StaticResource ControlMargin}"
                             IsEnabled="False" />
                 <DatePicker Width="200"
                             Margin="{StaticResource ControlMargin}"
-                            Controls:TextBoxHelper.AutoWatermark="True"
+                            mah:TextBoxHelper.AutoWatermark="True"
                             SelectedDate="{Binding DatePickerDate}" />
                 <DatePicker Width="200"
                             Margin="{StaticResource ControlMargin}"
-                            Controls:TextBoxHelper.Watermark="Select a date"
+                            mah:TextBoxHelper.Watermark="Select a date"
                             FontSize="22"
                             SelectedDate="{Binding DatePickerDate, ValidatesOnDataErrors=True, UpdateSourceTrigger=PropertyChanged, NotifyOnValidationError=True}">
-                    <Controls:TextBoxHelper.ButtonWidth>
-                        <Binding Converter="{x:Static Converters:FontSizeOffsetConverter.Instance}"
+                    <mah:TextBoxHelper.ButtonWidth>
+                        <Binding Converter="{x:Static mah:FontSizeOffsetConverter.Instance}"
                                  Path="FontSize"
                                  RelativeSource="{RelativeSource Self}">
                             <Binding.ConverterParameter>
                                 <system:Double>5</system:Double>
                             </Binding.ConverterParameter>
                         </Binding>
-                    </Controls:TextBoxHelper.ButtonWidth>
+                    </mah:TextBoxHelper.ButtonWidth>
                 </DatePicker>
             </StackPanel>
 
@@ -99,11 +98,11 @@
             <StackPanel Grid.Column="2" Margin="{StaticResource ColumnMargin}">
                 <Label Content="DateTime/Time picker" Style="{DynamicResource DescriptionHeaderStyle}" />
 
-                <Controls:DateTimePicker Margin="{StaticResource ControlMargin}">
+                <mah:DateTimePicker Margin="{StaticResource ControlMargin}">
                     <i:Interaction.Behaviors>
                         <behaviors:DateTimeNowBehavior />
                     </i:Interaction.Behaviors>
-                </Controls:DateTimePicker>
+                </mah:DateTimePicker>
 
                 <GroupBox Margin="{StaticResource ControlMargin}" Header="Try it yourself">
                     <StackPanel>
@@ -160,14 +159,14 @@
                                       Grid.Row="1"
                                       Grid.Column="1"
                                       Margin="{StaticResource ControlMargin}"
-                                      SelectedItem="{x:Static Controls:TimePartVisibility.All}">
+                                      SelectedItem="{x:Static mah:TimePartVisibility.All}">
                                 <ComboBox.ItemsSource>
-                                    <x:Array Type="Controls:TimePartVisibility">
-                                        <Controls:TimePartVisibility>All</Controls:TimePartVisibility>
-                                        <Controls:TimePartVisibility>HourMinute</Controls:TimePartVisibility>
-                                        <Controls:TimePartVisibility>Hour</Controls:TimePartVisibility>
-                                        <Controls:TimePartVisibility>Minute</Controls:TimePartVisibility>
-                                        <Controls:TimePartVisibility>Second</Controls:TimePartVisibility>
+                                    <x:Array Type="mah:TimePartVisibility">
+                                        <mah:TimePartVisibility>All</mah:TimePartVisibility>
+                                        <mah:TimePartVisibility>HourMinute</mah:TimePartVisibility>
+                                        <mah:TimePartVisibility>Hour</mah:TimePartVisibility>
+                                        <mah:TimePartVisibility>Minute</mah:TimePartVisibility>
+                                        <mah:TimePartVisibility>Second</mah:TimePartVisibility>
                                     </x:Array>
                                 </ComboBox.ItemsSource>
                             </ComboBox>
@@ -180,14 +179,14 @@
                                       Grid.Row="2"
                                       Grid.Column="1"
                                       Margin="{StaticResource ControlMargin}"
-                                      SelectedItem="{x:Static Controls:TimePartVisibility.All}">
+                                      SelectedItem="{x:Static mah:TimePartVisibility.All}">
                                 <ComboBox.ItemsSource>
-                                    <x:Array Type="Controls:TimePartVisibility">
-                                        <Controls:TimePartVisibility>All</Controls:TimePartVisibility>
-                                        <Controls:TimePartVisibility>HourMinute</Controls:TimePartVisibility>
-                                        <Controls:TimePartVisibility>Hour</Controls:TimePartVisibility>
-                                        <Controls:TimePartVisibility>Minute</Controls:TimePartVisibility>
-                                        <Controls:TimePartVisibility>Second</Controls:TimePartVisibility>
+                                    <x:Array Type="mah:TimePartVisibility">
+                                        <mah:TimePartVisibility>All</mah:TimePartVisibility>
+                                        <mah:TimePartVisibility>HourMinute</mah:TimePartVisibility>
+                                        <mah:TimePartVisibility>Hour</mah:TimePartVisibility>
+                                        <mah:TimePartVisibility>Minute</mah:TimePartVisibility>
+                                        <mah:TimePartVisibility>Second</mah:TimePartVisibility>
                                     </x:Array>
                                 </ComboBox.ItemsSource>
                             </ComboBox>
@@ -217,11 +216,11 @@
                                       Grid.Row="4"
                                       Grid.Column="1"
                                       Margin="{StaticResource ControlMargin}"
-                                      SelectedItem="{x:Static Controls:TimePickerFormat.Long}">
+                                      SelectedItem="{x:Static mah:TimePickerFormat.Long}">
                                 <ComboBox.ItemsSource>
-                                    <x:Array Type="Controls:TimePickerFormat">
-                                        <Controls:TimePickerFormat>Long</Controls:TimePickerFormat>
-                                        <Controls:TimePickerFormat>Short</Controls:TimePickerFormat>
+                                    <x:Array Type="mah:TimePickerFormat">
+                                        <mah:TimePickerFormat>Long</mah:TimePickerFormat>
+                                        <mah:TimePickerFormat>Short</mah:TimePickerFormat>
                                     </x:Array>
                                 </ComboBox.ItemsSource>
                             </ComboBox>
@@ -234,7 +233,7 @@
                                       Grid.Row="5"
                                       Grid.Column="1"
                                       Margin="{StaticResource ControlMargin}"
-                                      Controls:TextBoxHelper.ClearTextButton="True"
+                                      mah:TextBoxHelper.ClearTextButton="True"
                                       ItemsSource="{Binding CultureInfos, Mode=OneWay}"
                                       SelectedItem="{Binding CurrentCulture, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
                                 <ComboBox.ItemTemplate>
@@ -254,18 +253,18 @@
                             </ComboBox>
                         </Grid>
 
-                        <Controls:DateTimePicker Margin="{StaticResource ControlMargin}"
-                                                 Controls:TextBoxHelper.ClearTextButton="{Binding Path=IsChecked, ElementName=DateTimePickerClearTextButton, Mode=TwoWay}"
-                                                 Controls:TextBoxHelper.UseFloatingWatermark="True"
-                                                 Culture="{Binding CurrentCulture, Mode=OneWay}"
-                                                 HandVisibility="{Binding Path=SelectedItem, ElementName=DateTimePickerHandVisibility, Mode=TwoWay}"
-                                                 IsClockVisible="{Binding Path=IsChecked, ElementName=DateTimePickerIsClockVisible, Mode=TwoWay}"
-                                                 IsEnabled="{Binding Path=IsChecked, ElementName=DateTimePickerIsEnabled, Mode=TwoWay}"
-                                                 IsReadOnly="{Binding Path=IsChecked, ElementName=DateTimePickerIsReadOnly, Mode=TwoWay}"
-                                                 Orientation="{Binding Path=SelectedItem, ElementName=DateTimePickerOrientation, Mode=TwoWay}"
-                                                 PickerVisibility="{Binding Path=SelectedItem, ElementName=DateTimePickerPickerVisibility, Mode=TwoWay}"
-                                                 SelectedDateFormat="{Binding Path=SelectedItem, ElementName=DateTimePickerDateFormat}"
-                                                 SelectedTimeFormat="{Binding Path=SelectedItem, ElementName=DateTimePickerTimeFormat}" />
+                        <mah:DateTimePicker Margin="{StaticResource ControlMargin}"
+                                            mah:TextBoxHelper.ClearTextButton="{Binding Path=IsChecked, ElementName=DateTimePickerClearTextButton, Mode=TwoWay}"
+                                            mah:TextBoxHelper.UseFloatingWatermark="True"
+                                            Culture="{Binding CurrentCulture, Mode=OneWay}"
+                                            HandVisibility="{Binding Path=SelectedItem, ElementName=DateTimePickerHandVisibility, Mode=TwoWay}"
+                                            IsClockVisible="{Binding Path=IsChecked, ElementName=DateTimePickerIsClockVisible, Mode=TwoWay}"
+                                            IsEnabled="{Binding Path=IsChecked, ElementName=DateTimePickerIsEnabled, Mode=TwoWay}"
+                                            IsReadOnly="{Binding Path=IsChecked, ElementName=DateTimePickerIsReadOnly, Mode=TwoWay}"
+                                            Orientation="{Binding Path=SelectedItem, ElementName=DateTimePickerOrientation, Mode=TwoWay}"
+                                            PickerVisibility="{Binding Path=SelectedItem, ElementName=DateTimePickerPickerVisibility, Mode=TwoWay}"
+                                            SelectedDateFormat="{Binding Path=SelectedItem, ElementName=DateTimePickerDateFormat}"
+                                            SelectedTimeFormat="{Binding Path=SelectedItem, ElementName=DateTimePickerTimeFormat}" />
 
                     </StackPanel>
                 </GroupBox>
@@ -273,38 +272,38 @@
                 <GroupBox Margin="{StaticResource ControlMargin}" Header="Current time">
                     <AdornerDecorator>
                         <StackPanel>
-                            <Controls:DateTimePicker x:Name="DateTimePicker"
-                                                     Margin="{StaticResource ControlMargin}"
-                                                     Controls:TextBoxHelper.ClearTextButton="{Binding Path=IsChecked, ElementName=DateTimePickerClearTextButton, Mode=TwoWay}"
-                                                     Culture="{Binding CurrentCulture, Mode=OneWay}"
-                                                     HandVisibility="{Binding Path=SelectedItem, ElementName=DateTimePickerHandVisibility, Mode=TwoWay}"
-                                                     IsClockVisible="{Binding Path=IsChecked, ElementName=DateTimePickerIsClockVisible, Mode=TwoWay}"
-                                                     IsEnabled="{Binding Path=IsChecked, ElementName=DateTimePickerIsEnabled, Mode=TwoWay}"
-                                                     IsReadOnly="{Binding Path=IsChecked, ElementName=DateTimePickerIsReadOnly, Mode=TwoWay}"
-                                                     Orientation="{Binding Path=SelectedItem, ElementName=DateTimePickerOrientation, Mode=TwoWay}"
-                                                     PickerVisibility="{Binding Path=SelectedItem, ElementName=DateTimePickerPickerVisibility, Mode=TwoWay}"
-                                                     SelectedDateFormat="{Binding Path=SelectedItem, ElementName=DateTimePickerDateFormat}"
-                                                     SelectedTimeFormat="{Binding Path=SelectedItem, ElementName=DateTimePickerTimeFormat}">
+                            <mah:DateTimePicker x:Name="DateTimePicker"
+                                                Margin="{StaticResource ControlMargin}"
+                                                mah:TextBoxHelper.ClearTextButton="{Binding Path=IsChecked, ElementName=DateTimePickerClearTextButton, Mode=TwoWay}"
+                                                Culture="{Binding CurrentCulture, Mode=OneWay}"
+                                                HandVisibility="{Binding Path=SelectedItem, ElementName=DateTimePickerHandVisibility, Mode=TwoWay}"
+                                                IsClockVisible="{Binding Path=IsChecked, ElementName=DateTimePickerIsClockVisible, Mode=TwoWay}"
+                                                IsEnabled="{Binding Path=IsChecked, ElementName=DateTimePickerIsEnabled, Mode=TwoWay}"
+                                                IsReadOnly="{Binding Path=IsChecked, ElementName=DateTimePickerIsReadOnly, Mode=TwoWay}"
+                                                Orientation="{Binding Path=SelectedItem, ElementName=DateTimePickerOrientation, Mode=TwoWay}"
+                                                PickerVisibility="{Binding Path=SelectedItem, ElementName=DateTimePickerPickerVisibility, Mode=TwoWay}"
+                                                SelectedDateFormat="{Binding Path=SelectedItem, ElementName=DateTimePickerDateFormat}"
+                                                SelectedTimeFormat="{Binding Path=SelectedItem, ElementName=DateTimePickerTimeFormat}">
                                 <i:Interaction.Behaviors>
                                     <behaviors:DateTimeNowBehavior />
                                 </i:Interaction.Behaviors>
-                            </Controls:DateTimePicker>
+                            </mah:DateTimePicker>
 
-                            <Controls:TimePicker Margin="{StaticResource ControlMargin}"
-                                                 Controls:TextBoxHelper.ClearTextButton="{Binding Path=IsChecked, ElementName=DateTimePickerClearTextButton, Mode=TwoWay}"
-                                                 Culture="{Binding CurrentCulture, Mode=OneWay}"
-                                                 HandVisibility="{Binding Path=SelectedItem, ElementName=DateTimePickerHandVisibility, Mode=TwoWay}"
-                                                 IsEnabled="{Binding Path=IsChecked, ElementName=DateTimePickerIsEnabled, Mode=TwoWay}"
-                                                 IsReadOnly="{Binding Path=IsChecked, ElementName=DateTimePickerIsReadOnly, Mode=TwoWay}"
-                                                 PickerVisibility="{Binding Path=SelectedItem, ElementName=DateTimePickerPickerVisibility, Mode=TwoWay}"
-                                                 SelectedDateTime="{Binding Path=SelectedDateTime, ElementName=DateTimePicker}"
-                                                 SelectedTimeFormat="{Binding Path=SelectedItem, ElementName=DateTimePickerTimeFormat}" />
+                            <mah:TimePicker Margin="{StaticResource ControlMargin}"
+                                            mah:TextBoxHelper.ClearTextButton="{Binding Path=IsChecked, ElementName=DateTimePickerClearTextButton, Mode=TwoWay}"
+                                            Culture="{Binding CurrentCulture, Mode=OneWay}"
+                                            HandVisibility="{Binding Path=SelectedItem, ElementName=DateTimePickerHandVisibility, Mode=TwoWay}"
+                                            IsEnabled="{Binding Path=IsChecked, ElementName=DateTimePickerIsEnabled, Mode=TwoWay}"
+                                            IsReadOnly="{Binding Path=IsChecked, ElementName=DateTimePickerIsReadOnly, Mode=TwoWay}"
+                                            PickerVisibility="{Binding Path=SelectedItem, ElementName=DateTimePickerPickerVisibility, Mode=TwoWay}"
+                                            SelectedDateTime="{Binding Path=SelectedDateTime, ElementName=DateTimePicker}"
+                                            SelectedTimeFormat="{Binding Path=SelectedItem, ElementName=DateTimePickerTimeFormat}" />
 
-                            <Controls:TimePicker Margin="{StaticResource ControlMargin}"
-                                                 Controls:TextBoxHelper.AutoWatermark="True"
-                                                 PickerVisibility="HourMinute"
-                                                 SelectedDateTime="{Binding TimePickerDate, Mode=TwoWay, ValidatesOnDataErrors=True, UpdateSourceTrigger=PropertyChanged, NotifyOnValidationError=True}"
-                                                 SelectedTimeFormat="Short" />
+                            <mah:TimePicker Margin="{StaticResource ControlMargin}"
+                                            mah:TextBoxHelper.AutoWatermark="True"
+                                            PickerVisibility="HourMinute"
+                                            SelectedDateTime="{Binding TimePickerDate, Mode=TwoWay, ValidatesOnDataErrors=True, UpdateSourceTrigger=PropertyChanged, NotifyOnValidationError=True}"
+                                            SelectedTimeFormat="Short" />
                         </StackPanel>
                     </AdornerDecorator>
                 </GroupBox>
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 a4b64b8d43..07bdf50d63 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuCreatorsUpdate.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuCreatorsUpdate.xaml
@@ -1,13 +1,12 @@
 <UserControl x:Class="MetroDemo.ExampleViews.HamburgerMenuCreatorsUpdate"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:converters="http://metro.mahapps.com/winfx/xaml/shared"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
+             xmlns:local="clr-namespace:MetroDemo"
              xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:metroDemo="clr-namespace:MetroDemo"
-             d:DataContext="{d:DesignInstance metroDemo:MainWindowViewModel}"
+             d:DataContext="{d:DesignInstance local:MainWindowViewModel}"
              d:DesignHeight="300"
              d:DesignWidth="400"
              mc:Ignorable="d">
@@ -205,7 +204,7 @@
                                                              Transition="Default">
                                 <mah:TransitioningContentControl.ContentTemplate>
                                     <DataTemplate>
-                                        <Image Source="{Binding Mode=OneWay, Converter={converters:NullToUnsetValueConverter}}" />
+                                        <Image Source="{Binding Mode=OneWay, Converter={mah:NullToUnsetValueConverter}}" />
                                     </DataTemplate>
                                 </mah:TransitioningContentControl.ContentTemplate>
                             </mah:TransitioningContentControl>
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 b8e9da78f0..b7de49633d 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuDefault.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuDefault.xaml
@@ -1,13 +1,12 @@
 <UserControl x:Class="MetroDemo.ExampleViews.HamburgerMenuDefault"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:converters="http://metro.mahapps.com/winfx/xaml/shared"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
+             xmlns:local="clr-namespace:MetroDemo"
              xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:metroDemo="clr-namespace:MetroDemo"
-             d:DataContext="{d:DesignInstance metroDemo:MainWindowViewModel}"
+             d:DataContext="{d:DesignInstance local:MainWindowViewModel}"
              d:DesignHeight="300"
              d:DesignWidth="400"
              mc:Ignorable="d">
@@ -262,7 +261,7 @@
                                                              Transition="Default">
                                 <mah:TransitioningContentControl.Resources>
                                     <DataTemplate DataType="{x:Type mah:HamburgerMenuGlyphItem}">
-                                        <Image Source="{Binding Glyph, Mode=OneWay, Converter={converters:NullToUnsetValueConverter}}" />
+                                        <Image Source="{Binding Glyph, Mode=OneWay, Converter={mah:NullToUnsetValueConverter}}" />
                                     </DataTemplate>
                                     <DataTemplate DataType="{x:Type mah:HamburgerMenuIconItem}">
                                         <ContentControl Content="{Binding Tag, Mode=OneWay}"
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 5c8de0fa1a..cb694e3334 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuSample.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuSample.xaml
@@ -1,28 +1,28 @@
 <UserControl x:Class="MetroDemo.ExampleViews.HamburgerMenuSample"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:Controls="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:exampleViews="clr-namespace:MetroDemo.ExampleViews"
+             xmlns:local="clr-namespace:MetroDemo"
+             xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:metroDemo="clr-namespace:MetroDemo"
-             d:DataContext="{d:DesignInstance metroDemo:MainWindowViewModel}"
+             d:DataContext="{d:DesignInstance local:MainWindowViewModel}"
              d:DesignHeight="300"
              d:DesignWidth="400"
              mc:Ignorable="d">
 
     <UserControl.Resources>
-        <Style BasedOn="{StaticResource {x:Type Controls:MetroHeader}}" TargetType="{x:Type Controls:MetroHeader}">
-            <Setter Property="Controls:HeaderedControlHelper.HeaderMargin" Value="0 0 0 5" />
+        <Style BasedOn="{StaticResource {x:Type mah:MetroHeader}}" TargetType="{x:Type mah:MetroHeader}">
             <Setter Property="FontSize" Value="15" />
             <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="mah:HeaderedControlHelper.HeaderMargin" Value="0 0 0 5" />
         </Style>
     </UserControl.Resources>
 
     <Grid>
         <TabControl x:Name="HamburgerTabControl"
                     Margin="10"
-                    Controls:TabControlHelper.Underlined="TabPanel">
+                    mah:TabControlHelper.Underlined="TabPanel">
             <TabItem Header="Default">
                 <exampleViews:HamburgerMenuDefault DataContext="{Binding}" />
             </TabItem>
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 7d8694c877..dbb17e8143 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/OtherExamples.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/OtherExamples.xaml
@@ -1,15 +1,14 @@
 <UserControl x:Class="MetroDemo.ExampleViews.OtherExamples"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:Controls="http://metro.mahapps.com/winfx/xaml/controls"
-             xmlns:MetroDemo="clr-namespace:MetroDemo"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
-             xmlns:mah="http://metro.mahapps.com/winfx/xaml/shared"
+             xmlns:local="clr-namespace:MetroDemo"
+             xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:mx="clr-namespace:MetroDemo.Markup"
              xmlns:vc="clr-namespace:MetroDemo.ValueConverter"
-             d:DataContext="{d:DesignInstance MetroDemo:MainWindowViewModel}"
+             d:DataContext="{d:DesignInstance local:MainWindowViewModel}"
              d:DesignHeight="600"
              d:DesignWidth="800"
              mc:Ignorable="d">
@@ -18,7 +17,7 @@
         <ResourceDictionary>
 
             <!--  better results for this examples  -->
-            <Style BasedOn="{StaticResource {x:Type Controls:TransitioningContentControl}}" TargetType="{x:Type Controls:TransitioningContentControl}">
+            <Style BasedOn="{StaticResource {x:Type mah:TransitioningContentControl}}" TargetType="{x:Type mah:TransitioningContentControl}">
                 <Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
                 <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
                 <Setter Property="TextOptions.TextRenderingMode" Value="ClearType" />
@@ -44,17 +43,17 @@
 
         <StackPanel Grid.Column="0">
             <Label Content="Transitions" Style="{DynamicResource DescriptionHeaderStyle}" />
-            <Controls:TransitioningContentControl x:Name="transitioning"
-                                                  Width="250"
-                                                  Height="50"
-                                                  Margin="0 10 0 0"
-                                                  Transition="Down" />
-            <Controls:TransitioningContentControl x:Name="customTransitioning"
-                                                  Width="250"
-                                                  Height="50"
-                                                  Margin="0 10 0 0"
-                                                  Transition="Custom">
-                <Controls:TransitioningContentControl.CustomVisualStates>
+            <mah:TransitioningContentControl x:Name="transitioning"
+                                             Width="250"
+                                             Height="50"
+                                             Margin="0 10 0 0"
+                                             Transition="Down" />
+            <mah:TransitioningContentControl x:Name="customTransitioning"
+                                             Width="250"
+                                             Height="50"
+                                             Margin="0 10 0 0"
+                                             Transition="Custom">
+                <mah:TransitioningContentControl.CustomVisualStates>
                     <VisualState x:Name="CustomTransition">
                         <Storyboard>
                             <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
@@ -71,15 +70,15 @@
                             </DoubleAnimationUsingKeyFrames>
                         </Storyboard>
                     </VisualState>
-                </Controls:TransitioningContentControl.CustomVisualStates>
-            </Controls:TransitioningContentControl>
-            <Controls:TransitioningContentControl x:Name="SecondcustomTransitioning"
-                                                  Width="250"
-                                                  Height="50"
-                                                  Margin="0 10 0 0"
-                                                  CustomVisualStatesName="SecondCustomTransition"
-                                                  Transition="Custom">
-                <Controls:TransitioningContentControl.CustomVisualStates>
+                </mah:TransitioningContentControl.CustomVisualStates>
+            </mah:TransitioningContentControl>
+            <mah:TransitioningContentControl x:Name="SecondcustomTransitioning"
+                                             Width="250"
+                                             Height="50"
+                                             Margin="0 10 0 0"
+                                             CustomVisualStatesName="SecondCustomTransition"
+                                             Transition="Custom">
+                <mah:TransitioningContentControl.CustomVisualStates>
                     <VisualState x:Name="SecondCustomTransition">
                         <Storyboard>
                             <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
@@ -101,8 +100,8 @@
                             </DoubleAnimationUsingKeyFrames>
                         </Storyboard>
                     </VisualState>
-                </Controls:TransitioningContentControl.CustomVisualStates>
-            </Controls:TransitioningContentControl>
+                </mah:TransitioningContentControl.CustomVisualStates>
+            </mah:TransitioningContentControl>
         </StackPanel>
 
         <StackPanel Grid.Row="0"
@@ -155,15 +154,15 @@
                           Grid.Row="2"
                           Grid.Column="1"
                           Grid.ColumnSpan="1"
-                          ItemsSource="{Binding Source={mx:EnumBindingSource {x:Type Controls:NavigationButtonsPosition}}, Mode=OneTime}"
+                          ItemsSource="{Binding Source={mx:EnumBindingSource {x:Type mah:NavigationButtonsPosition}}, Mode=OneTime}"
                           SelectedValue="{Binding ElementName=FlipView1st, Path=NavigationButtonsPosition, FallbackValue=Inside, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
             </Grid>
-            <Controls:FlipView x:Name="FlipView1st"
-                               Height="200"
-                               Margin="0 0 5 0"
-                               Foreground="{DynamicResource MahApps.Brushes.ThemeBackground}"
-                               SelectionChanged="FlipView_SelectionChanged">
-                <Controls:FlipView.Items>
+            <mah:FlipView x:Name="FlipView1st"
+                          Height="200"
+                          Margin="0 0 5 0"
+                          Foreground="{DynamicResource MahApps.Brushes.ThemeBackground}"
+                          SelectionChanged="FlipView_SelectionChanged">
+                <mah:FlipView.Items>
                     <Grid Background="#2E8DEF">
                         <iconPacks:PackIconModern Width="60"
                                                   Height="60"
@@ -185,17 +184,17 @@
                                                   VerticalAlignment="Center"
                                                   Kind="ChessHorse" />
                     </Grid>
-                </Controls:FlipView.Items>
-            </Controls:FlipView>
+                </mah:FlipView.Items>
+            </mah:FlipView>
             <StackPanel HorizontalAlignment="Center"
                         DataContext="{Binding ElementName=FlipView1st, Mode=OneWay}"
                         Orientation="Horizontal">
-                <Controls:NumericUpDown Controls:TextBoxHelper.SelectAllOnFocus="True"
-                                        ButtonsAlignment="Left"
-                                        Interval="1"
-                                        Maximum="{Binding Path=Items.Count, Mode=OneWay}"
-                                        Minimum="1"
-                                        Value="{Binding Path=SelectedIndex, Mode=TwoWay, Converter={vc:Int32IndexToNumberConverter}}" />
+                <mah:NumericUpDown mah:TextBoxHelper.SelectAllOnFocus="True"
+                                   ButtonsAlignment="Left"
+                                   Interval="1"
+                                   Maximum="{Binding Path=Items.Count, Mode=OneWay}"
+                                   Minimum="1"
+                                   Value="{Binding Path=SelectedIndex, Mode=TwoWay, Converter={vc:Int32IndexToNumberConverter}}" />
                 <TextBlock Margin="8 0 0 0" VerticalAlignment="Center">
                     <Run Text="/" />
                     <Run Text="{Binding Path=Items.Count, Mode=OneWay}" />
@@ -203,28 +202,28 @@
             </StackPanel>
 
             <Separator Margin="0 5" />
-            <Controls:FlipView x:Name="FlipView2nd"
-                               Height="300"
-                               Margin="0 0 5 0"
-                               BannerText="Databound Items"
-                               CircularNavigation="{Binding ElementName=CircularNaviCheckBox, Path=IsChecked, Mode=OneWay}"
-                               IsBannerEnabled="{Binding ElementName=ShowBannerCheckBox, Path=IsChecked, Mode=OneWay}"
-                               IsNavigationEnabled="{Binding ElementName=ShowNaviCheckBox, Path=IsChecked, Mode=OneWay}"
-                               ItemTemplate="{StaticResource ImageDataTemplate}"
-                               ItemsSource="{Binding FlipViewImages, Mode=OneWay}"
-                               MouseHoverBorderEnabled="{Binding ElementName=ShowMouseOverCheckBox, Path=IsChecked, Mode=OneWay}"
-                               NavigationButtonsPosition="{Binding ElementName=NaviButtonsPosition, Path=SelectedValue, Mode=OneWay}"
-                               Orientation="{Binding ElementName=Orientation, Path=SelectedValue, Mode=OneWay}" />
+            <mah:FlipView x:Name="FlipView2nd"
+                          Height="300"
+                          Margin="0 0 5 0"
+                          BannerText="Databound Items"
+                          CircularNavigation="{Binding ElementName=CircularNaviCheckBox, Path=IsChecked, Mode=OneWay}"
+                          IsBannerEnabled="{Binding ElementName=ShowBannerCheckBox, Path=IsChecked, Mode=OneWay}"
+                          IsNavigationEnabled="{Binding ElementName=ShowNaviCheckBox, Path=IsChecked, Mode=OneWay}"
+                          ItemTemplate="{StaticResource ImageDataTemplate}"
+                          ItemsSource="{Binding FlipViewImages, Mode=OneWay}"
+                          MouseHoverBorderEnabled="{Binding ElementName=ShowMouseOverCheckBox, Path=IsChecked, Mode=OneWay}"
+                          NavigationButtonsPosition="{Binding ElementName=NaviButtonsPosition, Path=SelectedValue, Mode=OneWay}"
+                          Orientation="{Binding ElementName=Orientation, Path=SelectedValue, Mode=OneWay}" />
             <StackPanel HorizontalAlignment="Center"
                         DataContext="{Binding ElementName=FlipView2nd, Mode=OneWay}"
                         Orientation="Horizontal">
-                <Controls:NumericUpDown Controls:TextBoxHelper.SelectAllOnFocus="True"
-                                        ButtonsAlignment="Opposite"
-                                        Interval="1"
-                                        Maximum="{Binding Path=Items.Count, Mode=OneWay}"
-                                        Minimum="1"
-                                        SwitchUpDownButtons="True"
-                                        Value="{Binding Path=SelectedIndex, Mode=TwoWay, Converter={vc:Int32IndexToNumberConverter}}" />
+                <mah:NumericUpDown mah:TextBoxHelper.SelectAllOnFocus="True"
+                                   ButtonsAlignment="Opposite"
+                                   Interval="1"
+                                   Maximum="{Binding Path=Items.Count, Mode=OneWay}"
+                                   Minimum="1"
+                                   SwitchUpDownButtons="True"
+                                   Value="{Binding Path=SelectedIndex, Mode=TwoWay, Converter={vc:Int32IndexToNumberConverter}}" />
             </StackPanel>
         </StackPanel>
 
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 4756a31406..64f860df28 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ProgressBars.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ProgressBars.xaml
@@ -1,18 +1,18 @@
 <UserControl x:Class="MetroDemo.ExampleViews.ProgressBars"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:Controls="http://metro.mahapps.com/winfx/xaml/controls"
-             xmlns:MetroDemo="clr-namespace:MetroDemo"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="clr-namespace:MetroDemo"
+             xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             d:DataContext="{d:DesignInstance MetroDemo:MainWindowViewModel}"
+             d:DataContext="{d:DesignInstance local:MainWindowViewModel}"
              d:DesignHeight="600"
              d:DesignWidth="800"
              mc:Ignorable="d">
 
     <UserControl.Resources>
         <ResourceDictionary>
-            <Style BasedOn="{StaticResource MahApps.Styles.MetroHeader}" TargetType="{x:Type Controls:MetroHeader}">
+            <Style BasedOn="{StaticResource MahApps.Styles.MetroHeader}" TargetType="{x:Type mah:MetroHeader}">
                 <Setter Property="HeaderTemplate">
                     <Setter.Value>
                         <DataTemplate>
@@ -31,7 +31,7 @@
 
     <StackPanel Margin="10" Orientation="Vertical">
 
-        <Controls:MetroHeader Margin="0 0 0 10" Header="ProgressBar">
+        <mah:MetroHeader Margin="0 0 0 10" Header="ProgressBar">
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />
@@ -43,8 +43,8 @@
                     <Slider x:Name="ProgressValueSlider01"
                             Width="250"
                             Margin="4"
-                            Controls:SliderHelper.ChangeValueBy="LargeChange"
-                            Controls:SliderHelper.EnableMouseWheel="MouseHover"
+                            mah:SliderHelper.ChangeValueBy="LargeChange"
+                            mah:SliderHelper.EnableMouseWheel="MouseHover"
                             AutoToolTipPlacement="TopLeft"
                             LargeChange="10"
                             Maximum="100"
@@ -108,9 +108,9 @@
                                  Value="{Binding ElementName=ProgressValueSlider01, Path=Value}" />
                 </StackPanel>
             </Grid>
-        </Controls:MetroHeader>
+        </mah:MetroHeader>
 
-        <Controls:MetroHeader Margin="0 0 0 10" Header="MetroProgressBar">
+        <mah:MetroHeader Margin="0 0 0 10" Header="MetroProgressBar">
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />
@@ -122,8 +122,8 @@
                     <Slider x:Name="ProgressValueSlider02"
                             Width="250"
                             Margin="4"
-                            Controls:SliderHelper.ChangeValueBy="LargeChange"
-                            Controls:SliderHelper.EnableMouseWheel="MouseHover"
+                            mah:SliderHelper.ChangeValueBy="LargeChange"
+                            mah:SliderHelper.EnableMouseWheel="MouseHover"
                             AutoToolTipPlacement="TopLeft"
                             LargeChange="10"
                             Maximum="100"
@@ -131,17 +131,17 @@
                             Orientation="Horizontal"
                             SmallChange="1"
                             Value="25" />
-                    <Controls:MetroProgressBar Width="250"
-                                               Margin="4"
-                                               Maximum="100"
-                                               Minimum="0"
-                                               Value="{Binding ElementName=ProgressValueSlider02, Path=Value}" />
-                    <Controls:MetroProgressBar Width="250"
-                                               Height="15"
-                                               Margin="4"
-                                               Maximum="100"
-                                               Minimum="0"
-                                               Value="{Binding ElementName=ProgressValueSlider02, Path=Value}" />
+                    <mah:MetroProgressBar Width="250"
+                                          Margin="4"
+                                          Maximum="100"
+                                          Minimum="0"
+                                          Value="{Binding ElementName=ProgressValueSlider02, Path=Value}" />
+                    <mah:MetroProgressBar Width="250"
+                                          Height="15"
+                                          Margin="4"
+                                          Maximum="100"
+                                          Minimum="0"
+                                          Value="{Binding ElementName=ProgressValueSlider02, Path=Value}" />
 
                     <CheckBox x:Name="IsVisibleCheckBox02"
                               Width="250"
@@ -153,43 +153,43 @@
                               Margin="4"
                               Content="IsIndeterminate"
                               IsChecked="True" />
-                    <Controls:MetroProgressBar Width="250"
-                                               Margin="4"
-                                               IsIndeterminate="{Binding ElementName=IsIndeterminateCheckBox02, Path=IsChecked}"
-                                               Maximum="100"
-                                               Minimum="0"
-                                               Visibility="{Binding ElementName=IsVisibleCheckBox02, Path=IsChecked, Converter={StaticResource BooleanToVisibilityConverter}}"
-                                               Value="{Binding ElementName=ProgressValueSlider02, Path=Value}" />
+                    <mah:MetroProgressBar Width="250"
+                                          Margin="4"
+                                          IsIndeterminate="{Binding ElementName=IsIndeterminateCheckBox02, Path=IsChecked}"
+                                          Maximum="100"
+                                          Minimum="0"
+                                          Visibility="{Binding ElementName=IsVisibleCheckBox02, Path=IsChecked, Converter={StaticResource BooleanToVisibilityConverter}}"
+                                          Value="{Binding ElementName=ProgressValueSlider02, Path=Value}" />
                 </StackPanel>
                 <StackPanel Grid.Column="1"
                             Margin="10 0"
                             Orientation="Horizontal">
-                    <Controls:MetroProgressBar Height="250"
-                                               Margin="4"
-                                               Maximum="100"
-                                               Minimum="0"
-                                               Orientation="Vertical"
-                                               Value="{Binding ElementName=ProgressValueSlider02, Path=Value}" />
-                    <Controls:MetroProgressBar Width="15"
-                                               Height="250"
-                                               Margin="4"
-                                               Maximum="100"
-                                               Minimum="0"
-                                               Orientation="Vertical"
-                                               Value="{Binding ElementName=ProgressValueSlider02, Path=Value}" />
-                    <Controls:MetroProgressBar Height="250"
-                                               Margin="4"
-                                               IsIndeterminate="{Binding ElementName=IsIndeterminateCheckBox02, Path=IsChecked}"
-                                               Maximum="100"
-                                               Minimum="0"
-                                               Orientation="Vertical"
-                                               Visibility="{Binding ElementName=IsVisibleCheckBox02, Path=IsChecked, Converter={StaticResource BooleanToVisibilityConverter}}"
-                                               Value="{Binding ElementName=ProgressValueSlider02, Path=Value}" />
+                    <mah:MetroProgressBar Height="250"
+                                          Margin="4"
+                                          Maximum="100"
+                                          Minimum="0"
+                                          Orientation="Vertical"
+                                          Value="{Binding ElementName=ProgressValueSlider02, Path=Value}" />
+                    <mah:MetroProgressBar Width="15"
+                                          Height="250"
+                                          Margin="4"
+                                          Maximum="100"
+                                          Minimum="0"
+                                          Orientation="Vertical"
+                                          Value="{Binding ElementName=ProgressValueSlider02, Path=Value}" />
+                    <mah:MetroProgressBar Height="250"
+                                          Margin="4"
+                                          IsIndeterminate="{Binding ElementName=IsIndeterminateCheckBox02, Path=IsChecked}"
+                                          Maximum="100"
+                                          Minimum="0"
+                                          Orientation="Vertical"
+                                          Visibility="{Binding ElementName=IsVisibleCheckBox02, Path=IsChecked, Converter={StaticResource BooleanToVisibilityConverter}}"
+                                          Value="{Binding ElementName=ProgressValueSlider02, Path=Value}" />
                 </StackPanel>
             </Grid>
-        </Controls:MetroHeader>
+        </mah:MetroHeader>
 
-        <Controls:MetroHeader Margin="0 0 0 10" Header="ProgressRing">
+        <mah:MetroHeader Margin="0 0 0 10" Header="ProgressRing">
             <StackPanel MinHeight="150"
                         Margin="10 0"
                         Orientation="Vertical">
@@ -215,23 +215,23 @@
                 <StackPanel Margin="4"
                             HorizontalAlignment="Left"
                             Orientation="Horizontal">
-                    <Controls:ProgressRing IsActive="{Binding ElementName=IsActiveCheckBox, Path=IsChecked}"
-                                           IsLarge="{Binding ElementName=IsLargeCheckBox, Path=IsChecked}"
-                                           Visibility="{Binding ElementName=IsVisibleCheckBox03, Path=IsChecked, Converter={StaticResource BooleanToVisibilityConverter}}" />
-                    <Controls:ProgressRing Width="40"
-                                           Height="40"
-                                           IsActive="{Binding ElementName=IsActiveCheckBox, Path=IsChecked}"
-                                           IsLarge="{Binding ElementName=IsLargeCheckBox, Path=IsChecked}"
-                                           ToolTip="Magic happens!"
-                                           Visibility="{Binding ElementName=IsVisibleCheckBox03, Path=IsChecked, Converter={StaticResource BooleanToVisibilityConverter}}" />
-                    <Controls:ProgressRing Width="20"
-                                           Height="20"
-                                           IsActive="{Binding ElementName=IsActiveCheckBox, Path=IsChecked}"
-                                           IsLarge="{Binding ElementName=IsLargeCheckBox, Path=IsChecked}"
-                                           Visibility="{Binding ElementName=IsVisibleCheckBox03, Path=IsChecked, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                    <mah:ProgressRing IsActive="{Binding ElementName=IsActiveCheckBox, Path=IsChecked}"
+                                      IsLarge="{Binding ElementName=IsLargeCheckBox, Path=IsChecked}"
+                                      Visibility="{Binding ElementName=IsVisibleCheckBox03, Path=IsChecked, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                    <mah:ProgressRing Width="40"
+                                      Height="40"
+                                      IsActive="{Binding ElementName=IsActiveCheckBox, Path=IsChecked}"
+                                      IsLarge="{Binding ElementName=IsLargeCheckBox, Path=IsChecked}"
+                                      ToolTip="Magic happens!"
+                                      Visibility="{Binding ElementName=IsVisibleCheckBox03, Path=IsChecked, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                    <mah:ProgressRing Width="20"
+                                      Height="20"
+                                      IsActive="{Binding ElementName=IsActiveCheckBox, Path=IsChecked}"
+                                      IsLarge="{Binding ElementName=IsLargeCheckBox, Path=IsChecked}"
+                                      Visibility="{Binding ElementName=IsVisibleCheckBox03, Path=IsChecked, Converter={StaticResource BooleanToVisibilityConverter}}" />
                 </StackPanel>
             </StackPanel>
-        </Controls:MetroHeader>
+        </mah:MetroHeader>
 
     </StackPanel>
 
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 e76242385c..e832c0aa7e 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SelectionExamples.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SelectionExamples.xaml
@@ -1,11 +1,11 @@
 <UserControl x:Class="MetroDemo.ExampleViews.SelectionExamples"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:Controls="http://metro.mahapps.com/winfx/xaml/controls"
-             xmlns:MetroDemo="clr-namespace:MetroDemo"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="clr-namespace:MetroDemo"
+             xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             d:DataContext="{d:DesignInstance MetroDemo:MainWindowViewModel}"
+             d:DataContext="{d:DesignInstance local:MainWindowViewModel}"
              d:DesignHeight="600"
              d:DesignWidth="800"
              mc:Ignorable="d">
@@ -21,8 +21,8 @@
                           VerticalScrollBarVisibility="Disabled">
                 <UniformGrid Columns="2" Rows="2">
                     <ListBox Margin="2"
-                             Controls:MultiSelectorHelper.SelectedItems="{Binding SelectedArtists}"
-                             Controls:ScrollViewerHelper.EndOfVerticalScrollReachedCommand="{Binding EndOfScrollReachedCmdWithParameter, Mode=OneWay}"
+                             mah:MultiSelectorHelper.SelectedItems="{Binding SelectedArtists}"
+                             mah:ScrollViewerHelper.EndOfVerticalScrollReachedCommand="{Binding EndOfScrollReachedCmdWithParameter, Mode=OneWay}"
                              AlternationCount="2"
                              BorderThickness="1"
                              DisplayMemberPath="Name"
@@ -32,10 +32,10 @@
                              Style="{StaticResource MahApps.Styles.ListBox.Virtualized}">
                         <ListBox.ItemContainerStyle>
                             <Style BasedOn="{StaticResource MahApps.Styles.ListBoxItem}" TargetType="{x:Type ListBoxItem}">
-                                <Setter Property="Controls:ItemHelper.MouseLeftButtonPressedBackgroundBrush" Value="Coral" />
-                                <Setter Property="Controls:ItemHelper.MouseLeftButtonPressedForegroundBrush" Value="Black" />
-                                <Setter Property="Controls:ItemHelper.MouseRightButtonPressedBackgroundBrush" Value="DarkOliveGreen" />
-                                <Setter Property="Controls:ItemHelper.MouseRightButtonPressedForegroundBrush" Value="White" />
+                                <Setter Property="mah:ItemHelper.MouseLeftButtonPressedBackgroundBrush" Value="Coral" />
+                                <Setter Property="mah:ItemHelper.MouseLeftButtonPressedForegroundBrush" Value="Black" />
+                                <Setter Property="mah:ItemHelper.MouseRightButtonPressedBackgroundBrush" Value="DarkOliveGreen" />
+                                <Setter Property="mah:ItemHelper.MouseRightButtonPressedForegroundBrush" Value="White" />
                                 <Style.Triggers>
                                     <Trigger Property="ItemsControl.AlternationIndex" Value="0">
                                         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Gray10}" />
@@ -45,7 +45,7 @@
                         </ListBox.ItemContainerStyle>
                     </ListBox>
                     <ListBox Margin="2"
-                             Controls:MultiSelectorHelper.SelectedItems="{Binding SelectedArtists}"
+                             mah:MultiSelectorHelper.SelectedItems="{Binding SelectedArtists}"
                              AlternationCount="2"
                              BorderThickness="1"
                              DisplayMemberPath="Name"
@@ -222,8 +222,8 @@
                           VerticalScrollBarVisibility="Auto">
                 <StackPanel HorizontalAlignment="Left" Orientation="Vertical">
                     <ComboBox Width="200"
-                              Controls:TextBoxHelper.ClearTextButton="True"
-                              Controls:TextBoxHelper.Watermark="Please select an item..."
+                              mah:TextBoxHelper.ClearTextButton="True"
+                              mah:TextBoxHelper.Watermark="Please select an item..."
                               BorderThickness="4"
                               SelectedIndex="0">
                         <ComboBox.ContextMenu>
@@ -239,8 +239,8 @@
 
                     <ComboBox Width="200"
                               Margin="{StaticResource ControlMargin}"
-                              Controls:TextBoxHelper.ClearTextButton="True"
-                              Controls:TextBoxHelper.Watermark="Please select an item..."
+                              mah:TextBoxHelper.ClearTextButton="True"
+                              mah:TextBoxHelper.Watermark="Please select an item..."
                               SelectedIndex="0">
                         <ComboBox.ContextMenu>
                             <ContextMenu>
@@ -269,9 +269,9 @@
 
                     <ComboBox Width="200"
                               Margin="{StaticResource ControlMargin}"
-                              Controls:TextBoxHelper.ClearTextButton="True"
-                              Controls:TextBoxHelper.UseFloatingWatermark="True"
-                              Controls:TextBoxHelper.Watermark="Please select an item..."
+                              mah:TextBoxHelper.ClearTextButton="True"
+                              mah:TextBoxHelper.UseFloatingWatermark="True"
+                              mah:TextBoxHelper.Watermark="Please select an item..."
                               SelectedIndex="0">
                         <ComboBox.ContextMenu>
                             <ContextMenu>
@@ -286,9 +286,9 @@
 
                     <ComboBox Width="200"
                               Margin="{StaticResource ControlMargin}"
-                              Controls:TextBoxHelper.ClearTextButton="True"
-                              Controls:TextBoxHelper.UseFloatingWatermark="True"
-                              Controls:TextBoxHelper.Watermark="Editable..."
+                              mah:TextBoxHelper.ClearTextButton="True"
+                              mah:TextBoxHelper.UseFloatingWatermark="True"
+                              mah:TextBoxHelper.Watermark="Editable..."
                               IsEditable="True"
                               SelectedIndex="0">
                         <ComboBox.ContextMenu>
@@ -301,14 +301,14 @@
                     </ComboBox>
 
                     <TextBox Margin="{StaticResource ControlMargin}"
-                             Controls:TextBoxHelper.ClearTextButton="True"
-                             Controls:TextBoxHelper.UseFloatingWatermark="True"
-                             Controls:TextBoxHelper.Watermark="Editable TextBox..." />
+                             mah:TextBoxHelper.ClearTextButton="True"
+                             mah:TextBoxHelper.UseFloatingWatermark="True"
+                             mah:TextBoxHelper.Watermark="Editable TextBox..." />
 
                     <ComboBox Width="200"
                               Margin="{StaticResource ControlMargin}"
-                              Controls:TextBoxHelper.UseFloatingWatermark="True"
-                              Controls:TextBoxHelper.Watermark="Autocompletion"
+                              mah:TextBoxHelper.UseFloatingWatermark="True"
+                              mah:TextBoxHelper.Watermark="Autocompletion"
                               DisplayMemberPath="Title"
                               IsEditable="True"
                               ItemsSource="{Binding Albums}"
@@ -319,7 +319,7 @@
                     <ComboBox x:Name="groupingComboBox"
                               Width="200"
                               Margin="{StaticResource ControlMargin}"
-                              Controls:TextBoxHelper.Watermark="Autocompletion with grouping"
+                              mah:TextBoxHelper.Watermark="Autocompletion with grouping"
                               DisplayMemberPath="Title"
                               IsEditable="True"
                               IsEnabled="True"
@@ -348,7 +348,7 @@
                     </ComboBox>
                     <ComboBox Width="200"
                               Margin="0 10 0 0"
-                              Controls:TextBoxHelper.Watermark="Autocompletion"
+                              mah:TextBoxHelper.Watermark="Autocompletion"
                               DisplayMemberPath="Title"
                               IsEditable="True"
                               IsEnabled="False"
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 ae91fa5d4f..dbb2507421 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/Sliders.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/Sliders.xaml
@@ -1,18 +1,18 @@
 <UserControl x:Class="MetroDemo.ExampleViews.Sliders"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:Controls="http://metro.mahapps.com/winfx/xaml/controls"
-             xmlns:MetroDemo="clr-namespace:MetroDemo"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="clr-namespace:MetroDemo"
+             xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             d:DataContext="{d:DesignInstance MetroDemo:MainWindowViewModel}"
+             d:DataContext="{d:DesignInstance local:MainWindowViewModel}"
              d:DesignHeight="600"
              d:DesignWidth="800"
              mc:Ignorable="d">
 
     <UserControl.Resources>
         <ResourceDictionary>
-            <Style BasedOn="{StaticResource MahApps.Styles.MetroHeader}" TargetType="{x:Type Controls:MetroHeader}">
+            <Style BasedOn="{StaticResource MahApps.Styles.MetroHeader}" TargetType="{x:Type mah:MetroHeader}">
                 <Setter Property="HeaderTemplate">
                     <Setter.Value>
                         <DataTemplate>
@@ -29,7 +29,7 @@
 
     <StackPanel Margin="10" Orientation="Vertical">
 
-        <Controls:MetroHeader Margin="0 0 0 10" Header="Slider Win10 (default) style">
+        <mah:MetroHeader Margin="0 0 0 10" Header="Slider Win10 (default) style">
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />
@@ -41,8 +41,8 @@
                             Orientation="Horizontal">
                     <Slider Height="150"
                             Margin="4"
-                            Controls:SliderHelper.ChangeValueBy="LargeChange"
-                            Controls:SliderHelper.EnableMouseWheel="MouseHover"
+                            mah:SliderHelper.ChangeValueBy="LargeChange"
+                            mah:SliderHelper.EnableMouseWheel="MouseHover"
                             AutoToolTipPlacement="TopLeft"
                             LargeChange="10"
                             Maximum="100"
@@ -52,7 +52,7 @@
                             Value="40" />
                     <Slider Height="150"
                             Margin="4"
-                            Controls:SliderHelper.EnableMouseWheel="MouseHover"
+                            mah:SliderHelper.EnableMouseWheel="MouseHover"
                             AutoToolTipPlacement="BottomRight"
                             LargeChange="10"
                             Maximum="100"
@@ -121,8 +121,8 @@
                             Orientation="Vertical">
                     <Slider Width="200"
                             Margin="4"
-                            Controls:SliderHelper.ChangeValueBy="LargeChange"
-                            Controls:SliderHelper.EnableMouseWheel="MouseHover"
+                            mah:SliderHelper.ChangeValueBy="LargeChange"
+                            mah:SliderHelper.EnableMouseWheel="MouseHover"
                             AutoToolTipPlacement="TopLeft"
                             LargeChange="10"
                             Maximum="100"
@@ -132,7 +132,7 @@
                             Value="40" />
                     <Slider Width="200"
                             Margin="4"
-                            Controls:SliderHelper.EnableMouseWheel="MouseHover"
+                            mah:SliderHelper.EnableMouseWheel="MouseHover"
                             AutoToolTipPlacement="BottomRight"
                             LargeChange="10"
                             Maximum="100"
@@ -196,9 +196,9 @@
                             Value="40" />
                 </StackPanel>
             </Grid>
-        </Controls:MetroHeader>
+        </mah:MetroHeader>
 
-        <Controls:MetroHeader Margin="0 0 0 10" Header="Slider Metro (legacy) style">
+        <mah:MetroHeader Margin="0 0 0 10" Header="Slider Metro (legacy) style">
             <Grid>
                 <Grid.Resources>
                     <Style BasedOn="{StaticResource MahApps.Styles.Slider}" TargetType="{x:Type Slider}" />
@@ -213,8 +213,8 @@
                             Orientation="Horizontal">
                     <Slider Height="150"
                             Margin="4"
-                            Controls:SliderHelper.ChangeValueBy="LargeChange"
-                            Controls:SliderHelper.EnableMouseWheel="MouseHover"
+                            mah:SliderHelper.ChangeValueBy="LargeChange"
+                            mah:SliderHelper.EnableMouseWheel="MouseHover"
                             AutoToolTipPlacement="TopLeft"
                             LargeChange="10"
                             Maximum="100"
@@ -224,7 +224,7 @@
                             Value="40" />
                     <Slider Height="150"
                             Margin="4"
-                            Controls:SliderHelper.EnableMouseWheel="MouseHover"
+                            mah:SliderHelper.EnableMouseWheel="MouseHover"
                             AutoToolTipPlacement="BottomRight"
                             LargeChange="10"
                             Maximum="100"
@@ -293,8 +293,8 @@
                             Orientation="Vertical">
                     <Slider Width="200"
                             Margin="4"
-                            Controls:SliderHelper.ChangeValueBy="LargeChange"
-                            Controls:SliderHelper.EnableMouseWheel="MouseHover"
+                            mah:SliderHelper.ChangeValueBy="LargeChange"
+                            mah:SliderHelper.EnableMouseWheel="MouseHover"
                             AutoToolTipPlacement="TopLeft"
                             LargeChange="10"
                             Maximum="100"
@@ -304,7 +304,7 @@
                             Value="40" />
                     <Slider Width="200"
                             Margin="4"
-                            Controls:SliderHelper.EnableMouseWheel="MouseHover"
+                            mah:SliderHelper.EnableMouseWheel="MouseHover"
                             AutoToolTipPlacement="BottomRight"
                             LargeChange="10"
                             Maximum="100"
@@ -368,9 +368,9 @@
                             Value="40" />
                 </StackPanel>
             </Grid>
-        </Controls:MetroHeader>
+        </mah:MetroHeader>
 
-        <Controls:MetroHeader Margin="0 0 0 10" Header="RangeSlider Win10 (default) style">
+        <mah:MetroHeader Margin="0 0 0 10" Header="RangeSlider Win10 (default) style">
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />
@@ -380,107 +380,107 @@
                 <StackPanel Grid.Column="0"
                             Margin="10 0"
                             Orientation="Horizontal">
-                    <Controls:RangeSlider Height="150"
-                                          Margin="4"
-                                          Controls:SliderHelper.ChangeValueBy="LargeChange"
-                                          Controls:SliderHelper.EnableMouseWheel="MouseHover"
-                                          AutoToolTipPlacement="TopLeft"
-                                          LargeChange="10"
-                                          LowerValue="40"
-                                          Maximum="100"
-                                          Minimum="0"
-                                          Orientation="Vertical"
-                                          SmallChange="1"
-                                          UpperValue="40" />
-                    <Controls:RangeSlider Height="150"
-                                          Margin="4"
-                                          Controls:SliderHelper.EnableMouseWheel="MouseHover"
-                                          AutoToolTipPlacement="BottomRight"
-                                          LargeChange="10"
-                                          LowerValue="50"
-                                          Maximum="100"
-                                          Minimum="0"
-                                          Orientation="Vertical"
-                                          SmallChange="1"
-                                          TickPlacement="TopLeft"
-                                          Ticks="20 25 30 50 70 75 80"
-                                          UpperValue="50" />
-                    <Controls:RangeSlider Height="150"
-                                          Margin="4"
-                                          LargeChange="10"
-                                          LowerValue="40"
-                                          Maximum="100"
-                                          Minimum="0"
-                                          Orientation="Vertical"
-                                          SmallChange="1"
-                                          TickFrequency="5"
-                                          TickPlacement="TopLeft"
-                                          UpperValue="40" />
-                    <Controls:RangeSlider Height="150"
-                                          Margin="4"
-                                          IsSelectionRangeEnabled="True"
-                                          LargeChange="10"
-                                          LowerValue="40"
-                                          Maximum="100"
-                                          Minimum="0"
-                                          Orientation="Vertical"
-                                          SelectionEnd="80"
-                                          SelectionStart="20"
-                                          SmallChange="1"
-                                          TickFrequency="5"
-                                          TickPlacement="TopLeft"
-                                          UpperValue="40" />
-                    <Controls:RangeSlider Height="150"
-                                          Margin="4"
-                                          IsEnabled="False"
-                                          LowerValue="40"
-                                          Maximum="100"
-                                          Minimum="0"
-                                          Orientation="Vertical"
-                                          TickFrequency="5"
-                                          TickPlacement="TopLeft"
-                                          UpperValue="40" />
-                    <Controls:RangeSlider Height="150"
-                                          Margin="4"
-                                          LargeChange="10"
-                                          LowerValue="40"
-                                          Maximum="100"
-                                          Minimum="0"
-                                          Orientation="Vertical"
-                                          SmallChange="1"
-                                          TickFrequency="5"
-                                          TickPlacement="BottomRight"
-                                          UpperValue="40" />
-                    <Controls:RangeSlider Height="150"
-                                          Margin="4"
-                                          LargeChange="10"
-                                          LowerValue="40"
-                                          Maximum="100"
-                                          Minimum="0"
-                                          Orientation="Vertical"
-                                          SmallChange="1"
-                                          TickFrequency="5"
-                                          TickPlacement="Both"
-                                          UpperValue="40" />
+                    <mah:RangeSlider Height="150"
+                                     Margin="4"
+                                     mah:SliderHelper.ChangeValueBy="LargeChange"
+                                     mah:SliderHelper.EnableMouseWheel="MouseHover"
+                                     AutoToolTipPlacement="TopLeft"
+                                     LargeChange="10"
+                                     LowerValue="40"
+                                     Maximum="100"
+                                     Minimum="0"
+                                     Orientation="Vertical"
+                                     SmallChange="1"
+                                     UpperValue="40" />
+                    <mah:RangeSlider Height="150"
+                                     Margin="4"
+                                     mah:SliderHelper.EnableMouseWheel="MouseHover"
+                                     AutoToolTipPlacement="BottomRight"
+                                     LargeChange="10"
+                                     LowerValue="50"
+                                     Maximum="100"
+                                     Minimum="0"
+                                     Orientation="Vertical"
+                                     SmallChange="1"
+                                     TickPlacement="TopLeft"
+                                     Ticks="20 25 30 50 70 75 80"
+                                     UpperValue="50" />
+                    <mah:RangeSlider Height="150"
+                                     Margin="4"
+                                     LargeChange="10"
+                                     LowerValue="40"
+                                     Maximum="100"
+                                     Minimum="0"
+                                     Orientation="Vertical"
+                                     SmallChange="1"
+                                     TickFrequency="5"
+                                     TickPlacement="TopLeft"
+                                     UpperValue="40" />
+                    <mah:RangeSlider Height="150"
+                                     Margin="4"
+                                     IsSelectionRangeEnabled="True"
+                                     LargeChange="10"
+                                     LowerValue="40"
+                                     Maximum="100"
+                                     Minimum="0"
+                                     Orientation="Vertical"
+                                     SelectionEnd="80"
+                                     SelectionStart="20"
+                                     SmallChange="1"
+                                     TickFrequency="5"
+                                     TickPlacement="TopLeft"
+                                     UpperValue="40" />
+                    <mah:RangeSlider Height="150"
+                                     Margin="4"
+                                     IsEnabled="False"
+                                     LowerValue="40"
+                                     Maximum="100"
+                                     Minimum="0"
+                                     Orientation="Vertical"
+                                     TickFrequency="5"
+                                     TickPlacement="TopLeft"
+                                     UpperValue="40" />
+                    <mah:RangeSlider Height="150"
+                                     Margin="4"
+                                     LargeChange="10"
+                                     LowerValue="40"
+                                     Maximum="100"
+                                     Minimum="0"
+                                     Orientation="Vertical"
+                                     SmallChange="1"
+                                     TickFrequency="5"
+                                     TickPlacement="BottomRight"
+                                     UpperValue="40" />
+                    <mah:RangeSlider Height="150"
+                                     Margin="4"
+                                     LargeChange="10"
+                                     LowerValue="40"
+                                     Maximum="100"
+                                     Minimum="0"
+                                     Orientation="Vertical"
+                                     SmallChange="1"
+                                     TickFrequency="5"
+                                     TickPlacement="Both"
+                                     UpperValue="40" />
                 </StackPanel>
                 <!--  horizontal  -->
                 <StackPanel Grid.Column="1"
                             Margin="10 0"
                             Orientation="Vertical">
-                    <Controls:RangeSlider Width="200"
-                                          Margin="4"
-                                          Controls:SliderHelper.ChangeValueBy="LargeChange"
-                                          Controls:SliderHelper.EnableMouseWheel="MouseHover"
-                                          AutoToolTipPlacement="TopLeft"
-                                          LargeChange="10"
-                                          LowerValue="40"
-                                          Maximum="100"
-                                          Minimum="0"
-                                          Orientation="Horizontal"
-                                          SmallChange="1"
-                                          UpperValue="60">
-                        <Controls:RangeSlider.AutoToolTipRangeValuesTemplate>
-                            <DataTemplate DataType="Controls:RangeSliderAutoTooltipValues">
+                    <mah:RangeSlider Width="200"
+                                     Margin="4"
+                                     mah:SliderHelper.ChangeValueBy="LargeChange"
+                                     mah:SliderHelper.EnableMouseWheel="MouseHover"
+                                     AutoToolTipPlacement="TopLeft"
+                                     LargeChange="10"
+                                     LowerValue="40"
+                                     Maximum="100"
+                                     Minimum="0"
+                                     Orientation="Horizontal"
+                                     SmallChange="1"
+                                     UpperValue="60">
+                        <mah:RangeSlider.AutoToolTipRangeValuesTemplate>
+                            <DataTemplate DataType="mah:RangeSliderAutoTooltipValues">
                                 <UniformGrid Columns="2" Rows="2">
                                     <TextBlock HorizontalAlignment="Right" Text="From:" />
                                     <TextBlock HorizontalAlignment="Right" Text="{Binding LowerValue, StringFormat='{}{0:N2}'}" />
@@ -488,86 +488,86 @@
                                     <TextBlock HorizontalAlignment="Right" Text="{Binding UpperValue, StringFormat='{}{0:N2}'}" />
                                 </UniformGrid>
                             </DataTemplate>
-                        </Controls:RangeSlider.AutoToolTipRangeValuesTemplate>
-                    </Controls:RangeSlider>
-                    <Controls:RangeSlider Width="200"
-                                          Margin="4"
-                                          Controls:SliderHelper.EnableMouseWheel="MouseHover"
-                                          AutoToolTipPlacement="BottomRight"
-                                          LargeChange="10"
-                                          LowerValue="50"
-                                          Maximum="100"
-                                          Minimum="0"
-                                          Orientation="Horizontal"
-                                          SmallChange="1"
-                                          TickPlacement="TopLeft"
-                                          Ticks="20 25 30 50 70 75 80"
-                                          UpperValue="50" />
-                    <Controls:RangeSlider Width="200"
-                                          Margin="4"
-                                          LargeChange="10"
-                                          LowerValue="40"
-                                          Maximum="100"
-                                          Minimum="0"
-                                          Orientation="Horizontal"
-                                          SmallChange="1"
-                                          TickFrequency="5"
-                                          TickPlacement="TopLeft"
-                                          UpperValue="40" />
-                    <Controls:RangeSlider Width="200"
-                                          Margin="4"
-                                          IsSelectionRangeEnabled="True"
-                                          LargeChange="10"
-                                          LowerValue="40"
-                                          Maximum="100"
-                                          Minimum="0"
-                                          Orientation="Horizontal"
-                                          SelectionEnd="80"
-                                          SelectionStart="20"
-                                          SmallChange="1"
-                                          TickFrequency="5"
-                                          TickPlacement="TopLeft"
-                                          UpperValue="40" />
-                    <Controls:RangeSlider Width="200"
-                                          Margin="4"
-                                          IsEnabled="False"
-                                          LowerValue="40"
-                                          Maximum="100"
-                                          Minimum="0"
-                                          Orientation="Horizontal"
-                                          TickFrequency="5"
-                                          TickPlacement="TopLeft"
-                                          UpperValue="40" />
-                    <Controls:RangeSlider Width="200"
-                                          Margin="4"
-                                          LargeChange="10"
-                                          LowerValue="40"
-                                          Maximum="100"
-                                          Minimum="0"
-                                          Orientation="Horizontal"
-                                          SmallChange="1"
-                                          TickFrequency="5"
-                                          TickPlacement="BottomRight"
-                                          UpperValue="40" />
-                    <Controls:RangeSlider Width="200"
-                                          Margin="4"
-                                          LargeChange="10"
-                                          LowerValue="40"
-                                          Maximum="100"
-                                          Minimum="0"
-                                          Orientation="Horizontal"
-                                          SmallChange="1"
-                                          TickFrequency="5"
-                                          TickPlacement="Both"
-                                          UpperValue="40" />
+                        </mah:RangeSlider.AutoToolTipRangeValuesTemplate>
+                    </mah:RangeSlider>
+                    <mah:RangeSlider Width="200"
+                                     Margin="4"
+                                     mah:SliderHelper.EnableMouseWheel="MouseHover"
+                                     AutoToolTipPlacement="BottomRight"
+                                     LargeChange="10"
+                                     LowerValue="50"
+                                     Maximum="100"
+                                     Minimum="0"
+                                     Orientation="Horizontal"
+                                     SmallChange="1"
+                                     TickPlacement="TopLeft"
+                                     Ticks="20 25 30 50 70 75 80"
+                                     UpperValue="50" />
+                    <mah:RangeSlider Width="200"
+                                     Margin="4"
+                                     LargeChange="10"
+                                     LowerValue="40"
+                                     Maximum="100"
+                                     Minimum="0"
+                                     Orientation="Horizontal"
+                                     SmallChange="1"
+                                     TickFrequency="5"
+                                     TickPlacement="TopLeft"
+                                     UpperValue="40" />
+                    <mah:RangeSlider Width="200"
+                                     Margin="4"
+                                     IsSelectionRangeEnabled="True"
+                                     LargeChange="10"
+                                     LowerValue="40"
+                                     Maximum="100"
+                                     Minimum="0"
+                                     Orientation="Horizontal"
+                                     SelectionEnd="80"
+                                     SelectionStart="20"
+                                     SmallChange="1"
+                                     TickFrequency="5"
+                                     TickPlacement="TopLeft"
+                                     UpperValue="40" />
+                    <mah:RangeSlider Width="200"
+                                     Margin="4"
+                                     IsEnabled="False"
+                                     LowerValue="40"
+                                     Maximum="100"
+                                     Minimum="0"
+                                     Orientation="Horizontal"
+                                     TickFrequency="5"
+                                     TickPlacement="TopLeft"
+                                     UpperValue="40" />
+                    <mah:RangeSlider Width="200"
+                                     Margin="4"
+                                     LargeChange="10"
+                                     LowerValue="40"
+                                     Maximum="100"
+                                     Minimum="0"
+                                     Orientation="Horizontal"
+                                     SmallChange="1"
+                                     TickFrequency="5"
+                                     TickPlacement="BottomRight"
+                                     UpperValue="40" />
+                    <mah:RangeSlider Width="200"
+                                     Margin="4"
+                                     LargeChange="10"
+                                     LowerValue="40"
+                                     Maximum="100"
+                                     Minimum="0"
+                                     Orientation="Horizontal"
+                                     SmallChange="1"
+                                     TickFrequency="5"
+                                     TickPlacement="Both"
+                                     UpperValue="40" />
                 </StackPanel>
             </Grid>
-        </Controls:MetroHeader>
+        </mah:MetroHeader>
 
-        <Controls:MetroHeader Margin="0 0 0 10" Header="RangeSlider Metro (legacy) style">
+        <mah:MetroHeader Margin="0 0 0 10" Header="RangeSlider Metro (legacy) style">
             <Grid>
                 <Grid.Resources>
-                    <Style BasedOn="{StaticResource MahApps.Styles.RangeSlider}" TargetType="{x:Type Controls:RangeSlider}" />
+                    <Style BasedOn="{StaticResource MahApps.Styles.RangeSlider}" TargetType="{x:Type mah:RangeSlider}" />
                 </Grid.Resources>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />
@@ -577,180 +577,180 @@
                 <StackPanel Grid.Column="0"
                             Margin="10 0"
                             Orientation="Horizontal">
-                    <Controls:RangeSlider Height="150"
-                                          Margin="4"
-                                          Controls:SliderHelper.ChangeValueBy="LargeChange"
-                                          Controls:SliderHelper.EnableMouseWheel="MouseHover"
-                                          AutoToolTipPlacement="TopLeft"
-                                          LargeChange="10"
-                                          LowerValue="40"
-                                          Maximum="100"
-                                          Minimum="0"
-                                          Orientation="Vertical"
-                                          SmallChange="1"
-                                          UpperValue="40" />
-                    <Controls:RangeSlider Height="150"
-                                          Margin="4"
-                                          Controls:SliderHelper.EnableMouseWheel="MouseHover"
-                                          AutoToolTipPlacement="BottomRight"
-                                          LargeChange="10"
-                                          LowerValue="50"
-                                          Maximum="100"
-                                          Minimum="0"
-                                          Orientation="Vertical"
-                                          SmallChange="1"
-                                          TickPlacement="TopLeft"
-                                          Ticks="20 25 30 50 70 75 80"
-                                          UpperValue="50" />
-                    <Controls:RangeSlider Height="150"
-                                          Margin="4"
-                                          LargeChange="10"
-                                          LowerValue="40"
-                                          Maximum="100"
-                                          Minimum="0"
-                                          Orientation="Vertical"
-                                          SmallChange="1"
-                                          TickFrequency="5"
-                                          TickPlacement="TopLeft"
-                                          UpperValue="40" />
-                    <Controls:RangeSlider Height="150"
-                                          Margin="4"
-                                          IsSelectionRangeEnabled="True"
-                                          LargeChange="10"
-                                          LowerValue="40"
-                                          Maximum="100"
-                                          Minimum="0"
-                                          Orientation="Vertical"
-                                          SelectionEnd="80"
-                                          SelectionStart="20"
-                                          SmallChange="1"
-                                          TickFrequency="5"
-                                          TickPlacement="TopLeft"
-                                          UpperValue="40" />
-                    <Controls:RangeSlider Height="150"
-                                          Margin="4"
-                                          IsEnabled="False"
-                                          LowerValue="40"
-                                          Maximum="100"
-                                          Minimum="0"
-                                          Orientation="Vertical"
-                                          TickFrequency="5"
-                                          TickPlacement="TopLeft"
-                                          UpperValue="40" />
-                    <Controls:RangeSlider Height="150"
-                                          Margin="4"
-                                          LargeChange="10"
-                                          LowerValue="40"
-                                          Maximum="100"
-                                          Minimum="0"
-                                          Orientation="Vertical"
-                                          SmallChange="1"
-                                          TickFrequency="5"
-                                          TickPlacement="BottomRight"
-                                          UpperValue="40" />
-                    <Controls:RangeSlider Height="150"
-                                          Margin="4"
-                                          LargeChange="10"
-                                          LowerValue="40"
-                                          Maximum="100"
-                                          Minimum="0"
-                                          Orientation="Vertical"
-                                          SmallChange="1"
-                                          TickFrequency="5"
-                                          TickPlacement="Both"
-                                          UpperValue="40" />
+                    <mah:RangeSlider Height="150"
+                                     Margin="4"
+                                     mah:SliderHelper.ChangeValueBy="LargeChange"
+                                     mah:SliderHelper.EnableMouseWheel="MouseHover"
+                                     AutoToolTipPlacement="TopLeft"
+                                     LargeChange="10"
+                                     LowerValue="40"
+                                     Maximum="100"
+                                     Minimum="0"
+                                     Orientation="Vertical"
+                                     SmallChange="1"
+                                     UpperValue="40" />
+                    <mah:RangeSlider Height="150"
+                                     Margin="4"
+                                     mah:SliderHelper.EnableMouseWheel="MouseHover"
+                                     AutoToolTipPlacement="BottomRight"
+                                     LargeChange="10"
+                                     LowerValue="50"
+                                     Maximum="100"
+                                     Minimum="0"
+                                     Orientation="Vertical"
+                                     SmallChange="1"
+                                     TickPlacement="TopLeft"
+                                     Ticks="20 25 30 50 70 75 80"
+                                     UpperValue="50" />
+                    <mah:RangeSlider Height="150"
+                                     Margin="4"
+                                     LargeChange="10"
+                                     LowerValue="40"
+                                     Maximum="100"
+                                     Minimum="0"
+                                     Orientation="Vertical"
+                                     SmallChange="1"
+                                     TickFrequency="5"
+                                     TickPlacement="TopLeft"
+                                     UpperValue="40" />
+                    <mah:RangeSlider Height="150"
+                                     Margin="4"
+                                     IsSelectionRangeEnabled="True"
+                                     LargeChange="10"
+                                     LowerValue="40"
+                                     Maximum="100"
+                                     Minimum="0"
+                                     Orientation="Vertical"
+                                     SelectionEnd="80"
+                                     SelectionStart="20"
+                                     SmallChange="1"
+                                     TickFrequency="5"
+                                     TickPlacement="TopLeft"
+                                     UpperValue="40" />
+                    <mah:RangeSlider Height="150"
+                                     Margin="4"
+                                     IsEnabled="False"
+                                     LowerValue="40"
+                                     Maximum="100"
+                                     Minimum="0"
+                                     Orientation="Vertical"
+                                     TickFrequency="5"
+                                     TickPlacement="TopLeft"
+                                     UpperValue="40" />
+                    <mah:RangeSlider Height="150"
+                                     Margin="4"
+                                     LargeChange="10"
+                                     LowerValue="40"
+                                     Maximum="100"
+                                     Minimum="0"
+                                     Orientation="Vertical"
+                                     SmallChange="1"
+                                     TickFrequency="5"
+                                     TickPlacement="BottomRight"
+                                     UpperValue="40" />
+                    <mah:RangeSlider Height="150"
+                                     Margin="4"
+                                     LargeChange="10"
+                                     LowerValue="40"
+                                     Maximum="100"
+                                     Minimum="0"
+                                     Orientation="Vertical"
+                                     SmallChange="1"
+                                     TickFrequency="5"
+                                     TickPlacement="Both"
+                                     UpperValue="40" />
                 </StackPanel>
                 <!--  horizontal  -->
                 <StackPanel Grid.Column="1"
                             Margin="10 0"
                             Orientation="Vertical">
-                    <Controls:RangeSlider Width="200"
-                                          Margin="4"
-                                          Controls:SliderHelper.ChangeValueBy="LargeChange"
-                                          Controls:SliderHelper.EnableMouseWheel="MouseHover"
-                                          AutoToolTipPlacement="TopLeft"
-                                          LargeChange="10"
-                                          LowerValue="40"
-                                          Maximum="100"
-                                          Minimum="0"
-                                          Orientation="Horizontal"
-                                          SmallChange="1"
-                                          UpperValue="40" />
-                    <Controls:RangeSlider Width="200"
-                                          Margin="4"
-                                          Controls:SliderHelper.EnableMouseWheel="MouseHover"
-                                          AutoToolTipPlacement="BottomRight"
-                                          LargeChange="10"
-                                          LowerValue="50"
-                                          Maximum="100"
-                                          Minimum="0"
-                                          Orientation="Horizontal"
-                                          SmallChange="1"
-                                          TickPlacement="TopLeft"
-                                          Ticks="20 25 30 50 70 75 80"
-                                          UpperValue="50" />
-                    <Controls:RangeSlider Width="200"
-                                          Margin="4"
-                                          LargeChange="10"
-                                          LowerValue="40"
-                                          Maximum="100"
-                                          Minimum="0"
-                                          Orientation="Horizontal"
-                                          SmallChange="1"
-                                          TickFrequency="5"
-                                          TickPlacement="TopLeft"
-                                          UpperValue="40" />
-                    <Controls:RangeSlider Width="200"
-                                          Margin="4"
-                                          IsSelectionRangeEnabled="True"
-                                          LargeChange="10"
-                                          LowerValue="40"
-                                          Maximum="100"
-                                          Minimum="0"
-                                          Orientation="Horizontal"
-                                          SelectionEnd="80"
-                                          SelectionStart="20"
-                                          SmallChange="1"
-                                          TickFrequency="5"
-                                          TickPlacement="TopLeft"
-                                          UpperValue="40" />
-                    <Controls:RangeSlider Width="200"
-                                          Margin="4"
-                                          IsEnabled="False"
-                                          LowerValue="40"
-                                          Maximum="100"
-                                          Minimum="0"
-                                          Orientation="Horizontal"
-                                          TickFrequency="5"
-                                          TickPlacement="TopLeft"
-                                          UpperValue="40" />
-                    <Controls:RangeSlider Width="200"
-                                          Margin="4"
-                                          LargeChange="10"
-                                          LowerValue="40"
-                                          Maximum="100"
-                                          Minimum="0"
-                                          Orientation="Horizontal"
-                                          SmallChange="1"
-                                          TickFrequency="5"
-                                          TickPlacement="BottomRight"
-                                          UpperValue="40" />
-                    <Controls:RangeSlider Width="200"
-                                          Margin="4"
-                                          LargeChange="10"
-                                          LowerValue="40"
-                                          Maximum="100"
-                                          Minimum="0"
-                                          Orientation="Horizontal"
-                                          SmallChange="1"
-                                          TickFrequency="5"
-                                          TickPlacement="Both"
-                                          UpperValue="40" />
+                    <mah:RangeSlider Width="200"
+                                     Margin="4"
+                                     mah:SliderHelper.ChangeValueBy="LargeChange"
+                                     mah:SliderHelper.EnableMouseWheel="MouseHover"
+                                     AutoToolTipPlacement="TopLeft"
+                                     LargeChange="10"
+                                     LowerValue="40"
+                                     Maximum="100"
+                                     Minimum="0"
+                                     Orientation="Horizontal"
+                                     SmallChange="1"
+                                     UpperValue="40" />
+                    <mah:RangeSlider Width="200"
+                                     Margin="4"
+                                     mah:SliderHelper.EnableMouseWheel="MouseHover"
+                                     AutoToolTipPlacement="BottomRight"
+                                     LargeChange="10"
+                                     LowerValue="50"
+                                     Maximum="100"
+                                     Minimum="0"
+                                     Orientation="Horizontal"
+                                     SmallChange="1"
+                                     TickPlacement="TopLeft"
+                                     Ticks="20 25 30 50 70 75 80"
+                                     UpperValue="50" />
+                    <mah:RangeSlider Width="200"
+                                     Margin="4"
+                                     LargeChange="10"
+                                     LowerValue="40"
+                                     Maximum="100"
+                                     Minimum="0"
+                                     Orientation="Horizontal"
+                                     SmallChange="1"
+                                     TickFrequency="5"
+                                     TickPlacement="TopLeft"
+                                     UpperValue="40" />
+                    <mah:RangeSlider Width="200"
+                                     Margin="4"
+                                     IsSelectionRangeEnabled="True"
+                                     LargeChange="10"
+                                     LowerValue="40"
+                                     Maximum="100"
+                                     Minimum="0"
+                                     Orientation="Horizontal"
+                                     SelectionEnd="80"
+                                     SelectionStart="20"
+                                     SmallChange="1"
+                                     TickFrequency="5"
+                                     TickPlacement="TopLeft"
+                                     UpperValue="40" />
+                    <mah:RangeSlider Width="200"
+                                     Margin="4"
+                                     IsEnabled="False"
+                                     LowerValue="40"
+                                     Maximum="100"
+                                     Minimum="0"
+                                     Orientation="Horizontal"
+                                     TickFrequency="5"
+                                     TickPlacement="TopLeft"
+                                     UpperValue="40" />
+                    <mah:RangeSlider Width="200"
+                                     Margin="4"
+                                     LargeChange="10"
+                                     LowerValue="40"
+                                     Maximum="100"
+                                     Minimum="0"
+                                     Orientation="Horizontal"
+                                     SmallChange="1"
+                                     TickFrequency="5"
+                                     TickPlacement="BottomRight"
+                                     UpperValue="40" />
+                    <mah:RangeSlider Width="200"
+                                     Margin="4"
+                                     LargeChange="10"
+                                     LowerValue="40"
+                                     Maximum="100"
+                                     Minimum="0"
+                                     Orientation="Horizontal"
+                                     SmallChange="1"
+                                     TickFrequency="5"
+                                     TickPlacement="Both"
+                                     UpperValue="40" />
                 </StackPanel>
             </Grid>
-        </Controls:MetroHeader>
+        </mah:MetroHeader>
 
-        <Controls:MetroHeader Margin="0 0 0 10" Header="Slider Flat style">
+        <mah:MetroHeader Margin="0 0 0 10" Header="Slider Flat style">
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />
@@ -762,8 +762,8 @@
                             Orientation="Horizontal">
                     <Slider Height="150"
                             Margin="4"
-                            Controls:SliderHelper.ChangeValueBy="LargeChange"
-                            Controls:SliderHelper.EnableMouseWheel="MouseHover"
+                            mah:SliderHelper.ChangeValueBy="LargeChange"
+                            mah:SliderHelper.EnableMouseWheel="MouseHover"
                             AutoToolTipPlacement="TopLeft"
                             LargeChange="10"
                             Maximum="100"
@@ -774,7 +774,7 @@
                             Value="40" />
                     <Slider Height="150"
                             Margin="4"
-                            Controls:SliderHelper.EnableMouseWheel="MouseHover"
+                            mah:SliderHelper.EnableMouseWheel="MouseHover"
                             AutoToolTipPlacement="BottomRight"
                             LargeChange="10"
                             Maximum="100"
@@ -849,8 +849,8 @@
                             Orientation="Vertical">
                     <Slider Width="200"
                             Margin="4"
-                            Controls:SliderHelper.ChangeValueBy="LargeChange"
-                            Controls:SliderHelper.EnableMouseWheel="MouseHover"
+                            mah:SliderHelper.ChangeValueBy="LargeChange"
+                            mah:SliderHelper.EnableMouseWheel="MouseHover"
                             AutoToolTipPlacement="TopLeft"
                             LargeChange="10"
                             Maximum="100"
@@ -861,7 +861,7 @@
                             Value="40" />
                     <Slider Width="200"
                             Margin="4"
-                            Controls:SliderHelper.EnableMouseWheel="MouseHover"
+                            mah:SliderHelper.EnableMouseWheel="MouseHover"
                             AutoToolTipPlacement="BottomRight"
                             LargeChange="10"
                             Maximum="100"
@@ -931,7 +931,7 @@
                             Value="40" />
                 </StackPanel>
             </Grid>
-        </Controls:MetroHeader>
+        </mah:MetroHeader>
 
     </StackPanel>
 
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SplitViewExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SplitViewExamples.xaml
index f3e9ab34d5..47323525c0 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SplitViewExamples.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SplitViewExamples.xaml
@@ -1,11 +1,11 @@
 <UserControl x:Class="MetroDemo.ExampleViews.SplitViewExamples"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="clr-namespace:MetroDemo"
+             xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:metroDemo="clr-namespace:MetroDemo"
-             d:DataContext="{d:DesignInstance metroDemo:MainWindowViewModel}"
+             d:DataContext="{d:DesignInstance local:MainWindowViewModel}"
              d:DesignHeight="600"
              d:DesignWidth="800"
              mc:Ignorable="d">
@@ -17,7 +17,7 @@
 
             <SolidColorBrush x:Key="SplitViewBackgroundBrush" Opacity="1" Color="{StaticResource SystemBaseMediumColor}" />
 
-            <Style TargetType="{x:Type controls:SplitView}">
+            <Style TargetType="{x:Type mah:SplitView}">
                 <Setter Property="CompactPaneLength" Value="48" />
                 <Setter Property="DisplayMode" Value="CompactOverlay" />
                 <Setter Property="IsPaneOpen" Value="False" />
@@ -28,37 +28,37 @@
             <!--  #Templates  -->
             <ControlTemplate x:Key="ConfigDataTemplate">
                 <ControlTemplate.Resources>
-                    <Style BasedOn="{StaticResource MahApps.Styles.MetroHeader.Horizontal}" TargetType="controls:MetroHeader" />
+                    <Style BasedOn="{StaticResource MahApps.Styles.MetroHeader.Horizontal}" TargetType="mah:MetroHeader" />
                 </ControlTemplate.Resources>
-                <StackPanel d:DataContext="{d:DesignInstance controls:SplitView}" Grid.IsSharedSizeScope="True">
+                <StackPanel d:DataContext="{d:DesignInstance mah:SplitView}" Grid.IsSharedSizeScope="True">
 
-                    <controls:MetroHeader Header="IsOpen">
-                        <controls:ToggleSwitch Margin="2" IsOn="{Binding IsPaneOpen}" />
-                    </controls:MetroHeader>
+                    <mah:MetroHeader Header="IsOpen">
+                        <mah:ToggleSwitch Margin="2" IsOn="{Binding IsPaneOpen}" />
+                    </mah:MetroHeader>
 
-                    <controls:MetroHeader Header="DisplayMode">
+                    <mah:MetroHeader Header="DisplayMode">
                         <ComboBox Margin="2" SelectedValue="{Binding DisplayMode}">
-                            <controls:SplitViewDisplayMode>Inline</controls:SplitViewDisplayMode>
-                            <controls:SplitViewDisplayMode>Overlay</controls:SplitViewDisplayMode>
-                            <controls:SplitViewDisplayMode>CompactInline</controls:SplitViewDisplayMode>
-                            <controls:SplitViewDisplayMode>CompactOverlay</controls:SplitViewDisplayMode>
+                            <mah:SplitViewDisplayMode>Inline</mah:SplitViewDisplayMode>
+                            <mah:SplitViewDisplayMode>Overlay</mah:SplitViewDisplayMode>
+                            <mah:SplitViewDisplayMode>CompactInline</mah:SplitViewDisplayMode>
+                            <mah:SplitViewDisplayMode>CompactOverlay</mah:SplitViewDisplayMode>
                         </ComboBox>
-                    </controls:MetroHeader>
+                    </mah:MetroHeader>
 
-                    <controls:MetroHeader Header="CanResizeOpenPane">
-                        <controls:ToggleSwitch Margin="2" IsOn="{Binding CanResizeOpenPane}" />
-                    </controls:MetroHeader>
+                    <mah:MetroHeader Header="CanResizeOpenPane">
+                        <mah:ToggleSwitch Margin="2" IsOn="{Binding CanResizeOpenPane}" />
+                    </mah:MetroHeader>
 
-                    <controls:MetroHeader Header="PanePlacement">
+                    <mah:MetroHeader Header="PanePlacement">
                         <ComboBox Margin="2" SelectedValue="{Binding PanePlacement}">
-                            <controls:SplitViewPanePlacement>Left</controls:SplitViewPanePlacement>
-                            <controls:SplitViewPanePlacement>Right</controls:SplitViewPanePlacement>
+                            <mah:SplitViewPanePlacement>Left</mah:SplitViewPanePlacement>
+                            <mah:SplitViewPanePlacement>Right</mah:SplitViewPanePlacement>
                         </ComboBox>
-                    </controls:MetroHeader>
+                    </mah:MetroHeader>
 
-                    <controls:MetroHeader Header="CancelClose">
-                        <controls:ToggleSwitch Margin="2" IsOn="{Binding Tag, Mode=TwoWay}" />
-                    </controls:MetroHeader>
+                    <mah:MetroHeader Header="CancelClose">
+                        <mah:ToggleSwitch Margin="2" IsOn="{Binding Tag, Mode=TwoWay}" />
+                    </mah:MetroHeader>
 
                 </StackPanel>
             </ControlTemplate>
@@ -95,16 +95,16 @@
                       Grid.Column="1"
                       ResizeBehavior="PreviousAndNext" />
 
-        <controls:SplitView x:Name="SimpleSplitview"
-                            Grid.Row="1"
-                            Grid.Column="2"
-                            Margin="5"
-                            DisplayMode="Inline"
-                            IsPaneOpen="True"
-                            OpenPaneLength="150"
-                            PaneBackground="Red"
-                            PaneClosing="Splitview_PaneClosing">
-            <controls:SplitView.Pane>
+        <mah:SplitView x:Name="SimpleSplitview"
+                       Grid.Row="1"
+                       Grid.Column="2"
+                       Margin="5"
+                       DisplayMode="Inline"
+                       IsPaneOpen="True"
+                       OpenPaneLength="150"
+                       PaneBackground="Red"
+                       PaneClosing="Splitview_PaneClosing">
+            <mah:SplitView.Pane>
                 <Grid Margin="48 0 0 0" Background="LightGreen">
                     <TextBlock Margin="10"
                                HorizontalAlignment="Center"
@@ -114,7 +114,7 @@
                                Text="Pane content area"
                                TextWrapping="Wrap" />
                 </Grid>
-            </controls:SplitView.Pane>
+            </mah:SplitView.Pane>
 
             <Grid Background="CornflowerBlue">
                 <TextBlock Margin="20"
@@ -126,6 +126,6 @@
                            TextWrapping="Wrap" />
             </Grid>
 
-        </controls:SplitView>
+        </mah:SplitView>
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TabControlExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TabControlExamples.xaml
index 507be46d7b..72a55e01a9 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TabControlExamples.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TabControlExamples.xaml
@@ -1,12 +1,12 @@
 <UserControl x:Class="MetroDemo.ExampleViews.TabControlExamples"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:Controls="http://metro.mahapps.com/winfx/xaml/controls"
-             xmlns:MetroDemo="clr-namespace:MetroDemo"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:MetroDemo.ExampleViews"
+             xmlns:exampleViews="clr-namespace:MetroDemo.ExampleViews"
+             xmlns:local="clr-namespace:MetroDemo"
+             xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             d:DataContext="{d:DesignInstance MetroDemo:MainWindowViewModel}"
+             d:DataContext="{d:DesignInstance local:MainWindowViewModel}"
              d:DesignHeight="600"
              d:DesignWidth="800"
              mc:Ignorable="d">
@@ -21,14 +21,14 @@
         </ObjectDataProvider>
         <ObjectDataProvider x:Key="UnderlinedEnumValues"
                             MethodName="GetValues"
-                            ObjectType="{x:Type Controls:UnderlinedType}">
+                            ObjectType="{x:Type mah:UnderlinedType}">
             <ObjectDataProvider.MethodParameters>
-                <x:Type TypeName="Controls:UnderlinedType" />
+                <x:Type TypeName="mah:UnderlinedType" />
             </ObjectDataProvider.MethodParameters>
         </ObjectDataProvider>
         <ObjectDataProvider x:Key="UnderlinePlacementEnumValues"
                             MethodName="GetDockValues"
-                            ObjectType="{x:Type local:DockHelper}" />
+                            ObjectType="{x:Type exampleViews:DockHelper}" />
 
         <ControlTemplate x:Key="TabControlConfigDataTemplate">
             <Grid d:DataContext="{d:DesignInstance TabControl}">
@@ -42,7 +42,7 @@
                               HorizontalAlignment="Left"
                               VerticalAlignment="Center"
                               ItemsSource="{Binding Source={StaticResource UnderlinedEnumValues}}"
-                              SelectedItem="{Binding Path=(Controls:TabControlHelper.Underlined), Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                              SelectedItem="{Binding Path=(mah:TabControlHelper.Underlined), Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                     <TextBlock Margin="5 5"
                                VerticalAlignment="Center"
                                Text="TabStripPlacement" />
@@ -62,12 +62,12 @@
                               HorizontalAlignment="Left"
                               VerticalAlignment="Center"
                               ItemsSource="{Binding Source={StaticResource UnderlinePlacementEnumValues}}"
-                              SelectedItem="{Binding Path=(Controls:TabControlHelper.UnderlinePlacement), Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                              SelectedItem="{Binding Path=(mah:TabControlHelper.UnderlinePlacement), Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                 </StackPanel>
             </Grid>
         </ControlTemplate>
         <ControlTemplate x:Key="MetroTabControlConfigDataTemplate">
-            <Grid d:DataContext="{d:DesignInstance Controls:MetroTabControl}">
+            <Grid d:DataContext="{d:DesignInstance mah:MetroTabControl}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Margin="5 5"
                                VerticalAlignment="Center"
@@ -86,7 +86,7 @@
                               HorizontalAlignment="Left"
                               VerticalAlignment="Center"
                               ItemsSource="{Binding Source={StaticResource UnderlinedEnumValues}}"
-                              SelectedItem="{Binding Path=(Controls:TabControlHelper.Underlined), Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                              SelectedItem="{Binding Path=(mah:TabControlHelper.Underlined), Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                     <TextBlock Margin="5 5"
                                VerticalAlignment="Center"
                                Text="TabStripPlacement" />
@@ -106,7 +106,7 @@
                               HorizontalAlignment="Left"
                               VerticalAlignment="Center"
                               ItemsSource="{Binding Source={StaticResource UnderlinePlacementEnumValues}}"
-                              SelectedItem="{Binding Path=(Controls:TabControlHelper.UnderlinePlacement), Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                              SelectedItem="{Binding Path=(mah:TabControlHelper.UnderlinePlacement), Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                 </StackPanel>
             </Grid>
         </ControlTemplate>
@@ -121,8 +121,8 @@
                 <ContentControl DataContext="{Binding ElementName=DefaultTabControl}" Template="{StaticResource TabControlConfigDataTemplate}" />
                 <TabControl x:Name="DefaultTabControl"
                             Height="200"
-                            Controls:HeaderedControlHelper.HeaderFontFamily="Segoe Script"
-                            Controls:HeaderedControlHelper.HeaderFontSize="18">
+                            mah:HeaderedControlHelper.HeaderFontFamily="Segoe Script"
+                            mah:HeaderedControlHelper.HeaderFontSize="18">
                     <TabItem Header="Item _1">
                         <TextBlock FontSize="30" Text="Content" />
                     </TabItem>
@@ -154,12 +154,12 @@
                         <TabItem Header="this tabcontrol">
                             <TextBlock FontSize="30" Text="Cool transition" />
                         </TabItem>
-                        <Controls:MetroTabItem Header="animates its content">
+                        <mah:MetroTabItem Header="animates its content">
                             <TextBlock FontSize="30" Text="More cool transition" />
-                        </Controls:MetroTabItem>
-                        <Controls:MetroTabItem Header="with a transition">
+                        </mah:MetroTabItem>
+                        <mah:MetroTabItem Header="with a transition">
                             <TextBlock FontSize="30" Text="Animate everything!" />
-                        </Controls:MetroTabItem>
+                        </mah:MetroTabItem>
                     </TabControl>
                 </Grid>
 
@@ -174,12 +174,12 @@
                         <TabItem Header="these tabs">
                             <TextBlock FontSize="30" Text="first content" />
                         </TabItem>
-                        <Controls:MetroTabItem Header="appear only on a single line">
+                        <mah:MetroTabItem Header="appear only on a single line">
                             <TextBlock FontSize="30" Text="second one" />
-                        </Controls:MetroTabItem>
-                        <Controls:MetroTabItem Header="if they are overflowing">
+                        </mah:MetroTabItem>
+                        <mah:MetroTabItem Header="if they are overflowing">
                             <TextBlock FontSize="30" Text="3" />
-                        </Controls:MetroTabItem>
+                        </mah:MetroTabItem>
                         <TabItem Header="instead of wrapping them">
                             <TextBlock FontSize="30" Text="last of them" />
                         </TabItem>
@@ -195,43 +195,43 @@
             <StackPanel Margin="15 5 15 5">
                 <Label Content="MetroAnimatedTabControl" Style="{DynamicResource DescriptionHeaderStyle}" />
                 <ContentControl DataContext="{Binding ElementName=MetroAnimatedTabControl}" Template="{StaticResource TabControlConfigDataTemplate}" />
-                <Controls:MetroAnimatedTabControl x:Name="MetroAnimatedTabControl" Height="150">
+                <mah:MetroAnimatedTabControl x:Name="MetroAnimatedTabControl" Height="150">
                     <TabItem Header="this tabcontrol">
                         <TextBlock FontSize="30" Text="Cool transition" />
                     </TabItem>
-                    <Controls:MetroTabItem Header="animates its content">
+                    <mah:MetroTabItem Header="animates its content">
                         <TextBlock FontSize="30" Text="More cool transition" />
-                    </Controls:MetroTabItem>
-                    <Controls:MetroTabItem Header="with a transition">
+                    </mah:MetroTabItem>
+                    <mah:MetroTabItem Header="with a transition">
                         <TextBlock FontSize="30" Text="Animate everything!" />
-                    </Controls:MetroTabItem>
-                </Controls:MetroAnimatedTabControl>
+                    </mah:MetroTabItem>
+                </mah:MetroAnimatedTabControl>
 
                 <Label Margin="0 5 0 0"
                        Content="MetroAnimatedSingleRowTabControl"
                        Style="{DynamicResource DescriptionHeaderStyle}" />
                 <ContentControl DataContext="{Binding ElementName=MetroAnimatedSingleRowTabControl}" Template="{StaticResource TabControlConfigDataTemplate}" />
-                <Controls:MetroAnimatedSingleRowTabControl x:Name="MetroAnimatedSingleRowTabControl" Height="150">
+                <mah:MetroAnimatedSingleRowTabControl x:Name="MetroAnimatedSingleRowTabControl" Height="150">
                     <TabItem Header="these tabs">
                         <TextBlock FontSize="30" Text="first content" />
                     </TabItem>
-                    <Controls:MetroTabItem Header="appear only on a single line">
+                    <mah:MetroTabItem Header="appear only on a single line">
                         <TextBlock FontSize="30" Text="second one" />
-                    </Controls:MetroTabItem>
-                    <Controls:MetroTabItem Header="if they are overflowing">
+                    </mah:MetroTabItem>
+                    <mah:MetroTabItem Header="if they are overflowing">
                         <TextBlock FontSize="30" Text="3" />
-                    </Controls:MetroTabItem>
+                    </mah:MetroTabItem>
                     <TabItem Header="instead of wrapping them">
                         <TextBlock FontSize="30" Text="last of them" />
                     </TabItem>
-                </Controls:MetroAnimatedSingleRowTabControl>
+                </mah:MetroAnimatedSingleRowTabControl>
 
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition />
                         <ColumnDefinition />
                     </Grid.ColumnDefinitions>
-                    <Controls:MetroAnimatedSingleRowTabControl Height="100" TabStripPlacement="Left">
+                    <mah:MetroAnimatedSingleRowTabControl Height="100" TabStripPlacement="Left">
                         <TabControl.Resources>
                             <Style BasedOn="{StaticResource {x:Type TabItem}}" TargetType="{x:Type TabItem}">
                                 <Setter Property="HeaderTemplate">
@@ -256,10 +256,10 @@
                         <TabItem Header="Test3">
                             <TextBlock FontSize="12" Text="TabStripPlacement Left Test 3" />
                         </TabItem>
-                    </Controls:MetroAnimatedSingleRowTabControl>
-                    <Controls:MetroAnimatedSingleRowTabControl Grid.Column="1"
-                                                               Height="100"
-                                                               TabStripPlacement="Right">
+                    </mah:MetroAnimatedSingleRowTabControl>
+                    <mah:MetroAnimatedSingleRowTabControl Grid.Column="1"
+                                                          Height="100"
+                                                          TabStripPlacement="Right">
                         <TabControl.Resources>
                             <Style BasedOn="{StaticResource {x:Type TabItem}}" TargetType="{x:Type TabItem}">
                                 <Setter Property="HeaderTemplate">
@@ -284,88 +284,88 @@
                         <TabItem Header="Test3">
                             <TextBlock FontSize="12" Text="TabStripPlacement Right Test 3" />
                         </TabItem>
-                    </Controls:MetroAnimatedSingleRowTabControl>
+                    </mah:MetroAnimatedSingleRowTabControl>
                 </Grid>
 
                 <Label Margin="0 5 0 0"
                        Content="MetroTabControl w/ Closable Items"
                        Style="{DynamicResource DescriptionHeaderStyle}" />
                 <ContentControl DataContext="{Binding ElementName=MetroTabControlClosable}" Template="{StaticResource MetroTabControlConfigDataTemplate}" />
-                <Controls:MetroTabControl x:Name="MetroTabControlClosable" TabItemClosingEvent="MetroTabControl_TabItemClosingEvent">
-                    <Controls:MetroTabItem Controls:HeaderedControlHelper.HeaderFontSize="20"
-                                           CloseButtonEnabled="True"
-                                           CloseTabCommand="{Binding SingleCloseTabCommand}"
-                                           CloseTabCommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Header}"
-                                           Header="headers">
+                <mah:MetroTabControl x:Name="MetroTabControlClosable" TabItemClosingEvent="MetroTabControl_TabItemClosingEvent">
+                    <mah:MetroTabItem mah:HeaderedControlHelper.HeaderFontSize="20"
+                                      CloseButtonEnabled="True"
+                                      CloseTabCommand="{Binding SingleCloseTabCommand}"
+                                      CloseTabCommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Header}"
+                                      Header="headers">
                         <TextBlock FontSize="30" Text="you can bind to a command" />
-                    </Controls:MetroTabItem>
-                    <Controls:MetroTabItem Controls:HeaderedControlHelper.HeaderFontSize="22"
-                                           CloseButtonEnabled="True"
-                                           CloseTabCommand="{Binding NeverCloseTabCommand}"
-                                           CloseTabCommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Header}"
-                                           Header="can">
+                    </mah:MetroTabItem>
+                    <mah:MetroTabItem mah:HeaderedControlHelper.HeaderFontSize="22"
+                                      CloseButtonEnabled="True"
+                                      CloseTabCommand="{Binding NeverCloseTabCommand}"
+                                      CloseTabCommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Header}"
+                                      Header="can">
                         <TextBlock FontSize="30" Text="and ensure the command never closes" />
-                    </Controls:MetroTabItem>
-                    <Controls:MetroTabItem Controls:HeaderedControlHelper.HeaderFontSize="24"
-                                           CloseButtonEnabled="True"
-                                           Header="have">
+                    </mah:MetroTabItem>
+                    <mah:MetroTabItem mah:HeaderedControlHelper.HeaderFontSize="24"
+                                      CloseButtonEnabled="True"
+                                      Header="have">
                         <TextBlock FontSize="30" Text="More more content" />
-                    </Controls:MetroTabItem>
-                    <Controls:MetroTabItem Controls:HeaderedControlHelper.HeaderFontSize="26"
-                                           CloseButtonEnabled="True"
-                                           Header="different">
+                    </mah:MetroTabItem>
+                    <mah:MetroTabItem mah:HeaderedControlHelper.HeaderFontSize="26"
+                                      CloseButtonEnabled="True"
+                                      Header="different">
                         <TextBlock FontSize="30" Text="So much content!" />
-                    </Controls:MetroTabItem>
-                    <Controls:MetroTabItem Controls:HeaderedControlHelper.HeaderFontSize="28"
-                                           CloseButtonEnabled="True"
-                                           Header="font">
+                    </mah:MetroTabItem>
+                    <mah:MetroTabItem mah:HeaderedControlHelper.HeaderFontSize="28"
+                                      CloseButtonEnabled="True"
+                                      Header="font">
                         <TextBlock FontSize="30" Text="Content!" />
-                    </Controls:MetroTabItem>
-                    <Controls:MetroTabItem Controls:HeaderedControlHelper.HeaderFontSize="30"
-                                           CloseButtonEnabled="True"
-                                           Header="sizes">
+                    </mah:MetroTabItem>
+                    <mah:MetroTabItem mah:HeaderedControlHelper.HeaderFontSize="30"
+                                      CloseButtonEnabled="True"
+                                      Header="sizes">
                         <TextBlock FontSize="30" Text="This is not content (it is). This one won't close." />
-                    </Controls:MetroTabItem>
-                    <Controls:MetroTabItem Controls:HeaderedControlHelper.HeaderFontSize="36"
-                                           CloseButtonEnabled="True"
-                                           Header="close button">
+                    </mah:MetroTabItem>
+                    <mah:MetroTabItem mah:HeaderedControlHelper.HeaderFontSize="36"
+                                      CloseButtonEnabled="True"
+                                      Header="close button">
                         <TextBlock FontSize="24" Text="The size of close button will be changed proportionately considering its header size." />
-                    </Controls:MetroTabItem>
-                </Controls:MetroTabControl>
+                    </mah:MetroTabItem>
+                </mah:MetroTabControl>
 
                 <Label Margin="0 5 0 0"
                        Content="MetroTabControl style"
                        Style="{DynamicResource DescriptionHeaderStyle}" />
                 <ContentControl DataContext="{Binding ElementName=MetroTabControl}" Template="{StaticResource MetroTabControlConfigDataTemplate}" />
-                <Controls:MetroTabControl x:Name="MetroTabControl"
-                                          Height="200"
-                                          KeepVisualTreeInMemoryWhenChangingTabs="True">
-                    <Controls:MetroTabItem Controls:HeaderedControlHelper.HeaderFontSize="18" Header="item _1">
+                <mah:MetroTabControl x:Name="MetroTabControl"
+                                     Height="200"
+                                     KeepVisualTreeInMemoryWhenChangingTabs="True">
+                    <mah:MetroTabItem mah:HeaderedControlHelper.HeaderFontSize="18" Header="item _1">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock FontSize="30" Text="Load-Count: " />
                             <TextBlock FontSize="30"
                                        Loaded="TextBlock_OnLoaded"
                                        Text="0" />
                         </StackPanel>
-                    </Controls:MetroTabItem>
-                    <Controls:MetroTabItem Controls:HeaderedControlHelper.HeaderFontSize="18" Header="item _2 more">
+                    </mah:MetroTabItem>
+                    <mah:MetroTabItem mah:HeaderedControlHelper.HeaderFontSize="18" Header="item _2 more">
                         <TextBlock FontSize="30" Text="More content" />
-                    </Controls:MetroTabItem>
-                    <Controls:MetroTabItem Controls:HeaderedControlHelper.HeaderFontSize="18" Header="item _3 header here">
+                    </mah:MetroTabItem>
+                    <mah:MetroTabItem mah:HeaderedControlHelper.HeaderFontSize="18" Header="item _3 header here">
                         <TextBlock FontSize="30" Text="More more content" />
-                    </Controls:MetroTabItem>
-                    <Controls:MetroTabItem Controls:HeaderedControlHelper.HeaderFontSize="18" Header="item _4 ">
+                    </mah:MetroTabItem>
+                    <mah:MetroTabItem mah:HeaderedControlHelper.HeaderFontSize="18" Header="item _4 ">
                         <TextBlock FontSize="30" Text="So much content!" />
-                    </Controls:MetroTabItem>
-                    <Controls:MetroTabItem Controls:HeaderedControlHelper.HeaderFontSize="18"
-                                           CloseButtonEnabled="True"
-                                           Header="item _5">
+                    </mah:MetroTabItem>
+                    <mah:MetroTabItem mah:HeaderedControlHelper.HeaderFontSize="18"
+                                      CloseButtonEnabled="True"
+                                      Header="item _5">
                         <TextBlock FontSize="30" Text="Content!" />
-                    </Controls:MetroTabItem>
-                    <Controls:MetroTabItem Controls:HeaderedControlHelper.HeaderFontSize="18" Header="item _6">
+                    </mah:MetroTabItem>
+                    <mah:MetroTabItem mah:HeaderedControlHelper.HeaderFontSize="18" Header="item _6">
                         <TextBlock FontSize="30" Text="This is not content (it is)" />
-                    </Controls:MetroTabItem>
-                </Controls:MetroTabControl>
+                    </mah:MetroTabItem>
+                </mah:MetroTabControl>
             </StackPanel>
 
         </Expander>
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 b27827af1e..cac99344a6 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml
@@ -1,15 +1,14 @@
 <UserControl x:Class="MetroDemo.ExampleViews.TextExamples"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:Controls="http://metro.mahapps.com/winfx/xaml/controls"
-             xmlns:MetroDemo="clr-namespace:MetroDemo"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:exampleViews="clr-namespace:MetroDemo.ExampleViews"
              xmlns:globalization="clr-namespace:System.Globalization;assembly=mscorlib"
              xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
-             xmlns:local="clr-namespace:MetroDemo.ExampleViews"
+             xmlns:local="clr-namespace:MetroDemo"
+             xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:sys="clr-namespace:System;assembly=mscorlib"
-             d:DataContext="{d:DesignInstance MetroDemo:MainWindowViewModel}"
+             d:DataContext="{d:DesignInstance local:MainWindowViewModel}"
              d:DesignHeight="600"
              d:DesignWidth="800"
              mc:Ignorable="d">
@@ -19,17 +18,17 @@
 
         <ObjectDataProvider x:Key="NumericInputValues"
                             MethodName="GetValues"
-                            ObjectType="{x:Type Controls:NumericInput}">
+                            ObjectType="{x:Type mah:NumericInput}">
             <ObjectDataProvider.MethodParameters>
-                <x:Type TypeName="Controls:NumericInput" />
+                <x:Type TypeName="mah:NumericInput" />
             </ObjectDataProvider.MethodParameters>
         </ObjectDataProvider>
 
         <ObjectDataProvider x:Key="DecimalPointCorrectionValues"
                             MethodName="GetValues"
-                            ObjectType="{x:Type Controls:DecimalPointCorrectionMode}">
+                            ObjectType="{x:Type mah:DecimalPointCorrectionMode}">
             <ObjectDataProvider.MethodParameters>
-                <x:Type TypeName="Controls:DecimalPointCorrectionMode" />
+                <x:Type TypeName="mah:DecimalPointCorrectionMode" />
             </ObjectDataProvider.MethodParameters>
         </ObjectDataProvider>
 
@@ -43,9 +42,9 @@
 
         <ObjectDataProvider x:Key="ButtonsAlignmentValues"
                             MethodName="GetValues"
-                            ObjectType="{x:Type Controls:ButtonsAlignment}">
+                            ObjectType="{x:Type mah:ButtonsAlignment}">
             <ObjectDataProvider.MethodParameters>
-                <x:Type TypeName="Controls:ButtonsAlignment" />
+                <x:Type TypeName="mah:ButtonsAlignment" />
             </ObjectDataProvider.MethodParameters>
         </ObjectDataProvider>
 
@@ -69,8 +68,8 @@
                   Header="TextBox">
             <AdornerDecorator>
                 <StackPanel>
-                    <Controls:MetroHeader Margin="{StaticResource ControlMargin}" Header="TextBox Header">
-                        <Controls:MetroHeader.HeaderTemplate>
+                    <mah:MetroHeader Margin="{StaticResource ControlMargin}" Header="TextBox Header">
+                        <mah:MetroHeader.HeaderTemplate>
                             <DataTemplate>
                                 <StackPanel VerticalAlignment="Center" Orientation="Horizontal">
                                     <iconPacks:PackIconMaterial VerticalAlignment="Center" Kind="FaceProfile" />
@@ -79,7 +78,7 @@
                                                Text="{Binding}" />
                                 </StackPanel>
                             </DataTemplate>
-                        </Controls:MetroHeader.HeaderTemplate>
+                        </mah:MetroHeader.HeaderTemplate>
                         <TextBox SpellCheck.IsEnabled="True" Text="Enabled">
                             <TextBox.ContextMenu>
                                 <ContextMenu>
@@ -87,14 +86,14 @@
                                 </ContextMenu>
                             </TextBox.ContextMenu>
                         </TextBox>
-                    </Controls:MetroHeader>
+                    </mah:MetroHeader>
                     <TextBox Margin="{StaticResource ControlMargin}"
                              HorizontalContentAlignment="Stretch"
-                             Controls:TextBoxHelper.ClearTextButton="True"
-                             Controls:TextBoxHelper.IsWaitingForData="True"
-                             Controls:TextBoxHelper.UseFloatingWatermark="True"
-                             Controls:TextBoxHelper.Watermark="Watermark"
-                             Controls:TextBoxHelper.WatermarkAlignment="Right"
+                             mah:TextBoxHelper.ClearTextButton="True"
+                             mah:TextBoxHelper.IsWaitingForData="True"
+                             mah:TextBoxHelper.UseFloatingWatermark="True"
+                             mah:TextBoxHelper.Watermark="Watermark"
+                             mah:TextBoxHelper.WatermarkAlignment="Right"
                              SpellCheck.IsEnabled="True"
                              ToolTip="Default alignment">
                         <TextBox.ContextMenu>
@@ -108,29 +107,29 @@
                         </TextBox.ContextMenu>
                     </TextBox>
                     <TextBox Margin="{StaticResource ControlMargin}"
-                             Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd, Mode=OneWay}"
+                             mah:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd, Mode=OneWay}"
                              ContextMenu="{x:Null}"
                              Text="Clear button and no ContextMenu">
                         <TextBox.Style>
                             <Style BasedOn="{StaticResource MahApps.Styles.TextBox}" TargetType="{x:Type TextBox}">
-                                <Setter Property="Controls:TextBoxHelper.ClearTextButton" Value="True" />
+                                <Setter Property="mah:TextBoxHelper.ClearTextButton" Value="True" />
                                 <Style.Triggers>
-                                    <Trigger Property="Controls:TextBoxHelper.HasText" Value="False">
-                                        <Setter Property="Controls:TextBoxHelper.ClearTextButton" Value="False" />
-                                        <Setter Property="Controls:TextBoxHelper.Watermark" Value="Now enter some text..." />
+                                    <Trigger Property="mah:TextBoxHelper.HasText" Value="False">
+                                        <Setter Property="mah:TextBoxHelper.ClearTextButton" Value="False" />
+                                        <Setter Property="mah:TextBoxHelper.Watermark" Value="Now enter some text..." />
                                     </Trigger>
-                                    <Trigger Property="Controls:TextBoxHelper.HasText" Value="True">
-                                        <Setter Property="Controls:TextBoxHelper.ClearTextButton" Value="True" />
+                                    <Trigger Property="mah:TextBoxHelper.HasText" Value="True">
+                                        <Setter Property="mah:TextBoxHelper.ClearTextButton" Value="True" />
                                     </Trigger>
                                 </Style.Triggers>
                             </Style>
                         </TextBox.Style>
                     </TextBox>
                     <TextBox Margin="{StaticResource ControlMargin}"
-                             Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd, Mode=OneWay}"
-                             Controls:TextBoxHelper.ClearTextButton="True"
-                             Controls:TextBoxHelper.UseFloatingWatermark="True"
-                             Controls:TextBoxHelper.Watermark="Search...">
+                             mah:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd, Mode=OneWay}"
+                             mah:TextBoxHelper.ClearTextButton="True"
+                             mah:TextBoxHelper.UseFloatingWatermark="True"
+                             mah:TextBoxHelper.Watermark="Search...">
                         <TextBox.InputBindings>
                             <KeyBinding Key="Return"
                                         Command="{Binding TextBoxButtonCmd, Mode=OneWay}"
@@ -139,9 +138,9 @@
                         <TextBox.Style>
                             <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" />
-                                        <Setter Property="Controls:TextBoxHelper.ButtonContentTemplate" Value="{x:Null}" />
+                                    <Trigger Property="mah:TextBoxHelper.HasText" Value="True">
+                                        <Setter Property="mah:TextBoxHelper.ButtonContent" Value="r" />
+                                        <Setter Property="mah:TextBoxHelper.ButtonContentTemplate" Value="{x:Null}" />
                                     </Trigger>
                                 </Style.Triggers>
                             </Style>
@@ -149,38 +148,38 @@
                     </TextBox>
                     <TextBox Name="test2"
                              Margin="{StaticResource ControlMargin}"
-                             Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmdWithParameter, Mode=OneWay}"
-                             Controls:TextBoxHelper.ButtonCommandParameter="{Binding ElementName=test2, Path=Text}"
-                             Controls:TextBoxHelper.Watermark="Enter parameter"
+                             mah:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmdWithParameter, Mode=OneWay}"
+                             mah:TextBoxHelper.ButtonCommandParameter="{Binding ElementName=test2, Path=Text}"
+                             mah:TextBoxHelper.Watermark="Enter parameter"
                              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"
+                             mah:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd, Mode=OneWay}"
+                             mah:TextBoxHelper.ButtonContent="s"
+                             mah:TextBoxHelper.Watermark="Custom icon style"
                              Style="{DynamicResource MahApps.Styles.TextBox.Button}" />
                     <TextBox Margin="{StaticResource ControlMargin}"
-                             Controls:TextBoxHelper.Watermark="Number smaller than 10"
+                             mah:TextBoxHelper.Watermark="Number smaller than 10"
                              Text="{Binding IntegerGreater10Property, ValidatesOnDataErrors=True, UpdateSourceTrigger=PropertyChanged, NotifyOnValidationError=True}" />
                     <TextBox Margin="{StaticResource ControlMargin}"
-                             Controls:TextBoxHelper.SelectAllOnFocus="True"
+                             mah:TextBoxHelper.SelectAllOnFocus="True"
                              Text="Select all on focus" />
                     <TextBox Margin="{StaticResource ControlMargin}"
                              IsEnabled="False"
                              Text="Disabled" />
                     <TextBox Margin="{StaticResource ControlMargin}"
-                             Controls:TextBoxHelper.Watermark="Watermark"
+                             mah:TextBoxHelper.Watermark="Watermark"
                              IsEnabled="False" />
                     <TextBox Margin="{StaticResource ControlMargin}"
-                             Controls:TextBoxHelper.ClearTextButton="True"
-                             Controls:TextBoxHelper.Watermark="Watermark"
+                             mah:TextBoxHelper.ClearTextButton="True"
+                             mah:TextBoxHelper.Watermark="Watermark"
                              IsEnabled="False"
                              Text="Clear button" />
                     <TextBox Margin="{StaticResource ControlMargin}"
-                             Controls:TextBoxHelper.Watermark="Search style"
+                             mah:TextBoxHelper.Watermark="Search style"
                              IsEnabled="False"
                              Style="{DynamicResource MahApps.Styles.TextBox.Search}" />
                     <TextBox Margin="{StaticResource ControlMargin}"
-                             Controls:TextBoxHelper.Watermark="Number smaller than 10"
+                             mah:TextBoxHelper.Watermark="Number smaller than 10"
                              IsEnabled="False"
                              Text="{Binding IntegerGreater10Property, ValidatesOnDataErrors=True, UpdateSourceTrigger=PropertyChanged, NotifyOnValidationError=True}" />
                 </StackPanel>
@@ -193,27 +192,27 @@
                   Header="RichTextBox">
             <StackPanel>
                 <RichTextBox Margin="{StaticResource ControlMargin}"
-                             Controls:TextBoxHelper.ClearTextButton="True"
-                             Controls:TextBoxHelper.Watermark="Type something in..."
+                             mah:TextBoxHelper.ClearTextButton="True"
+                             mah:TextBoxHelper.Watermark="Type something in..."
                              IsDocumentEnabled="True"
                              SpellCheck.IsEnabled="True" />
                 <RichTextBox Margin="{StaticResource ControlMargin}"
-                             Controls:TextBoxHelper.ClearTextButton="True"
-                             Controls:TextBoxHelper.UseFloatingWatermark="True"
-                             Controls:TextBoxHelper.Watermark="Need some input..."
+                             mah:TextBoxHelper.ClearTextButton="True"
+                             mah:TextBoxHelper.UseFloatingWatermark="True"
+                             mah:TextBoxHelper.Watermark="Need some input..."
                              IsDocumentEnabled="True"
                              SpellCheck.IsEnabled="True" />
                 <RichTextBox Margin="{StaticResource ControlMargin}"
-                             Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd, Mode=OneWay}"
-                             Controls:TextBoxHelper.ButtonContent="s"
-                             Controls:TextBoxHelper.Watermark="Type in..."
+                             mah:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd, Mode=OneWay}"
+                             mah:TextBoxHelper.ButtonContent="s"
+                             mah:TextBoxHelper.Watermark="Type in..."
                              IsDocumentEnabled="True"
                              SpellCheck.IsEnabled="True"
                              Style="{StaticResource MahApps.Styles.RichTextBox.Button}" />
                 <RichTextBox Height="120"
                              Margin="{StaticResource ControlMargin}"
                              Padding="5"
-                             Controls:TextBoxHelper.SelectAllOnFocus="True"
+                             mah:TextBoxHelper.SelectAllOnFocus="True"
                              IsDocumentEnabled="True"
                              SpellCheck.IsEnabled="True">
                     <!--
@@ -270,33 +269,33 @@
                   Header="PasswordBox">
             <StackPanel>
                 <PasswordBox Margin="{StaticResource ControlMargin}"
-                             Controls:TextBoxHelper.Watermark="Password"
+                             mah:TextBoxHelper.Watermark="Password"
                              Password="Password" />
                 <PasswordBox Margin="{StaticResource ControlMargin}"
-                             Controls:TextBoxHelper.UseFloatingWatermark="True"
-                             Controls:TextBoxHelper.Watermark="Win8"
+                             mah:TextBoxHelper.UseFloatingWatermark="True"
+                             mah:TextBoxHelper.Watermark="Win8"
                              Password="Win8"
                              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"
+                             mah:TextBoxHelper.ClearTextButton="{Binding RelativeSource={RelativeSource Self}, Path=(mah:TextBoxHelper.HasText), Mode=OneWay}"
+                             mah:TextBoxHelper.IsWaitingForData="True"
+                             mah:TextBoxHelper.UseFloatingWatermark="True"
+                             mah:TextBoxHelper.Watermark="Revealed PasswordBox"
                              Style="{StaticResource MahApps.Styles.PasswordBox.Button.Revealed}" />
                 <PasswordBox Margin="{StaticResource ControlMargin}"
-                             Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd, Mode=OneWay}"
-                             Controls:TextBoxHelper.ClearTextButton="True"
-                             Controls:TextBoxHelper.UseFloatingWatermark="True"
-                             Controls:TextBoxHelper.Watermark="Password"
+                             mah:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd, Mode=OneWay}"
+                             mah:TextBoxHelper.ClearTextButton="True"
+                             mah:TextBoxHelper.UseFloatingWatermark="True"
+                             mah:TextBoxHelper.Watermark="Password"
                              Password="Password" />
                 <PasswordBox Margin="{StaticResource ControlMargin}"
-                             Controls:PasswordBoxHelper.CapsLockIcon="!"
-                             Controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd, Mode=OneWay}"
-                             Controls:TextBoxHelper.ButtonContent="4"
-                             Controls:TextBoxHelper.UseFloatingWatermark="True"
-                             Controls:TextBoxHelper.Watermark="Custom icon style"
+                             mah:PasswordBoxHelper.CapsLockIcon="!"
+                             mah:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonCmd, Mode=OneWay}"
+                             mah:TextBoxHelper.ButtonContent="4"
+                             mah:TextBoxHelper.UseFloatingWatermark="True"
+                             mah:TextBoxHelper.Watermark="Custom icon style"
                              Style="{DynamicResource MahApps.Styles.PasswordBox.Button}">
-                    <Controls:PasswordBoxHelper.CapsLockWarningToolTip>
+                    <mah:PasswordBoxHelper.CapsLockWarningToolTip>
                         <TextBlock>
                             <Run Text="This is a custom Warning to show you that" />
                             <Run Foreground="Red"
@@ -304,19 +303,19 @@
                                  TextDecorations="Underline" />
                             <Run Text=" is on" />
                         </TextBlock>
-                    </Controls:PasswordBoxHelper.CapsLockWarningToolTip>
+                    </mah:PasswordBoxHelper.CapsLockWarningToolTip>
                 </PasswordBox>
                 <PasswordBox Margin="{StaticResource ControlMargin}"
                              IsEnabled="False"
                              Password="Password" />
                 <PasswordBox Margin="{StaticResource ControlMargin}"
-                             Controls:TextBoxHelper.ClearTextButton="True"
+                             mah:TextBoxHelper.ClearTextButton="True"
                              IsEnabled="False"
                              Password="Password" />
 
                 <Label Content="Select all on focus" />
                 <PasswordBox Margin="{StaticResource ControlMargin}"
-                             Controls:TextBoxHelper.SelectAllOnFocus="True"
+                             mah:TextBoxHelper.SelectAllOnFocus="True"
                              Password="Password"
                              ToolTip="Select all on focus" />
             </StackPanel>
@@ -433,41 +432,41 @@
                           Grid.ColumnSpan="2"
                           Margin="{StaticResource ControlMargin}"
                           Content="{Binding RelativeSource={RelativeSource Mode=Self}, Path=IsChecked}"
-                          IsChecked="{Binding ElementName=NUD, Path=(Controls:TextBoxHelper.ClearTextButton), Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                          IsChecked="{Binding ElementName=NUD, Path=(mah:TextBoxHelper.ClearTextButton), Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
                 <Label Grid.Row="7"
                        Grid.Column="0"
                        Margin="{StaticResource ControlMargin}"
                        Content="Min" />
-                <Controls:NumericUpDown Grid.Row="7"
-                                        Grid.Column="1"
-                                        Grid.ColumnSpan="2"
-                                        Margin="{StaticResource ControlMargin}"
-                                        Controls:TextBoxHelper.ClearTextButton="True"
-                                        Maximum="{Binding ElementName=NUD, Path=Maximum, Mode=OneWay}"
-                                        Value="{Binding ElementName=NUD, Path=Minimum, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                <mah:NumericUpDown Grid.Row="7"
+                                   Grid.Column="1"
+                                   Grid.ColumnSpan="2"
+                                   Margin="{StaticResource ControlMargin}"
+                                   mah:TextBoxHelper.ClearTextButton="True"
+                                   Maximum="{Binding ElementName=NUD, Path=Maximum, Mode=OneWay}"
+                                   Value="{Binding ElementName=NUD, Path=Minimum, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                 <Label Grid.Row="8"
                        Grid.Column="0"
                        Margin="{StaticResource ControlMargin}"
                        Content="Max" />
-                <Controls:NumericUpDown Grid.Row="8"
-                                        Grid.Column="1"
-                                        Grid.ColumnSpan="2"
-                                        Margin="{StaticResource ControlMargin}"
-                                        Controls:TextBoxHelper.ClearTextButton="True"
-                                        Minimum="{Binding ElementName=NUD, Path=Minimum, Mode=OneWay}"
-                                        Value="{Binding ElementName=NUD, Path=Maximum, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                <mah:NumericUpDown Grid.Row="8"
+                                   Grid.Column="1"
+                                   Grid.ColumnSpan="2"
+                                   Margin="{StaticResource ControlMargin}"
+                                   mah:TextBoxHelper.ClearTextButton="True"
+                                   Minimum="{Binding ElementName=NUD, Path=Minimum, Mode=OneWay}"
+                                   Value="{Binding ElementName=NUD, Path=Maximum, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
                 <Label Grid.Row="9"
                        Grid.Column="0"
                        Margin="{StaticResource ControlMargin}"
                        Content="Interval" />
-                <Controls:NumericUpDown Grid.Row="9"
-                                        Grid.Column="1"
-                                        Grid.ColumnSpan="2"
-                                        Margin="{StaticResource ControlMargin}"
-                                        Controls:TextBoxHelper.ClearTextButton="True"
-                                        Value="{Binding ElementName=NUD, Path=Interval, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                <mah:NumericUpDown Grid.Row="9"
+                                   Grid.Column="1"
+                                   Grid.ColumnSpan="2"
+                                   Margin="{StaticResource ControlMargin}"
+                                   mah:TextBoxHelper.ClearTextButton="True"
+                                   Value="{Binding ElementName=NUD, Path=Interval, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
                 <Label Grid.Row="10"
                        Grid.Column="0"
@@ -510,9 +509,9 @@
                           Grid.Column="1"
                           Grid.ColumnSpan="2"
                           Margin="{StaticResource ControlMargin}"
-                          Controls:TextBoxHelper.ClearTextButton="True"
+                          mah:TextBoxHelper.ClearTextButton="True"
                           IsEditable="True"
-                          ItemsSource="{x:Static local:TextExamples.NUD_StringFormats}"
+                          ItemsSource="{x:Static exampleViews:TextExamples.NUD_StringFormats}"
                           SelectedItem="{Binding ElementName=NUD, Path=StringFormat, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
                 <Label Grid.Row="14"
@@ -525,7 +524,7 @@
                           Grid.ColumnSpan="2"
                           Margin="{StaticResource ControlMargin}"
                           HorizontalAlignment="Stretch"
-                          Controls:TextBoxHelper.ClearTextButton="True"
+                          mah:TextBoxHelper.ClearTextButton="True"
                           ItemsSource="{Binding CultureInfos, Mode=OneWay}"
                           SelectedItem="{Binding ElementName=NUD, Path=Culture, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, NotifyOnValidationError=True}">
                     <ComboBox.ItemTemplate>
@@ -606,7 +605,7 @@
                          Grid.Column="1"
                          Grid.ColumnSpan="2"
                          Margin="{StaticResource ControlMargin}"
-                         Controls:TextBoxHelper.ClearTextButton="True"
+                         mah:TextBoxHelper.ClearTextButton="True"
                          Text="Type a number" />
 
                 <Label Grid.Row="21"
@@ -614,15 +613,15 @@
                        Margin="{StaticResource ControlMargin}"
                        Content="NumericUpDown"
                        FontWeight="Bold" />
-                <Controls:NumericUpDown x:Name="NUD"
-                                        Grid.Row="21"
-                                        Grid.Column="1"
-                                        Grid.ColumnSpan="2"
-                                        Margin="{StaticResource ControlMargin}"
-                                        Controls:TextBoxHelper.Watermark="{Binding ElementName=NUD_Watermark, Path=Text, Mode=OneWay}"
-                                        Maximum="10"
-                                        Minimum="0"
-                                        Value="{Binding NumericUpDownValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                <mah:NumericUpDown x:Name="NUD"
+                                   Grid.Row="21"
+                                   Grid.Column="1"
+                                   Grid.ColumnSpan="2"
+                                   Margin="{StaticResource ControlMargin}"
+                                   mah:TextBoxHelper.Watermark="{Binding ElementName=NUD_Watermark, Path=Text, Mode=OneWay}"
+                                   Maximum="10"
+                                   Minimum="0"
+                                   Value="{Binding NumericUpDownValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
                 <Label Grid.Row="22"
                        Grid.Column="0"
@@ -646,11 +645,11 @@
                           Margin="{StaticResource ControlMargin}"
                           Content="Require modifier keys" />
                 <TextBlock Margin="{StaticResource ControlMargin}" Text="Try SHIFT+D to demonstrate validation" />
-                <Controls:HotKeyBox Margin="{StaticResource ControlMargin}"
-                                    Controls:TextBoxHelper.ClearTextButton="True"
-                                    Controls:TextBoxHelper.Watermark="Enter hot key"
-                                    AreModifierKeysRequired="{Binding ElementName=ModifierKeysRequired, Path=IsChecked}"
-                                    HotKey="{Binding HotKey, ValidatesOnDataErrors=True, UpdateSourceTrigger=PropertyChanged, NotifyOnValidationError=True}" />
+                <mah:HotKeyBox Margin="{StaticResource ControlMargin}"
+                               mah:TextBoxHelper.ClearTextButton="True"
+                               mah:TextBoxHelper.Watermark="Enter hot key"
+                               AreModifierKeysRequired="{Binding ElementName=ModifierKeysRequired, Path=IsChecked}"
+                               HotKey="{Binding HotKey, ValidatesOnDataErrors=True, UpdateSourceTrigger=PropertyChanged, NotifyOnValidationError=True}" />
             </StackPanel>
         </GroupBox>
     </Grid>
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 f4a249e940..4708cdf4f4 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TilesExample.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TilesExample.xaml
@@ -1,17 +1,17 @@
 <UserControl x:Class="MetroDemo.ExampleViews.TilesExample"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:Controls="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
+             xmlns:local="clr-namespace:MetroDemo"
+             xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:metroDemo="clr-namespace:MetroDemo"
-             d:DataContext="{d:DesignInstance metroDemo:MainWindowViewModel}"
+             d:DataContext="{d:DesignInstance local:MainWindowViewModel}"
              mc:Ignorable="d">
 
     <UserControl.Resources>
         <ResourceDictionary>
-            <Style x:Key="LargeTileStyle" TargetType="Controls:Tile">
+            <Style x:Key="LargeTileStyle" TargetType="mah:Tile">
                 <Setter Property="Height" Value="125" />
                 <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
                 <Setter Property="TextOptions.TextRenderingMode" Value="ClearType" />
@@ -19,7 +19,7 @@
                 <Setter Property="Width" Value="300" />
             </Style>
 
-            <Style x:Key="SmallTileStyle" TargetType="Controls:Tile">
+            <Style x:Key="SmallTileStyle" TargetType="mah:Tile">
                 <Setter Property="Height" Value="125" />
                 <Setter Property="TextOptions.TextFormattingMode" Value="Ideal" />
                 <Setter Property="TextOptions.TextRenderingMode" Value="ClearType" />
@@ -53,62 +53,62 @@
                    Height="382"
                    HorizontalAlignment="Left"
                    VerticalAlignment="Top">
-            <Controls:Tile Title="Mail"
-                           Margin="3"
-                           Controls:ControlsHelper.MouseOverBorderBrush="{DynamicResource MahApps.Brushes.ThemeForeground}"
-                           Background="Teal"
-                           HorizontalTitleAlignment="Right"
-                           Style="{StaticResource LargeTileStyle}">
+            <mah:Tile Title="Mail"
+                      Margin="3"
+                      mah:ControlsHelper.MouseOverBorderBrush="{DynamicResource MahApps.Brushes.ThemeForeground}"
+                      Background="Teal"
+                      HorizontalTitleAlignment="Right"
+                      Style="{StaticResource LargeTileStyle}">
                 <iconPacks:PackIconModern Width="40"
                                           Height="40"
                                           Kind="Email" />
-            </Controls:Tile>
-            <Controls:Tile Title="Desktop"
-                           Margin="3"
-                           Controls:ControlsHelper.MouseOverBorderBrush="{DynamicResource MahApps.Brushes.ThemeForeground}"
-                           Style="{StaticResource LargeTileStyle}">
+            </mah:Tile>
+            <mah:Tile Title="Desktop"
+                      Margin="3"
+                      mah:ControlsHelper.MouseOverBorderBrush="{DynamicResource MahApps.Brushes.ThemeForeground}"
+                      Style="{StaticResource LargeTileStyle}">
                 <iconPacks:PackIconFontAwesome Width="40"
                                                Height="40"
                                                Kind="DesktopSolid" />
-            </Controls:Tile>
-            <Controls:Tile Title="Finance"
-                           Background="DimGray"
-                           Style="{StaticResource LargeTileStyle}">
+            </mah:Tile>
+            <mah:Tile Title="Finance"
+                      Background="DimGray"
+                      Style="{StaticResource LargeTileStyle}">
                 <iconPacks:PackIconModern Width="40"
                                           Height="40"
                                           Kind="Money" />
-            </Controls:Tile>
-            <Controls:Tile Title="People"
-                           Background="#D2691E"
-                           HorizontalTitleAlignment="Right"
-                           Style="{StaticResource LargeTileStyle}">
+            </mah:Tile>
+            <mah:Tile Title="People"
+                      Background="#D2691E"
+                      HorizontalTitleAlignment="Right"
+                      Style="{StaticResource LargeTileStyle}">
                 <iconPacks:PackIconModern Width="40"
                                           Height="40"
                                           Kind="PeopleMultiple" />
-            </Controls:Tile>
-            <Controls:Tile Title="Count"
-                           Background="#FF842D"
-                           Count="28"
-                           CountFontSize="42"
-                           HorizontalTitleAlignment="Center"
-                           IsEnabled="False"
-                           Style="{StaticResource SmallTileStyle}"
-                           TitleFontSize="16"
-                           VerticalTitleAlignment="Top" />
-            <Controls:Tile Title="Weather"
-                           Background="#1E90FF"
-                           Style="{StaticResource SmallTileStyle}">
+            </mah:Tile>
+            <mah:Tile Title="Count"
+                      Background="#FF842D"
+                      Count="28"
+                      CountFontSize="42"
+                      HorizontalTitleAlignment="Center"
+                      IsEnabled="False"
+                      Style="{StaticResource SmallTileStyle}"
+                      TitleFontSize="16"
+                      VerticalTitleAlignment="Top" />
+            <mah:Tile Title="Weather"
+                      Background="#1E90FF"
+                      Style="{StaticResource SmallTileStyle}">
                 <iconPacks:PackIconMaterial Width="40"
                                             Height="40"
                                             Kind="WeatherCloudy" />
-            </Controls:Tile>
-            <Controls:Tile Title="Store"
-                           Background="Green"
-                           Style="{StaticResource LargeTileStyle}">
+            </mah:Tile>
+            <mah:Tile Title="Store"
+                      Background="Green"
+                      Style="{StaticResource LargeTileStyle}">
                 <iconPacks:PackIconEntypo Width="40"
                                           Height="40"
                                           Kind="WindowsStore" />
-            </Controls:Tile>
+            </mah:Tile>
         </WrapPanel>
     </Grid>
 </UserControl>
\ No newline at end of file
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 e9d0cb6341..be15c45163 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/CleanWindowDemo.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/CleanWindowDemo.xaml
@@ -1,17 +1,17 @@
-<Controls:MetroWindow x:Class="MetroDemo.ExampleWindows.CleanWindowDemo"
-                      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;assembly=MahApps.Metro"
-                      xmlns:models="clr-namespace:MetroDemo.Models"
-                      x:Name="ThisView"
-                      Title="CleanWindowDemo"
-                      Width="800"
-                      Height="400"
-                      GlowBrush="{DynamicResource MahApps.Brushes.Accent}"
-                      Icon="..\mahapps.metro.logo2.ico"
-                      ResizeMode="CanResizeWithGrip"
-                      ShowIconOnTitleBar="True"
-                      Style="{DynamicResource MahApps.Styles.MetroWindow.Clean}">
+<mah:MetroWindow x:Class="MetroDemo.ExampleWindows.CleanWindowDemo"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
+                 xmlns:models="clr-namespace:MetroDemo.Models"
+                 x:Name="ThisView"
+                 Title="CleanWindowDemo"
+                 Width="800"
+                 Height="400"
+                 GlowBrush="{DynamicResource MahApps.Brushes.Accent}"
+                 Icon="..\mahapps.metro.logo2.ico"
+                 ResizeMode="CanResizeWithGrip"
+                 ShowIconOnTitleBar="True"
+                 Style="{DynamicResource MahApps.Styles.MetroWindow.Clean}">
 
     <Window.Resources>
         <ResourceDictionary>
@@ -39,25 +39,25 @@
         </ResourceDictionary>
     </Window.Resources>
 
-    <Controls:MetroWindow.LeftWindowCommands>
-        <Controls:WindowCommands>
+    <mah:MetroWindow.LeftWindowCommands>
+        <mah:WindowCommands>
             <Button Content="Test" />
-        </Controls:WindowCommands>
-    </Controls:MetroWindow.LeftWindowCommands>
+        </mah:WindowCommands>
+    </mah:MetroWindow.LeftWindowCommands>
 
-    <Controls:MetroWindow.RightWindowCommands>
-        <Controls:WindowCommands>
+    <mah:MetroWindow.RightWindowCommands>
+        <mah:WindowCommands>
             <Button Content="Another Test" />
             <ToggleButton Content="ToggleButton" />
-        </Controls:WindowCommands>
-    </Controls:MetroWindow.RightWindowCommands>
-
-    <Controls:MetroWindow.Flyouts>
-        <Controls:FlyoutsControl>
-            <Controls:Flyout x:Name="settingsFlyout"
-                             Width="500"
-                             Header="Settings"
-                             Position="Right">
+        </mah:WindowCommands>
+    </mah:MetroWindow.RightWindowCommands>
+
+    <mah:MetroWindow.Flyouts>
+        <mah:FlyoutsControl>
+            <mah:Flyout x:Name="settingsFlyout"
+                        Width="500"
+                        Header="Settings"
+                        Position="Right">
                 <Grid Margin="10">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />
@@ -68,16 +68,16 @@
 
                     <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
                         <StackPanel Orientation="Vertical">
-                            <TextBox Controls:TextBoxHelper.Watermark="TextBox 01" />
-                            <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 02" />
-                            <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 03" />
-                            <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 04" />
-                            <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 05" />
-                            <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 06" />
-                            <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 07" />
-                            <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 08" />
-                            <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 09" />
-                            <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 10" />
+                            <TextBox mah:TextBoxHelper.Watermark="TextBox 01" />
+                            <TextBox Margin="0 5 0 0" mah:TextBoxHelper.Watermark="TextBox 02" />
+                            <TextBox Margin="0 5 0 0" mah:TextBoxHelper.Watermark="TextBox 03" />
+                            <TextBox Margin="0 5 0 0" mah:TextBoxHelper.Watermark="TextBox 04" />
+                            <TextBox Margin="0 5 0 0" mah:TextBoxHelper.Watermark="TextBox 05" />
+                            <TextBox Margin="0 5 0 0" mah:TextBoxHelper.Watermark="TextBox 06" />
+                            <TextBox Margin="0 5 0 0" mah:TextBoxHelper.Watermark="TextBox 07" />
+                            <TextBox Margin="0 5 0 0" mah:TextBoxHelper.Watermark="TextBox 08" />
+                            <TextBox Margin="0 5 0 0" mah:TextBoxHelper.Watermark="TextBox 09" />
+                            <TextBox Margin="0 5 0 0" mah:TextBoxHelper.Watermark="TextBox 10" />
                         </StackPanel>
                     </ScrollViewer>
 
@@ -93,9 +93,9 @@
                     </UniformGrid>
 
                 </Grid>
-            </Controls:Flyout>
-        </Controls:FlyoutsControl>
-    </Controls:MetroWindow.Flyouts>
+            </mah:Flyout>
+        </mah:FlyoutsControl>
+    </mah:MetroWindow.Flyouts>
 
     <Grid>
         <Grid.RowDefinitions>
@@ -117,7 +117,7 @@
 
             <GroupBox Grid.Column="0"
                       Padding="5"
-                      Controls:HeaderedControlHelper.HeaderFontSize="30"
+                      mah:HeaderedControlHelper.HeaderFontSize="30"
                       Header="artists">
                 <ListBox x:Name="artist"
                          ItemsSource="{x:Static models:SampleData.Artists}"
@@ -137,14 +137,14 @@
                 </ListBox>
             </GroupBox>
 
-            <Controls:MetroTabControl x:Name="TC" Grid.Column="1">
-                <Controls:MetroTabItem Header="artist">
+            <mah:MetroTabControl x:Name="TC" Grid.Column="1">
+                <mah:MetroTabItem Header="artist">
                     <TextBlock HorizontalAlignment="Center"
                                VerticalAlignment="Center"
                                FontSize="24"
                                Text="{Binding ElementName=artist, Path=SelectedItem.Name, TargetNullValue=''}" />
-                </Controls:MetroTabItem>
-                <Controls:MetroTabItem Header="albums">
+                </mah:MetroTabItem>
+                <mah:MetroTabItem Header="albums">
                     <ListBox x:Name="albums"
                              ItemsSource="{Binding ElementName=artist, Path=SelectedItem.Albums}"
                              Style="{DynamicResource MahApps.Styles.ListBox.Virtualized}">
@@ -161,12 +161,12 @@
                             </DataTemplate>
                         </ListBox.ItemTemplate>
                     </ListBox>
-                </Controls:MetroTabItem>
-            </Controls:MetroTabControl>
+                </mah:MetroTabItem>
+            </mah:MetroTabControl>
 
             <GroupBox Grid.Column="2"
                       Padding="5"
-                      Controls:HeaderedControlHelper.HeaderFontSize="30"
+                      mah:HeaderedControlHelper.HeaderFontSize="30"
                       Header="some tests">
                 <StackPanel MinWidth="100"
                             HorizontalAlignment="Center"
@@ -194,4 +194,4 @@
         </StatusBar>
     </Grid>
 
-</Controls:MetroWindow>
\ No newline at end of file
+</mah:MetroWindow>
\ No newline at end of file
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 ce692ff9bf..2be8bce8bc 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/DynamicFlyout.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/DynamicFlyout.xaml
@@ -1,14 +1,14 @@
-<Controls:Flyout x:Class="MetroDemo.ExampleWindows.DynamicFlyout"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:Controls="http://metro.mahapps.com/winfx/xaml/controls"
-                 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                 Width="300"
-                 d:DesignHeight="400"
-                 d:DesignWidth="300"
-                 Header="Dynamic Flyout"
-                 mc:Ignorable="d">
+<mah:Flyout x:Class="MetroDemo.ExampleWindows.DynamicFlyout"
+            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+            xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+            xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
+            xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+            Width="300"
+            d:DesignHeight="400"
+            d:DesignWidth="300"
+            Header="Dynamic Flyout"
+            mc:Ignorable="d">
     <Grid Margin="10">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
@@ -20,11 +20,11 @@
                    TextWrapping="Wrap" />
         <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
             <StackPanel Orientation="Vertical">
-                <TextBox x:Name="firstTB" Controls:TextBoxHelper.Watermark="Test watermark..." />
-                <PasswordBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="And a Password..." />
+                <TextBox x:Name="firstTB" mah:TextBoxHelper.Watermark="Test watermark..." />
+                <PasswordBox Margin="0 5 0 0" mah:TextBoxHelper.Watermark="And a Password..." />
                 <Slider x:Name="TheSlider"
                         Margin="0 5 0 0"
-                        Controls:SliderHelper.EnableMouseWheel="MouseHover"
+                        mah:SliderHelper.EnableMouseWheel="MouseHover"
                         LargeChange="10"
                         Maximum="100"
                         Minimum="0"
@@ -49,4 +49,4 @@
                     Style="{DynamicResource MahApps.Styles.Button.Square}" />
         </UniformGrid>
     </Grid>
-</Controls:Flyout>
\ No newline at end of file
+</mah:Flyout>
\ No newline at end of file
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 cf05ab6b0a..c71aaa3086 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml
@@ -1,50 +1,50 @@
-<Controls:MetroWindow x:Class="MetroDemo.ExampleWindows.FlyoutDemo"
-                      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;assembly=MahApps.Metro"
-                      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                      xmlns:exampleWindows="clr-namespace:MetroDemo.ExampleWindows"
-                      xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
-                      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                      xmlns:metroDemo="clr-namespace:MetroDemo"
-                      x:Name="flyoutsDemo"
-                      Title="Flyouts Demo"
-                      Width="700"
-                      Height="500"
-                      MinWidth="700"
-                      MinHeight="500"
-                      d:DataContext="{d:DesignInstance metroDemo:MainWindowViewModel}"
-                      BorderBrush="{DynamicResource MahApps.Brushes.Accent}"
-                      BorderThickness="1"
-                      IconOverlayBehavior="Never"
-                      SaveWindowPosition="True"
-                      TitleCharacterCasing="Normal"
-                      WindowStartupLocation="CenterScreen"
-                      mc:Ignorable="d">
+<mah:MetroWindow x:Class="MetroDemo.ExampleWindows.FlyoutDemo"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                 xmlns:exampleWindows="clr-namespace:MetroDemo.ExampleWindows"
+                 xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
+                 xmlns:local="clr-namespace:MetroDemo"
+                 xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
+                 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                 x:Name="ThisView"
+                 Title="Flyouts Demo"
+                 Width="700"
+                 Height="500"
+                 MinWidth="700"
+                 MinHeight="500"
+                 d:DataContext="{d:DesignInstance local:MainWindowViewModel}"
+                 BorderBrush="{DynamicResource MahApps.Brushes.Accent}"
+                 BorderThickness="1"
+                 IconOverlayBehavior="Never"
+                 SaveWindowPosition="True"
+                 TitleCharacterCasing="Normal"
+                 WindowStartupLocation="CenterScreen"
+                 mc:Ignorable="d">
 
     <Window.Resources>
         <ResourceDictionary>
 
             <ObjectDataProvider x:Key="WindowCommandsOverlayBehaviorValues"
                                 MethodName="GetValues"
-                                ObjectType="{x:Type Controls:WindowCommandsOverlayBehavior}">
+                                ObjectType="{x:Type mah:WindowCommandsOverlayBehavior}">
                 <ObjectDataProvider.MethodParameters>
-                    <x:Type TypeName="Controls:WindowCommandsOverlayBehavior" />
+                    <x:Type TypeName="mah:WindowCommandsOverlayBehavior" />
                 </ObjectDataProvider.MethodParameters>
             </ObjectDataProvider>
 
             <ObjectDataProvider x:Key="OverlayBehaviorValues"
                                 MethodName="GetValues"
-                                ObjectType="{x:Type Controls:OverlayBehavior}">
+                                ObjectType="{x:Type mah:OverlayBehavior}">
                 <ObjectDataProvider.MethodParameters>
-                    <x:Type TypeName="Controls:OverlayBehavior" />
+                    <x:Type TypeName="mah:OverlayBehavior" />
                 </ObjectDataProvider.MethodParameters>
             </ObjectDataProvider>
 
         </ResourceDictionary>
     </Window.Resources>
 
-    <Controls:MetroWindow.IconTemplate>
+    <mah:MetroWindow.IconTemplate>
         <DataTemplate>
             <iconPacks:PackIconModern Width="{TemplateBinding Width}"
                                       Height="{TemplateBinding Height}"
@@ -52,9 +52,9 @@
                                       Foreground="{DynamicResource MahApps.Brushes.IdealForeground}"
                                       Kind="Box" />
         </DataTemplate>
-    </Controls:MetroWindow.IconTemplate>
+    </mah:MetroWindow.IconTemplate>
 
-    <Controls:MetroWindow.TitleTemplate>
+    <mah:MetroWindow.TitleTemplate>
         <DataTemplate>
             <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
                 <TextBlock Margin="0 -1 8 0"
@@ -69,37 +69,37 @@
                         Style="{StaticResource MahApps.Styles.Button.Flat}" />
             </StackPanel>
         </DataTemplate>
-    </Controls:MetroWindow.TitleTemplate>
+    </mah:MetroWindow.TitleTemplate>
 
-    <Controls:MetroWindow.LeftWindowCommands>
-        <Controls:WindowCommands ShowSeparators="False">
+    <mah:MetroWindow.LeftWindowCommands>
+        <mah:WindowCommands ShowSeparators="False">
             <Button Content="A"
                     FontFamily="Wingdings"
                     FontSize="20" />
-        </Controls:WindowCommands>
-    </Controls:MetroWindow.LeftWindowCommands>
+        </mah:WindowCommands>
+    </mah:MetroWindow.LeftWindowCommands>
 
-    <Controls:MetroWindow.RightWindowCommands>
-        <Controls:WindowCommands>
+    <mah:MetroWindow.RightWindowCommands>
+        <mah:WindowCommands>
             <Button Content="B"
                     FontFamily="Wingdings"
                     FontSize="20" />
             <Button Content="C"
                     FontFamily="Wingdings"
                     FontSize="20" />
-        </Controls:WindowCommands>
-    </Controls:MetroWindow.RightWindowCommands>
+        </mah:WindowCommands>
+    </mah:MetroWindow.RightWindowCommands>
 
-    <Controls:MetroWindow.Flyouts>
-        <Controls:FlyoutsControl x:Name="flyoutsControl">
-            <Controls:Flyout x:Name="settingsFlyout"
-                             Margin="200 30 0 0"
-                             Controls:ControlsHelper.ContentCharacterCasing="Upper"
-                             Controls:HeaderedControlHelper.HeaderFontFamily="Segoe Script"
-                             AreAnimationsEnabled="True"
-                             FocusedElement="{Binding ElementName=firstTB}"
-                             Header="Settings"
-                             Position="Right">
+    <mah:MetroWindow.Flyouts>
+        <mah:FlyoutsControl x:Name="flyoutsControl">
+            <mah:Flyout x:Name="settingsFlyout"
+                        Margin="200 30 0 0"
+                        mah:ControlsHelper.ContentCharacterCasing="Upper"
+                        mah:HeaderedControlHelper.HeaderFontFamily="Segoe Script"
+                        AreAnimationsEnabled="True"
+                        FocusedElement="{Binding ElementName=firstTB}"
+                        Header="Settings"
+                        Position="Right">
                 <Grid Margin="10">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />
@@ -110,20 +110,20 @@
                         <TextBlock Grid.Row="0" Text="Something above the ScrollPanel" />
                         <TextBlock Grid.Row="0" Text="This Flyout animates its opacity when opening and closing." />
                     </StackPanel>
-                    <TabControl Grid.Row="1" Controls:TabControlHelper.Underlined="TabPanel">
+                    <TabControl Grid.Row="1" mah:TabControlHelper.Underlined="TabPanel">
                         <TabItem Header="Settings">
                             <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
                                 <StackPanel Orientation="Vertical">
-                                    <TextBox x:Name="firstTB" Controls:TextBoxHelper.Watermark="TextBox 01" />
-                                    <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 02" />
-                                    <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 03" />
-                                    <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 04" />
-                                    <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 05" />
-                                    <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 06" />
-                                    <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 07" />
-                                    <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 08" />
-                                    <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 09" />
-                                    <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 10" />
+                                    <TextBox x:Name="firstTB" mah:TextBoxHelper.Watermark="TextBox 01" />
+                                    <TextBox Margin="0 5 0 0" mah:TextBoxHelper.Watermark="TextBox 02" />
+                                    <TextBox Margin="0 5 0 0" mah:TextBoxHelper.Watermark="TextBox 03" />
+                                    <TextBox Margin="0 5 0 0" mah:TextBoxHelper.Watermark="TextBox 04" />
+                                    <TextBox Margin="0 5 0 0" mah:TextBoxHelper.Watermark="TextBox 05" />
+                                    <TextBox Margin="0 5 0 0" mah:TextBoxHelper.Watermark="TextBox 06" />
+                                    <TextBox Margin="0 5 0 0" mah:TextBoxHelper.Watermark="TextBox 07" />
+                                    <TextBox Margin="0 5 0 0" mah:TextBoxHelper.Watermark="TextBox 08" />
+                                    <TextBox Margin="0 5 0 0" mah:TextBoxHelper.Watermark="TextBox 09" />
+                                    <TextBox Margin="0 5 0 0" mah:TextBoxHelper.Watermark="TextBox 10" />
                                 </StackPanel>
                             </ScrollViewer>
                         </TabItem>
@@ -140,13 +140,13 @@
                                 Style="{DynamicResource MahApps.Styles.Button.Square}" />
                     </UniformGrid>
                 </Grid>
-            </Controls:Flyout>
+            </mah:Flyout>
 
-            <Controls:Flyout HorizontalContentAlignment="Stretch"
-                             AnimateOpacity="True"
-                             CloseButtonIsCancel="True"
-                             Header="New Goodness"
-                             Position="Right">
+            <mah:Flyout HorizontalContentAlignment="Stretch"
+                        AnimateOpacity="True"
+                        CloseButtonIsCancel="True"
+                        Header="New Goodness"
+                        Position="Right">
                 <StackPanel Margin="10" Orientation="Vertical">
                     <Button Margin="2"
                             Content="create"
@@ -155,13 +155,13 @@
                             Content="cancel"
                             Style="{StaticResource MahApps.Styles.Button.Flat}" />
                 </StackPanel>
-            </Controls:Flyout>
+            </mah:Flyout>
 
             <exampleWindows:ShowcaseFlyout DataContext="{Binding}" />
 
-            <Controls:Flyout Header="Accented"
-                             Position="Right"
-                             Theme="Accent">
+            <mah:Flyout Header="Accented"
+                        Position="Right"
+                        Theme="Accent">
                 <Grid Width="400" Margin="10">
                     <StackPanel>
                         <TextBlock Text="This flyout adapts its theme to the current accent" />
@@ -172,24 +172,24 @@
                         <ToggleButton Margin="10" Content="Toggle Button" />
                     </StackPanel>
                 </Grid>
-            </Controls:Flyout>
-            <Controls:Flyout Header="Inverse"
-                             Position="Right"
-                             Theme="Inverse">
+            </mah:Flyout>
+            <mah:Flyout Header="Inverse"
+                        Position="Right"
+                        Theme="Inverse">
                 <Grid Width="400" Margin="10">
                     <TextBlock Text="This flyout has the inverse theme of the current window theme" />
                 </Grid>
-            </Controls:Flyout>
-            <Controls:Flyout Header="Adapt"
-                             Position="Right"
-                             Theme="Adapt">
+            </mah:Flyout>
+            <mah:Flyout Header="Adapt"
+                        Position="Right"
+                        Theme="Adapt">
                 <Grid Width="400" Margin="10">
                     <TextBlock Text="This flyout adapts the theme of the current window" />
                 </Grid>
-            </Controls:Flyout>
-            <Controls:Flyout AnimateOnPositionChange="{Binding AnimateOnPositionChange}"
-                             Header="Cool"
-                             Position="Right">
+            </mah:Flyout>
+            <mah:Flyout AnimateOnPositionChange="{Binding AnimateOnPositionChange}"
+                        Header="Cool"
+                        Position="Right">
                 <Grid Width="270" Margin="10">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" />
@@ -235,8 +235,8 @@
                                 Style="{DynamicResource MahApps.Styles.Button.Square}" />
                     </UniformGrid>
                 </Grid>
-            </Controls:Flyout>
-            <Controls:Flyout Header="Left" Position="Left">
+            </mah:Flyout>
+            <mah:Flyout Header="Left" Position="Left">
                 <StackPanel Width="150" Margin="5 5 5 5">
                     <TextBlock Text="a test for left" />
                     <CheckBox Content="a simple checkbox" />
@@ -247,15 +247,15 @@
                         <ComboBoxItem>Item 3</ComboBoxItem>
                     </ComboBox>
                 </StackPanel>
-            </Controls:Flyout>
+            </mah:Flyout>
 
-            <Controls:Flyout Margin="50 0 50 0"
-                             CloseButtonVisibility="Collapsed"
-                             Header="Top"
-                             IsModal="True"
-                             Position="Top"
-                             Theme="Light"
-                             TitleVisibility="Collapsed">
+            <mah:Flyout Margin="50 0 50 0"
+                        CloseButtonVisibility="Collapsed"
+                        Header="Top"
+                        IsModal="True"
+                        Position="Top"
+                        Theme="Light"
+                        TitleVisibility="Collapsed">
                 <Grid Height="150">
                     <TextBlock Margin="10"
                                FontSize="22"
@@ -279,11 +279,11 @@
                                 Style="{DynamicResource MahApps.Styles.Button.Flat}" />
                     </Grid>
                 </Grid>
-            </Controls:Flyout>
+            </mah:Flyout>
 
-            <Controls:Flyout Height="150"
-                             Header="Top"
-                             Position="Top">
+            <mah:Flyout Height="150"
+                        Header="Top"
+                        Position="Top">
                 <StackPanel Height="80"
                             Margin="5"
                             HorizontalAlignment="Right"
@@ -295,9 +295,9 @@
                         <iconPacks:PackIconModern Kind="Alert" />
                     </Button>
                 </StackPanel>
-            </Controls:Flyout>
+            </mah:Flyout>
 
-            <Controls:Flyout Header="Bottom" Position="Bottom">
+            <mah:Flyout Header="Bottom" Position="Bottom">
                 <StackPanel Height="80"
                             Margin="5 5 5 5"
                             HorizontalAlignment="Right"
@@ -310,30 +310,30 @@
                         <iconPacks:PackIconModern Kind="Add" />
                     </Button>
                 </StackPanel>
-            </Controls:Flyout>
+            </mah:Flyout>
 
-            <Controls:Flyout Header="Modal"
-                             IsModal="True"
-                             Position="Right">
+            <mah:Flyout Header="Modal"
+                        IsModal="True"
+                        Position="Right">
                 <StackPanel Height="80"
                             Margin="5 5 5 5"
                             Orientation="Horizontal">
                     <TextBlock>Modal Flyout</TextBlock>
                 </StackPanel>
-            </Controls:Flyout>
-            <Controls:Flyout Height="75"
-                             CloseButtonVisibility="Collapsed"
-                             IsPinned="False"
-                             Position="Bottom"
-                             TitleVisibility="Collapsed">
+            </mah:Flyout>
+            <mah:Flyout Height="75"
+                        CloseButtonVisibility="Collapsed"
+                        IsPinned="False"
+                        Position="Bottom"
+                        TitleVisibility="Collapsed">
                 <TextBlock VerticalAlignment="Center" Text="This is an AppBar" />
-            </Controls:Flyout>
-            <Controls:Flyout x:Name="AutoCloseFlyout"
-                             AutoCloseInterval="6000"
-                             CloseButtonVisibility="Collapsed"
-                             Header="AutoClose"
-                             IsAutoCloseEnabled="True"
-                             Position="Right">
+            </mah:Flyout>
+            <mah:Flyout x:Name="AutoCloseFlyout"
+                        AutoCloseInterval="6000"
+                        CloseButtonVisibility="Collapsed"
+                        Header="AutoClose"
+                        IsAutoCloseEnabled="True"
+                        Position="Right">
                 <StackPanel Width="400"
                             Margin="10"
                             SnapsToDevicePixels="True">
@@ -352,9 +352,9 @@
                         <Run Text=" milliseconds" />
                     </TextBlock>
                 </StackPanel>
-            </Controls:Flyout>
-        </Controls:FlyoutsControl>
-    </Controls:MetroWindow.Flyouts>
+            </mah:Flyout>
+        </mah:FlyoutsControl>
+    </mah:MetroWindow.Flyouts>
 
     <Grid>
 
@@ -426,7 +426,7 @@
                           Margin="5"
                           HorizontalAlignment="Center"
                           VerticalAlignment="Top">
-            <TextBox Controls:TextBoxHelper.Watermark="Number greater than 10" Text="{Binding IntegerGreater10Property, ValidatesOnDataErrors=True, UpdateSourceTrigger=PropertyChanged, NotifyOnValidationError=True}" />
+            <TextBox mah:TextBoxHelper.Watermark="Number greater than 10" Text="{Binding IntegerGreater10Property, ValidatesOnDataErrors=True, UpdateSourceTrigger=PropertyChanged, NotifyOnValidationError=True}" />
         </AdornerDecorator>
 
         <StackPanel Grid.Row="1"
@@ -454,7 +454,7 @@
                           Margin="2"
                           VerticalAlignment="Center"
                           ItemsSource="{Binding Source={StaticResource WindowCommandsOverlayBehaviorValues}}"
-                          SelectedValue="{Binding ElementName=flyoutsDemo, Path=LeftWindowCommandsOverlayBehavior, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                          SelectedValue="{Binding ElementName=ThisView, Path=LeftWindowCommandsOverlayBehavior, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
             </Grid>
 
             <Grid>
@@ -471,7 +471,7 @@
                           Margin="2"
                           VerticalAlignment="Center"
                           ItemsSource="{Binding Source={StaticResource WindowCommandsOverlayBehaviorValues}}"
-                          SelectedValue="{Binding ElementName=flyoutsDemo, Path=RightWindowCommandsOverlayBehavior, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                          SelectedValue="{Binding ElementName=ThisView, Path=RightWindowCommandsOverlayBehavior, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
             </Grid>
 
             <Grid>
@@ -488,7 +488,7 @@
                           Margin="2"
                           VerticalAlignment="Center"
                           ItemsSource="{Binding Source={StaticResource OverlayBehaviorValues}}"
-                          SelectedValue="{Binding ElementName=flyoutsDemo, Path=WindowButtonCommandsOverlayBehavior, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                          SelectedValue="{Binding ElementName=ThisView, Path=WindowButtonCommandsOverlayBehavior, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
             </Grid>
 
             <Grid>
@@ -505,10 +505,10 @@
                           Margin="2"
                           VerticalAlignment="Center"
                           ItemsSource="{Binding Source={StaticResource OverlayBehaviorValues}}"
-                          SelectedValue="{Binding ElementName=flyoutsDemo, Path=IconOverlayBehavior, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                          SelectedValue="{Binding ElementName=ThisView, Path=IconOverlayBehavior, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
             </Grid>
 
-            <CheckBox Content="ShowTitleBar" IsChecked="{Binding ElementName=flyoutsDemo, Path=ShowTitleBar, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+            <CheckBox Content="ShowTitleBar" IsChecked="{Binding ElementName=ThisView, Path=ShowTitleBar, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
             <Button Margin="2 10 2 2"
                     Click="ShowLeft"
@@ -528,4 +528,4 @@
         </StackPanel>
     </Grid>
 
-</Controls:MetroWindow>
\ No newline at end of file
+</mah:MetroWindow>
\ No newline at end of file
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 f4aae3f647..a343500c23 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/InteropDemo.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/InteropDemo.xaml
@@ -1,13 +1,13 @@
-<controls:MetroWindow x:Class="MetroDemo.ExampleWindows.InteropDemo"
-                      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;assembly=MahApps.Metro"
-                      xmlns:winForms="clr-namespace:System.Windows.Forms;assembly=System.Windows.Forms"
-                      Title="Interop Demo"
-                      Width="800"
-                      Height="800"
-                      ResizeMode="CanResizeWithGrip"
-                      WindowTransitionsEnabled="False">
+<mah:MetroWindow x:Class="MetroDemo.ExampleWindows.InteropDemo"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
+                 xmlns:winForms="clr-namespace:System.Windows.Forms;assembly=System.Windows.Forms"
+                 Title="Interop Demo"
+                 Width="800"
+                 Height="800"
+                 ResizeMode="CanResizeWithGrip"
+                 WindowTransitionsEnabled="False">
 
     <Grid>
         <Border Margin="10"
@@ -39,4 +39,4 @@
                        Text="Hello Airspace" />
         </Border>-->
     </Grid>
-</controls:MetroWindow>
\ No newline at end of file
+</mah:MetroWindow>
\ No newline at end of file
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 b4355f71b6..405e4b6dc0 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/ShowcaseFlyout.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/ShowcaseFlyout.xaml
@@ -1,38 +1,37 @@
-<controls:Flyout x:Class="MetroDemo.ExampleWindows.ShowcaseFlyout"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:actions="clr-namespace:MahApps.Metro.Actions;assembly=MahApps.Metro"
-                 xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
-                 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                 xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
-                 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                 xmlns:metroDemo="clr-namespace:MetroDemo"
-                 xmlns:system="clr-namespace:System;assembly=mscorlib"
-                 x:Name="ThisView"
-                 Width="500"
-                 d:DataContext="{d:DesignInstance metroDemo:MainWindowViewModel}"
-                 d:DesignHeight="300"
-                 d:DesignWidth="400"
-                 CloseCommand="{Binding CloseCmd}"
-                 Header="{Binding}"
-                 Position="Right"
-                 Theme="Dark"
-                 mc:Ignorable="d">
+<mah:Flyout x:Class="MetroDemo.ExampleWindows.ShowcaseFlyout"
+            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+            xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+            xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+            xmlns:local="clr-namespace:MetroDemo"
+            xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
+            xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+            xmlns:system="clr-namespace:System;assembly=mscorlib"
+            x:Name="ThisView"
+            Width="500"
+            d:DataContext="{d:DesignInstance local:MainWindowViewModel}"
+            d:DesignHeight="300"
+            d:DesignWidth="400"
+            CloseCommand="{Binding CloseCmd}"
+            Header="{Binding}"
+            Position="Right"
+            Theme="Dark"
+            mc:Ignorable="d">
 
-    <controls:Flyout.Resources>
+    <mah:Flyout.Resources>
         <ResourceDictionary>
             <ObjectDataProvider x:Key="FlyoutThemeEnumValues"
                                 MethodName="GetValues"
-                                ObjectType="{x:Type controls:FlyoutTheme}">
+                                ObjectType="{x:Type mah:FlyoutTheme}">
                 <ObjectDataProvider.MethodParameters>
-                    <x:Type TypeName="controls:FlyoutTheme" />
+                    <x:Type TypeName="mah:FlyoutTheme" />
                 </ObjectDataProvider.MethodParameters>
             </ObjectDataProvider>
         </ResourceDictionary>
-    </controls:Flyout.Resources>
+    </mah:Flyout.Resources>
 
-    <controls:Flyout.HeaderTemplate>
-        <DataTemplate DataType="{x:Type metroDemo:MainWindowViewModel}">
+    <mah:Flyout.HeaderTemplate>
+        <DataTemplate DataType="{x:Type local:MainWindowViewModel}">
             <DockPanel x:Name="dpHeader"
                        VerticalAlignment="Center"
                        LastChildFill="True">
@@ -44,29 +43,29 @@
                         DockPanel.Dock="Left"
                         FontFamily="Segoe UI Symbol"
                         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}"
+                        Foreground="{Binding RelativeSource={RelativeSource AncestorType={x:Type mah:Flyout}}, Path=Foreground}"
+                        IsCancel="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:Flyout}}, Path=CloseButtonIsCancel}"
                         Style="{DynamicResource MahApps.Styles.Button.Circle}"
-                        Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:Flyout}}, Path=CloseButtonVisibility}">
+                        Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:Flyout}}, Path=CloseButtonVisibility}">
                     <i:Interaction.Triggers>
                         <i:EventTrigger EventName="Click">
-                            <actions:CloseFlyoutAction Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type controls:Flyout}}, Path=CloseCommand, Mode=OneWay}" CommandParameter="{Binding RelativeSource={RelativeSource AncestorType={x:Type controls:Flyout}}, Path=CloseCommandParameter, Mode=OneWay}" />
+                            <mah:CloseFlyoutAction Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type mah:Flyout}}, Path=CloseCommand, Mode=OneWay}" CommandParameter="{Binding RelativeSource={RelativeSource AncestorType={x:Type mah:Flyout}}, Path=CloseCommandParameter, Mode=OneWay}" />
                         </i:EventTrigger>
                     </i:Interaction.Triggers>
                     <ContentControl Width="20"
                                     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}"
+                                    FlowDirection="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:Flyout}}, Path=FlowDirection}"
                                     Style="{DynamicResource MahApps.Styles.ContentControl.PathIcon}" />
                 </Button>
                 <TextBlock x:Name="PART_BackHeaderText"
                            Margin="15 0 0 0"
                            VerticalAlignment="Center"
                            Text="{Binding Title, Mode=OneWay}"
-                           Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:Flyout}}, Path=TitleVisibility}" />
+                           Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:Flyout}}, Path=TitleVisibility}" />
             </DockPanel>
             <DataTemplate.Triggers>
-                <DataTrigger Binding="{Binding Position, RelativeSource={RelativeSource AncestorType={x:Type controls:Flyout}}}" Value="Left">
+                <DataTrigger Binding="{Binding Position, RelativeSource={RelativeSource AncestorType={x:Type mah:Flyout}}}" Value="Left">
                     <Setter TargetName="PART_BackButton" Property="DockPanel.Dock" Value="Right" />
                     <Setter TargetName="PART_BackButton" Property="LayoutTransform">
                         <Setter.Value>
@@ -76,14 +75,14 @@
                     <Setter TargetName="PART_BackHeaderText" Property="Margin" Value="0 0 15 0" />
                     <Setter TargetName="PART_BackHeaderText" Property="TextAlignment" Value="Right" />
                 </DataTrigger>
-                <DataTrigger Binding="{Binding Position, RelativeSource={RelativeSource AncestorType={x:Type controls:Flyout}}}" Value="Top">
+                <DataTrigger Binding="{Binding Position, RelativeSource={RelativeSource AncestorType={x:Type mah:Flyout}}}" Value="Top">
                     <Setter TargetName="PART_BackButton" Property="LayoutTransform">
                         <Setter.Value>
                             <RotateTransform Angle="-90" />
                         </Setter.Value>
                     </Setter>
                 </DataTrigger>
-                <DataTrigger Binding="{Binding Position, RelativeSource={RelativeSource AncestorType={x:Type controls:Flyout}}}" Value="Bottom">
+                <DataTrigger Binding="{Binding Position, RelativeSource={RelativeSource AncestorType={x:Type mah:Flyout}}}" Value="Bottom">
                     <Setter TargetName="PART_BackButton" Property="LayoutTransform">
                         <Setter.Value>
                             <RotateTransform Angle="90" />
@@ -92,7 +91,7 @@
                 </DataTrigger>
             </DataTemplate.Triggers>
         </DataTemplate>
-    </controls:Flyout.HeaderTemplate>
+    </mah:Flyout.HeaderTemplate>
 
     <ScrollViewer>
         <StackPanel Margin="2" Orientation="Vertical">
@@ -125,26 +124,26 @@
                           Margin="2"
                           Content="Can close Flyout"
                           IsChecked="{Binding CanCloseFlyout, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-                <controls:ToggleSwitch Grid.Row="2"
-                                       Grid.Column="1"
-                                       Margin="2"
-                                       Header="Flyout closing"
-                                       IsOn="{Binding CanCloseFlyout, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                       OffContent="Disabled"
-                                       OnContent="Allowed" />
-                <controls:ToggleSwitch Grid.Row="3"
-                                       Grid.Column="1"
-                                       Margin="2"
-                                       Header="Flyout closing"
-                                       IsOn="{Binding CanCloseFlyout, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                       OffContent="Disabled"
-                                       OnContent="Allowed" />
+                <mah:ToggleSwitch Grid.Row="2"
+                                  Grid.Column="1"
+                                  Margin="2"
+                                  Header="Flyout closing"
+                                  IsOn="{Binding CanCloseFlyout, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                  OffContent="Disabled"
+                                  OnContent="Allowed" />
+                <mah:ToggleSwitch Grid.Row="3"
+                                  Grid.Column="1"
+                                  Margin="2"
+                                  Header="Flyout closing"
+                                  IsOn="{Binding CanCloseFlyout, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                  OffContent="Disabled"
+                                  OnContent="Allowed" />
 
             </Grid>
 
-            <controls:MetroAnimatedTabControl Height="300"
-                                              Margin="2"
-                                              controls:TabControlHelper.Underlined="TabPanel">
+            <mah:MetroAnimatedTabControl Height="300"
+                                         Margin="2"
+                                         mah:TabControlHelper.Underlined="TabPanel">
                 <TabItem Header="Artists">
                     <ListView Margin="2"
                               BorderThickness="0"
@@ -171,7 +170,7 @@
                     <StackPanel Orientation="Vertical">
                         <Slider x:Name="TheSlider"
                                 Margin="4"
-                                controls:SliderHelper.EnableMouseWheel="MouseHover"
+                                mah:SliderHelper.EnableMouseWheel="MouseHover"
                                 LargeChange="10"
                                 Maximum="100"
                                 Minimum="0"
@@ -189,9 +188,9 @@
                                    FontSize="48"
                                    Text="{Binding ElementName=TheSlider, Path=Value, Mode=OneWay, StringFormat={}{0:N0}}" />
                         <TextBox Margin="2"
-                                 controls:TextBoxHelper.Watermark="TextBox 01"
+                                 mah:TextBoxHelper.Watermark="TextBox 01"
                                  Text="{Binding ElementName=TheSlider, Path=Value, Mode=OneWay, StringFormat='{}Slider value is {0:N0}'}" />
-                        <TextBox Margin="2" controls:TextBoxHelper.Watermark="TextBox 02" />
+                        <TextBox Margin="2" mah:TextBoxHelper.Watermark="TextBox 02" />
                     </StackPanel>
                 </TabItem>
                 <TabItem Header="Calendar">
@@ -205,7 +204,7 @@
                                   SelectionMode="MultipleRange" />
                     </StackPanel>
                 </TabItem>
-            </controls:MetroAnimatedTabControl>
+            </mah:MetroAnimatedTabControl>
         </StackPanel>
     </ScrollViewer>
-</controls:Flyout>
\ No newline at end of file
+</mah:Flyout>
\ No newline at end of file
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 a5454f213d..6b19b12e04 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/SizeToContentDemo.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/SizeToContentDemo.xaml
@@ -1,12 +1,12 @@
-<controls:MetroWindow x:Class="MetroDemo.ExampleWindows.SizeToContentDemo"
-                      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;assembly=MahApps.Metro"
-                      xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
-                      Title="SizeToContent Demo"
-                      GlowBrush="{DynamicResource MahApps.Brushes.Accent}"
-                      SizeToContent="WidthAndHeight"
-                      WindowStartupLocation="CenterOwner">
+<mah:MetroWindow x:Class="MetroDemo.ExampleWindows.SizeToContentDemo"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
+                 xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
+                 Title="SizeToContent Demo"
+                 GlowBrush="{DynamicResource MahApps.Brushes.Accent}"
+                 SizeToContent="WidthAndHeight"
+                 WindowStartupLocation="CenterOwner">
     <Grid Width="50"
           Height="50"
           Background="Firebrick">
@@ -30,4 +30,4 @@
     <!--        <PasswordBox  Margin="4" controls:TextBoxHelper.Watermark="Password" controls:TextBoxHelper.UseFloatingWatermark="True"></PasswordBox>-->
     <!--    </StackPanel>-->
 
-</controls:MetroWindow>
\ No newline at end of file
+</mah:MetroWindow>
\ No newline at end of file
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 670a444270..9c48b7a045 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/VSDemo.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/VSDemo.xaml
@@ -1,15 +1,15 @@
-<Controls:MetroWindow x:Class="MetroDemo.ExampleWindows.VSDemo"
-                      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;assembly=MahApps.Metro"
-                      xmlns:System="clr-namespace:System;assembly=mscorlib"
-                      xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
-                      x:Name="MainWindow"
-                      Title="Visual Studio 2012 Style Demo"
-                      Width="1000"
-                      Height="800"
-                      Style="{DynamicResource MahApps.Styles.MetroWindow.VisualStudio}"
-                      WindowStartupLocation="CenterScreen">
+<mah:MetroWindow x:Class="MetroDemo.ExampleWindows.VSDemo"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
+                 xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
+                 xmlns:system="clr-namespace:System;assembly=mscorlib"
+                 x:Name="MainWindow"
+                 Title="Visual Studio Style Demo"
+                 Width="1000"
+                 Height="800"
+                 Style="{DynamicResource MahApps.Styles.MetroWindow.VisualStudio}"
+                 WindowStartupLocation="CenterScreen">
 
     <Window.Resources>
         <ResourceDictionary>
@@ -26,19 +26,19 @@
                     Modifiers="Control" />
     </Window.InputBindings>
 
-    <Controls:MetroWindow.RightWindowCommands>
-        <Controls:WindowCommands ShowSeparators="False">
+    <mah:MetroWindow.RightWindowCommands>
+        <mah:WindowCommands ShowSeparators="False">
             <Button Style="{StaticResource MahApps.Styles.Button.Window.Notification.VisualStudio}" ToolTip="1 Notification">
                 <iconPacks:PackIconEntypo Width="16"
                                           Height="16"
                                           Kind="Flag" />
             </Button>
             <TextBox Name="QuickLaunchBar"
-                     Controls:TextBoxHelper.ButtonContent="{iconPacks:Modern Magnify, Width=12, Height=12}"
-                     Controls:TextBoxHelper.Watermark="Quick Launch (Ctrl+Q)"
+                     mah:TextBoxHelper.ButtonContent="{iconPacks:Modern Magnify, Width=12, Height=12}"
+                     mah:TextBoxHelper.Watermark="Quick Launch (Ctrl+Q)"
                      Style="{DynamicResource MahApps.Styles.TextBox.Window.QuickLaunch.VisualStudio}" />
-        </Controls:WindowCommands>
-    </Controls:MetroWindow.RightWindowCommands>
+        </mah:WindowCommands>
+    </mah:MetroWindow.RightWindowCommands>
 
     <DockPanel>
         <Menu Margin="2 0 0 0"
@@ -127,7 +127,7 @@
                                            Grid.Column="1"
                                            FontSize="16"
                                            Foreground="{StaticResource MahApps.Brushes.Foreground}"
-                                           Text="{x:Static System:Environment.UserName}" />
+                                           Text="{x:Static system:Environment.UserName}" />
                                 <TextBlock Grid.Row="2"
                                            FontSize="16"
                                            Foreground="{StaticResource MahApps.Brushes.Foreground}">
@@ -647,4 +647,4 @@
         </Grid>
     </DockPanel>
 
-</Controls:MetroWindow>
\ No newline at end of file
+</mah:MetroWindow>
\ No newline at end of file
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 cab875e9ba..6e71e0ff1b 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/HamburgerMenuRipple/HamburgerMenuRipple.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/HamburgerMenuRipple/HamburgerMenuRipple.xaml
@@ -3,11 +3,11 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
+             xmlns:local="clr-namespace:MetroDemo"
              xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:metroDemo="clr-namespace:MetroDemo"
-             d:DataContext="{d:DesignInstance metroDemo:MainWindowViewModel}"
+             d:DataContext="{d:DesignInstance local:MainWindowViewModel}"
              d:DesignHeight="300"
              d:DesignWidth="400"
              mc:Ignorable="d">
@@ -270,12 +270,12 @@
                     <mah:HamburgerMenuItemCollection>
                         <mah:HamburgerMenuIconItem Icon="{iconPacks:Material Kind=Home}" Label="Home">
                             <mah:HamburgerMenuIconItem.Tag>
-                                <metroDemo:HomeView />
+                                <local:HomeView />
                             </mah:HamburgerMenuIconItem.Tag>
                         </mah:HamburgerMenuIconItem>
                         <mah:HamburgerMenuIconItem Icon="{iconPacks:Material Kind=AccountCircle}" Label="Private">
                             <mah:HamburgerMenuIconItem.Tag>
-                                <metroDemo:PrivateView />
+                                <local:PrivateView />
                             </mah:HamburgerMenuIconItem.Tag>
                         </mah:HamburgerMenuIconItem>
                         <mah:HamburgerMenuIconItem Icon="{iconPacks:Octicons Kind=Briefcase}" Label="Briefcase">
@@ -299,7 +299,7 @@
                     <mah:HamburgerMenuItemCollection>
                         <mah:HamburgerMenuIconItem Icon="{iconPacks:Material Kind=Cog}" Label="Settings">
                             <mah:HamburgerMenuIconItem.Tag>
-                                <metroDemo:SettingsView />
+                                <local:SettingsView />
                             </mah:HamburgerMenuIconItem.Tag>
                         </mah:HamburgerMenuIconItem>
                     </mah:HamburgerMenuItemCollection>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml
index a5bf9601dc..c12cec9ed0 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml
@@ -1,29 +1,28 @@
-<Controls:MetroWindow x:Class="MetroDemo.MainWindow"
-                      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;assembly=MahApps.Metro"
-                      xmlns:Dialog="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
-                      xmlns:MetroDemo="clr-namespace:MetroDemo"
-                      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                      xmlns:exampleViews="clr-namespace:MetroDemo.ExampleViews"
-                      xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
-                      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                      xmlns:theming="urn:controlzex"
-                      Title="MahApps.Metro - Demo Application"
-                      Width="900"
-                      Height="600"
-                      Dialog:DialogParticipation.Register="{Binding}"
-                      d:DataContext="{d:DesignInstance MetroDemo:MainWindowViewModel}"
-                      d:DesignHeight="600"
-                      d:DesignWidth="800"
-                      Closing="MetroWindow_Closing"
-                      GlowBrush="{DynamicResource MahApps.Brushes.Accent}"
-                      Icon="mahapps.metro.logo2.ico"
-                      NonActiveGlowBrush="#CDFF0000"
-                      ShowIconOnTitleBar="True"
-                      ShowTitleBar="{Binding ShowMyTitleBar, Mode=TwoWay}"
-                      WindowStartupLocation="CenterScreen"
-                      mc:Ignorable="d">
+<mah:MetroWindow x:Class="MetroDemo.MainWindow"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                 xmlns:exampleViews="clr-namespace:MetroDemo.ExampleViews"
+                 xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
+                 xmlns:local="clr-namespace:MetroDemo"
+                 xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
+                 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                 xmlns:theming="urn:controlzex"
+                 Title="MahApps.Metro - Demo Application"
+                 Width="900"
+                 Height="600"
+                 d:DataContext="{d:DesignInstance local:MainWindowViewModel}"
+                 d:DesignHeight="600"
+                 d:DesignWidth="800"
+                 mah:DialogParticipation.Register="{Binding}"
+                 Closing="MetroWindow_Closing"
+                 GlowBrush="{DynamicResource MahApps.Brushes.Accent}"
+                 Icon="mahapps.metro.logo2.ico"
+                 NonActiveGlowBrush="#CDFF0000"
+                 ShowIconOnTitleBar="True"
+                 ShowTitleBar="{Binding ShowMyTitleBar, Mode=TwoWay}"
+                 WindowStartupLocation="CenterScreen"
+                 mc:Ignorable="d">
     <!--
         if using DialogParticipation on Windows which open/close frequently you will get a
         memory leak unless you unregister.  The easiest way to do this is in your Closing/Unloaded
@@ -104,18 +103,18 @@
         </ResourceDictionary>
     </Window.Resources>
 
-    <Controls:MetroWindow.LeftWindowCommands>
-        <Controls:WindowCommands>
+    <mah:MetroWindow.LeftWindowCommands>
+        <mah:WindowCommands>
             <Button Click="LaunchMahAppsOnGitHub" ToolTip="MahApps.Metro on GitHub">
                 <iconPacks:PackIconModern Width="22"
                                           Height="22"
                                           Kind="SocialGithubOctocat" />
             </Button>
-        </Controls:WindowCommands>
-    </Controls:MetroWindow.LeftWindowCommands>
+        </mah:WindowCommands>
+    </mah:MetroWindow.LeftWindowCommands>
 
-    <Controls:MetroWindow.RightWindowCommands>
-        <Controls:WindowCommands ShowLastSeparator="False">
+    <mah:MetroWindow.RightWindowCommands>
+        <mah:WindowCommands ShowLastSeparator="False">
             <Button Click="LaunchFlyoutDemo"
                     Content="Flyouts"
                     ToolTip="Flyouts demo window" />
@@ -137,8 +136,8 @@
             <ToggleButton Content="Confirm quit"
                           IsChecked="{Binding QuitConfirmationEnabled}"
                           ToolTip="Enable quit confirmation dialog on exit" />
-        </Controls:WindowCommands>
-    </Controls:MetroWindow.RightWindowCommands>
+        </mah:WindowCommands>
+    </mah:MetroWindow.RightWindowCommands>
 
     <Grid>
         <Grid.RowDefinitions>
@@ -170,10 +169,10 @@
             <MenuItem Header="Dialogs">
                 <MenuItem Header="Use Accent?"
                           IsCheckable="True"
-                          IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:MetroWindow}}, Path=UseAccentForDialogs}" />
+                          IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:MetroWindow}}, Path=UseAccentForDialogs}" />
                 <MenuItem Header="Show Dialogs over TitleBar"
                           IsCheckable="True"
-                          IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:MetroWindow}}, Path=ShowDialogsOverTitleBar}" />
+                          IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:MetroWindow}}, Path=ShowDialogsOverTitleBar}" />
                 <Separator />
                 <MenuItem Click="ShowInputDialog" Header="Show InputDialog" />
                 <MenuItem Click="ShowInputDialogCustomButtonSizes" Header="Show InputDialog (with custom button font sizes)" />
@@ -212,16 +211,16 @@
                           IsChecked="{Binding Path=ShowMyTitleBar, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                 <MenuItem Header="ShowInTaskbar"
                           IsCheckable="True"
-                          IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:MetroWindow}}, Path=ShowInTaskbar}" />
+                          IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:MetroWindow}}, Path=ShowInTaskbar}" />
                 <MenuItem Header="Topmost"
                           IsCheckable="True"
-                          IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:MetroWindow}}, Path=Topmost}" />
+                          IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:MetroWindow}}, Path=Topmost}" />
                 <MenuItem Header="Ignore taskbar on maximize"
                           IsCheckable="True"
-                          IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:MetroWindow}}, Path=IgnoreTaskbarOnMaximize}" />
+                          IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:MetroWindow}}, Path=IgnoreTaskbarOnMaximize}" />
                 <MenuItem Header="Toggle FullScreen (no taskbar, window style = none)"
                           IsCheckable="True"
-                          IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:MetroWindow}}, Path=ToggleFullScreen}" />
+                          IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:MetroWindow}}, Path=ToggleFullScreen}" />
                 <Separator />
                 <MenuItem Click="MenuWindowWithoutBorderOnClick" Header="Window without Border" />
                 <MenuItem Click="MenuWindowWithBorderOnClick" Header="Window with Border" />
@@ -232,33 +231,33 @@
                 <MenuItem x:Name="ShowSeparatorsMI"
                           Header="ShowSeparators (RightWindowCommands)"
                           IsCheckable="True"
-                          IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:MetroWindow}}, Path=RightWindowCommands.ShowSeparators}" />
+                          IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:MetroWindow}}, Path=RightWindowCommands.ShowSeparators}" />
                 <MenuItem Header="ShowLastSeparator in (RightWindowCommands)"
                           IsCheckable="True"
-                          IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:MetroWindow}}, Path=RightWindowCommands.ShowLastSeparator}"
+                          IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:MetroWindow}}, Path=RightWindowCommands.ShowLastSeparator}"
                           IsEnabled="{Binding ElementName=ShowSeparatorsMI, Path=IsChecked, Mode=OneWay}" />
                 <Separator />
                 <MenuItem Command="{Binding ToggleIconScalingCommand}"
-                          CommandParameter="{x:Static Controls:MultiFrameImageMode.ScaleDownLargerFrame}"
+                          CommandParameter="{x:Static mah:MultiFrameImageMode.ScaleDownLargerFrame}"
                           Header="Window icon: scale down larger frame"
                           IsCheckable="True"
                           IsChecked="{Binding IsScaleDownLargerFrame, Mode=OneWay}" />
                 <MenuItem Command="{Binding ToggleIconScalingCommand}"
-                          CommandParameter="{x:Static Controls:MultiFrameImageMode.NoScaleSmallerFrame}"
+                          CommandParameter="{x:Static mah:MultiFrameImageMode.NoScaleSmallerFrame}"
                           Header="Window icon: no scale, smaller frame"
                           IsCheckable="True"
                           IsChecked="{Binding IsNoScaleSmallerFrame, Mode=OneWay}" />
                 <Separator />
                 <MenuItem Header="ShowSystemMenu"
                           IsCheckable="True"
-                          IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:MetroWindow}}, Path=ShowSystemMenu}" />
+                          IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:MetroWindow}}, Path=ShowSystemMenu}" />
                 <MenuItem Header="ShowSystemMenuOnRightClick"
                           IsCheckable="True"
-                          IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:MetroWindow}}, Path=ShowSystemMenuOnRightClick}" />
+                          IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:MetroWindow}}, Path=ShowSystemMenuOnRightClick}" />
             </MenuItem>
         </Menu>
 
-        <Controls:MetroAnimatedSingleRowTabControl x:Name="MainTabControl" Grid.Row="1">
+        <mah:MetroAnimatedSingleRowTabControl x:Name="MainTabControl" Grid.Row="1">
             <TabItem Header="buttons">
                 <ScrollViewer Margin="2"
                               HorizontalScrollBarVisibility="Auto"
@@ -317,7 +316,7 @@
             </TabItem>
             <TabItem Header="tiles">
                 <ScrollViewer Margin="2"
-                              Controls:ScrollViewerHelper.IsHorizontalScrollWheelEnabled="True"
+                              mah:ScrollViewerHelper.IsHorizontalScrollWheelEnabled="True"
                               HorizontalScrollBarVisibility="Visible"
                               VerticalScrollBarVisibility="Disabled">
                     <exampleViews:TilesExample DataContext="{Binding}" />
@@ -337,7 +336,7 @@
                     <exampleViews:OtherExamples DataContext="{Binding}" />
                 </ScrollViewer>
             </TabItem>
-        </Controls:MetroAnimatedSingleRowTabControl>
+        </mah:MetroAnimatedSingleRowTabControl>
 
         <StatusBar Grid.Row="2">
             <StatusBarItem>MahApps.Metro DEMO Application</StatusBarItem>
@@ -347,4 +346,4 @@
         </StatusBar>
 
     </Grid>
-</Controls:MetroWindow>
\ No newline at end of file
+</mah:MetroWindow>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml b/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml
index d16d11c078..1432b13a33 100644
--- a/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml
+++ b/src/MahApps.Metro/Controls/Dialogs/InputDialog.xaml
@@ -1,8 +1,8 @@
-<Dialogs:BaseMetroDialog x:Class="MahApps.Metro.Controls.Dialogs.InputDialog"
+<dialogs:BaseMetroDialog x:Class="MahApps.Metro.Controls.Dialogs.InputDialog"
                          xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                         xmlns:Dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs"
-                         xmlns:controls="clr-namespace:MahApps.Metro.Controls">
+                         xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs"
+                         xmlns:mah="clr-namespace:MahApps.Metro.Controls">
     <Grid Margin="0 10 0 0">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" MinHeight="20" />
@@ -11,18 +11,18 @@
         </Grid.RowDefinitions>
         <TextBlock Grid.Row="0"
                    Margin="0 5 0 0"
-                   FontSize="{Binding DialogMessageFontSize, RelativeSource={RelativeSource AncestorType=Dialogs:InputDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
-                   Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType=Dialogs:InputDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
-                   Text="{Binding Message, RelativeSource={RelativeSource AncestorType=Dialogs:InputDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                   FontSize="{Binding DialogMessageFontSize, RelativeSource={RelativeSource AncestorType=dialogs:InputDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                   Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType=dialogs:InputDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                   Text="{Binding Message, RelativeSource={RelativeSource AncestorType=dialogs:InputDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                    TextWrapping="Wrap" />
         <TextBox x:Name="PART_TextBox"
                  Grid.Row="1"
                  Margin="0 5 0 0"
-                 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}"
-                 Text="{Binding Input, RelativeSource={RelativeSource AncestorType=Dialogs:InputDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                 mah:ControlsHelper.FocusBorderBrush="{DynamicResource MahApps.Brushes.Accent}"
+                 mah: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}"
+                 Text="{Binding Input, RelativeSource={RelativeSource AncestorType=dialogs:InputDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                  TextWrapping="Wrap" />
 
         <StackPanel Grid.Row="2"
@@ -31,14 +31,14 @@
                     Orientation="Horizontal">
             <Button x:Name="PART_AffirmativeButton"
                     Margin="0 0 5 0"
-                    Content="{Binding AffirmativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:InputDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
-                    FontSize="{Binding DialogButtonFontSize, RelativeSource={RelativeSource AncestorType=Dialogs:InputDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                    Content="{Binding AffirmativeButtonText, RelativeSource={RelativeSource AncestorType=dialogs:InputDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                    FontSize="{Binding DialogButtonFontSize, RelativeSource={RelativeSource AncestorType=dialogs:InputDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                     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}"
-                    FontSize="{Binding DialogButtonFontSize, RelativeSource={RelativeSource AncestorType=Dialogs:InputDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                    Content="{Binding NegativeButtonText, RelativeSource={RelativeSource AncestorType=dialogs:InputDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                    FontSize="{Binding DialogButtonFontSize, RelativeSource={RelativeSource AncestorType=dialogs:InputDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                     Style="{DynamicResource MahApps.Styles.Button.Dialogs}" />
         </StackPanel>
     </Grid>
-</Dialogs:BaseMetroDialog>
\ No newline at end of file
+</dialogs:BaseMetroDialog>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml b/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml
index 7c449e83e0..eafb0db41b 100644
--- a/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml
+++ b/src/MahApps.Metro/Controls/Dialogs/LoginDialog.xaml
@@ -1,9 +1,9 @@
-<Dialogs:BaseMetroDialog x:Class="MahApps.Metro.Controls.Dialogs.LoginDialog"
+<dialogs:BaseMetroDialog x:Class="MahApps.Metro.Controls.Dialogs.LoginDialog"
                          xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                         xmlns:Behaviors="clr-namespace:MahApps.Metro.Behaviors"
-                         xmlns:Controls="clr-namespace:MahApps.Metro.Controls"
-                         xmlns:Dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs">
+                         xmlns:behaviors="clr-namespace:MahApps.Metro.Behaviors"
+                         xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs"
+                         xmlns:mah="clr-namespace:MahApps.Metro.Controls">
     <Grid Margin="0 10 0 0">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" MinHeight="20" />
@@ -14,51 +14,51 @@
         </Grid.RowDefinitions>
         <TextBlock Grid.Row="0"
                    Margin="0 5 0 0"
-                   FontSize="{Binding DialogMessageFontSize, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
-                   Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
-                   Text="{Binding Message, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                   FontSize="{Binding DialogMessageFontSize, RelativeSource={RelativeSource AncestorType=dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                   Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType=dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                   Text="{Binding Message, RelativeSource={RelativeSource AncestorType=dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                    TextWrapping="Wrap" />
         <TextBox x:Name="PART_TextBox"
                  Grid.Row="1"
                  Margin="0 5 0 0"
-                 Controls:TextBoxHelper.SelectAllOnFocus="True"
-                 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="{Binding DialogMessageFontSize, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
-                 Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
-                 Text="{Binding Username, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                 mah:TextBoxHelper.SelectAllOnFocus="True"
+                 mah:TextBoxHelper.Watermark="{Binding UsernameWatermark, RelativeSource={RelativeSource AncestorType=dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                 mah: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="{Binding DialogMessageFontSize, RelativeSource={RelativeSource AncestorType=dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                 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" />
         <PasswordBox x:Name="PART_TextBox2"
                      Grid.Row="2"
                      Margin="0 5 0 0"
-                     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="{Binding DialogMessageFontSize, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
-                     Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}" />
+                     behaviors:PasswordBoxBindingBehavior.Password="{Binding Password, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                     mah:TextBoxHelper.SelectAllOnFocus="True"
+                     mah:TextBoxHelper.Watermark="{Binding PasswordWatermark, RelativeSource={RelativeSource AncestorType=dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                     FontSize="{Binding DialogMessageFontSize, RelativeSource={RelativeSource AncestorType=dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                     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="{Binding DialogMessageFontSize, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
-                  IsChecked="{Binding RememberCheckBoxChecked, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
-                  Visibility="{Binding RememberCheckBoxVisibility, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}" />
+                  Content="{Binding RememberCheckBoxText, RelativeSource={RelativeSource AncestorType=dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                  FontSize="{Binding DialogMessageFontSize, RelativeSource={RelativeSource AncestorType=dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                  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"
                     MinHeight="85"
                     HorizontalAlignment="Right"
                     Orientation="Horizontal">
             <Button x:Name="PART_AffirmativeButton"
                     Margin="0 0 5 0"
-                    Content="{Binding AffirmativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
-                    FontSize="{Binding DialogButtonFontSize, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                    Content="{Binding AffirmativeButtonText, RelativeSource={RelativeSource AncestorType=dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                    FontSize="{Binding DialogButtonFontSize, RelativeSource={RelativeSource AncestorType=dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                     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}"
-                    FontSize="{Binding DialogButtonFontSize, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                    Content="{Binding NegativeButtonText, RelativeSource={RelativeSource AncestorType=dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                    FontSize="{Binding DialogButtonFontSize, RelativeSource={RelativeSource AncestorType=dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                     Style="{DynamicResource MahApps.Styles.Button.Dialogs}"
-                    Visibility="{Binding NegativeButtonButtonVisibility, RelativeSource={RelativeSource AncestorType=Dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}" />
+                    Visibility="{Binding NegativeButtonButtonVisibility, RelativeSource={RelativeSource AncestorType=dialogs:LoginDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}" />
         </StackPanel>
     </Grid>
-</Dialogs:BaseMetroDialog>
\ No newline at end of file
+</dialogs:BaseMetroDialog>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Controls/Dialogs/MessageDialog.xaml b/src/MahApps.Metro/Controls/Dialogs/MessageDialog.xaml
index 5820623002..469beb4ecd 100644
--- a/src/MahApps.Metro/Controls/Dialogs/MessageDialog.xaml
+++ b/src/MahApps.Metro/Controls/Dialogs/MessageDialog.xaml
@@ -1,10 +1,10 @@
-<Dialogs:BaseMetroDialog x:Class="MahApps.Metro.Controls.Dialogs.MessageDialog"
+<dialogs:BaseMetroDialog x:Class="MahApps.Metro.Controls.Dialogs.MessageDialog"
                          xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                         xmlns:Dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs">
-    <Dialogs:BaseMetroDialog.CommandBindings>
+                         xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs">
+    <dialogs:BaseMetroDialog.CommandBindings>
         <CommandBinding Command="Copy" Executed="OnKeyCopyExecuted" />
-    </Dialogs:BaseMetroDialog.CommandBindings>
+    </dialogs:BaseMetroDialog.CommandBindings>
     <Grid Margin="0 10 0 0">
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />
@@ -17,9 +17,9 @@
                       VerticalScrollBarVisibility="Auto">
             <TextBlock x:Name="PART_MessageTextBlock"
                        Margin="0 5 0 0"
-                       FontSize="{Binding DialogMessageFontSize, RelativeSource={RelativeSource AncestorType=Dialogs:MessageDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
-                       Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType=Dialogs:MessageDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
-                       Text="{Binding Message, RelativeSource={RelativeSource AncestorType=Dialogs:MessageDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                       FontSize="{Binding DialogMessageFontSize, RelativeSource={RelativeSource AncestorType=dialogs:MessageDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                       Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType=dialogs:MessageDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                       Text="{Binding Message, RelativeSource={RelativeSource AncestorType=dialogs:MessageDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                        TextWrapping="Wrap" />
         </ScrollViewer>
 
@@ -29,26 +29,26 @@
                     Orientation="Horizontal">
             <Button x:Name="PART_AffirmativeButton"
                     Margin="0 0 5 0"
-                    Content="{Binding AffirmativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:MessageDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
-                    FontSize="{Binding DialogButtonFontSize, RelativeSource={RelativeSource AncestorType=Dialogs:MessageDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                    Content="{Binding AffirmativeButtonText, RelativeSource={RelativeSource AncestorType=dialogs:MessageDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                    FontSize="{Binding DialogButtonFontSize, RelativeSource={RelativeSource AncestorType=dialogs:MessageDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                     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}"
-                    FontSize="{Binding DialogButtonFontSize, RelativeSource={RelativeSource AncestorType=Dialogs:MessageDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                    Content="{Binding NegativeButtonText, RelativeSource={RelativeSource AncestorType=dialogs:MessageDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                    FontSize="{Binding DialogButtonFontSize, RelativeSource={RelativeSource AncestorType=dialogs:MessageDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                     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}"
-                    FontSize="{Binding DialogButtonFontSize, RelativeSource={RelativeSource AncestorType=Dialogs:MessageDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                    Content="{Binding FirstAuxiliaryButtonText, RelativeSource={RelativeSource AncestorType=dialogs:MessageDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                    FontSize="{Binding DialogButtonFontSize, RelativeSource={RelativeSource AncestorType=dialogs:MessageDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                     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}"
-                    FontSize="{Binding DialogButtonFontSize, RelativeSource={RelativeSource AncestorType=Dialogs:MessageDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                    Content="{Binding SecondAuxiliaryButtonText, RelativeSource={RelativeSource AncestorType=dialogs:MessageDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                    FontSize="{Binding DialogButtonFontSize, RelativeSource={RelativeSource AncestorType=dialogs:MessageDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                     Style="{DynamicResource MahApps.Styles.Button.Dialogs}"
                     Visibility="Collapsed" />
         </StackPanel>
     </Grid>
-</Dialogs:BaseMetroDialog>
\ No newline at end of file
+</dialogs:BaseMetroDialog>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Controls/Dialogs/ProgressDialog.xaml b/src/MahApps.Metro/Controls/Dialogs/ProgressDialog.xaml
index a483b80dcd..d21b0bc433 100644
--- a/src/MahApps.Metro/Controls/Dialogs/ProgressDialog.xaml
+++ b/src/MahApps.Metro/Controls/Dialogs/ProgressDialog.xaml
@@ -1,10 +1,10 @@
-<Dialogs:BaseMetroDialog x:Class="MahApps.Metro.Controls.Dialogs.ProgressDialog"
+<dialogs:BaseMetroDialog x:Class="MahApps.Metro.Controls.Dialogs.ProgressDialog"
                          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"
-                         xmlns:Dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs"
+                         xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs"
+                         xmlns:mah="clr-namespace:MahApps.Metro.Controls"
                          Cursor="Wait">
-    <Dialogs:BaseMetroDialog.Content>
+    <dialogs:BaseMetroDialog.Content>
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="*" />
@@ -12,9 +12,9 @@
             </Grid.RowDefinitions>
             <TextBlock Grid.Row="0"
                        Margin="0 5 0 0"
-                       FontSize="{Binding DialogMessageFontSize, RelativeSource={RelativeSource AncestorType=Dialogs:ProgressDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
-                       Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType=Dialogs:ProgressDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
-                       Text="{Binding Message, RelativeSource={RelativeSource AncestorType=Dialogs:ProgressDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                       FontSize="{Binding DialogMessageFontSize, RelativeSource={RelativeSource AncestorType=dialogs:ProgressDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                       Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType=dialogs:ProgressDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                       Text="{Binding Message, RelativeSource={RelativeSource AncestorType=dialogs:ProgressDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                        TextWrapping="Wrap" />
 
             <StackPanel Grid.Row="1"
@@ -23,21 +23,21 @@
                         Orientation="Horizontal">
                 <Button x:Name="PART_NegativeButton"
                         Margin="5 0 0 0"
-                        Content="{Binding NegativeButtonText, RelativeSource={RelativeSource AncestorType=Dialogs:ProgressDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                        Content="{Binding NegativeButtonText, RelativeSource={RelativeSource AncestorType=dialogs:ProgressDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                         Cursor="Arrow"
-                        FontSize="{Binding DialogButtonFontSize, RelativeSource={RelativeSource AncestorType=Dialogs:ProgressDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                        FontSize="{Binding DialogButtonFontSize, RelativeSource={RelativeSource AncestorType=dialogs:ProgressDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
                         Style="{DynamicResource MahApps.Styles.Button.Dialogs.Accent}"
                         Visibility="Hidden" />
             </StackPanel>
         </Grid>
-    </Dialogs:BaseMetroDialog.Content>
-    <Dialogs:BaseMetroDialog.DialogBottom>
-        <Controls:MetroProgressBar x:Name="PART_ProgressBar"
-                                   HorizontalAlignment="Stretch"
-                                   VerticalAlignment="Bottom"
-                                   Panel.ZIndex="5"
-                                   Foreground="{Binding ProgressBarForeground, RelativeSource={RelativeSource AncestorType=Dialogs:ProgressDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
-                                   Maximum="1.0"
-                                   Minimum="0.0" />
-    </Dialogs:BaseMetroDialog.DialogBottom>
-</Dialogs:BaseMetroDialog>
\ No newline at end of file
+    </dialogs:BaseMetroDialog.Content>
+    <dialogs:BaseMetroDialog.DialogBottom>
+        <mah:MetroProgressBar x:Name="PART_ProgressBar"
+                              HorizontalAlignment="Stretch"
+                              VerticalAlignment="Bottom"
+                              Panel.ZIndex="5"
+                              Foreground="{Binding ProgressBarForeground, RelativeSource={RelativeSource AncestorType=dialogs:ProgressDialog, Mode=FindAncestor}, UpdateSourceTrigger=PropertyChanged}"
+                              Maximum="1.0"
+                              Minimum="0.0" />
+    </dialogs:BaseMetroDialog.DialogBottom>
+</dialogs:BaseMetroDialog>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Controls/MetroNavigationWindow.xaml b/src/MahApps.Metro/Controls/MetroNavigationWindow.xaml
index f72f84a90a..364520ad81 100644
--- a/src/MahApps.Metro/Controls/MetroNavigationWindow.xaml
+++ b/src/MahApps.Metro/Controls/MetroNavigationWindow.xaml
@@ -1,8 +1,8 @@
-<Controls:MetroWindow x:Class="MahApps.Metro.Controls.MetroNavigationWindow"
-                      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 MahApps.Brushes.Accent}">
+<mah:MetroWindow x:Class="MahApps.Metro.Controls.MetroNavigationWindow"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:mah="clr-namespace:MahApps.Metro.Controls"
+                 GlowBrush="{DynamicResource MahApps.Brushes.Accent}">
 
     <Grid>
         <Grid.RowDefinitions>
@@ -42,8 +42,8 @@
         </StackPanel>
 
         <Grid Grid.Row="1">
-            <ContentPresenter Panel.ZIndex="1" Content="{Binding OverlayContent, RelativeSource={RelativeSource AncestorType=Controls:MetroNavigationWindow, Mode=FindAncestor}}" />
+            <ContentPresenter Panel.ZIndex="1" Content="{Binding OverlayContent, RelativeSource={RelativeSource AncestorType=mah:MetroNavigationWindow, Mode=FindAncestor}}" />
             <Frame x:Name="PART_Frame" NavigationUIVisibility="Hidden" />
         </Grid>
     </Grid>
-</Controls:MetroWindow>
\ No newline at end of file
+</mah:MetroWindow>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Properties/AssemblyInfo.cs b/src/MahApps.Metro/Properties/AssemblyInfo.cs
index 576c02e5e2..96a9118ace 100644
--- a/src/MahApps.Metro/Properties/AssemblyInfo.cs
+++ b/src/MahApps.Metro/Properties/AssemblyInfo.cs
@@ -17,15 +17,23 @@
 [assembly: System.Resources.NeutralResourcesLanguage("en", System.Resources.UltimateResourceFallbackLocation.MainAssembly)]
 
 [assembly: XmlnsPrefix(@"http://metro.mahapps.com/winfx/xaml/controls", "mah")]
-[assembly: XmlnsPrefix(@"http://metro.mahapps.com/winfx/xaml/shared", "mah")]
+[assembly: XmlnsDefinition(@"http://metro.mahapps.com/winfx/xaml/controls", "MahApps.Metro.Behaviors")]
+[assembly: XmlnsDefinition(@"http://metro.mahapps.com/winfx/xaml/controls", "MahApps.Metro.Theming")]
+[assembly: XmlnsDefinition(@"http://metro.mahapps.com/winfx/xaml/controls", "MahApps.Metro.Automation.Peers")]
+[assembly: XmlnsDefinition(@"http://metro.mahapps.com/winfx/xaml/controls", "MahApps.Metro.Accessibility")]
+[assembly: XmlnsDefinition(@"http://metro.mahapps.com/winfx/xaml/controls", "MahApps.Metro.ValueBoxes")]
+[assembly: XmlnsDefinition(@"http://metro.mahapps.com/winfx/xaml/controls", "MahApps.Metro.Actions")]
+[assembly: XmlnsDefinition(@"http://metro.mahapps.com/winfx/xaml/controls", "MahApps.Metro.Converters")]
+[assembly: XmlnsDefinition(@"http://metro.mahapps.com/winfx/xaml/controls", "MahApps.Metro.Markup")]
+[assembly: XmlnsDefinition(@"http://metro.mahapps.com/winfx/xaml/controls", "MahApps.Metro")]
+[assembly: XmlnsDefinition(@"http://metro.mahapps.com/winfx/xaml/controls", "MahApps.Metro.Controls")]
+[assembly: XmlnsDefinition(@"http://metro.mahapps.com/winfx/xaml/controls", "MahApps.Metro.Controls.Dialogs")]
 
+[assembly: XmlnsPrefix(@"http://metro.mahapps.com/winfx/xaml/shared", "mah")]
 [assembly: XmlnsDefinition(@"http://metro.mahapps.com/winfx/xaml/shared", "MahApps.Metro.Behaviors")]
 [assembly: XmlnsDefinition(@"http://metro.mahapps.com/winfx/xaml/shared", "MahApps.Metro.Actions")]
 [assembly: XmlnsDefinition(@"http://metro.mahapps.com/winfx/xaml/shared", "MahApps.Metro.Converters")]
 [assembly: XmlnsDefinition(@"http://metro.mahapps.com/winfx/xaml/shared", "MahApps.Metro.Markup")]
-[assembly: XmlnsDefinition(@"http://metro.mahapps.com/winfx/xaml/controls", "MahApps.Metro")]
-[assembly: XmlnsDefinition(@"http://metro.mahapps.com/winfx/xaml/controls", "MahApps.Metro.Controls")]
-[assembly: XmlnsDefinition(@"http://metro.mahapps.com/winfx/xaml/controls", "MahApps.Metro.Controls.Dialogs")]
 
 [assembly: SuppressMessage("WpfAnalyzers.DependencyProperty", "WPF0005:Name of PropertyChangedCallback should match registered name.")]
 [assembly: SuppressMessage("WpfAnalyzers.DependencyProperty", "WPF0006:Name of CoerceValueCallback should match registered name.")]
diff --git a/src/MahApps.Metro/Styles/Clean/Controls.xaml b/src/MahApps.Metro/Styles/Clean/Controls.xaml
index 8879016a2b..807414f35e 100644
--- a/src/MahApps.Metro/Styles/Clean/Controls.xaml
+++ b/src/MahApps.Metro/Styles/Clean/Controls.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary 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">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Clean/GroupBox.xaml" />
@@ -11,9 +11,9 @@
     </ResourceDictionary.MergedDictionaries>
 
     <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.Win10}" TargetType="{x:Type Controls:WindowButtonCommands}" />
-    <Style BasedOn="{StaticResource MahApps.Styles.WindowCommands.Clean}" TargetType="{x:Type Controls:WindowCommands}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.MetroWindow.Clean}" TargetType="{x:Type mah:MetroWindow}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.WindowButtonCommands.Clean.Win10}" TargetType="{x:Type mah:WindowButtonCommands}" />
+    <Style BasedOn="{StaticResource MahApps.Styles.WindowCommands.Clean}" TargetType="{x:Type mah: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/GroupBox.xaml b/src/MahApps.Metro/Styles/Clean/GroupBox.xaml
index b131aa26a6..0a91bb78f9 100644
--- a/src/MahApps.Metro/Styles/Clean/GroupBox.xaml
+++ b/src/MahApps.Metro/Styles/Clean/GroupBox.xaml
@@ -1,12 +1,10 @@
 <ResourceDictionary 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">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
     <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:HeaderedControlHelper.HeaderFontSize" Value="16" />
-        <Setter Property="Controls:HeaderedControlHelper.HeaderForeground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="GroupBox">
@@ -16,22 +14,22 @@
                             <RowDefinition Height="*" />
                         </Grid.RowDefinitions>
 
-                        <Grid Grid.Row="0" Background="{TemplateBinding Controls:HeaderedControlHelper.HeaderBackground}">
-                            <Controls:ContentControlEx Margin="{TemplateBinding Padding}"
-                                                       HorizontalAlignment="{TemplateBinding Controls:HeaderedControlHelper.HeaderHorizontalContentAlignment}"
-                                                       VerticalAlignment="{TemplateBinding Controls:HeaderedControlHelper.HeaderVerticalContentAlignment}"
-                                                       Content="{TemplateBinding Header}"
-                                                       ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
-                                                       ContentStringFormat="{TemplateBinding HeaderStringFormat}"
-                                                       ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                                       ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
-                                                       FontFamily="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontFamily}"
-                                                       FontSize="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontSize}"
-                                                       FontStretch="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontStretch}"
-                                                       FontWeight="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontWeight}"
-                                                       Foreground="{TemplateBinding Controls:HeaderedControlHelper.HeaderForeground}"
-                                                       RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
-                                                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <Grid Grid.Row="0" Background="{TemplateBinding mah:HeaderedControlHelper.HeaderBackground}">
+                            <mah:ContentControlEx Margin="{TemplateBinding Padding}"
+                                                  HorizontalAlignment="{TemplateBinding mah:HeaderedControlHelper.HeaderHorizontalContentAlignment}"
+                                                  VerticalAlignment="{TemplateBinding mah:HeaderedControlHelper.HeaderVerticalContentAlignment}"
+                                                  Content="{TemplateBinding Header}"
+                                                  ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
+                                                  ContentStringFormat="{TemplateBinding HeaderStringFormat}"
+                                                  ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                                  ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
+                                                  FontFamily="{TemplateBinding mah:HeaderedControlHelper.HeaderFontFamily}"
+                                                  FontSize="{TemplateBinding mah:HeaderedControlHelper.HeaderFontSize}"
+                                                  FontStretch="{TemplateBinding mah:HeaderedControlHelper.HeaderFontStretch}"
+                                                  FontWeight="{TemplateBinding mah:HeaderedControlHelper.HeaderFontWeight}"
+                                                  Foreground="{TemplateBinding mah:HeaderedControlHelper.HeaderForeground}"
+                                                  RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
+                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Grid>
 
                         <Grid Grid.Row="1"
@@ -72,6 +70,8 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
+        <Setter Property="mah:HeaderedControlHelper.HeaderFontSize" Value="16" />
+        <Setter Property="mah:HeaderedControlHelper.HeaderForeground" Value="{DynamicResource MahApps.Brushes.Text}" />
     </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Clean/MetroWindow.xaml b/src/MahApps.Metro/Styles/Clean/MetroWindow.xaml
index b9f753b7fe..831d0d6556 100644
--- a/src/MahApps.Metro/Styles/Clean/MetroWindow.xaml
+++ b/src/MahApps.Metro/Styles/Clean/MetroWindow.xaml
@@ -1,8 +1,8 @@
 <ResourceDictionary 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">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
-    <Style x:Key="MahApps.Styles.MetroWindow.Clean" TargetType="{x:Type Controls:MetroWindow}">
+    <Style x:Key="MahApps.Styles.MetroWindow.Clean" TargetType="{x:Type mah:MetroWindow}">
         <Setter Property="NonActiveWindowTitleBrush" Value="{DynamicResource MahApps.Brushes.Transparent}" />
         <Setter Property="TitleAlignment" Value="Center" />
         <Setter Property="TitleForeground" Value="{DynamicResource MahApps.Brushes.ThemeForeground}" />
diff --git a/src/MahApps.Metro/Styles/Clean/WindowButtonCommands.xaml b/src/MahApps.Metro/Styles/Clean/WindowButtonCommands.xaml
index 3ec6eae062..3c704d7ee3 100644
--- a/src/MahApps.Metro/Styles/Clean/WindowButtonCommands.xaml
+++ b/src/MahApps.Metro/Styles/Clean/WindowButtonCommands.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary 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">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Themes/WindowButtonCommands.xaml" />
@@ -9,7 +9,7 @@
 
     <Style x:Key="MahApps.Styles.WindowButtonCommands.Clean"
            BasedOn="{StaticResource MahApps.Styles.WindowButtonCommands.Base}"
-           TargetType="{x:Type Controls:WindowButtonCommands}">
+           TargetType="{x:Type mah:WindowButtonCommands}">
         <Setter Property="DarkCloseButtonStyle" Value="{StaticResource MahApps.Styles.Button.MetroWindow.Close.Dark.Clean}" />
         <Setter Property="DarkMaxButtonStyle" Value="{DynamicResource MahApps.Styles.Button.MetroWindow.Dark.Clean}" />
         <Setter Property="DarkMinButtonStyle" Value="{DynamicResource MahApps.Styles.Button.MetroWindow.Dark.Clean}" />
@@ -20,7 +20,7 @@
 
     <Style x:Key="MahApps.Styles.WindowButtonCommands.Clean.Win10"
            BasedOn="{StaticResource MahApps.Styles.WindowButtonCommands.Clean}"
-           TargetType="{x:Type Controls:WindowButtonCommands}">
+           TargetType="{x:Type mah:WindowButtonCommands}">
         <Setter Property="DarkCloseButtonStyle" Value="{DynamicResource MahApps.Styles.Button.MetroWindow.Close.Dark.Clean.Win10}" />
         <Setter Property="LightCloseButtonStyle" Value="{DynamicResource MahApps.Styles.Button.MetroWindow.Close.Light.Clean.Win10}" />
         <Setter Property="Template" Value="{StaticResource MahApps.Templates.WindowButtonCommands.Win10}" />
diff --git a/src/MahApps.Metro/Styles/Clean/WindowCommands.xaml b/src/MahApps.Metro/Styles/Clean/WindowCommands.xaml
index 59b809ef2b..b2c822a3be 100644
--- a/src/MahApps.Metro/Styles/Clean/WindowCommands.xaml
+++ b/src/MahApps.Metro/Styles/Clean/WindowCommands.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary 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">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Themes/WindowCommands.xaml" />
@@ -8,10 +8,10 @@
 
     <Style x:Key="MahApps.Styles.WindowCommands.Clean"
            BasedOn="{StaticResource MahApps.Styles.WindowCommands.Base}"
-           TargetType="{x:Type Controls:WindowCommands}">
-        <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Upper" />
+           TargetType="{x:Type mah:WindowCommands}">
         <Setter Property="SeparatorHeight" Value="11" />
         <Setter Property="ShowLastSeparator" Value="False" />
+        <Setter Property="mah:ControlsHelper.ContentCharacterCasing" Value="Upper" />
     </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Controls.Buttons.xaml b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
index 8b9436c79f..a35ad7aa6f 100644
--- a/src/MahApps.Metro/Styles/Controls.Buttons.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Buttons.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary 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"
-                    xmlns:converters="clr-namespace:MahApps.Metro.Converters">
+                    xmlns:converters="clr-namespace:MahApps.Metro.Converters"
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
     <converters:ThicknessToDoubleConverter x:Key="BorderThicknessToStrokeThicknessConverter" TakeThicknessSide="Left" />
 
@@ -31,25 +31,25 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ButtonBase}">
-                    <Controls:ClipBorder x:Name="Border"
-                                         Margin="0"
-                                         Background="{TemplateBinding Background}"
-                                         BorderBrush="{TemplateBinding BorderBrush}"
-                                         BorderThickness="{TemplateBinding BorderThickness}"
-                                         CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
-                                         SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                        <Controls:ContentControlEx x:Name="PART_ContentPresenter"
-                                                   Padding="{TemplateBinding Padding}"
-                                                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                   Content="{TemplateBinding Content}"
-                                                   ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
-                                                   ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                                   ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                   ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                   RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
-                                                   SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                    </Controls:ClipBorder>
+                    <mah:ClipBorder x:Name="Border"
+                                    Margin="0"
+                                    Background="{TemplateBinding Background}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
+                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                        <mah:ContentControlEx x:Name="PART_ContentPresenter"
+                                              Padding="{TemplateBinding Padding}"
+                                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                              Content="{TemplateBinding Content}"
+                                              ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
+                                              ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                                              ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                              RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
+                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                    </mah:ClipBorder>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -79,25 +79,25 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ToggleButton}">
-                    <Controls:ClipBorder x:Name="Border"
-                                         Margin="0"
-                                         Background="{TemplateBinding Background}"
-                                         BorderBrush="{TemplateBinding BorderBrush}"
-                                         BorderThickness="{TemplateBinding BorderThickness}"
-                                         CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
-                                         SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                        <Controls:ContentControlEx x:Name="PART_ContentPresenter"
-                                                   Padding="{TemplateBinding Padding}"
-                                                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                   Content="{TemplateBinding Content}"
-                                                   ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
-                                                   ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                                   ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                   ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                   RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
-                                                   SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                    </Controls:ClipBorder>
+                    <mah:ClipBorder x:Name="Border"
+                                    Margin="0"
+                                    Background="{TemplateBinding Background}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
+                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                        <mah:ContentControlEx x:Name="PART_ContentPresenter"
+                                              Padding="{TemplateBinding Padding}"
+                                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                              Content="{TemplateBinding Content}"
+                                              ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
+                                              ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                                              ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                              RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
+                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                    </mah:ClipBorder>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -185,7 +185,7 @@
                                           Margin="{TemplateBinding Padding}"
                                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
+                                          RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
                                           SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                     </Grid>
                     <ControlTemplate.Triggers>
@@ -243,7 +243,7 @@
                               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                               Opacity="0.75"
-                              RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
+                              RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
                               SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
         </Grid>
         <ControlTemplate.Triggers>
@@ -279,17 +279,17 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Button}">
                     <Grid Background="{TemplateBinding Background}">
-                        <Controls:ContentControlEx x:Name="PART_ContentPresenter"
-                                                   Padding="{TemplateBinding Padding}"
-                                                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                   Content="{TemplateBinding Content}"
-                                                   ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
-                                                   ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                                   ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                   ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                   RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
-                                                   SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <mah:ContentControlEx x:Name="PART_ContentPresenter"
+                                              Padding="{TemplateBinding Padding}"
+                                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                              Content="{TemplateBinding Content}"
+                                              ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
+                                              ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                                              ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                              RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
+                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
@@ -387,11 +387,6 @@
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Gray10}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Button.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 MahApps.Brushes.Button.Border.Focus}" />
-        <Setter Property="Controls:ControlsHelper.FocusBorderThickness" Value="2" />
-        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.Button.Border.MouseOver}" />
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Family.Button}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Button}" />
         <Setter Property="FontWeight" Value="Bold" />
@@ -403,42 +398,42 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ButtonBase}">
                     <Grid>
-                        <Controls:ClipBorder x:Name="Border"
-                                             Background="{TemplateBinding Background}"
-                                             BorderBrush="{TemplateBinding BorderBrush}"
-                                             BorderThickness="{TemplateBinding BorderThickness}"
-                                             CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
-                                             SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        <Controls:ClipBorder x:Name="DisabledVisualElement"
-                                             Background="{DynamicResource MahApps.Brushes.Control.Disabled}"
-                                             CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
-                                             IsHitTestVisible="False"
-                                             Opacity="0"
-                                             SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        <Controls:ContentControlEx x:Name="PART_ContentPresenter"
-                                                   Margin="{TemplateBinding BorderThickness}"
-                                                   Padding="{TemplateBinding Padding}"
-                                                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                   Content="{TemplateBinding Content}"
-                                                   ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
-                                                   ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                                   ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                   ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                   RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
-                                                   SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <mah:ClipBorder x:Name="Border"
+                                        Background="{TemplateBinding Background}"
+                                        BorderBrush="{TemplateBinding BorderBrush}"
+                                        BorderThickness="{TemplateBinding BorderThickness}"
+                                        CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
+                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <mah:ClipBorder x:Name="DisabledVisualElement"
+                                        Background="{DynamicResource MahApps.Brushes.Control.Disabled}"
+                                        CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
+                                        IsHitTestVisible="False"
+                                        Opacity="0"
+                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <mah:ContentControlEx x:Name="PART_ContentPresenter"
+                                              Margin="{TemplateBinding BorderThickness}"
+                                              Padding="{TemplateBinding Padding}"
+                                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                              Content="{TemplateBinding Content}"
+                                              ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
+                                              ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                                              ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                              RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
+                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
                             <Setter TargetName="Border" Property="Background" Value="{DynamicResource MahApps.Brushes.Gray8}" />
-                            <Setter TargetName="Border" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.MouseOverBorderBrush), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.MouseOverBorderBrush), Mode=OneWay}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
                             <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}" />
-                            <Setter TargetName="Border" Property="BorderThickness" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderThickness), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.FocusBorderBrush), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="BorderThickness" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.FocusBorderThickness), Mode=OneWay}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter TargetName="DisabledVisualElement" Property="Opacity" Value="0.7" />
@@ -448,13 +443,17 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
+        <Setter Property="mah:ControlsHelper.ContentCharacterCasing" Value="Upper" />
+        <Setter Property="mah:ControlsHelper.CornerRadius" Value="3" />
+        <Setter Property="mah:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.Button.Border.Focus}" />
+        <Setter Property="mah:ControlsHelper.FocusBorderThickness" Value="2" />
+        <Setter Property="mah:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.Button.Border.MouseOver}" />
     </Style>
 
     <Style x:Key="MahApps.Styles.Button.Square" TargetType="{x:Type ButtonBase}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.ThemeForeground}" />
         <Setter Property="BorderThickness" Value="2" />
-        <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Lower" />
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Family.Button}" />
         <Setter Property="FontWeight" Value="SemiBold" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ThemeForeground}" />
@@ -465,30 +464,30 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ButtonBase}">
                     <Grid>
-                        <Controls:ClipBorder x:Name="Background"
-                                             Background="{TemplateBinding Background}"
-                                             BorderBrush="{TemplateBinding BorderBrush}"
-                                             BorderThickness="{TemplateBinding BorderThickness}"
-                                             CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
-                                             SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        <Controls:ClipBorder x:Name="DisabledVisualElement"
-                                             Background="{DynamicResource MahApps.Brushes.Control.Disabled}"
-                                             CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
-                                             IsHitTestVisible="False"
-                                             Opacity="0"
-                                             SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <mah:ClipBorder x:Name="Background"
+                                        Background="{TemplateBinding Background}"
+                                        BorderBrush="{TemplateBinding BorderBrush}"
+                                        BorderThickness="{TemplateBinding BorderThickness}"
+                                        CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
+                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <mah:ClipBorder x:Name="DisabledVisualElement"
+                                        Background="{DynamicResource MahApps.Brushes.Control.Disabled}"
+                                        CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
+                                        IsHitTestVisible="False"
+                                        Opacity="0"
+                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         <Grid Margin="{TemplateBinding BorderThickness}">
-                            <Controls:ContentControlEx x:Name="PART_ContentPresenter"
-                                                       Padding="{TemplateBinding Padding}"
-                                                       HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                       VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                       Content="{TemplateBinding Content}"
-                                                       ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
-                                                       ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                                       ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                       ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                       RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
-                                                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            <mah:ContentControlEx x:Name="PART_ContentPresenter"
+                                                  Padding="{TemplateBinding Padding}"
+                                                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                  Content="{TemplateBinding Content}"
+                                                  ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
+                                                  ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                  ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                                  RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
+                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Grid>
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
@@ -529,6 +528,7 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
+        <Setter Property="mah:ControlsHelper.ContentCharacterCasing" Value="Lower" />
     </Style>
 
     <Style x:Key="MahApps.Styles.Button.Square.Accent"
@@ -540,33 +540,33 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ButtonBase}">
                     <Grid>
-                        <Controls:ClipBorder x:Name="Background"
-                                             Background="{TemplateBinding Background}"
-                                             BorderBrush="{TemplateBinding BorderBrush}"
-                                             BorderThickness="{TemplateBinding BorderThickness}"
-                                             CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
-                                             SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        <Controls:ClipBorder x:Name="DisabledVisualElement"
-                                             Background="{DynamicResource MahApps.Brushes.Control.Disabled}"
-                                             CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
-                                             IsHitTestVisible="False"
-                                             Opacity="0"
-                                             SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <mah:ClipBorder x:Name="Background"
+                                        Background="{TemplateBinding Background}"
+                                        BorderBrush="{TemplateBinding BorderBrush}"
+                                        BorderThickness="{TemplateBinding BorderThickness}"
+                                        CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
+                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <mah:ClipBorder x:Name="DisabledVisualElement"
+                                        Background="{DynamicResource MahApps.Brushes.Control.Disabled}"
+                                        CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
+                                        IsHitTestVisible="False"
+                                        Opacity="0"
+                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         <Grid Margin="{TemplateBinding BorderThickness}">
                             <Rectangle x:Name="MouseOverRectangle"
                                        Fill="{DynamicResource MahApps.Brushes.Button.AccentedSquare.Background.MouseOver}"
                                        Opacity="0" />
-                            <Controls:ContentControlEx x:Name="PART_ContentPresenter"
-                                                       Padding="{TemplateBinding Padding}"
-                                                       HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                       VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                       Content="{TemplateBinding Content}"
-                                                       ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
-                                                       ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                                       ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                       ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                       RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
-                                                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            <mah:ContentControlEx x:Name="PART_ContentPresenter"
+                                                  Padding="{TemplateBinding Padding}"
+                                                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                  Content="{TemplateBinding Content}"
+                                                  ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
+                                                  ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                  ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                                  RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
+                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Grid>
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
@@ -619,29 +619,29 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ButtonBase}">
                     <Grid Background="{TemplateBinding Background}">
-                        <Controls:ClipBorder x:Name="Background"
-                                             Background="{x:Null}"
-                                             BorderBrush="{TemplateBinding BorderBrush}"
-                                             BorderThickness="{TemplateBinding BorderThickness}"
-                                             CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
-                                             SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        <Controls:ClipBorder x:Name="DisabledVisualElement"
-                                             Background="{DynamicResource MahApps.Brushes.Control.Disabled}"
-                                             CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
-                                             IsHitTestVisible="False"
-                                             Opacity="0"
-                                             SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        <Controls:ContentControlEx x:Name="PART_ContentPresenter"
-                                                   Padding="{TemplateBinding Padding}"
-                                                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                   Content="{TemplateBinding Content}"
-                                                   ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
-                                                   ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                                   ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                   ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                   RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
-                                                   SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <mah:ClipBorder x:Name="Background"
+                                        Background="{x:Null}"
+                                        BorderBrush="{TemplateBinding BorderBrush}"
+                                        BorderThickness="{TemplateBinding BorderThickness}"
+                                        CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
+                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <mah:ClipBorder x:Name="DisabledVisualElement"
+                                        Background="{DynamicResource MahApps.Brushes.Control.Disabled}"
+                                        CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
+                                        IsHitTestVisible="False"
+                                        Opacity="0"
+                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <mah:ContentControlEx x:Name="PART_ContentPresenter"
+                                              Padding="{TemplateBinding Padding}"
+                                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                              Content="{TemplateBinding Content}"
+                                              ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
+                                              ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                                              ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                              RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
+                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualState x:Name="Normal" />
@@ -707,7 +707,7 @@
                                           Margin="{TemplateBinding Padding}"
                                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
+                                          RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
                                           SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                     </Grid>
                     <ControlTemplate.Triggers>
@@ -766,9 +766,6 @@
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Gray10}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Button.Border}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Controls:ControlsHelper.CornerRadius" Value="3" />
-        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.Button.Border.Focus}" />
-        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.Button.Border.MouseOver}" />
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Family.Button}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Button}" />
         <Setter Property="FontWeight" Value="Bold" />
@@ -780,40 +777,40 @@
             <Setter.Value>
                 <ControlTemplate TargetType="ToggleButton">
                     <Grid>
-                        <Controls:ClipBorder x:Name="Border"
-                                             Background="{TemplateBinding Background}"
-                                             BorderBrush="{TemplateBinding BorderBrush}"
-                                             BorderThickness="{TemplateBinding BorderThickness}"
-                                             CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
-                                             SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        <Controls:ClipBorder x:Name="DisabledVisualElement"
-                                             Background="{DynamicResource MahApps.Brushes.Control.Disabled}"
-                                             CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
-                                             IsHitTestVisible="False"
-                                             Opacity="0"
-                                             SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        <Controls:ContentControlEx x:Name="PART_ContentPresenter"
-                                                   Margin="{TemplateBinding BorderThickness}"
-                                                   Padding="{TemplateBinding Padding}"
-                                                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                   Content="{TemplateBinding Content}"
-                                                   ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
-                                                   ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                                   ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                   ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                   RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
-                                                   SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <mah:ClipBorder x:Name="Border"
+                                        Background="{TemplateBinding Background}"
+                                        BorderBrush="{TemplateBinding BorderBrush}"
+                                        BorderThickness="{TemplateBinding BorderThickness}"
+                                        CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
+                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <mah:ClipBorder x:Name="DisabledVisualElement"
+                                        Background="{DynamicResource MahApps.Brushes.Control.Disabled}"
+                                        CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
+                                        IsHitTestVisible="False"
+                                        Opacity="0"
+                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <mah:ContentControlEx x:Name="PART_ContentPresenter"
+                                              Margin="{TemplateBinding BorderThickness}"
+                                              Padding="{TemplateBinding Padding}"
+                                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                              Content="{TemplateBinding Content}"
+                                              ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
+                                              ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                                              ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                              RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
+                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsChecked" Value="True">
                             <Setter TargetName="Border" Property="BorderThickness" Value="2" />
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Border" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.MouseOverBorderBrush), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.MouseOverBorderBrush), Mode=OneWay}" />
                         </Trigger>
                         <Trigger Property="IsKeyboardFocusWithin" Value="True">
-                            <Setter TargetName="Border" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.FocusBorderBrush), Mode=OneWay}" />
                             <Setter TargetName="Border" Property="BorderThickness" Value="2" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
@@ -824,6 +821,9 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
+        <Setter Property="mah:ControlsHelper.CornerRadius" Value="3" />
+        <Setter Property="mah:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.Button.Border.Focus}" />
+        <Setter Property="mah:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.Button.Border.MouseOver}" />
         <Style.Triggers>
             <Trigger Property="IsChecked" Value="True">
                 <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Gray2}" />
@@ -863,12 +863,12 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ButtonBase}">
                     <Grid>
-                        <Controls:ClipBorder x:Name="Border"
-                                             Background="{TemplateBinding Background}"
-                                             BorderBrush="{TemplateBinding BorderBrush}"
-                                             BorderThickness="{TemplateBinding BorderThickness}"
-                                             CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
-                                             SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                        <mah:ClipBorder x:Name="Border"
+                                        Background="{TemplateBinding Background}"
+                                        BorderBrush="{TemplateBinding BorderBrush}"
+                                        BorderThickness="{TemplateBinding BorderThickness}"
+                                        CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
+                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
 
                             <Grid>
                                 <Rectangle x:Name="MouseOverRectangle"
@@ -877,19 +877,19 @@
                                 <Rectangle x:Name="PressedRectangle"
                                            Fill="{DynamicResource MahApps.Brushes.ThemeForeground}"
                                            Opacity="0" />
-                                <Controls:ContentControlEx x:Name="PART_ContentPresenter"
-                                                           Padding="{TemplateBinding Padding}"
-                                                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                           Content="{TemplateBinding Content}"
-                                                           ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
-                                                           ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                                           ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                           ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                           RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
-                                                           SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                <mah:ContentControlEx x:Name="PART_ContentPresenter"
+                                                      Padding="{TemplateBinding Padding}"
+                                                      HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                      VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                      Content="{TemplateBinding Content}"
+                                                      ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
+                                                      ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                                      ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                      ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                                      RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
+                                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                             </Grid>
-                        </Controls:ClipBorder>
+                        </mah:ClipBorder>
 
                         <Rectangle x:Name="FocusVisualWhite"
                                    IsHitTestVisible="False"
@@ -973,12 +973,12 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ButtonBase}">
                     <Grid>
-                        <Controls:ClipBorder x:Name="Border"
-                                             Background="{TemplateBinding Background}"
-                                             BorderBrush="{TemplateBinding BorderBrush}"
-                                             BorderThickness="{TemplateBinding BorderThickness}"
-                                             CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
-                                             SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                        <mah:ClipBorder x:Name="Border"
+                                        Background="{TemplateBinding Background}"
+                                        BorderBrush="{TemplateBinding BorderBrush}"
+                                        BorderThickness="{TemplateBinding BorderThickness}"
+                                        CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
+                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
 
                             <Grid>
                                 <Rectangle x:Name="MouseOverRectangle"
@@ -987,19 +987,19 @@
                                 <Rectangle x:Name="PressedRectangle"
                                            Fill="White"
                                            Opacity="0" />
-                                <Controls:ContentControlEx x:Name="PART_ContentPresenter"
-                                                           Padding="{TemplateBinding Padding}"
-                                                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                           Content="{TemplateBinding Content}"
-                                                           ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
-                                                           ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                                           ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                           ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                           RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
-                                                           SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                <mah:ContentControlEx x:Name="PART_ContentPresenter"
+                                                      Padding="{TemplateBinding Padding}"
+                                                      HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                      VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                      Content="{TemplateBinding Content}"
+                                                      ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
+                                                      ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                                      ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                      ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                                      RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
+                                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                             </Grid>
-                        </Controls:ClipBorder>
+                        </mah:ClipBorder>
 
                         <Rectangle x:Name="FocusVisualWhite"
                                    IsHitTestVisible="False"
@@ -1083,18 +1083,18 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Button}">
-                    <Controls:ClipBorder x:Name="Border"
-                                         Background="{TemplateBinding Background}"
-                                         BorderBrush="{TemplateBinding BorderBrush}"
-                                         BorderThickness="{TemplateBinding BorderThickness}"
-                                         CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
-                                         SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                    <mah:ClipBorder x:Name="Border"
+                                    Background="{TemplateBinding Background}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
+                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
                         <ContentPresenter x:Name="PART_ContentPresenter"
                                           Margin="{TemplateBinding Padding}"
                                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}" />
-                    </Controls:ClipBorder>
+                                          RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}" />
+                    </mah:ClipBorder>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsKeyboardFocused" Value="True">
                             <Setter TargetName="Border" Property="BorderBrush" Value="Transparent" />
diff --git a/src/MahApps.Metro/Styles/Controls.CheckBox.xaml b/src/MahApps.Metro/Styles/Controls.CheckBox.xaml
index 9da634ddef..ed19cc9af1 100644
--- a/src/MahApps.Metro/Styles/Controls.CheckBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.CheckBox.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary 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"
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls"
                     xmlns:system="clr-namespace:System;assembly=mscorlib">
 
     <!--  ********************************** CheckBoxStyle **********************************  -->
@@ -11,100 +11,6 @@
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundUnchecked}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushUnchecked}" />
         <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Controls:CheckBoxHelper.BackgroundChecked" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundChecked}" />
-        <Setter Property="Controls:CheckBoxHelper.BackgroundCheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundCheckedDisabled}" />
-        <Setter Property="Controls:CheckBoxHelper.BackgroundCheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundCheckedMouseOver}" />
-        <Setter Property="Controls:CheckBoxHelper.BackgroundCheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundCheckedPressed}" />
-        <Setter Property="Controls:CheckBoxHelper.BackgroundIndeterminate" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundIndeterminate}" />
-        <Setter Property="Controls:CheckBoxHelper.BackgroundIndeterminateDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundIndeterminateDisabled}" />
-        <Setter Property="Controls:CheckBoxHelper.BackgroundIndeterminateMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundIndeterminateMouseOver}" />
-        <Setter Property="Controls:CheckBoxHelper.BackgroundIndeterminatePressed" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundIndeterminatePressed}" />
-        <Setter Property="Controls:CheckBoxHelper.BackgroundUnchecked" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundUnchecked}" />
-        <Setter Property="Controls:CheckBoxHelper.BackgroundUncheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundUncheckedDisabled}" />
-        <Setter Property="Controls:CheckBoxHelper.BackgroundUncheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundUncheckedMouseOver}" />
-        <Setter Property="Controls:CheckBoxHelper.BackgroundUncheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundUncheckedPressed}" />
-        <Setter Property="Controls:CheckBoxHelper.BorderBrushChecked" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushChecked}" />
-        <Setter Property="Controls:CheckBoxHelper.BorderBrushCheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushCheckedDisabled}" />
-        <Setter Property="Controls:CheckBoxHelper.BorderBrushCheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushCheckedMouseOver}" />
-        <Setter Property="Controls:CheckBoxHelper.BorderBrushCheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushCheckedPressed}" />
-        <Setter Property="Controls:CheckBoxHelper.BorderBrushIndeterminate" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushIndeterminate}" />
-        <Setter Property="Controls:CheckBoxHelper.BorderBrushIndeterminateDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushIndeterminateDisabled}" />
-        <Setter Property="Controls:CheckBoxHelper.BorderBrushIndeterminateMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushIndeterminateMouseOver}" />
-        <Setter Property="Controls:CheckBoxHelper.BorderBrushIndeterminatePressed" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushIndeterminatePressed}" />
-        <Setter Property="Controls:CheckBoxHelper.BorderBrushUnchecked" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushUnchecked}" />
-        <Setter Property="Controls:CheckBoxHelper.BorderBrushUncheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushUncheckedDisabled}" />
-        <Setter Property="Controls:CheckBoxHelper.BorderBrushUncheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushUncheckedMouseOver}" />
-        <Setter Property="Controls:CheckBoxHelper.BorderBrushUncheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushUncheckedPressed}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundFillChecked" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundFillCheckedDisabled" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundFillCheckedMouseOver" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundFillCheckedPressed" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundFillIndeterminate" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundFillIndeterminateDisabled" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundFillIndeterminateMouseOver" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundFillIndeterminatePressed" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundFillUnchecked" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundFillUncheckedDisabled" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundFillUncheckedMouseOver" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundFillUncheckedPressed" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundStrokeChecked" Value="{DynamicResource MahApps.Brushes.CheckBox}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundStrokeCheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundStrokeCheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.MouseOver}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundStrokeCheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.MouseOver}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundStrokeIndeterminate" Value="{DynamicResource MahApps.Brushes.CheckBox}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundStrokeIndeterminateDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundStrokeIndeterminateMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.MouseOver}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundStrokeIndeterminatePressed" Value="{DynamicResource MahApps.Brushes.CheckBox.MouseOver}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundStrokeUnchecked" Value="{DynamicResource MahApps.Brushes.CheckBox}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundStrokeUncheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundStrokeUncheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.MouseOver}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundStrokeUncheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.MouseOver}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckGlyphCheckedTemplate">
-            <Setter.Value>
-                <DataTemplate>
-                    <Path 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="{Binding RelativeSource={RelativeSource AncestorType=ContentControl}, Path=Foreground}"
-                          Stretch="Fill"
-                          UseLayoutRounding="False" />
-                </DataTemplate>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Controls:CheckBoxHelper.CheckGlyphForegroundChecked" Value="{DynamicResource MahApps.Brushes.Highlight}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckGlyphForegroundCheckedDisabled" Value="{DynamicResource MahApps.Brushes.Accent}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckGlyphForegroundCheckedMouseOver" Value="{DynamicResource MahApps.Brushes.Highlight}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckGlyphForegroundCheckedPressed" Value="{DynamicResource MahApps.Brushes.Highlight}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckGlyphForegroundIndeterminate" Value="{DynamicResource MahApps.Brushes.Gray3}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckGlyphForegroundIndeterminateDisabled" Value="{DynamicResource MahApps.Brushes.Gray3}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckGlyphForegroundIndeterminateMouseOver" Value="{DynamicResource MahApps.Brushes.Gray2}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckGlyphForegroundIndeterminatePressed" Value="{DynamicResource MahApps.Brushes.Gray2}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckGlyphForegroundUnchecked" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckGlyphForegroundUnchecked}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckGlyphForegroundUncheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckGlyphForegroundUncheckedDisabled}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckGlyphForegroundUncheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckGlyphForegroundUncheckedMouseOver}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckGlyphForegroundUncheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckGlyphForegroundUncheckedPressed}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckGlyphIndeterminateTemplate">
-            <Setter.Value>
-                <DataTemplate>
-                    <Rectangle Width="8"
-                               Height="3"
-                               Fill="{Binding RelativeSource={RelativeSource AncestorType=ContentControl}, Path=Foreground}"
-                               UseLayoutRounding="False" />
-                </DataTemplate>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Controls:CheckBoxHelper.ForegroundChecked" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundChecked}" />
-        <Setter Property="Controls:CheckBoxHelper.ForegroundCheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundCheckedDisabled}" />
-        <Setter Property="Controls:CheckBoxHelper.ForegroundCheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundCheckedMouseOver}" />
-        <Setter Property="Controls:CheckBoxHelper.ForegroundCheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundCheckedPressed}" />
-        <Setter Property="Controls:CheckBoxHelper.ForegroundIndeterminate" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundIndeterminate}" />
-        <Setter Property="Controls:CheckBoxHelper.ForegroundIndeterminateDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundIndeterminateDisabled}" />
-        <Setter Property="Controls:CheckBoxHelper.ForegroundIndeterminateMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundIndeterminateMouseOver}" />
-        <Setter Property="Controls:CheckBoxHelper.ForegroundIndeterminatePressed" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundIndeterminatePressed}" />
-        <Setter Property="Controls:CheckBoxHelper.ForegroundUnchecked" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundUnchecked}" />
-        <Setter Property="Controls:CheckBoxHelper.ForegroundUncheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundUncheckedDisabled}" />
-        <Setter Property="Controls:CheckBoxHelper.ForegroundUncheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundUncheckedMouseOver}" />
-        <Setter Property="Controls:CheckBoxHelper.ForegroundUncheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundUncheckedPressed}" />
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Family.Control}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundUnchecked}" />
@@ -120,7 +26,7 @@
                                 Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                                CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         <Grid Margin="{TemplateBinding BorderThickness}">
                             <Grid.ColumnDefinitions>
@@ -129,21 +35,21 @@
                             </Grid.ColumnDefinitions>
                             <Grid x:Name="Check"
                                   Grid.Column="0"
-                                  Width="{TemplateBinding Controls:CheckBoxHelper.CheckSize}"
-                                  Height="{TemplateBinding Controls:CheckBoxHelper.CheckSize}"
+                                  Width="{TemplateBinding mah:CheckBoxHelper.CheckSize}"
+                                  Height="{TemplateBinding mah:CheckBoxHelper.CheckSize}"
                                   HorizontalAlignment="Center"
                                   VerticalAlignment="Center"
                                   SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
                                 <Rectangle x:Name="NormalRectangle"
-                                           Fill="{TemplateBinding Controls:CheckBoxHelper.CheckBackgroundFillUnchecked}"
-                                           Stroke="{TemplateBinding Controls:CheckBoxHelper.CheckBackgroundStrokeUnchecked}"
-                                           StrokeThickness="{TemplateBinding Controls:CheckBoxHelper.CheckStrokeThickness}"
+                                           Fill="{TemplateBinding mah:CheckBoxHelper.CheckBackgroundFillUnchecked}"
+                                           Stroke="{TemplateBinding mah:CheckBoxHelper.CheckBackgroundStrokeUnchecked}"
+                                           StrokeThickness="{TemplateBinding mah:CheckBoxHelper.CheckStrokeThickness}"
                                            UseLayoutRounding="False" />
                                 <ContentControl x:Name="CheckGlyph"
-                                                Content="{TemplateBinding Controls:CheckBoxHelper.CheckGlyphUnchecked}"
-                                                ContentTemplate="{TemplateBinding Controls:CheckBoxHelper.CheckGlyphUncheckedTemplate}"
+                                                Content="{TemplateBinding mah:CheckBoxHelper.CheckGlyphUnchecked}"
+                                                ContentTemplate="{TemplateBinding mah:CheckBoxHelper.CheckGlyphUncheckedTemplate}"
                                                 Focusable="False"
-                                                Foreground="{TemplateBinding Controls:CheckBoxHelper.CheckGlyphForegroundUnchecked}"
+                                                Foreground="{TemplateBinding mah:CheckBoxHelper.CheckGlyphForegroundUnchecked}"
                                                 IsTabStop="False" />
                             </Grid>
                             <ContentPresenter x:Name="ContentPresenter"
@@ -155,7 +61,7 @@
                                               ContentStringFormat="{TemplateBinding ContentStringFormat}"
                                               ContentTemplate="{TemplateBinding ContentTemplate}"
                                               ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                              RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
+                                              RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
                                               SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Grid>
                     </Grid>
@@ -168,15 +74,15 @@
                                 <Condition Property="IsPressed" Value="False" />
                                 <Condition Property="IsEnabled" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="CheckGlyph" Property="Content" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphUnchecked)}" />
-                            <Setter TargetName="CheckGlyph" Property="ContentTemplate" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphUncheckedTemplate)}" />
-                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphForegroundUnchecked)}" />
+                            <Setter TargetName="CheckGlyph" Property="Content" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphUnchecked)}" />
+                            <Setter TargetName="CheckGlyph" Property="ContentTemplate" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphUncheckedTemplate)}" />
+                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphForegroundUnchecked)}" />
                             <Setter TargetName="CheckGlyph" Property="Opacity" Value="1" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.ForegroundUnchecked)}" />
-                            <Setter TargetName="NormalRectangle" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckBackgroundFillUnchecked)}" />
-                            <Setter TargetName="NormalRectangle" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckBackgroundStrokeUnchecked)}" />
-                            <Setter TargetName="RootBorder" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.BackgroundUnchecked)}" />
-                            <Setter TargetName="RootBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.BorderBrushUnchecked)}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.ForegroundUnchecked)}" />
+                            <Setter TargetName="NormalRectangle" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckBackgroundFillUnchecked)}" />
+                            <Setter TargetName="NormalRectangle" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckBackgroundStrokeUnchecked)}" />
+                            <Setter TargetName="RootBorder" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.BackgroundUnchecked)}" />
+                            <Setter TargetName="RootBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.BorderBrushUnchecked)}" />
                         </MultiTrigger>
                         <!--  UncheckedMouseOver  -->
                         <MultiTrigger>
@@ -184,15 +90,15 @@
                                 <Condition Property="IsChecked" Value="False" />
                                 <Condition Property="IsMouseOver" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="CheckGlyph" Property="Content" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphUnchecked)}" />
-                            <Setter TargetName="CheckGlyph" Property="ContentTemplate" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphUncheckedTemplate)}" />
-                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphForegroundUncheckedMouseOver)}" />
+                            <Setter TargetName="CheckGlyph" Property="Content" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphUnchecked)}" />
+                            <Setter TargetName="CheckGlyph" Property="ContentTemplate" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphUncheckedTemplate)}" />
+                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphForegroundUncheckedMouseOver)}" />
                             <Setter TargetName="CheckGlyph" Property="Opacity" Value="1" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.ForegroundUncheckedMouseOver)}" />
-                            <Setter TargetName="NormalRectangle" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckBackgroundFillUncheckedMouseOver)}" />
-                            <Setter TargetName="NormalRectangle" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckBackgroundStrokeUncheckedMouseOver)}" />
-                            <Setter TargetName="RootBorder" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.BackgroundUncheckedMouseOver)}" />
-                            <Setter TargetName="RootBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.BorderBrushUncheckedMouseOver)}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.ForegroundUncheckedMouseOver)}" />
+                            <Setter TargetName="NormalRectangle" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckBackgroundFillUncheckedMouseOver)}" />
+                            <Setter TargetName="NormalRectangle" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckBackgroundStrokeUncheckedMouseOver)}" />
+                            <Setter TargetName="RootBorder" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.BackgroundUncheckedMouseOver)}" />
+                            <Setter TargetName="RootBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.BorderBrushUncheckedMouseOver)}" />
                         </MultiTrigger>
                         <!--  UncheckedPressed  -->
                         <MultiTrigger>
@@ -200,14 +106,14 @@
                                 <Condition Property="IsChecked" Value="False" />
                                 <Condition Property="IsPressed" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="CheckGlyph" Property="Content" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphUnchecked)}" />
-                            <Setter TargetName="CheckGlyph" Property="ContentTemplate" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphUncheckedTemplate)}" />
-                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphForegroundUncheckedPressed)}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.ForegroundUncheckedPressed)}" />
-                            <Setter TargetName="NormalRectangle" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckBackgroundFillUncheckedPressed)}" />
-                            <Setter TargetName="NormalRectangle" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckBackgroundStrokeUncheckedPressed)}" />
-                            <Setter TargetName="RootBorder" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.BackgroundUncheckedPressed)}" />
-                            <Setter TargetName="RootBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.BorderBrushUncheckedPressed)}" />
+                            <Setter TargetName="CheckGlyph" Property="Content" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphUnchecked)}" />
+                            <Setter TargetName="CheckGlyph" Property="ContentTemplate" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphUncheckedTemplate)}" />
+                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphForegroundUncheckedPressed)}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.ForegroundUncheckedPressed)}" />
+                            <Setter TargetName="NormalRectangle" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckBackgroundFillUncheckedPressed)}" />
+                            <Setter TargetName="NormalRectangle" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckBackgroundStrokeUncheckedPressed)}" />
+                            <Setter TargetName="RootBorder" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.BackgroundUncheckedPressed)}" />
+                            <Setter TargetName="RootBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.BorderBrushUncheckedPressed)}" />
                         </MultiTrigger>
                         <!--  UncheckedDisabled  -->
                         <MultiTrigger>
@@ -215,15 +121,15 @@
                                 <Condition Property="IsChecked" Value="False" />
                                 <Condition Property="IsEnabled" Value="False" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="CheckGlyph" Property="Content" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphUnchecked)}" />
-                            <Setter TargetName="CheckGlyph" Property="ContentTemplate" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphUncheckedTemplate)}" />
-                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphForegroundUncheckedDisabled)}" />
+                            <Setter TargetName="CheckGlyph" Property="Content" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphUnchecked)}" />
+                            <Setter TargetName="CheckGlyph" Property="ContentTemplate" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphUncheckedTemplate)}" />
+                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphForegroundUncheckedDisabled)}" />
                             <Setter TargetName="CheckGlyph" Property="Opacity" Value="1" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.ForegroundUncheckedDisabled)}" />
-                            <Setter TargetName="NormalRectangle" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckBackgroundFillUncheckedDisabled)}" />
-                            <Setter TargetName="NormalRectangle" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckBackgroundStrokeUncheckedDisabled)}" />
-                            <Setter TargetName="RootBorder" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.BackgroundUncheckedDisabled)}" />
-                            <Setter TargetName="RootBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.BorderBrushUncheckedDisabled)}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.ForegroundUncheckedDisabled)}" />
+                            <Setter TargetName="NormalRectangle" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckBackgroundFillUncheckedDisabled)}" />
+                            <Setter TargetName="NormalRectangle" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckBackgroundStrokeUncheckedDisabled)}" />
+                            <Setter TargetName="RootBorder" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.BackgroundUncheckedDisabled)}" />
+                            <Setter TargetName="RootBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.BorderBrushUncheckedDisabled)}" />
                         </MultiTrigger>
 
                         <!--  CheckedNormal  -->
@@ -234,15 +140,15 @@
                                 <Condition Property="IsPressed" Value="False" />
                                 <Condition Property="IsEnabled" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="CheckGlyph" Property="Content" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphChecked)}" />
-                            <Setter TargetName="CheckGlyph" Property="ContentTemplate" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphCheckedTemplate)}" />
-                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphForegroundChecked)}" />
+                            <Setter TargetName="CheckGlyph" Property="Content" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphChecked)}" />
+                            <Setter TargetName="CheckGlyph" Property="ContentTemplate" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphCheckedTemplate)}" />
+                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphForegroundChecked)}" />
                             <Setter TargetName="CheckGlyph" Property="Opacity" Value="1" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.ForegroundChecked)}" />
-                            <Setter TargetName="NormalRectangle" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckBackgroundFillChecked)}" />
-                            <Setter TargetName="NormalRectangle" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckBackgroundStrokeChecked)}" />
-                            <Setter TargetName="RootBorder" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.BackgroundChecked)}" />
-                            <Setter TargetName="RootBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.BorderBrushChecked)}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.ForegroundChecked)}" />
+                            <Setter TargetName="NormalRectangle" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckBackgroundFillChecked)}" />
+                            <Setter TargetName="NormalRectangle" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckBackgroundStrokeChecked)}" />
+                            <Setter TargetName="RootBorder" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.BackgroundChecked)}" />
+                            <Setter TargetName="RootBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.BorderBrushChecked)}" />
                         </MultiTrigger>
                         <!--  CheckedMouseOver  -->
                         <MultiTrigger>
@@ -250,15 +156,15 @@
                                 <Condition Property="IsChecked" Value="True" />
                                 <Condition Property="IsMouseOver" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="CheckGlyph" Property="Content" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphChecked)}" />
-                            <Setter TargetName="CheckGlyph" Property="ContentTemplate" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphCheckedTemplate)}" />
-                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphForegroundCheckedMouseOver)}" />
+                            <Setter TargetName="CheckGlyph" Property="Content" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphChecked)}" />
+                            <Setter TargetName="CheckGlyph" Property="ContentTemplate" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphCheckedTemplate)}" />
+                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphForegroundCheckedMouseOver)}" />
                             <Setter TargetName="CheckGlyph" Property="Opacity" Value="1" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.ForegroundCheckedMouseOver)}" />
-                            <Setter TargetName="NormalRectangle" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckBackgroundFillCheckedMouseOver)}" />
-                            <Setter TargetName="NormalRectangle" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckBackgroundStrokeCheckedMouseOver)}" />
-                            <Setter TargetName="RootBorder" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.BackgroundCheckedMouseOver)}" />
-                            <Setter TargetName="RootBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.BorderBrushCheckedMouseOver)}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.ForegroundCheckedMouseOver)}" />
+                            <Setter TargetName="NormalRectangle" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckBackgroundFillCheckedMouseOver)}" />
+                            <Setter TargetName="NormalRectangle" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckBackgroundStrokeCheckedMouseOver)}" />
+                            <Setter TargetName="RootBorder" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.BackgroundCheckedMouseOver)}" />
+                            <Setter TargetName="RootBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.BorderBrushCheckedMouseOver)}" />
                         </MultiTrigger>
                         <!--  CheckedPressed  -->
                         <MultiTrigger>
@@ -266,14 +172,14 @@
                                 <Condition Property="IsChecked" Value="True" />
                                 <Condition Property="IsPressed" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="CheckGlyph" Property="Content" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphChecked)}" />
-                            <Setter TargetName="CheckGlyph" Property="ContentTemplate" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphCheckedTemplate)}" />
-                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphForegroundCheckedPressed)}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.ForegroundCheckedPressed)}" />
-                            <Setter TargetName="NormalRectangle" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckBackgroundFillCheckedPressed)}" />
-                            <Setter TargetName="NormalRectangle" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckBackgroundStrokeCheckedPressed)}" />
-                            <Setter TargetName="RootBorder" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.BackgroundCheckedPressed)}" />
-                            <Setter TargetName="RootBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.BorderBrushCheckedPressed)}" />
+                            <Setter TargetName="CheckGlyph" Property="Content" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphChecked)}" />
+                            <Setter TargetName="CheckGlyph" Property="ContentTemplate" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphCheckedTemplate)}" />
+                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphForegroundCheckedPressed)}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.ForegroundCheckedPressed)}" />
+                            <Setter TargetName="NormalRectangle" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckBackgroundFillCheckedPressed)}" />
+                            <Setter TargetName="NormalRectangle" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckBackgroundStrokeCheckedPressed)}" />
+                            <Setter TargetName="RootBorder" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.BackgroundCheckedPressed)}" />
+                            <Setter TargetName="RootBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.BorderBrushCheckedPressed)}" />
                         </MultiTrigger>
                         <!--  CheckedDisabled  -->
                         <MultiTrigger>
@@ -281,15 +187,15 @@
                                 <Condition Property="IsChecked" Value="True" />
                                 <Condition Property="IsEnabled" Value="False" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="CheckGlyph" Property="Content" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphChecked)}" />
-                            <Setter TargetName="CheckGlyph" Property="ContentTemplate" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphCheckedTemplate)}" />
-                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphForegroundCheckedDisabled)}" />
+                            <Setter TargetName="CheckGlyph" Property="Content" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphChecked)}" />
+                            <Setter TargetName="CheckGlyph" Property="ContentTemplate" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphCheckedTemplate)}" />
+                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphForegroundCheckedDisabled)}" />
                             <Setter TargetName="CheckGlyph" Property="Opacity" Value="1" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.ForegroundCheckedDisabled)}" />
-                            <Setter TargetName="NormalRectangle" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckBackgroundFillCheckedDisabled)}" />
-                            <Setter TargetName="NormalRectangle" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckBackgroundStrokeCheckedDisabled)}" />
-                            <Setter TargetName="RootBorder" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.BackgroundCheckedDisabled)}" />
-                            <Setter TargetName="RootBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.BorderBrushCheckedDisabled)}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.ForegroundCheckedDisabled)}" />
+                            <Setter TargetName="NormalRectangle" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckBackgroundFillCheckedDisabled)}" />
+                            <Setter TargetName="NormalRectangle" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckBackgroundStrokeCheckedDisabled)}" />
+                            <Setter TargetName="RootBorder" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.BackgroundCheckedDisabled)}" />
+                            <Setter TargetName="RootBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.BorderBrushCheckedDisabled)}" />
                         </MultiTrigger>
 
                         <!--  IndeterminateNormal  -->
@@ -300,15 +206,15 @@
                                 <Condition Property="IsPressed" Value="False" />
                                 <Condition Property="IsEnabled" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="CheckGlyph" Property="Content" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphIndeterminate)}" />
-                            <Setter TargetName="CheckGlyph" Property="ContentTemplate" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphIndeterminateTemplate)}" />
-                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphForegroundIndeterminate)}" />
+                            <Setter TargetName="CheckGlyph" Property="Content" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphIndeterminate)}" />
+                            <Setter TargetName="CheckGlyph" Property="ContentTemplate" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphIndeterminateTemplate)}" />
+                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphForegroundIndeterminate)}" />
                             <Setter TargetName="CheckGlyph" Property="Opacity" Value="1" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.ForegroundIndeterminate)}" />
-                            <Setter TargetName="NormalRectangle" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckBackgroundFillIndeterminate)}" />
-                            <Setter TargetName="NormalRectangle" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckBackgroundStrokeIndeterminate)}" />
-                            <Setter TargetName="RootBorder" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.BackgroundIndeterminate)}" />
-                            <Setter TargetName="RootBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.BorderBrushIndeterminate)}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.ForegroundIndeterminate)}" />
+                            <Setter TargetName="NormalRectangle" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckBackgroundFillIndeterminate)}" />
+                            <Setter TargetName="NormalRectangle" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckBackgroundStrokeIndeterminate)}" />
+                            <Setter TargetName="RootBorder" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.BackgroundIndeterminate)}" />
+                            <Setter TargetName="RootBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.BorderBrushIndeterminate)}" />
                         </MultiTrigger>
                         <!--  IndeterminateMouseOver  -->
                         <MultiTrigger>
@@ -316,15 +222,15 @@
                                 <Condition Property="IsChecked" Value="{x:Null}" />
                                 <Condition Property="IsMouseOver" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="CheckGlyph" Property="Content" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphIndeterminate)}" />
-                            <Setter TargetName="CheckGlyph" Property="ContentTemplate" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphIndeterminateTemplate)}" />
-                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphForegroundIndeterminateMouseOver)}" />
+                            <Setter TargetName="CheckGlyph" Property="Content" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphIndeterminate)}" />
+                            <Setter TargetName="CheckGlyph" Property="ContentTemplate" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphIndeterminateTemplate)}" />
+                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphForegroundIndeterminateMouseOver)}" />
                             <Setter TargetName="CheckGlyph" Property="Opacity" Value="1" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.ForegroundIndeterminateMouseOver)}" />
-                            <Setter TargetName="NormalRectangle" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckBackgroundFillIndeterminateMouseOver)}" />
-                            <Setter TargetName="NormalRectangle" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckBackgroundStrokeIndeterminateMouseOver)}" />
-                            <Setter TargetName="RootBorder" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.BackgroundIndeterminateMouseOver)}" />
-                            <Setter TargetName="RootBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.BorderBrushIndeterminateMouseOver)}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.ForegroundIndeterminateMouseOver)}" />
+                            <Setter TargetName="NormalRectangle" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckBackgroundFillIndeterminateMouseOver)}" />
+                            <Setter TargetName="NormalRectangle" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckBackgroundStrokeIndeterminateMouseOver)}" />
+                            <Setter TargetName="RootBorder" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.BackgroundIndeterminateMouseOver)}" />
+                            <Setter TargetName="RootBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.BorderBrushIndeterminateMouseOver)}" />
                         </MultiTrigger>
                         <!--  IndeterminatePressed  -->
                         <MultiTrigger>
@@ -332,14 +238,14 @@
                                 <Condition Property="IsChecked" Value="{x:Null}" />
                                 <Condition Property="IsPressed" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="CheckGlyph" Property="Content" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphIndeterminate)}" />
-                            <Setter TargetName="CheckGlyph" Property="ContentTemplate" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphIndeterminateTemplate)}" />
-                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphForegroundIndeterminatePressed)}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.ForegroundIndeterminatePressed)}" />
-                            <Setter TargetName="NormalRectangle" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckBackgroundFillIndeterminatePressed)}" />
-                            <Setter TargetName="NormalRectangle" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckBackgroundStrokeIndeterminatePressed)}" />
-                            <Setter TargetName="RootBorder" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.BackgroundIndeterminatePressed)}" />
-                            <Setter TargetName="RootBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.BorderBrushIndeterminatePressed)}" />
+                            <Setter TargetName="CheckGlyph" Property="Content" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphIndeterminate)}" />
+                            <Setter TargetName="CheckGlyph" Property="ContentTemplate" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphIndeterminateTemplate)}" />
+                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphForegroundIndeterminatePressed)}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.ForegroundIndeterminatePressed)}" />
+                            <Setter TargetName="NormalRectangle" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckBackgroundFillIndeterminatePressed)}" />
+                            <Setter TargetName="NormalRectangle" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckBackgroundStrokeIndeterminatePressed)}" />
+                            <Setter TargetName="RootBorder" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.BackgroundIndeterminatePressed)}" />
+                            <Setter TargetName="RootBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.BorderBrushIndeterminatePressed)}" />
                         </MultiTrigger>
                         <!--  IndeterminateDisabled  -->
                         <MultiTrigger>
@@ -347,15 +253,15 @@
                                 <Condition Property="IsChecked" Value="{x:Null}" />
                                 <Condition Property="IsEnabled" Value="False" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="CheckGlyph" Property="Content" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphIndeterminate)}" />
-                            <Setter TargetName="CheckGlyph" Property="ContentTemplate" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphIndeterminateTemplate)}" />
-                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckGlyphForegroundIndeterminateDisabled)}" />
+                            <Setter TargetName="CheckGlyph" Property="Content" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphIndeterminate)}" />
+                            <Setter TargetName="CheckGlyph" Property="ContentTemplate" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphIndeterminateTemplate)}" />
+                            <Setter TargetName="CheckGlyph" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckGlyphForegroundIndeterminateDisabled)}" />
                             <Setter TargetName="CheckGlyph" Property="Opacity" Value="1" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.ForegroundIndeterminateDisabled)}" />
-                            <Setter TargetName="NormalRectangle" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckBackgroundFillIndeterminateDisabled)}" />
-                            <Setter TargetName="NormalRectangle" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.CheckBackgroundStrokeIndeterminateDisabled)}" />
-                            <Setter TargetName="RootBorder" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.BackgroundIndeterminateDisabled)}" />
-                            <Setter TargetName="RootBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:CheckBoxHelper.BorderBrushIndeterminateDisabled)}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.ForegroundIndeterminateDisabled)}" />
+                            <Setter TargetName="NormalRectangle" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckBackgroundFillIndeterminateDisabled)}" />
+                            <Setter TargetName="NormalRectangle" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.CheckBackgroundStrokeIndeterminateDisabled)}" />
+                            <Setter TargetName="RootBorder" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.BackgroundIndeterminateDisabled)}" />
+                            <Setter TargetName="RootBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:CheckBoxHelper.BorderBrushIndeterminateDisabled)}" />
                         </MultiTrigger>
 
                         <Trigger Property="FlowDirection" Value="RightToLeft">
@@ -366,7 +272,7 @@
                             </Setter>
                         </Trigger>
 
-                        <Trigger Property="Controls:ToggleButtonHelper.ContentDirection" Value="RightToLeft">
+                        <Trigger Property="mah:ToggleButtonHelper.ContentDirection" Value="RightToLeft">
                             <Setter TargetName="Check" Property="Grid.Column" Value="1" />
                             <Setter TargetName="ContentPresenter" Property="Grid.Column" Value="0" />
                             <Setter TargetName="LeftCol" Property="Width" Value="*" />
@@ -377,8 +283,102 @@
             </Setter.Value>
         </Setter>
         <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="mah:CheckBoxHelper.BackgroundChecked" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundChecked}" />
+        <Setter Property="mah:CheckBoxHelper.BackgroundCheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundCheckedDisabled}" />
+        <Setter Property="mah:CheckBoxHelper.BackgroundCheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundCheckedMouseOver}" />
+        <Setter Property="mah:CheckBoxHelper.BackgroundCheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundCheckedPressed}" />
+        <Setter Property="mah:CheckBoxHelper.BackgroundIndeterminate" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundIndeterminate}" />
+        <Setter Property="mah:CheckBoxHelper.BackgroundIndeterminateDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundIndeterminateDisabled}" />
+        <Setter Property="mah:CheckBoxHelper.BackgroundIndeterminateMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundIndeterminateMouseOver}" />
+        <Setter Property="mah:CheckBoxHelper.BackgroundIndeterminatePressed" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundIndeterminatePressed}" />
+        <Setter Property="mah:CheckBoxHelper.BackgroundUnchecked" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundUnchecked}" />
+        <Setter Property="mah:CheckBoxHelper.BackgroundUncheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundUncheckedDisabled}" />
+        <Setter Property="mah:CheckBoxHelper.BackgroundUncheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundUncheckedMouseOver}" />
+        <Setter Property="mah:CheckBoxHelper.BackgroundUncheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundUncheckedPressed}" />
+        <Setter Property="mah:CheckBoxHelper.BorderBrushChecked" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushChecked}" />
+        <Setter Property="mah:CheckBoxHelper.BorderBrushCheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushCheckedDisabled}" />
+        <Setter Property="mah:CheckBoxHelper.BorderBrushCheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushCheckedMouseOver}" />
+        <Setter Property="mah:CheckBoxHelper.BorderBrushCheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushCheckedPressed}" />
+        <Setter Property="mah:CheckBoxHelper.BorderBrushIndeterminate" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushIndeterminate}" />
+        <Setter Property="mah:CheckBoxHelper.BorderBrushIndeterminateDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushIndeterminateDisabled}" />
+        <Setter Property="mah:CheckBoxHelper.BorderBrushIndeterminateMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushIndeterminateMouseOver}" />
+        <Setter Property="mah:CheckBoxHelper.BorderBrushIndeterminatePressed" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushIndeterminatePressed}" />
+        <Setter Property="mah:CheckBoxHelper.BorderBrushUnchecked" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushUnchecked}" />
+        <Setter Property="mah:CheckBoxHelper.BorderBrushUncheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushUncheckedDisabled}" />
+        <Setter Property="mah:CheckBoxHelper.BorderBrushUncheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushUncheckedMouseOver}" />
+        <Setter Property="mah:CheckBoxHelper.BorderBrushUncheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushUncheckedPressed}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundFillChecked" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundFillCheckedDisabled" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundFillCheckedMouseOver" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundFillCheckedPressed" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundFillIndeterminate" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundFillIndeterminateDisabled" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundFillIndeterminateMouseOver" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundFillIndeterminatePressed" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundFillUnchecked" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundFillUncheckedDisabled" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundFillUncheckedMouseOver" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundFillUncheckedPressed" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundStrokeChecked" Value="{DynamicResource MahApps.Brushes.CheckBox}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundStrokeCheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundStrokeCheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.MouseOver}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundStrokeCheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.MouseOver}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundStrokeIndeterminate" Value="{DynamicResource MahApps.Brushes.CheckBox}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundStrokeIndeterminateDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundStrokeIndeterminateMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.MouseOver}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundStrokeIndeterminatePressed" Value="{DynamicResource MahApps.Brushes.CheckBox.MouseOver}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundStrokeUnchecked" Value="{DynamicResource MahApps.Brushes.CheckBox}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundStrokeUncheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundStrokeUncheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.MouseOver}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundStrokeUncheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.MouseOver}" />
+        <Setter Property="mah:CheckBoxHelper.CheckGlyphCheckedTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <Path 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="{Binding RelativeSource={RelativeSource AncestorType=ContentControl}, Path=Foreground}"
+                          Stretch="Fill"
+                          UseLayoutRounding="False" />
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="mah:CheckBoxHelper.CheckGlyphForegroundChecked" Value="{DynamicResource MahApps.Brushes.Highlight}" />
+        <Setter Property="mah:CheckBoxHelper.CheckGlyphForegroundCheckedDisabled" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="mah:CheckBoxHelper.CheckGlyphForegroundCheckedMouseOver" Value="{DynamicResource MahApps.Brushes.Highlight}" />
+        <Setter Property="mah:CheckBoxHelper.CheckGlyphForegroundCheckedPressed" Value="{DynamicResource MahApps.Brushes.Highlight}" />
+        <Setter Property="mah:CheckBoxHelper.CheckGlyphForegroundIndeterminate" Value="{DynamicResource MahApps.Brushes.Gray3}" />
+        <Setter Property="mah:CheckBoxHelper.CheckGlyphForegroundIndeterminateDisabled" Value="{DynamicResource MahApps.Brushes.Gray3}" />
+        <Setter Property="mah:CheckBoxHelper.CheckGlyphForegroundIndeterminateMouseOver" Value="{DynamicResource MahApps.Brushes.Gray2}" />
+        <Setter Property="mah:CheckBoxHelper.CheckGlyphForegroundIndeterminatePressed" Value="{DynamicResource MahApps.Brushes.Gray2}" />
+        <Setter Property="mah:CheckBoxHelper.CheckGlyphForegroundUnchecked" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckGlyphForegroundUnchecked}" />
+        <Setter Property="mah:CheckBoxHelper.CheckGlyphForegroundUncheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckGlyphForegroundUncheckedDisabled}" />
+        <Setter Property="mah:CheckBoxHelper.CheckGlyphForegroundUncheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckGlyphForegroundUncheckedMouseOver}" />
+        <Setter Property="mah:CheckBoxHelper.CheckGlyphForegroundUncheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckGlyphForegroundUncheckedPressed}" />
+        <Setter Property="mah:CheckBoxHelper.CheckGlyphIndeterminateTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <Rectangle Width="8"
+                               Height="3"
+                               Fill="{Binding RelativeSource={RelativeSource AncestorType=ContentControl}, Path=Foreground}"
+                               UseLayoutRounding="False" />
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="mah:CheckBoxHelper.ForegroundChecked" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundChecked}" />
+        <Setter Property="mah:CheckBoxHelper.ForegroundCheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundCheckedDisabled}" />
+        <Setter Property="mah:CheckBoxHelper.ForegroundCheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundCheckedMouseOver}" />
+        <Setter Property="mah:CheckBoxHelper.ForegroundCheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundCheckedPressed}" />
+        <Setter Property="mah:CheckBoxHelper.ForegroundIndeterminate" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundIndeterminate}" />
+        <Setter Property="mah:CheckBoxHelper.ForegroundIndeterminateDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundIndeterminateDisabled}" />
+        <Setter Property="mah:CheckBoxHelper.ForegroundIndeterminateMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundIndeterminateMouseOver}" />
+        <Setter Property="mah:CheckBoxHelper.ForegroundIndeterminatePressed" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundIndeterminatePressed}" />
+        <Setter Property="mah:CheckBoxHelper.ForegroundUnchecked" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundUnchecked}" />
+        <Setter Property="mah:CheckBoxHelper.ForegroundUncheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundUncheckedDisabled}" />
+        <Setter Property="mah:CheckBoxHelper.ForegroundUncheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundUncheckedMouseOver}" />
+        <Setter Property="mah:CheckBoxHelper.ForegroundUncheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundUncheckedPressed}" />
         <Style.Triggers>
-            <Trigger Property="Controls:ToggleButtonHelper.ContentDirection" Value="RightToLeft">
+            <Trigger Property="mah:ToggleButtonHelper.ContentDirection" Value="RightToLeft">
                 <Setter Property="HorizontalContentAlignment" Value="Right" />
                 <Setter Property="Padding" Value="0 0 6 0" />
             </Trigger>
@@ -388,107 +388,107 @@
     <Style x:Key="MahApps.Styles.CheckBox.Win10"
            BasedOn="{StaticResource MahApps.Styles.CheckBox}"
            TargetType="CheckBox">
-        <Setter Property="Controls:CheckBoxHelper.BackgroundChecked" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundChecked}" />
-        <Setter Property="Controls:CheckBoxHelper.BackgroundCheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundCheckedDisabled}" />
-        <Setter Property="Controls:CheckBoxHelper.BackgroundCheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundCheckedMouseOver}" />
-        <Setter Property="Controls:CheckBoxHelper.BackgroundCheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundCheckedPressed}" />
-        <Setter Property="Controls:CheckBoxHelper.BackgroundIndeterminate" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundIndeterminate}" />
-        <Setter Property="Controls:CheckBoxHelper.BackgroundIndeterminateDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundIndeterminateDisabled}" />
-        <Setter Property="Controls:CheckBoxHelper.BackgroundIndeterminateMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundIndeterminateMouseOver}" />
-        <Setter Property="Controls:CheckBoxHelper.BackgroundIndeterminatePressed" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundIndeterminatePressed}" />
-        <Setter Property="Controls:CheckBoxHelper.BackgroundUnchecked" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundUnchecked}" />
-        <Setter Property="Controls:CheckBoxHelper.BackgroundUncheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundUncheckedDisabled}" />
-        <Setter Property="Controls:CheckBoxHelper.BackgroundUncheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundUncheckedMouseOver}" />
-        <Setter Property="Controls:CheckBoxHelper.BackgroundUncheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundUncheckedPressed}" />
-        <Setter Property="Controls:CheckBoxHelper.BorderBrushChecked" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushChecked}" />
-        <Setter Property="Controls:CheckBoxHelper.BorderBrushCheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushCheckedDisabled}" />
-        <Setter Property="Controls:CheckBoxHelper.BorderBrushCheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushCheckedMouseOver}" />
-        <Setter Property="Controls:CheckBoxHelper.BorderBrushCheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushCheckedPressed}" />
-        <Setter Property="Controls:CheckBoxHelper.BorderBrushIndeterminate" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushIndeterminate}" />
-        <Setter Property="Controls:CheckBoxHelper.BorderBrushIndeterminateDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushIndeterminateDisabled}" />
-        <Setter Property="Controls:CheckBoxHelper.BorderBrushIndeterminateMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushIndeterminateMouseOver}" />
-        <Setter Property="Controls:CheckBoxHelper.BorderBrushIndeterminatePressed" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushIndeterminatePressed}" />
-        <Setter Property="Controls:CheckBoxHelper.BorderBrushUnchecked" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushUnchecked}" />
-        <Setter Property="Controls:CheckBoxHelper.BorderBrushUncheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushUncheckedDisabled}" />
-        <Setter Property="Controls:CheckBoxHelper.BorderBrushUncheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushUncheckedMouseOver}" />
-        <Setter Property="Controls:CheckBoxHelper.BorderBrushUncheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushUncheckedPressed}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundFillChecked" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundFillChecked}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundFillCheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundFillCheckedDisabled}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundFillCheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundFillCheckedMouseOver}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundFillCheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundFillCheckedPressed}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundFillIndeterminate" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundFillIndeterminate}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundFillIndeterminateDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundFillIndeterminateDisabled}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundFillIndeterminateMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundFillIndeterminateMouseOver}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundFillIndeterminatePressed" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundFillIndeterminatePressed}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundFillUnchecked" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundFillUnchecked}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundFillUncheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundFillUncheckedDisabled}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundFillUncheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundFillUncheckedMouseOver}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundFillUncheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundFillUncheckedPressed}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundStrokeChecked" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundStrokeChecked}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundStrokeCheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundStrokeCheckedDisabled}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundStrokeCheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundStrokeCheckedMouseOver}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundStrokeCheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundStrokeCheckedPressed}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundStrokeIndeterminate" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundStrokeIndeterminate}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundStrokeIndeterminateDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundStrokeIndeterminateDisabled}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundStrokeIndeterminateMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundStrokeIndeterminateMouseOver}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundStrokeIndeterminatePressed" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundStrokeIndeterminatePressed}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundStrokeUnchecked" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundStrokeUnchecked}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundStrokeUncheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundStrokeUncheckedDisabled}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundStrokeUncheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundStrokeUncheckedMouseOver}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckBackgroundStrokeUncheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundStrokeUncheckedPressed}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckGlyphCheckedTemplate">
+        <Setter Property="MinHeight" Value="32" />
+        <Setter Property="MinWidth" Value="120" />
+        <Setter Property="Padding" Value="8 0 0 0" />
+        <Setter Property="mah:CheckBoxHelper.BackgroundChecked" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundChecked}" />
+        <Setter Property="mah:CheckBoxHelper.BackgroundCheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundCheckedDisabled}" />
+        <Setter Property="mah:CheckBoxHelper.BackgroundCheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundCheckedMouseOver}" />
+        <Setter Property="mah:CheckBoxHelper.BackgroundCheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundCheckedPressed}" />
+        <Setter Property="mah:CheckBoxHelper.BackgroundIndeterminate" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundIndeterminate}" />
+        <Setter Property="mah:CheckBoxHelper.BackgroundIndeterminateDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundIndeterminateDisabled}" />
+        <Setter Property="mah:CheckBoxHelper.BackgroundIndeterminateMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundIndeterminateMouseOver}" />
+        <Setter Property="mah:CheckBoxHelper.BackgroundIndeterminatePressed" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundIndeterminatePressed}" />
+        <Setter Property="mah:CheckBoxHelper.BackgroundUnchecked" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundUnchecked}" />
+        <Setter Property="mah:CheckBoxHelper.BackgroundUncheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundUncheckedDisabled}" />
+        <Setter Property="mah:CheckBoxHelper.BackgroundUncheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundUncheckedMouseOver}" />
+        <Setter Property="mah:CheckBoxHelper.BackgroundUncheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.BackgroundUncheckedPressed}" />
+        <Setter Property="mah:CheckBoxHelper.BorderBrushChecked" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushChecked}" />
+        <Setter Property="mah:CheckBoxHelper.BorderBrushCheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushCheckedDisabled}" />
+        <Setter Property="mah:CheckBoxHelper.BorderBrushCheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushCheckedMouseOver}" />
+        <Setter Property="mah:CheckBoxHelper.BorderBrushCheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushCheckedPressed}" />
+        <Setter Property="mah:CheckBoxHelper.BorderBrushIndeterminate" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushIndeterminate}" />
+        <Setter Property="mah:CheckBoxHelper.BorderBrushIndeterminateDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushIndeterminateDisabled}" />
+        <Setter Property="mah:CheckBoxHelper.BorderBrushIndeterminateMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushIndeterminateMouseOver}" />
+        <Setter Property="mah:CheckBoxHelper.BorderBrushIndeterminatePressed" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushIndeterminatePressed}" />
+        <Setter Property="mah:CheckBoxHelper.BorderBrushUnchecked" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushUnchecked}" />
+        <Setter Property="mah:CheckBoxHelper.BorderBrushUncheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushUncheckedDisabled}" />
+        <Setter Property="mah:CheckBoxHelper.BorderBrushUncheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushUncheckedMouseOver}" />
+        <Setter Property="mah:CheckBoxHelper.BorderBrushUncheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.BorderBrushUncheckedPressed}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundFillChecked" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundFillChecked}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundFillCheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundFillCheckedDisabled}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundFillCheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundFillCheckedMouseOver}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundFillCheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundFillCheckedPressed}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundFillIndeterminate" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundFillIndeterminate}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundFillIndeterminateDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundFillIndeterminateDisabled}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundFillIndeterminateMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundFillIndeterminateMouseOver}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundFillIndeterminatePressed" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundFillIndeterminatePressed}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundFillUnchecked" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundFillUnchecked}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundFillUncheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundFillUncheckedDisabled}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundFillUncheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundFillUncheckedMouseOver}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundFillUncheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundFillUncheckedPressed}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundStrokeChecked" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundStrokeChecked}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundStrokeCheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundStrokeCheckedDisabled}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundStrokeCheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundStrokeCheckedMouseOver}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundStrokeCheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundStrokeCheckedPressed}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundStrokeIndeterminate" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundStrokeIndeterminate}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundStrokeIndeterminateDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundStrokeIndeterminateDisabled}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundStrokeIndeterminateMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundStrokeIndeterminateMouseOver}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundStrokeIndeterminatePressed" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundStrokeIndeterminatePressed}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundStrokeUnchecked" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundStrokeUnchecked}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundStrokeUncheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundStrokeUncheckedDisabled}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundStrokeUncheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundStrokeUncheckedMouseOver}" />
+        <Setter Property="mah:CheckBoxHelper.CheckBackgroundStrokeUncheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckBackgroundStrokeUncheckedPressed}" />
+        <Setter Property="mah:CheckBoxHelper.CheckGlyphCheckedTemplate">
             <Setter.Value>
                 <DataTemplate>
-                    <Controls:FontIcon x:Name="CheckGlyph"
-                                       FontFamily="{DynamicResource MahApps.Fonts.Family.SymbolTheme}"
-                                       FontSize="20"
-                                       Foreground="{Binding RelativeSource={RelativeSource AncestorType=ContentControl}, Path=Foreground}"
-                                       Glyph="&#xE001;"
-                                       UseLayoutRounding="False" />
+                    <mah:FontIcon x:Name="CheckGlyph"
+                                  FontFamily="{DynamicResource MahApps.Fonts.Family.SymbolTheme}"
+                                  FontSize="20"
+                                  Foreground="{Binding RelativeSource={RelativeSource AncestorType=ContentControl}, Path=Foreground}"
+                                  Glyph="&#xE001;"
+                                  UseLayoutRounding="False" />
                 </DataTemplate>
             </Setter.Value>
         </Setter>
-        <Setter Property="Controls:CheckBoxHelper.CheckGlyphForegroundChecked" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckGlyphForegroundChecked}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckGlyphForegroundCheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckGlyphForegroundCheckedDisabled}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckGlyphForegroundCheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckGlyphForegroundCheckedMouseOver}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckGlyphForegroundCheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckGlyphForegroundCheckedPressed}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckGlyphForegroundIndeterminate" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckGlyphForegroundIndeterminate}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckGlyphForegroundIndeterminateDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckGlyphForegroundIndeterminateDisabled}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckGlyphForegroundIndeterminateMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckGlyphForegroundIndeterminateMouseOver}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckGlyphForegroundIndeterminatePressed" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckGlyphForegroundIndeterminatePressed}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckGlyphForegroundUnchecked" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckGlyphForegroundUnchecked}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckGlyphForegroundUncheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckGlyphForegroundUncheckedDisabled}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckGlyphForegroundUncheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckGlyphForegroundUncheckedMouseOver}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckGlyphForegroundUncheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckGlyphForegroundUncheckedPressed}" />
-        <Setter Property="Controls:CheckBoxHelper.CheckGlyphIndeterminateTemplate">
+        <Setter Property="mah:CheckBoxHelper.CheckGlyphForegroundChecked" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckGlyphForegroundChecked}" />
+        <Setter Property="mah:CheckBoxHelper.CheckGlyphForegroundCheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckGlyphForegroundCheckedDisabled}" />
+        <Setter Property="mah:CheckBoxHelper.CheckGlyphForegroundCheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckGlyphForegroundCheckedMouseOver}" />
+        <Setter Property="mah:CheckBoxHelper.CheckGlyphForegroundCheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckGlyphForegroundCheckedPressed}" />
+        <Setter Property="mah:CheckBoxHelper.CheckGlyphForegroundIndeterminate" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckGlyphForegroundIndeterminate}" />
+        <Setter Property="mah:CheckBoxHelper.CheckGlyphForegroundIndeterminateDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckGlyphForegroundIndeterminateDisabled}" />
+        <Setter Property="mah:CheckBoxHelper.CheckGlyphForegroundIndeterminateMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckGlyphForegroundIndeterminateMouseOver}" />
+        <Setter Property="mah:CheckBoxHelper.CheckGlyphForegroundIndeterminatePressed" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckGlyphForegroundIndeterminatePressed}" />
+        <Setter Property="mah:CheckBoxHelper.CheckGlyphForegroundUnchecked" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckGlyphForegroundUnchecked}" />
+        <Setter Property="mah:CheckBoxHelper.CheckGlyphForegroundUncheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckGlyphForegroundUncheckedDisabled}" />
+        <Setter Property="mah:CheckBoxHelper.CheckGlyphForegroundUncheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckGlyphForegroundUncheckedMouseOver}" />
+        <Setter Property="mah:CheckBoxHelper.CheckGlyphForegroundUncheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.CheckGlyphForegroundUncheckedPressed}" />
+        <Setter Property="mah:CheckBoxHelper.CheckGlyphIndeterminateTemplate">
             <Setter.Value>
                 <DataTemplate>
-                    <Controls:FontIcon x:Name="CheckGlyph"
-                                       FontFamily="{DynamicResource MahApps.Fonts.Family.SymbolTheme}"
-                                       FontSize="20"
-                                       Foreground="{Binding RelativeSource={RelativeSource AncestorType=ContentControl}, Path=Foreground}"
-                                       Glyph="&#xE73C;"
-                                       UseLayoutRounding="False" />
+                    <mah:FontIcon x:Name="CheckGlyph"
+                                  FontFamily="{DynamicResource MahApps.Fonts.Family.SymbolTheme}"
+                                  FontSize="20"
+                                  Foreground="{Binding RelativeSource={RelativeSource AncestorType=ContentControl}, Path=Foreground}"
+                                  Glyph="&#xE73C;"
+                                  UseLayoutRounding="False" />
                 </DataTemplate>
             </Setter.Value>
         </Setter>
-        <Setter Property="Controls:CheckBoxHelper.CheckSize" Value="20" />
-        <Setter Property="Controls:CheckBoxHelper.CheckStrokeThickness" Value="{DynamicResource CheckBoxBorderThemeThickness}" />
-        <Setter Property="Controls:CheckBoxHelper.ForegroundChecked" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundChecked}" />
-        <Setter Property="Controls:CheckBoxHelper.ForegroundCheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundCheckedDisabled}" />
-        <Setter Property="Controls:CheckBoxHelper.ForegroundCheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundCheckedMouseOver}" />
-        <Setter Property="Controls:CheckBoxHelper.ForegroundCheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundCheckedPressed}" />
-        <Setter Property="Controls:CheckBoxHelper.ForegroundIndeterminate" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundIndeterminate}" />
-        <Setter Property="Controls:CheckBoxHelper.ForegroundIndeterminateDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundIndeterminateDisabled}" />
-        <Setter Property="Controls:CheckBoxHelper.ForegroundIndeterminateMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundIndeterminateMouseOver}" />
-        <Setter Property="Controls:CheckBoxHelper.ForegroundIndeterminatePressed" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundIndeterminatePressed}" />
-        <Setter Property="Controls:CheckBoxHelper.ForegroundUnchecked" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundUnchecked}" />
-        <Setter Property="Controls:CheckBoxHelper.ForegroundUncheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundUncheckedDisabled}" />
-        <Setter Property="Controls:CheckBoxHelper.ForegroundUncheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundUncheckedMouseOver}" />
-        <Setter Property="Controls:CheckBoxHelper.ForegroundUncheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundUncheckedPressed}" />
-        <Setter Property="MinHeight" Value="32" />
-        <Setter Property="MinWidth" Value="120" />
-        <Setter Property="Padding" Value="8 0 0 0" />
+        <Setter Property="mah:CheckBoxHelper.CheckSize" Value="20" />
+        <Setter Property="mah:CheckBoxHelper.CheckStrokeThickness" Value="{DynamicResource CheckBoxBorderThemeThickness}" />
+        <Setter Property="mah:CheckBoxHelper.ForegroundChecked" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundChecked}" />
+        <Setter Property="mah:CheckBoxHelper.ForegroundCheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundCheckedDisabled}" />
+        <Setter Property="mah:CheckBoxHelper.ForegroundCheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundCheckedMouseOver}" />
+        <Setter Property="mah:CheckBoxHelper.ForegroundCheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundCheckedPressed}" />
+        <Setter Property="mah:CheckBoxHelper.ForegroundIndeterminate" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundIndeterminate}" />
+        <Setter Property="mah:CheckBoxHelper.ForegroundIndeterminateDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundIndeterminateDisabled}" />
+        <Setter Property="mah:CheckBoxHelper.ForegroundIndeterminateMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundIndeterminateMouseOver}" />
+        <Setter Property="mah:CheckBoxHelper.ForegroundIndeterminatePressed" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundIndeterminatePressed}" />
+        <Setter Property="mah:CheckBoxHelper.ForegroundUnchecked" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundUnchecked}" />
+        <Setter Property="mah:CheckBoxHelper.ForegroundUncheckedDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundUncheckedDisabled}" />
+        <Setter Property="mah:CheckBoxHelper.ForegroundUncheckedMouseOver" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundUncheckedMouseOver}" />
+        <Setter Property="mah:CheckBoxHelper.ForegroundUncheckedPressed" Value="{DynamicResource MahApps.Brushes.CheckBox.ForegroundUncheckedPressed}" />
         <Style.Triggers>
             <!--  UncheckedPressed  -->
             <MultiTrigger>
@@ -496,7 +496,7 @@
                     <Condition Property="IsChecked" Value="False" />
                     <Condition Property="IsPressed" Value="True" />
                 </MultiTrigger.Conditions>
-                <Setter Property="Controls:CheckBoxHelper.CheckStrokeThickness" Value="{DynamicResource CheckBoxCheckedStrokeThickness}" />
+                <Setter Property="mah:CheckBoxHelper.CheckStrokeThickness" Value="{DynamicResource CheckBoxCheckedStrokeThickness}" />
             </MultiTrigger>
             <!--  CheckedNormal  -->
             <MultiTrigger>
@@ -506,7 +506,7 @@
                     <Condition Property="IsPressed" Value="False" />
                     <Condition Property="IsEnabled" Value="True" />
                 </MultiTrigger.Conditions>
-                <Setter Property="Controls:CheckBoxHelper.CheckStrokeThickness" Value="{DynamicResource CheckBoxCheckedStrokeThickness}" />
+                <Setter Property="mah:CheckBoxHelper.CheckStrokeThickness" Value="{DynamicResource CheckBoxCheckedStrokeThickness}" />
             </MultiTrigger>
             <!--  CheckedPressed  -->
             <MultiTrigger>
@@ -514,10 +514,10 @@
                     <Condition Property="IsChecked" Value="True" />
                     <Condition Property="IsPressed" Value="True" />
                 </MultiTrigger.Conditions>
-                <Setter Property="Controls:CheckBoxHelper.CheckStrokeThickness" Value="{DynamicResource CheckBoxCheckedStrokeThickness}" />
+                <Setter Property="mah:CheckBoxHelper.CheckStrokeThickness" Value="{DynamicResource CheckBoxCheckedStrokeThickness}" />
             </MultiTrigger>
 
-            <Trigger Property="Controls:ToggleButtonHelper.ContentDirection" Value="RightToLeft">
+            <Trigger Property="mah:ToggleButtonHelper.ContentDirection" Value="RightToLeft">
                 <Setter Property="HorizontalContentAlignment" Value="Right" />
                 <Setter Property="Padding" Value="0 0 8 0" />
             </Trigger>
diff --git a/src/MahApps.Metro/Styles/Controls.ComboBox.xaml b/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
index c5c8a35a10..c566c46c4e 100644
--- a/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary 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"
-                    xmlns:Converters="clr-namespace:MahApps.Metro.Converters">
+                    xmlns:converters="clr-namespace:MahApps.Metro.Converters"
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.TextBox.xaml" />
@@ -51,9 +51,9 @@
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
                                        Style="{DynamicResource MahApps.Styles.TextBlock.Watermark}"
-                                       Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
-                                       TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
-                                       TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
+                                       Text="{TemplateBinding mah:TextBoxHelper.Watermark}"
+                                       TextAlignment="{TemplateBinding mah:TextBoxHelper.WatermarkAlignment}"
+                                       TextTrimming="{TemplateBinding mah:TextBoxHelper.WatermarkTrimming}"
                                        Visibility="Collapsed" />
 
                             <ContentControl x:Name="PART_FloatingMessageContainer"
@@ -62,7 +62,7 @@
                                             Margin="4 0"
                                             Style="{DynamicResource MahApps.Styles.ContentControl.FloatingMessageContainer}">
                                 <ContentControl.Height>
-                                    <MultiBinding Converter="{Converters:MathMultiplyConverter}">
+                                    <MultiBinding Converter="{converters:MathMultiplyConverter}">
                                         <Binding ElementName="PART_FloatingMessage"
                                                  Mode="OneWay"
                                                  Path="ActualHeight" />
@@ -76,13 +76,13 @@
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
                                            Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing}"
-                                           Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
-                                           TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
-                                           TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
+                                           Text="{TemplateBinding mah:TextBoxHelper.Watermark}"
+                                           TextAlignment="{TemplateBinding mah:TextBoxHelper.WatermarkAlignment}"
+                                           TextTrimming="{TemplateBinding mah:TextBoxHelper.WatermarkTrimming}">
                                     <TextBlock.RenderTransform>
                                         <TranslateTransform x:Name="FloatingMessageTransform">
                                             <TranslateTransform.Y>
-                                                <MultiBinding Converter="{Converters:MathSubtractConverter}">
+                                                <MultiBinding Converter="{converters:MathSubtractConverter}">
                                                     <Binding ElementName="PART_FloatingMessage"
                                                              Mode="OneWay"
                                                              Path="ActualHeight" />
@@ -100,17 +100,17 @@
                                     Grid.Row="0"
                                     Grid.RowSpan="2"
                                     Grid.Column="1"
-                                    Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
-                                    Controls:TextBoxHelper.IsClearTextButtonBehaviorEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ClearTextButton), Mode=OneWay}"
-                                    Content="{TemplateBinding Controls:TextBoxHelper.ButtonContent}"
-                                    ContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}"
+                                    Width="{TemplateBinding mah:TextBoxHelper.ButtonWidth}"
+                                    mah:TextBoxHelper.IsClearTextButtonBehaviorEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:TextBoxHelper.ClearTextButton), Mode=OneWay}"
+                                    Content="{TemplateBinding mah:TextBoxHelper.ButtonContent}"
+                                    ContentTemplate="{TemplateBinding mah:TextBoxHelper.ButtonContentTemplate}"
                                     Focusable="False"
-                                    FontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}"
-                                    FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
+                                    FontFamily="{TemplateBinding mah:TextBoxHelper.ButtonFontFamily}"
+                                    FontSize="{TemplateBinding mah:TextBoxHelper.ButtonFontSize}"
                                     Foreground="{TemplateBinding Foreground}"
                                     IsTabStop="False"
                                     Style="{DynamicResource MahApps.Styles.Button.Chromeless}"
-                                    Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ClearTextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                                    Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:TextBoxHelper.ClearTextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
                         </Grid>
                     </Grid>
                     <ControlTemplate.Triggers>
@@ -121,8 +121,8 @@
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
                                 <Condition Binding="{Binding Path=IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
-                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
-                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(mah:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(mah:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.ShowFloatingMessage}" />
@@ -132,7 +132,7 @@
                             </MultiDataTrigger.ExitActions>
                         </MultiDataTrigger>
 
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.ClearTextButton)}" Value="False">
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(mah:TextBoxHelper.ClearTextButton)}" Value="False">
                             <Setter TargetName="PART_ContentHost" Property="Grid.ColumnSpan" Value="2" />
                             <Setter TargetName="PART_Message" Property="Grid.ColumnSpan" Value="2" />
                         </DataTrigger>
@@ -154,7 +154,7 @@
 
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="Controls:TextBoxHelper.HasText" Value="False" />
+                                <Condition Property="mah:TextBoxHelper.HasText" Value="False" />
                                 <Condition Property="IsFocused" Value="True" />
                             </MultiTrigger.Conditions>
                             <MultiTrigger.EnterActions>
@@ -165,7 +165,7 @@
                             </MultiTrigger.ExitActions>
                         </MultiTrigger>
 
-                        <Trigger Property="Controls:TextBoxHelper.HasText" Value="True">
+                        <Trigger Property="mah:TextBoxHelper.HasText" Value="True">
                             <Trigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.EnterHasText}" />
                             </Trigger.EnterActions>
@@ -196,21 +196,21 @@
 
                         <Button x:Name="PART_ClearText"
                                 Grid.Column="1"
-                                Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
-                                Controls:TextBoxHelper.IsClearTextButtonBehaviorEnabled="{Binding RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}, Path=(Controls:TextBoxHelper.ClearTextButton), Mode=OneWay}"
-                                Content="{TemplateBinding Controls:TextBoxHelper.ButtonContent}"
-                                ContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}"
+                                Width="{TemplateBinding mah:TextBoxHelper.ButtonWidth}"
+                                mah:TextBoxHelper.IsClearTextButtonBehaviorEnabled="{Binding RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}, Path=(mah:TextBoxHelper.ClearTextButton), Mode=OneWay}"
+                                Content="{TemplateBinding mah:TextBoxHelper.ButtonContent}"
+                                ContentTemplate="{TemplateBinding mah:TextBoxHelper.ButtonContentTemplate}"
                                 Focusable="False"
-                                FontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}"
-                                FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
+                                FontFamily="{TemplateBinding mah:TextBoxHelper.ButtonFontFamily}"
+                                FontSize="{TemplateBinding mah:TextBoxHelper.ButtonFontSize}"
                                 Foreground="{TemplateBinding Foreground}"
                                 IsTabStop="False"
                                 Style="{DynamicResource MahApps.Styles.Button.Chromeless}"
-                                Visibility="{Binding RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}, Path=(Controls:TextBoxHelper.ClearTextButton), Converter={StaticResource BooleanToVisibilityConverter}}" />
+                                Visibility="{Binding RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}, Path=(mah:TextBoxHelper.ClearTextButton), Converter={StaticResource BooleanToVisibilityConverter}}" />
 
                         <Grid x:Name="BtnArrowBackground"
                               Grid.Column="2"
-                              Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
+                              Width="{TemplateBinding mah:TextBoxHelper.ButtonWidth}"
                               Background="Transparent">
                             <Path x:Name="Arrow"
                                   Width="8"
@@ -250,10 +250,6 @@
         <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 MahApps.Brushes.ComboBox.Border.Focus}" />
-        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.ComboBox.Border.MouseOver}" />
-        <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Font.Size.Button.ClearText}" />
-        <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="22" />
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Family.Control}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
@@ -274,14 +270,14 @@
                                 Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                                CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
 
                         <Grid Margin="{TemplateBinding BorderThickness}">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition x:Name="TextColumn" Width="*" />
-                                <ColumnDefinition x:Name="ButtonColumn" Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ButtonWidth), Mode=OneWay}" />
-                                <ColumnDefinition x:Name="ToggleButtonColumn" Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ButtonWidth), Mode=OneWay}" />
+                                <ColumnDefinition x:Name="ButtonColumn" Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:TextBoxHelper.ButtonWidth), Mode=OneWay}" />
+                                <ColumnDefinition x:Name="ToggleButtonColumn" Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:TextBoxHelper.ButtonWidth), Mode=OneWay}" />
                             </Grid.ColumnDefinitions>
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto" />
@@ -293,13 +289,13 @@
                                           Grid.ColumnSpan="3"
                                           Margin="0"
                                           VerticalAlignment="Stretch"
-                                          Controls:ControlsHelper.CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
-                                          Controls:TextBoxHelper.ButtonContent="{TemplateBinding Controls:TextBoxHelper.ButtonContent}"
-                                          Controls:TextBoxHelper.ButtonContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}"
-                                          Controls:TextBoxHelper.ButtonFontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}"
-                                          Controls:TextBoxHelper.ButtonFontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
-                                          Controls:TextBoxHelper.ButtonWidth="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
-                                          Controls:TextBoxHelper.ClearTextButton="{TemplateBinding Controls:TextBoxHelper.ClearTextButton}"
+                                          mah:ControlsHelper.CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
+                                          mah:TextBoxHelper.ButtonContent="{TemplateBinding mah:TextBoxHelper.ButtonContent}"
+                                          mah:TextBoxHelper.ButtonContentTemplate="{TemplateBinding mah:TextBoxHelper.ButtonContentTemplate}"
+                                          mah:TextBoxHelper.ButtonFontFamily="{TemplateBinding mah:TextBoxHelper.ButtonFontFamily}"
+                                          mah:TextBoxHelper.ButtonFontSize="{TemplateBinding mah:TextBoxHelper.ButtonFontSize}"
+                                          mah:TextBoxHelper.ButtonWidth="{TemplateBinding mah:TextBoxHelper.ButtonWidth}"
+                                          mah:TextBoxHelper.ClearTextButton="{TemplateBinding mah:TextBoxHelper.ClearTextButton}"
                                           Background="Transparent"
                                           BorderThickness="0"
                                           Foreground="{TemplateBinding Foreground}"
@@ -331,25 +327,25 @@
                                      HorizontalAlignment="Stretch"
                                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                      HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                     Controls:TextBoxHelper.ButtonContent="{TemplateBinding Controls:TextBoxHelper.ButtonContent}"
-                                     Controls:TextBoxHelper.ButtonContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}"
-                                     Controls:TextBoxHelper.ButtonFontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}"
-                                     Controls:TextBoxHelper.ButtonFontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
-                                     Controls:TextBoxHelper.ButtonWidth="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
-                                     Controls:TextBoxHelper.HasText="{TemplateBinding Controls:TextBoxHelper.HasText}"
-                                     Controls:TextBoxHelper.UseFloatingWatermark="{TemplateBinding Controls:TextBoxHelper.UseFloatingWatermark}"
-                                     Controls:TextBoxHelper.Watermark="{TemplateBinding Controls:TextBoxHelper.Watermark}"
-                                     Controls:TextBoxHelper.WatermarkAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
-                                     Controls:TextBoxHelper.WatermarkTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
+                                     mah:TextBoxHelper.ButtonContent="{TemplateBinding mah:TextBoxHelper.ButtonContent}"
+                                     mah:TextBoxHelper.ButtonContentTemplate="{TemplateBinding mah:TextBoxHelper.ButtonContentTemplate}"
+                                     mah:TextBoxHelper.ButtonFontFamily="{TemplateBinding mah:TextBoxHelper.ButtonFontFamily}"
+                                     mah:TextBoxHelper.ButtonFontSize="{TemplateBinding mah:TextBoxHelper.ButtonFontSize}"
+                                     mah:TextBoxHelper.ButtonWidth="{TemplateBinding mah:TextBoxHelper.ButtonWidth}"
+                                     mah:TextBoxHelper.HasText="{TemplateBinding mah:TextBoxHelper.HasText}"
+                                     mah:TextBoxHelper.UseFloatingWatermark="{TemplateBinding mah:TextBoxHelper.UseFloatingWatermark}"
+                                     mah:TextBoxHelper.Watermark="{TemplateBinding mah:TextBoxHelper.Watermark}"
+                                     mah:TextBoxHelper.WatermarkAlignment="{TemplateBinding mah:TextBoxHelper.WatermarkAlignment}"
+                                     mah:TextBoxHelper.WatermarkTrimming="{TemplateBinding mah:TextBoxHelper.WatermarkTrimming}"
                                      Background="{x:Null}"
                                      BorderThickness="0"
-                                     CharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ComboBoxHelper.CharacterCasing), Mode=OneWay}"
+                                     CharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ComboBoxHelper.CharacterCasing), Mode=OneWay}"
                                      Focusable="True"
                                      FontFamily="{TemplateBinding FontFamily}"
                                      FontSize="{TemplateBinding FontSize}"
                                      Foreground="{TemplateBinding Foreground}"
                                      IsReadOnly="{TemplateBinding IsReadOnly}"
-                                     MaxLength="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ComboBoxHelper.MaxLength), Mode=OneWay}"
+                                     MaxLength="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ComboBoxHelper.MaxLength), Mode=OneWay}"
                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
                                      Style="{StaticResource MahApps.Styles.TextBox.ComboBox.Editable}"
                                      Visibility="Collapsed" />
@@ -363,9 +359,9 @@
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
                                        Style="{DynamicResource MahApps.Styles.TextBlock.Watermark}"
-                                       Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
-                                       TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
-                                       TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
+                                       Text="{TemplateBinding mah:TextBoxHelper.Watermark}"
+                                       TextAlignment="{TemplateBinding mah:TextBoxHelper.WatermarkAlignment}"
+                                       TextTrimming="{TemplateBinding mah:TextBoxHelper.WatermarkTrimming}"
                                        Visibility="Collapsed" />
 
                             <ContentControl x:Name="PART_FloatingMessageContainer"
@@ -374,7 +370,7 @@
                                             Margin="4 0"
                                             Style="{DynamicResource MahApps.Styles.ContentControl.FloatingMessageContainer}">
                                 <ContentControl.Height>
-                                    <MultiBinding Converter="{Converters:MathMultiplyConverter}">
+                                    <MultiBinding Converter="{converters:MathMultiplyConverter}">
                                         <Binding ElementName="PART_FloatingMessage"
                                                  Mode="OneWay"
                                                  Path="ActualHeight" />
@@ -388,13 +384,13 @@
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
                                            Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing}"
-                                           Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
-                                           TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
-                                           TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
+                                           Text="{TemplateBinding mah:TextBoxHelper.Watermark}"
+                                           TextAlignment="{TemplateBinding mah:TextBoxHelper.WatermarkAlignment}"
+                                           TextTrimming="{TemplateBinding mah:TextBoxHelper.WatermarkTrimming}">
                                     <TextBlock.RenderTransform>
                                         <TranslateTransform x:Name="FloatingMessageTransform">
                                             <TranslateTransform.Y>
-                                                <MultiBinding Converter="{Converters:MathSubtractConverter}">
+                                                <MultiBinding Converter="{converters:MathSubtractConverter}">
                                                     <Binding ElementName="PART_FloatingMessage"
                                                              Mode="OneWay"
                                                              Path="ActualHeight" />
@@ -414,7 +410,7 @@
                                 Background="{DynamicResource MahApps.Brushes.Control.Disabled}"
                                 BorderBrush="{DynamicResource MahApps.Brushes.Control.Disabled}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                                CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                                 IsHitTestVisible="False"
                                 Opacity="0.6"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
@@ -465,7 +461,7 @@
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsEditable}" Value="True" />
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=ContextMenu, Converter={x:Static Converters:IsNullConverter.Instance}}" Value="False" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=ContextMenu, Converter={x:Static converters:IsNullConverter.Instance}}" Value="False" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="PART_EditableTextBox" Property="ContextMenu" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ContextMenu}" />
                         </MultiDataTrigger>
@@ -480,7 +476,7 @@
 
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=SelectedItem, Mode=OneWay, Converter={x:Static Converters:IsNullConverter.Instance}}" Value="True" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=SelectedItem, Mode=OneWay, Converter={x:Static converters:IsNullConverter.Instance}}" Value="True" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsKeyboardFocusWithin}" Value="True" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsEditable}" Value="False" />
                             </MultiDataTrigger.Conditions>
@@ -494,7 +490,7 @@
 
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=SelectedItem, Mode=OneWay, Converter={x:Static Converters:IsNullConverter.Instance}}" Value="False" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=SelectedItem, Mode=OneWay, Converter={x:Static converters:IsNullConverter.Instance}}" Value="False" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsEditable}" Value="False" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
@@ -508,9 +504,9 @@
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
                                 <Condition Binding="{Binding Path=IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
-                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(mah:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsEditable}" Value="False" />
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=SelectedItem, Mode=OneWay, Converter={x:Static Converters:IsNullConverter.Instance}}" Value="False" />
+                                <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 MahApps.Storyboard.ShowFloatingMessage}" />
@@ -520,7 +516,7 @@
                             </MultiDataTrigger.ExitActions>
                         </MultiDataTrigger>
 
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.ClearTextButton)}" Value="False">
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(mah:TextBoxHelper.ClearTextButton)}" Value="False">
                             <Setter TargetName="ContentSite" Property="Grid.ColumnSpan" Value="2" />
                             <Setter TargetName="PART_EditableTextBox" Property="Grid.ColumnSpan" Value="2" />
                             <Setter TargetName="PART_Message" Property="Grid.ColumnSpan" Value="2" />
@@ -541,19 +537,19 @@
                             <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)}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.MouseOverBorderBrush)}" />
                         </Trigger>
 
                         <Trigger SourceName="PART_EditableTextBox" Property="IsFocused" Value="True">
-                            <Setter TargetName="Border" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.FocusBorderBrush)}" />
                         </Trigger>
                         <Trigger Property="IsFocused" Value="True">
-                            <Setter TargetName="Border" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.FocusBorderBrush)}" />
                             <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource MahApps.Brushes.TextBlock.FloatingMessage}" />
                             <Setter TargetName="PART_FloatingMessage" Property="Opacity" Value="1" />
                         </Trigger>
                         <Trigger Property="IsKeyboardFocusWithin" Value="True">
-                            <Setter TargetName="Border" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.FocusBorderBrush)}" />
                         </Trigger>
 
                         <MultiTrigger>
@@ -573,6 +569,10 @@
         </Setter>
         <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource MahApps.Templates.ValidationError}" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="mah:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.ComboBox.Border.Focus}" />
+        <Setter Property="mah:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.ComboBox.Border.MouseOver}" />
+        <Setter Property="mah:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Font.Size.Button.ClearText}" />
+        <Setter Property="mah:TextBoxHelper.ButtonWidth" Value="22" />
         <Style.Triggers>
             <Trigger Property="VirtualizingStackPanel.IsVirtualizing" Value="True">
                 <Setter Property="ItemsPanel">
@@ -601,17 +601,6 @@
     <Style x:Key="MahApps.Styles.ComboBoxItem" TargetType="ComboBoxItem">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
         <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Controls:ItemHelper.ActiveSelectionBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
-        <Setter Property="Controls:ItemHelper.ActiveSelectionForegroundBrush" Value="{DynamicResource MahApps.Brushes.Selected.Foreground}" />
-        <Setter Property="Controls:ItemHelper.DisabledForegroundBrush" Value="{DynamicResource MahApps.Brushes.Gray}" />
-        <Setter Property="Controls:ItemHelper.DisabledSelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Gray7}" />
-        <Setter Property="Controls:ItemHelper.DisabledSelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.Selected.Foreground}" />
-        <Setter Property="Controls:ItemHelper.HoverBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent3}" />
-        <Setter Property="Controls:ItemHelper.HoverForegroundBrush" Value="{DynamicResource MahApps.Brushes.Text}" />
-        <Setter Property="Controls:ItemHelper.HoverSelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
-        <Setter Property="Controls:ItemHelper.HoverSelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.Selected.Foreground}" />
-        <Setter Property="Controls:ItemHelper.SelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent2}" />
-        <Setter Property="Controls:ItemHelper.SelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.Selected.Foreground}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="MinHeight" Value="22" />
@@ -638,16 +627,16 @@
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsSelected" Value="True">
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.SelectedBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.SelectedForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.SelectedBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.SelectedForegroundBrush), Mode=OneWay}" />
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsSelected" Value="True" />
                                 <Condition Property="Selector.IsSelectionActive" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.ActiveSelectionBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.ActiveSelectionForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.ActiveSelectionBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.ActiveSelectionForegroundBrush), Mode=OneWay}" />
                         </MultiTrigger>
 
                         <MultiTrigger>
@@ -655,21 +644,21 @@
                                 <Condition Property="IsMouseOver" Value="True" />
                                 <Condition Property="IsSelected" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.HoverSelectedBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.HoverSelectedForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.HoverSelectedBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.HoverSelectedForegroundBrush), Mode=OneWay}" />
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsMouseOver" Value="True" />
                                 <Condition Property="IsSelected" Value="False" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.HoverBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.HoverForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.HoverBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.HoverForegroundBrush), Mode=OneWay}" />
                         </MultiTrigger>
 
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.DisabledBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.DisabledForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.DisabledBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.DisabledForegroundBrush), Mode=OneWay}" />
                             <Setter TargetName="RootGrid" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Background, Mode=OneWay}" />
                         </Trigger>
                         <MultiTrigger>
@@ -677,14 +666,25 @@
                                 <Condition Property="IsEnabled" Value="False" />
                                 <Condition Property="IsSelected" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.DisabledSelectedBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.DisabledSelectedForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.DisabledSelectedBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.DisabledSelectedForegroundBrush), Mode=OneWay}" />
                         </MultiTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
         <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="mah:ItemHelper.ActiveSelectionBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="mah:ItemHelper.ActiveSelectionForegroundBrush" Value="{DynamicResource MahApps.Brushes.Selected.Foreground}" />
+        <Setter Property="mah:ItemHelper.DisabledForegroundBrush" Value="{DynamicResource MahApps.Brushes.Gray}" />
+        <Setter Property="mah:ItemHelper.DisabledSelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Gray7}" />
+        <Setter Property="mah:ItemHelper.DisabledSelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.Selected.Foreground}" />
+        <Setter Property="mah:ItemHelper.HoverBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent3}" />
+        <Setter Property="mah:ItemHelper.HoverForegroundBrush" Value="{DynamicResource MahApps.Brushes.Text}" />
+        <Setter Property="mah:ItemHelper.HoverSelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="mah:ItemHelper.HoverSelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.Selected.Foreground}" />
+        <Setter Property="mah:ItemHelper.SelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent2}" />
+        <Setter Property="mah:ItemHelper.SelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.Selected.Foreground}" />
         <Style.Triggers>
             <Trigger Property="IsVisible" Value="True">
                 <Setter Property="RenderOptions.ClearTypeHint" Value="{Binding Path=(RenderOptions.ClearTypeHint), FallbackValue=Auto, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Selector}}}" />
diff --git a/src/MahApps.Metro/Styles/Controls.DatePicker.xaml b/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
index c1a45c947f..7b4cabcfd6 100644
--- a/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
+++ b/src/MahApps.Metro/Styles/Controls.DatePicker.xaml
@@ -1,10 +1,10 @@
 <ResourceDictionary 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"
-                    xmlns:Converters="clr-namespace:MahApps.Metro.Converters"
                     xmlns:accessibility="clr-namespace:MahApps.Metro.Accessibility"
                     xmlns:behaviors="clr-namespace:MahApps.Metro.Behaviors"
-                    xmlns:i="http://schemas.microsoft.com/xaml/behaviors">
+                    xmlns:converters="clr-namespace:MahApps.Metro.Converters"
+                    xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.Shared.xaml" />
@@ -16,28 +16,6 @@
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="CalendarStyle" Value="{DynamicResource MahApps.Styles.Calendar.Base}" />
         <Setter Property="ContextMenu" Value="{DynamicResource MahApps.TextBox.ContextMenu}" />
-        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border.Focus}" />
-        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border.MouseOver}" />
-        <Setter Property="Controls:DatePickerHelper.DropDownButtonContent" Value="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" />
-        <Setter Property="Controls:DatePickerHelper.DropDownButtonContentTemplate">
-            <Setter.Value>
-                <DataTemplate>
-                    <!--  Modern - Calendar14  -->
-                    <ContentControl x:Name="PART_PackIcon"
-                                    Width="{Binding RelativeSource={RelativeSource AncestorType=DatePicker}, Path=(Controls:TextBoxHelper.ButtonWidth), Mode=OneWay}"
-                                    Height="{Binding RelativeSource={RelativeSource AncestorType=DatePicker}, Path=(Controls:TextBoxHelper.ButtonWidth), Mode=OneWay}"
-                                    Padding="3"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Content="{Binding Mode=OneWay}"
-                                    Style="{DynamicResource MahApps.Styles.ContentControl.PathIcon}" />
-                </DataTemplate>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Font.Size.Button.ClearText}" />
-        <Setter Property="Controls:TextBoxHelper.ButtonTemplate" Value="{DynamicResource MahApps.Templates.Button.Chromeless}" />
-        <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="22" />
-        <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True" />
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Family.Control}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
@@ -54,7 +32,7 @@
                                 Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                                CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
 
                         <Grid x:Name="PART_InnerGrid" Margin="{TemplateBinding BorderThickness}">
@@ -75,9 +53,9 @@
                                                Padding="{TemplateBinding Padding}"
                                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                               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}"
+                                               mah:TextBoxHelper.Watermark="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:TextBoxHelper.Watermark), Mode=OneWay}"
+                                               mah:TextBoxHelper.WatermarkAlignment="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:TextBoxHelper.WatermarkAlignment), Mode=OneWay}"
+                                               mah:TextBoxHelper.WatermarkTrimming="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:TextBoxHelper.WatermarkTrimming), Mode=OneWay}"
                                                CaretBrush="{DynamicResource MahApps.Brushes.ThemeForeground}"
                                                ContextMenu="{TemplateBinding ContextMenu}"
                                                Focusable="{TemplateBinding Focusable}"
@@ -95,7 +73,7 @@
                                             Margin="4 0"
                                             Style="{DynamicResource MahApps.Styles.ContentControl.FloatingMessageContainer}">
                                 <ContentControl.Height>
-                                    <MultiBinding Converter="{Converters:MathMultiplyConverter}">
+                                    <MultiBinding Converter="{converters:MathMultiplyConverter}">
                                         <Binding ElementName="PART_FloatingMessage"
                                                  Mode="OneWay"
                                                  Path="ActualHeight" />
@@ -109,13 +87,13 @@
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
                                            Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing}"
-                                           Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
-                                           TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
-                                           TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
+                                           Text="{TemplateBinding mah:TextBoxHelper.Watermark}"
+                                           TextAlignment="{TemplateBinding mah:TextBoxHelper.WatermarkAlignment}"
+                                           TextTrimming="{TemplateBinding mah:TextBoxHelper.WatermarkTrimming}">
                                     <TextBlock.RenderTransform>
                                         <TranslateTransform x:Name="FloatingMessageTransform">
                                             <TranslateTransform.Y>
-                                                <MultiBinding Converter="{Converters:MathSubtractConverter}">
+                                                <MultiBinding Converter="{converters:MathSubtractConverter}">
                                                     <Binding ElementName="PART_FloatingMessage"
                                                              Mode="OneWay"
                                                              Path="ActualHeight" />
@@ -133,31 +111,31 @@
                                     Grid.Row="0"
                                     Grid.RowSpan="2"
                                     Grid.Column="1"
-                                    Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
-                                    Command="{TemplateBinding Controls:TextBoxHelper.ButtonCommand}"
-                                    CommandParameter="{TemplateBinding Controls:TextBoxHelper.ButtonCommandParameter}"
+                                    Width="{TemplateBinding mah:TextBoxHelper.ButtonWidth}"
+                                    Command="{TemplateBinding mah:TextBoxHelper.ButtonCommand}"
+                                    CommandParameter="{TemplateBinding mah:TextBoxHelper.ButtonCommandParameter}"
                                     CommandTarget="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type DatePicker}}, Mode=OneWay}"
-                                    Content="{TemplateBinding Controls:TextBoxHelper.ButtonContent}"
-                                    ContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}"
+                                    Content="{TemplateBinding mah:TextBoxHelper.ButtonContent}"
+                                    ContentTemplate="{TemplateBinding mah:TextBoxHelper.ButtonContentTemplate}"
                                     Focusable="False"
-                                    FontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}"
-                                    FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
+                                    FontFamily="{TemplateBinding mah:TextBoxHelper.ButtonFontFamily}"
+                                    FontSize="{TemplateBinding mah:TextBoxHelper.ButtonFontSize}"
                                     Foreground="{TemplateBinding Foreground}"
                                     IsTabStop="False"
                                     Style="{DynamicResource MahApps.Styles.Button.Chromeless}"
-                                    Template="{TemplateBinding Controls:TextBoxHelper.ButtonTemplate}"
+                                    Template="{TemplateBinding mah:TextBoxHelper.ButtonTemplate}"
                                     Visibility="Visible" />
 
                             <Button x:Name="PART_Button"
                                     Grid.Row="0"
                                     Grid.RowSpan="2"
                                     Grid.Column="2"
-                                    Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
-                                    Content="{TemplateBinding Controls:DatePickerHelper.DropDownButtonContent}"
-                                    ContentTemplate="{TemplateBinding Controls:DatePickerHelper.DropDownButtonContentTemplate}"
+                                    Width="{TemplateBinding mah:TextBoxHelper.ButtonWidth}"
+                                    Content="{TemplateBinding mah:DatePickerHelper.DropDownButtonContent}"
+                                    ContentTemplate="{TemplateBinding mah:DatePickerHelper.DropDownButtonContentTemplate}"
                                     Focusable="False"
-                                    FontFamily="{TemplateBinding Controls:DatePickerHelper.DropDownButtonFontFamily}"
-                                    FontSize="{TemplateBinding Controls:DatePickerHelper.DropDownButtonFontSize}"
+                                    FontFamily="{TemplateBinding mah:DatePickerHelper.DropDownButtonFontFamily}"
+                                    FontSize="{TemplateBinding mah:DatePickerHelper.DropDownButtonFontSize}"
                                     Foreground="{TemplateBinding Foreground}"
                                     IsTabStop="False"
                                     Style="{DynamicResource MahApps.Styles.Button.Chromeless}" />
@@ -176,18 +154,18 @@
                                 Background="{DynamicResource MahApps.Brushes.Control.Disabled}"
                                 BorderBrush="{DynamicResource MahApps.Brushes.Control.Disabled}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                                CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                                 IsHitTestVisible="False"
                                 Opacity="0"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                     </Grid>
 
                     <ControlTemplate.Triggers>
-                        <Trigger Property="Controls:TextBoxHelper.ClearTextButton" Value="True">
-                            <Setter Property="Controls:TextBoxHelper.ButtonCommand" Value="{x:Static Controls:MahAppsCommands.ClearControlCommand}" />
+                        <Trigger Property="mah:TextBoxHelper.ClearTextButton" Value="True">
+                            <Setter Property="mah:TextBoxHelper.ButtonCommand" Value="{x:Static mah:MahAppsCommands.ClearControlCommand}" />
                         </Trigger>
 
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.ButtonsAlignment)}" Value="Left">
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(mah:TextBoxHelper.ButtonsAlignment)}" Value="Left">
                             <Setter TargetName="ButtonColumn" Property="Width" Value="*" />
                             <Setter TargetName="PART_Button" Property="Grid.Column" Value="0" />
                             <Setter TargetName="PART_ClearText" Property="Grid.Column" Value="1" />
@@ -196,20 +174,20 @@
                             <Setter TargetName="TextColumn" Property="Width" Value="Auto" />
                         </DataTrigger>
 
-                        <Trigger Property="Controls:ControlsHelper.IsReadOnly" Value="True">
+                        <Trigger Property="mah:ControlsHelper.IsReadOnly" Value="True">
                             <Setter TargetName="PART_Button" Property="IsEnabled" Value="False" />
                             <Setter TargetName="PART_TextBox" Property="IsReadOnly" Value="True" />
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.MouseOverBorderBrush)}" />
+                            <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.MouseOverBorderBrush)}" />
                         </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="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.FocusBorderBrush)}" />
                             <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource MahApps.Brushes.TextBlock.FloatingMessage}" />
                             <Setter TargetName="PART_FloatingMessage" Property="Opacity" Value="1" />
                         </Trigger>
                         <Trigger Property="IsKeyboardFocusWithin" Value="True">
-                            <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
+                            <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.FocusBorderBrush)}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter TargetName="DisabledVisualElement" Property="Opacity" Value="0.6" />
@@ -223,14 +201,14 @@
                             <Setter TargetName="PART_Button" Property="Foreground" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
                         </Trigger>
 
-                        <Trigger Property="Controls:TextBoxHelper.ButtonCommand" Value="{x:Null}">
+                        <Trigger Property="mah:TextBoxHelper.ButtonCommand" Value="{x:Null}">
                             <Setter TargetName="PART_ClearText" Property="Visibility" Value="Collapsed" />
                         </Trigger>
 
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="Controls:ControlsHelper.IsReadOnly" Value="True" />
-                                <Condition Property="Controls:TextBoxHelper.ButtonCommand" Value="{x:Null}" />
+                                <Condition Property="mah:ControlsHelper.IsReadOnly" Value="True" />
+                                <Condition Property="mah:TextBoxHelper.ButtonCommand" Value="{x:Null}" />
                             </MultiTrigger.Conditions>
                             <Setter TargetName="PART_ClearText" Property="IsEnabled" Value="False" />
                         </MultiTrigger>
@@ -246,8 +224,8 @@
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
                                 <Condition Binding="{Binding Path=IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
-                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
-                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(mah:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(mah:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.ShowFloatingMessage}" />
@@ -261,12 +239,33 @@
             </Setter.Value>
         </Setter>
         <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource MahApps.Templates.ValidationError}" />
+        <Setter Property="mah:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border.Focus}" />
+        <Setter Property="mah:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border.MouseOver}" />
+        <Setter Property="mah:DatePickerHelper.DropDownButtonContent" Value="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" />
+        <Setter Property="mah:DatePickerHelper.DropDownButtonContentTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <!--  Modern - Calendar14  -->
+                    <ContentControl x:Name="PART_PackIcon"
+                                    Width="{Binding RelativeSource={RelativeSource AncestorType=DatePicker}, Path=(mah:TextBoxHelper.ButtonWidth), Mode=OneWay}"
+                                    Height="{Binding RelativeSource={RelativeSource AncestorType=DatePicker}, Path=(mah:TextBoxHelper.ButtonWidth), Mode=OneWay}"
+                                    Padding="3"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Content="{Binding Mode=OneWay}"
+                                    Style="{DynamicResource MahApps.Styles.ContentControl.PathIcon}" />
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="mah:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Font.Size.Button.ClearText}" />
+        <Setter Property="mah:TextBoxHelper.ButtonTemplate" Value="{DynamicResource MahApps.Templates.Button.Chromeless}" />
+        <Setter Property="mah:TextBoxHelper.ButtonWidth" Value="22" />
+        <Setter Property="mah:TextBoxHelper.IsMonitoring" Value="True" />
     </Style>
 
     <Style x:Key="MahApps.Styles.DatePickerTextBox" TargetType="{x:Type DatePickerTextBox}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Control.Background}" />
         <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.Family.Control}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Content}" />
@@ -294,9 +293,9 @@
                                         Padding="{TemplateBinding Padding}"
                                         HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                         VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                        Controls:TextBoxHelper.WatermarkAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
-                                        Controls:TextBoxHelper.WatermarkTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
-                                        Controls:TextBoxHelper.WatermarkWrapping="{TemplateBinding Controls:TextBoxHelper.WatermarkWrapping}"
+                                        mah:TextBoxHelper.WatermarkAlignment="{TemplateBinding mah:TextBoxHelper.WatermarkAlignment}"
+                                        mah:TextBoxHelper.WatermarkTrimming="{TemplateBinding mah:TextBoxHelper.WatermarkTrimming}"
+                                        mah:TextBoxHelper.WatermarkWrapping="{TemplateBinding mah:TextBoxHelper.WatermarkWrapping}"
                                         Focusable="False"
                                         Foreground="{TemplateBinding Foreground}"
                                         IsHitTestVisible="False"
@@ -309,9 +308,9 @@
                                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                                Style="{DynamicResource MahApps.Styles.TextBlock.Watermark}"
                                                Text="{TemplateBinding Content}"
-                                               TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
-                                               TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
-                                               TextWrapping="{TemplateBinding Controls:TextBoxHelper.WatermarkWrapping}" />
+                                               TextAlignment="{TemplateBinding mah:TextBoxHelper.WatermarkAlignment}"
+                                               TextTrimming="{TemplateBinding mah:TextBoxHelper.WatermarkTrimming}"
+                                               TextWrapping="{TemplateBinding mah:TextBoxHelper.WatermarkWrapping}" />
                                 </ControlTemplate>
                             </ContentControl.Template>
                         </ContentControl>
@@ -323,15 +322,15 @@
                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                    Foreground="{TemplateBinding Foreground}"
                                    Style="{DynamicResource MahApps.Styles.TextBlock.Watermark}"
-                                   Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
-                                   TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
-                                   TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
-                                   TextWrapping="{TemplateBinding Controls:TextBoxHelper.WatermarkWrapping}" />
+                                   Text="{TemplateBinding mah:TextBoxHelper.Watermark}"
+                                   TextAlignment="{TemplateBinding mah:TextBoxHelper.WatermarkAlignment}"
+                                   TextTrimming="{TemplateBinding mah:TextBoxHelper.WatermarkTrimming}"
+                                   TextWrapping="{TemplateBinding mah:TextBoxHelper.WatermarkWrapping}" />
                     </Grid>
                     <ControlTemplate.Triggers>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="Controls:TextBoxHelper.HasText" Value="False" />
+                                <Condition Property="mah:TextBoxHelper.HasText" Value="False" />
                                 <Condition Property="IsFocused" Value="True" />
                             </MultiTrigger.Conditions>
                             <MultiTrigger.EnterActions>
@@ -342,11 +341,11 @@
                             </MultiTrigger.ExitActions>
                         </MultiTrigger>
 
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.Watermark)}" Value="">
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(mah:TextBoxHelper.Watermark)}" Value="">
                             <Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
                         </DataTrigger>
 
-                        <Trigger Property="Controls:TextBoxHelper.HasText" Value="True">
+                        <Trigger Property="mah:TextBoxHelper.HasText" Value="True">
                             <Trigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.EnterHasText.DatePickerTextBox}" />
                             </Trigger.EnterActions>
@@ -358,6 +357,7 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
+        <Setter Property="mah:TextBoxHelper.IsMonitoring" Value="True" />
     </Style>
 
     <Style x:Key="MahApps.Styles.DatePickerTextBox.TimePickerBase"
@@ -365,9 +365,9 @@
            TargetType="{x:Type DatePickerTextBox}">
         <Style.Triggers>
             <DataTrigger Binding="{Binding Path=(accessibility:AccessibilitySwitches.UseNetFx472CompatibleAccessibilityFeatures)}" Value="false">
-                <Setter Property="AutomationProperties.HelpText" Value="{Binding Path=(AutomationProperties.HelpText), Mode=OneWay, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Controls:TimePickerBase}}}" />
-                <Setter Property="AutomationProperties.LabeledBy" Value="{Binding Path=(AutomationProperties.LabeledBy), Mode=OneWay, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Controls:TimePickerBase}}}" />
-                <Setter Property="AutomationProperties.Name" Value="{Binding Path=(AutomationProperties.Name), Mode=OneWay, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Controls:TimePickerBase}}}" />
+                <Setter Property="AutomationProperties.HelpText" Value="{Binding Path=(AutomationProperties.HelpText), Mode=OneWay, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type mah:TimePickerBase}}}" />
+                <Setter Property="AutomationProperties.LabeledBy" Value="{Binding Path=(AutomationProperties.LabeledBy), Mode=OneWay, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type mah:TimePickerBase}}}" />
+                <Setter Property="AutomationProperties.Name" Value="{Binding Path=(AutomationProperties.Name), Mode=OneWay, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type mah:TimePickerBase}}}" />
             </DataTrigger>
         </Style.Triggers>
     </Style>
diff --git a/src/MahApps.Metro/Styles/Controls.Expander.xaml b/src/MahApps.Metro/Styles/Controls.Expander.xaml
index fa6364ec98..b7f8dab5fc 100644
--- a/src/MahApps.Metro/Styles/Controls.Expander.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Expander.xaml
@@ -1,14 +1,14 @@
 <ResourceDictionary 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"
-                    xmlns:Converters="clr-namespace:MahApps.Metro.Converters"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
+                    xmlns:converters="clr-namespace:MahApps.Metro.Converters"
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib">
 
-    <Converters:ThicknessBindingConverter x:Key="ThicknessBindingConverter" />
-    <Converters:CornerRadiusBindingConverter x:Key="CornerRadiusBindingConverter" />
+    <converters:ThicknessBindingConverter x:Key="ThicknessBindingConverter" />
+    <converters:CornerRadiusBindingConverter x:Key="CornerRadiusBindingConverter" />
 
     <Thickness x:Key="ExpanderHeaderThemePadding">2</Thickness>
-    <sys:Double x:Key="ExpanderToggleButtonEllipseThemeSize">18</sys:Double>
+    <system:Double x:Key="ExpanderToggleButtonEllipseThemeSize">18</system:Double>
 
     <Style x:Key="MahApps.Styles.ToggleButton.ExpanderHeader.Base" TargetType="{x:Type ToggleButton}">
         <Setter Property="Background" Value="Transparent" />
@@ -62,17 +62,17 @@
                                       Stroke="{TemplateBinding Foreground}"
                                       StrokeThickness="2" />
                             </Grid>
-                            <Controls:ContentControlEx Grid.Row="1"
-                                                       Margin="0 4 0 0"
-                                                       HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                       VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                       Content="{TemplateBinding Content}"
-                                                       ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
-                                                       ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                                       ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                       ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                       RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
-                                                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            <mah:ContentControlEx Grid.Row="1"
+                                                  Margin="0 4 0 0"
+                                                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                  Content="{TemplateBinding Content}"
+                                                  ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
+                                                  ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                  ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                                  RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
+                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
@@ -136,17 +136,17 @@
                                       Stroke="{TemplateBinding Foreground}"
                                       StrokeThickness="2" />
                             </Grid>
-                            <Controls:ContentControlEx Grid.Column="1"
-                                                       Margin="4 0 0 0"
-                                                       HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                       VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                       Content="{TemplateBinding Content}"
-                                                       ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
-                                                       ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                                       ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                       ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                       RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
-                                                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            <mah:ContentControlEx Grid.Column="1"
+                                                  Margin="4 0 0 0"
+                                                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                  Content="{TemplateBinding Content}"
+                                                  ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
+                                                  ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                  ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                                  RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
+                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
@@ -209,17 +209,17 @@
                                       Stroke="{TemplateBinding Foreground}"
                                       StrokeThickness="2" />
                             </Grid>
-                            <Controls:ContentControlEx Grid.Row="1"
-                                                       Margin="0 4 0 0"
-                                                       HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                       VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                       Content="{TemplateBinding Content}"
-                                                       ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
-                                                       ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                                       ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                       ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                       RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
-                                                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            <mah:ContentControlEx Grid.Row="1"
+                                                  Margin="0 4 0 0"
+                                                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                  Content="{TemplateBinding Content}"
+                                                  ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
+                                                  ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                  ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                                  RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
+                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
@@ -272,17 +272,17 @@
                                       Stroke="{TemplateBinding Foreground}"
                                       StrokeThickness="2" />
                             </Grid>
-                            <Controls:ContentControlEx Grid.Column="1"
-                                                       Margin="4 0 0 0"
-                                                       HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                       VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                       Content="{TemplateBinding Content}"
-                                                       ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
-                                                       ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                                       ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                       ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                       RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
-                                                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            <mah:ContentControlEx Grid.Column="1"
+                                                  Margin="4 0 0 0"
+                                                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                  Content="{TemplateBinding Content}"
+                                                  ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
+                                                  ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                  ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                                  RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
+                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
@@ -330,16 +330,6 @@
     <Style x:Key="MahApps.Styles.Expander" TargetType="{x:Type Expander}">
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Upper" />
-        <Setter Property="Controls:ExpanderHelper.CollapseStoryboard" Value="{StaticResource MahApps.Storyboard.Expander.Collapse}" />
-        <Setter Property="Controls:ExpanderHelper.ExpandStoryboard" Value="{StaticResource MahApps.Storyboard.Expander.Expand}" />
-        <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:HeaderedControlHelper.HeaderBackground" Value="{DynamicResource MahApps.Brushes.Accent}" />
-        <Setter Property="Controls:HeaderedControlHelper.HeaderFontSize" Value="{DynamicResource MahApps.Font.Size.Content}" />
-        <Setter Property="Controls:HeaderedControlHelper.HeaderForeground" Value="{x:Null}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ThemeForeground}" />
         <Setter Property="Padding" Value="4" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -353,33 +343,33 @@
                                    Opacity="0" />
                         <DockPanel x:Name="ExpanderRoot">
                             <Border x:Name="HeaderSite"
-                                    Background="{TemplateBinding Controls:HeaderedControlHelper.HeaderBackground}"
+                                    Background="{TemplateBinding mah:HeaderedControlHelper.HeaderBackground}"
                                     BorderBrush="{TemplateBinding BorderBrush}"
                                     BorderThickness="{TemplateBinding BorderThickness}"
-                                    CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.CornerRadius), Converter={StaticResource CornerRadiusBindingConverter}, ConverterParameter={x:Static Converters:RadiusType.Bottom}}"
+                                    CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.CornerRadius), Converter={StaticResource CornerRadiusBindingConverter}, ConverterParameter={x:Static converters:RadiusType.Bottom}}"
                                     DockPanel.Dock="Top"
                                     SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
                                     UseLayoutRounding="True">
                                 <ToggleButton x:Name="ToggleSite"
-                                              Controls:ControlsHelper.ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
+                                              mah:ControlsHelper.ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
                                               Content="{TemplateBinding Header}"
                                               ContentStringFormat="{TemplateBinding HeaderStringFormat}"
                                               ContentTemplate="{TemplateBinding HeaderTemplate}"
                                               ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
-                                              FontFamily="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontFamily}"
-                                              FontSize="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontSize}"
-                                              FontStretch="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontStretch}"
-                                              FontWeight="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontWeight}"
+                                              FontFamily="{TemplateBinding mah:HeaderedControlHelper.HeaderFontFamily}"
+                                              FontSize="{TemplateBinding mah:HeaderedControlHelper.HeaderFontSize}"
+                                              FontStretch="{TemplateBinding mah:HeaderedControlHelper.HeaderFontStretch}"
+                                              FontWeight="{TemplateBinding mah:HeaderedControlHelper.HeaderFontWeight}"
                                               IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                                              Style="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ExpanderHelper.HeaderDownStyle)}"
+                                              Style="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ExpanderHelper.HeaderDownStyle)}"
                                               UseLayoutRounding="False">
                                     <ToggleButton.Foreground>
-                                        <MultiBinding Converter="{x:Static Converters:BackgroundToForegroundConverter.Instance}">
+                                        <MultiBinding Converter="{x:Static converters:BackgroundToForegroundConverter.Instance}">
                                             <Binding Mode="OneWay"
-                                                     Path="(Controls:HeaderedControlHelper.HeaderBackground)"
+                                                     Path="(mah:HeaderedControlHelper.HeaderBackground)"
                                                      RelativeSource="{RelativeSource TemplatedParent}" />
                                             <Binding Mode="OneWay"
-                                                     Path="(Controls:HeaderedControlHelper.HeaderForeground)"
+                                                     Path="(mah:HeaderedControlHelper.HeaderForeground)"
                                                      RelativeSource="{RelativeSource TemplatedParent}" />
                                         </MultiBinding>
                                     </ToggleButton.Foreground>
@@ -390,8 +380,8 @@
                                     VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                     Background="{TemplateBinding Background}"
                                     BorderBrush="{TemplateBinding BorderBrush}"
-                                    BorderThickness="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={StaticResource ThicknessBindingConverter}, ConverterParameter={x:Static Converters:ThicknessSideType.Top}}"
-                                    CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.CornerRadius), Converter={StaticResource CornerRadiusBindingConverter}, ConverterParameter={x:Static Converters:RadiusType.Top}}"
+                                    BorderThickness="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={StaticResource ThicknessBindingConverter}, ConverterParameter={x:Static converters:ThicknessSideType.Top}}"
+                                    CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.CornerRadius), Converter={StaticResource CornerRadiusBindingConverter}, ConverterParameter={x:Static converters:RadiusType.Top}}"
                                     DockPanel.Dock="Bottom"
                                     Focusable="false"
                                     Opacity="0"
@@ -426,7 +416,7 @@
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
                                 <Condition Binding="{Binding IsExpanded, RelativeSource={RelativeSource Self}}" Value="True" />
-                                <Condition Binding="{Binding Path=(Controls:ExpanderHelper.ExpandStoryboard), RelativeSource={RelativeSource Self}}" Value="{x:Null}" />
+                                <Condition Binding="{Binding Path=(mah:ExpanderHelper.ExpandStoryboard), RelativeSource={RelativeSource Self}}" Value="{x:Null}" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="ExpandSite" Property="Opacity" Value="1" />
                             <Setter TargetName="ExpandSite" Property="Visibility" Value="Visible" />
@@ -434,38 +424,38 @@
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
                                 <Condition Binding="{Binding IsExpanded, RelativeSource={RelativeSource Self}}" Value="False" />
-                                <Condition Binding="{Binding Path=(Controls:ExpanderHelper.CollapseStoryboard), RelativeSource={RelativeSource Self}}" Value="{x:Null}" />
+                                <Condition Binding="{Binding Path=(mah:ExpanderHelper.CollapseStoryboard), RelativeSource={RelativeSource Self}}" Value="{x:Null}" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="ExpandSite" Property="Opacity" Value="0" />
                             <Setter TargetName="ExpandSite" Property="Visibility" Value="Collapsed" />
                         </MultiDataTrigger>
 
                         <Trigger Property="ExpandDirection" Value="Right">
-                            <Setter TargetName="ExpandSite" Property="BorderThickness" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={StaticResource ThicknessBindingConverter}, ConverterParameter={x:Static Converters:ThicknessSideType.Left}}" />
-                            <Setter TargetName="ExpandSite" Property="CornerRadius" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.CornerRadius), Converter={StaticResource CornerRadiusBindingConverter}, ConverterParameter={x:Static Converters:RadiusType.Left}}" />
+                            <Setter TargetName="ExpandSite" Property="BorderThickness" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={StaticResource ThicknessBindingConverter}, ConverterParameter={x:Static converters:ThicknessSideType.Left}}" />
+                            <Setter TargetName="ExpandSite" Property="CornerRadius" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.CornerRadius), Converter={StaticResource CornerRadiusBindingConverter}, ConverterParameter={x:Static converters:RadiusType.Left}}" />
                             <Setter TargetName="ExpandSite" Property="DockPanel.Dock" Value="Right" />
-                            <Setter TargetName="HeaderSite" Property="CornerRadius" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.CornerRadius), Converter={StaticResource CornerRadiusBindingConverter}, ConverterParameter={x:Static Converters:RadiusType.Right}}" />
+                            <Setter TargetName="HeaderSite" Property="CornerRadius" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.CornerRadius), Converter={StaticResource CornerRadiusBindingConverter}, ConverterParameter={x:Static converters:RadiusType.Right}}" />
                             <Setter TargetName="HeaderSite" Property="DockPanel.Dock" Value="Left" />
-                            <Setter TargetName="ToggleSite" Property="Style" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ExpanderHelper.HeaderRightStyle)}" />
+                            <Setter TargetName="ToggleSite" Property="Style" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ExpanderHelper.HeaderRightStyle)}" />
                         </Trigger>
                         <Trigger Property="ExpandDirection" Value="Up">
-                            <Setter TargetName="ExpandSite" Property="BorderThickness" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={StaticResource ThicknessBindingConverter}, ConverterParameter={x:Static Converters:ThicknessSideType.Bottom}}" />
-                            <Setter TargetName="ExpandSite" Property="CornerRadius" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.CornerRadius), Converter={StaticResource CornerRadiusBindingConverter}, ConverterParameter={x:Static Converters:RadiusType.Bottom}}" />
+                            <Setter TargetName="ExpandSite" Property="BorderThickness" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={StaticResource ThicknessBindingConverter}, ConverterParameter={x:Static converters:ThicknessSideType.Bottom}}" />
+                            <Setter TargetName="ExpandSite" Property="CornerRadius" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.CornerRadius), Converter={StaticResource CornerRadiusBindingConverter}, ConverterParameter={x:Static converters:RadiusType.Bottom}}" />
                             <Setter TargetName="ExpandSite" Property="DockPanel.Dock" Value="Top" />
-                            <Setter TargetName="HeaderSite" Property="CornerRadius" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.CornerRadius), Converter={StaticResource CornerRadiusBindingConverter}, ConverterParameter={x:Static Converters:RadiusType.Top}}" />
+                            <Setter TargetName="HeaderSite" Property="CornerRadius" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.CornerRadius), Converter={StaticResource CornerRadiusBindingConverter}, ConverterParameter={x:Static converters:RadiusType.Top}}" />
                             <Setter TargetName="HeaderSite" Property="DockPanel.Dock" Value="Bottom" />
-                            <Setter TargetName="ToggleSite" Property="Style" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ExpanderHelper.HeaderUpStyle)}" />
+                            <Setter TargetName="ToggleSite" Property="Style" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ExpanderHelper.HeaderUpStyle)}" />
                         </Trigger>
                         <Trigger Property="ExpandDirection" Value="Left">
-                            <Setter TargetName="ExpandSite" Property="BorderThickness" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={StaticResource ThicknessBindingConverter}, ConverterParameter={x:Static Converters:ThicknessSideType.Right}}" />
-                            <Setter TargetName="ExpandSite" Property="CornerRadius" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.CornerRadius), Converter={StaticResource CornerRadiusBindingConverter}, ConverterParameter={x:Static Converters:RadiusType.Right}}" />
+                            <Setter TargetName="ExpandSite" Property="BorderThickness" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={StaticResource ThicknessBindingConverter}, ConverterParameter={x:Static converters:ThicknessSideType.Right}}" />
+                            <Setter TargetName="ExpandSite" Property="CornerRadius" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.CornerRadius), Converter={StaticResource CornerRadiusBindingConverter}, ConverterParameter={x:Static converters:RadiusType.Right}}" />
                             <Setter TargetName="ExpandSite" Property="DockPanel.Dock" Value="Left" />
-                            <Setter TargetName="HeaderSite" Property="CornerRadius" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.CornerRadius), Converter={StaticResource CornerRadiusBindingConverter}, ConverterParameter={x:Static Converters:RadiusType.Left}}" />
+                            <Setter TargetName="HeaderSite" Property="CornerRadius" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.CornerRadius), Converter={StaticResource CornerRadiusBindingConverter}, ConverterParameter={x:Static converters:RadiusType.Left}}" />
                             <Setter TargetName="HeaderSite" Property="DockPanel.Dock" Value="Right" />
-                            <Setter TargetName="ToggleSite" Property="Style" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ExpanderHelper.HeaderLeftStyle)}" />
+                            <Setter TargetName="ToggleSite" Property="Style" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ExpanderHelper.HeaderLeftStyle)}" />
                         </Trigger>
                         <Trigger Property="IsExpanded" Value="false">
-                            <Setter TargetName="HeaderSite" Property="CornerRadius" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.CornerRadius)}" />
+                            <Setter TargetName="HeaderSite" Property="CornerRadius" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.CornerRadius)}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="false">
                             <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
@@ -474,5 +464,15 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
+        <Setter Property="mah:ControlsHelper.ContentCharacterCasing" Value="Upper" />
+        <Setter Property="mah:ExpanderHelper.CollapseStoryboard" Value="{StaticResource MahApps.Storyboard.Expander.Collapse}" />
+        <Setter Property="mah:ExpanderHelper.ExpandStoryboard" Value="{StaticResource MahApps.Storyboard.Expander.Expand}" />
+        <Setter Property="mah:ExpanderHelper.HeaderDownStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderHeader.Down}" />
+        <Setter Property="mah:ExpanderHelper.HeaderLeftStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderHeader.Left}" />
+        <Setter Property="mah:ExpanderHelper.HeaderRightStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderHeader.Right}" />
+        <Setter Property="mah:ExpanderHelper.HeaderUpStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderHeader.Up}" />
+        <Setter Property="mah:HeaderedControlHelper.HeaderBackground" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="mah:HeaderedControlHelper.HeaderFontSize" Value="{DynamicResource MahApps.Font.Size.Content}" />
+        <Setter Property="mah:HeaderedControlHelper.HeaderForeground" Value="{x:Null}" />
     </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Controls.GroupBox.xaml b/src/MahApps.Metro/Styles/Controls.GroupBox.xaml
index ff44304936..bf95e4242c 100644
--- a/src/MahApps.Metro/Styles/Controls.GroupBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.GroupBox.xaml
@@ -1,20 +1,16 @@
 <ResourceDictionary 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"
-                    xmlns:Converters="clr-namespace:MahApps.Metro.Converters">
+                    xmlns:converters="clr-namespace:MahApps.Metro.Converters"
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
-    <Converters:ThicknessBindingConverter x:Key="ThicknessBindingConverter" />
-    <Converters:CornerRadiusBindingConverter x:Key="CornerRadiusBindingConverter" />
+    <converters:ThicknessBindingConverter x:Key="ThicknessBindingConverter" />
+    <converters:CornerRadiusBindingConverter x:Key="CornerRadiusBindingConverter" />
 
     <Thickness x:Key="GroupBoxHeaderThemePadding">4</Thickness>
 
     <Style x:Key="MahApps.Styles.GroupBox" TargetType="{x:Type GroupBox}">
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Upper" />
-        <Setter Property="Controls:HeaderedControlHelper.HeaderBackground" Value="{DynamicResource MahApps.Brushes.Accent}" />
-        <Setter Property="Controls:HeaderedControlHelper.HeaderFontSize" Value="{DynamicResource MahApps.Font.Size.Content}" />
-        <Setter Property="Controls:HeaderedControlHelper.HeaderForeground" Value="{x:Null}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ThemeForeground}" />
         <Setter Property="Padding" Value="4" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -28,45 +24,45 @@
                         </Grid.RowDefinitions>
                         <Border x:Name="HeaderSite"
                                 Grid.Row="0"
-                                Background="{TemplateBinding Controls:HeaderedControlHelper.HeaderBackground}"
+                                Background="{TemplateBinding mah:HeaderedControlHelper.HeaderBackground}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.CornerRadius), Converter={StaticResource CornerRadiusBindingConverter}, ConverterParameter={x:Static Converters:RadiusType.Bottom}}"
+                                CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.CornerRadius), Converter={StaticResource CornerRadiusBindingConverter}, ConverterParameter={x:Static converters:RadiusType.Bottom}}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
                                 UseLayoutRounding="True">
-                            <Controls:ContentControlEx x:Name="HeaderContent"
-                                                       Margin="{DynamicResource GroupBoxHeaderThemePadding}"
-                                                       HorizontalAlignment="{TemplateBinding Controls:HeaderedControlHelper.HeaderHorizontalContentAlignment}"
-                                                       VerticalAlignment="{TemplateBinding Controls:HeaderedControlHelper.HeaderVerticalContentAlignment}"
-                                                       Content="{TemplateBinding Header}"
-                                                       ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
-                                                       ContentStringFormat="{TemplateBinding HeaderStringFormat}"
-                                                       ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                                       ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
-                                                       FontFamily="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontFamily}"
-                                                       FontSize="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontSize}"
-                                                       FontStretch="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontStretch}"
-                                                       FontWeight="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontWeight}"
-                                                       RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
-                                                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                                       UseLayoutRounding="False">
+                            <mah:ContentControlEx x:Name="HeaderContent"
+                                                  Margin="{DynamicResource GroupBoxHeaderThemePadding}"
+                                                  HorizontalAlignment="{TemplateBinding mah:HeaderedControlHelper.HeaderHorizontalContentAlignment}"
+                                                  VerticalAlignment="{TemplateBinding mah:HeaderedControlHelper.HeaderVerticalContentAlignment}"
+                                                  Content="{TemplateBinding Header}"
+                                                  ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
+                                                  ContentStringFormat="{TemplateBinding HeaderStringFormat}"
+                                                  ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                                  ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
+                                                  FontFamily="{TemplateBinding mah:HeaderedControlHelper.HeaderFontFamily}"
+                                                  FontSize="{TemplateBinding mah:HeaderedControlHelper.HeaderFontSize}"
+                                                  FontStretch="{TemplateBinding mah:HeaderedControlHelper.HeaderFontStretch}"
+                                                  FontWeight="{TemplateBinding mah:HeaderedControlHelper.HeaderFontWeight}"
+                                                  RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
+                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                                  UseLayoutRounding="False">
                                 <TextElement.Foreground>
-                                    <MultiBinding Converter="{x:Static Converters:BackgroundToForegroundConverter.Instance}">
+                                    <MultiBinding Converter="{x:Static converters:BackgroundToForegroundConverter.Instance}">
                                         <Binding Mode="OneWay"
-                                                 Path="(Controls:HeaderedControlHelper.HeaderBackground)"
+                                                 Path="(mah:HeaderedControlHelper.HeaderBackground)"
                                                  RelativeSource="{RelativeSource TemplatedParent}" />
                                         <Binding Mode="OneWay"
-                                                 Path="(Controls:HeaderedControlHelper.HeaderForeground)"
+                                                 Path="(mah:HeaderedControlHelper.HeaderForeground)"
                                                  RelativeSource="{RelativeSource TemplatedParent}" />
                                     </MultiBinding>
                                 </TextElement.Foreground>
-                            </Controls:ContentControlEx>
+                            </mah:ContentControlEx>
                         </Border>
                         <Border Grid.Row="1"
                                 Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={StaticResource ThicknessBindingConverter}, ConverterParameter={x:Static Converters:ThicknessSideType.Top}}"
-                                CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.CornerRadius), Converter={StaticResource CornerRadiusBindingConverter}, ConverterParameter={x:Static Converters:RadiusType.Top}}"
+                                BorderThickness="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={StaticResource ThicknessBindingConverter}, ConverterParameter={x:Static converters:ThicknessSideType.Top}}"
+                                CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.CornerRadius), Converter={StaticResource CornerRadiusBindingConverter}, ConverterParameter={x:Static converters:RadiusType.Top}}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
                                 UseLayoutRounding="True">
                             <ContentPresenter Margin="{TemplateBinding Padding}"
@@ -79,5 +75,9 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
+        <Setter Property="mah:ControlsHelper.ContentCharacterCasing" Value="Upper" />
+        <Setter Property="mah:HeaderedControlHelper.HeaderBackground" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="mah:HeaderedControlHelper.HeaderFontSize" Value="{DynamicResource MahApps.Font.Size.Content}" />
+        <Setter Property="mah:HeaderedControlHelper.HeaderForeground" Value="{x:Null}" />
     </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 9c45d75dac..5598f0814c 100644
--- a/src/MahApps.Metro/Styles/Controls.ListBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ListBox.xaml
@@ -1,7 +1,6 @@
 <ResourceDictionary 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"
-                    xmlns:converters="clr-namespace:MahApps.Metro.Converters">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
     <Style x:Key="MahApps.Styles.ListBox" TargetType="{x:Type ListBox}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
@@ -22,7 +21,7 @@
                             Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                            CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                             SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
                         <ScrollViewer Padding="{TemplateBinding Padding}"
                                       CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
@@ -77,17 +76,6 @@
     <Style x:Key="MahApps.Styles.ListBoxItem" TargetType="{x:Type ListBoxItem}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
         <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Controls:ItemHelper.ActiveSelectionBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
-        <Setter Property="Controls:ItemHelper.ActiveSelectionForegroundBrush" Value="{DynamicResource MahApps.Brushes.Selected.Foreground}" />
-        <Setter Property="Controls:ItemHelper.DisabledForegroundBrush" Value="{DynamicResource MahApps.Brushes.Gray}" />
-        <Setter Property="Controls:ItemHelper.DisabledSelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Gray7}" />
-        <Setter Property="Controls:ItemHelper.DisabledSelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.Selected.Foreground}" />
-        <Setter Property="Controls:ItemHelper.HoverBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent3}" />
-        <Setter Property="Controls:ItemHelper.HoverForegroundBrush" Value="{DynamicResource MahApps.Brushes.Text}" />
-        <Setter Property="Controls:ItemHelper.HoverSelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
-        <Setter Property="Controls:ItemHelper.HoverSelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.Selected.Foreground}" />
-        <Setter Property="Controls:ItemHelper.SelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent2}" />
-        <Setter Property="Controls:ItemHelper.SelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.Selected.Foreground}" />
         <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" />
@@ -116,16 +104,16 @@
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsSelected" Value="True">
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.SelectedBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.SelectedForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.SelectedBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.SelectedForegroundBrush), Mode=OneWay}" />
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsSelected" Value="True" />
                                 <Condition Property="Selector.IsSelectionActive" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.ActiveSelectionBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.ActiveSelectionForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.ActiveSelectionBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.ActiveSelectionForegroundBrush), Mode=OneWay}" />
                         </MultiTrigger>
 
                         <MultiTrigger>
@@ -133,30 +121,30 @@
                                 <Condition Property="IsMouseOver" Value="True" />
                                 <Condition Property="IsSelected" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.HoverSelectedBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.HoverSelectedForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.HoverSelectedBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.HoverSelectedForegroundBrush), Mode=OneWay}" />
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsMouseOver" Value="True" />
                                 <Condition Property="IsSelected" Value="False" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.HoverBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.HoverForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.HoverBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.HoverForegroundBrush), Mode=OneWay}" />
                         </MultiTrigger>
 
-                        <Trigger Property="Controls:ItemHelper.IsMouseLeftButtonPressed" Value="True">
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.MouseLeftButtonPressedBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.MouseLeftButtonPressedForegroundBrush), Mode=OneWay}" />
+                        <Trigger Property="mah:ItemHelper.IsMouseLeftButtonPressed" Value="True">
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.MouseLeftButtonPressedBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.MouseLeftButtonPressedForegroundBrush), Mode=OneWay}" />
                         </Trigger>
-                        <Trigger Property="Controls:ItemHelper.IsMouseRightButtonPressed" Value="True">
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.MouseRightButtonPressedBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.MouseRightButtonPressedForegroundBrush), Mode=OneWay}" />
+                        <Trigger Property="mah:ItemHelper.IsMouseRightButtonPressed" Value="True">
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.MouseRightButtonPressedBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.MouseRightButtonPressedForegroundBrush), Mode=OneWay}" />
                         </Trigger>
 
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.DisabledBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.DisabledForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.DisabledBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.DisabledForegroundBrush), Mode=OneWay}" />
                             <Setter TargetName="RootGrid" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Background, Mode=OneWay}" />
                         </Trigger>
                         <MultiTrigger>
@@ -164,13 +152,24 @@
                                 <Condition Property="IsEnabled" Value="False" />
                                 <Condition Property="IsSelected" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.DisabledSelectedBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.DisabledSelectedForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.DisabledSelectedBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.DisabledSelectedForegroundBrush), Mode=OneWay}" />
                         </MultiTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
         <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, Mode=OneWay, FallbackValue=Center, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
+        <Setter Property="mah:ItemHelper.ActiveSelectionBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="mah:ItemHelper.ActiveSelectionForegroundBrush" Value="{DynamicResource MahApps.Brushes.Selected.Foreground}" />
+        <Setter Property="mah:ItemHelper.DisabledForegroundBrush" Value="{DynamicResource MahApps.Brushes.Gray}" />
+        <Setter Property="mah:ItemHelper.DisabledSelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Gray7}" />
+        <Setter Property="mah:ItemHelper.DisabledSelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.Selected.Foreground}" />
+        <Setter Property="mah:ItemHelper.HoverBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent3}" />
+        <Setter Property="mah:ItemHelper.HoverForegroundBrush" Value="{DynamicResource MahApps.Brushes.Text}" />
+        <Setter Property="mah:ItemHelper.HoverSelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="mah:ItemHelper.HoverSelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.Selected.Foreground}" />
+        <Setter Property="mah:ItemHelper.SelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent2}" />
+        <Setter Property="mah:ItemHelper.SelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.Selected.Foreground}" />
     </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Controls.ListView.xaml b/src/MahApps.Metro/Styles/Controls.ListView.xaml
index eceb58364c..6c8d46b4db 100644
--- a/src/MahApps.Metro/Styles/Controls.ListView.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ListView.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary 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">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
     <Style x:Key="MahApps.Styles.ScrollViewer.GridView"
            BasedOn="{StaticResource {x:Static GridView.GridViewScrollViewerStyleKey}}"
@@ -110,7 +110,7 @@
                             Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                            CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                             SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
                         <ScrollViewer Padding="{TemplateBinding Padding}"
                                       CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
@@ -153,17 +153,6 @@
     <Style x:Key="MahApps.Styles.ListViewItem" TargetType="{x:Type ListViewItem}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
         <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Controls:ItemHelper.ActiveSelectionBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
-        <Setter Property="Controls:ItemHelper.ActiveSelectionForegroundBrush" Value="{DynamicResource MahApps.Brushes.Selected.Foreground}" />
-        <Setter Property="Controls:ItemHelper.DisabledForegroundBrush" Value="{DynamicResource MahApps.Brushes.Gray}" />
-        <Setter Property="Controls:ItemHelper.DisabledSelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Gray7}" />
-        <Setter Property="Controls:ItemHelper.DisabledSelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.Selected.Foreground}" />
-        <Setter Property="Controls:ItemHelper.HoverBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent3}" />
-        <Setter Property="Controls:ItemHelper.HoverForegroundBrush" Value="{DynamicResource MahApps.Brushes.Text}" />
-        <Setter Property="Controls:ItemHelper.HoverSelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
-        <Setter Property="Controls:ItemHelper.HoverSelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.Selected.Foreground}" />
-        <Setter Property="Controls:ItemHelper.SelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent2}" />
-        <Setter Property="Controls:ItemHelper.SelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.Selected.Foreground}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="Margin" Value="0" />
@@ -199,20 +188,20 @@
                         </Trigger>
 
                         <Trigger Property="IsSelected" Value="True">
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.SelectedBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.SelectedBackgroundBrush), Mode=OneWay}" />
                             <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Highlight}" />
-                            <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.SelectedForegroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="PART_RowPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.SelectedForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.SelectedForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="PART_RowPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.SelectedForegroundBrush), Mode=OneWay}" />
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsSelected" Value="True" />
                                 <Condition Property="Selector.IsSelectionActive" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.ActiveSelectionBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.ActiveSelectionBackgroundBrush), Mode=OneWay}" />
                             <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Highlight}" />
-                            <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.ActiveSelectionForegroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="PART_RowPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.ActiveSelectionForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.ActiveSelectionForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="PART_RowPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.ActiveSelectionForegroundBrush), Mode=OneWay}" />
                         </MultiTrigger>
 
                         <MultiTrigger>
@@ -220,35 +209,35 @@
                                 <Condition Property="IsMouseOver" Value="True" />
                                 <Condition Property="IsSelected" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.HoverSelectedBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.HoverSelectedForegroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="PART_RowPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.HoverSelectedForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.HoverSelectedBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.HoverSelectedForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="PART_RowPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.HoverSelectedForegroundBrush), Mode=OneWay}" />
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsMouseOver" Value="True" />
                                 <Condition Property="IsSelected" Value="False" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.HoverBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.HoverForegroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="PART_RowPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.HoverForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.HoverBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.HoverForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="PART_RowPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.HoverForegroundBrush), Mode=OneWay}" />
                         </MultiTrigger>
 
-                        <Trigger Property="Controls:ItemHelper.IsMouseLeftButtonPressed" Value="True">
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.MouseLeftButtonPressedBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.MouseLeftButtonPressedForegroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="PART_RowPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.MouseLeftButtonPressedForegroundBrush), Mode=OneWay}" />
+                        <Trigger Property="mah:ItemHelper.IsMouseLeftButtonPressed" Value="True">
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.MouseLeftButtonPressedBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.MouseLeftButtonPressedForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="PART_RowPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.MouseLeftButtonPressedForegroundBrush), Mode=OneWay}" />
                         </Trigger>
-                        <Trigger Property="Controls:ItemHelper.IsMouseRightButtonPressed" Value="True">
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.MouseRightButtonPressedBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.MouseRightButtonPressedForegroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="PART_RowPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.MouseRightButtonPressedForegroundBrush), Mode=OneWay}" />
+                        <Trigger Property="mah:ItemHelper.IsMouseRightButtonPressed" Value="True">
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.MouseRightButtonPressedBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.MouseRightButtonPressedForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="PART_RowPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.MouseRightButtonPressedForegroundBrush), Mode=OneWay}" />
                         </Trigger>
 
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.DisabledBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.DisabledForegroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="PART_RowPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.DisabledForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.DisabledBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.DisabledForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="PART_RowPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.DisabledForegroundBrush), Mode=OneWay}" />
                             <Setter TargetName="RootGrid" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Background, Mode=OneWay}" />
                         </Trigger>
                         <MultiTrigger>
@@ -257,9 +246,9 @@
                                 <Condition Property="IsSelected" Value="True" />
                             </MultiTrigger.Conditions>
                             <MultiTrigger.Setters>
-                                <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.DisabledSelectedForegroundBrush), Mode=OneWay}" />
-                                <Setter TargetName="PART_RowPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.DisabledSelectedForegroundBrush), Mode=OneWay}" />
-                                <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.DisabledSelectedBackgroundBrush), Mode=OneWay}" />
+                                <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.DisabledSelectedForegroundBrush), Mode=OneWay}" />
+                                <Setter TargetName="PART_RowPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.DisabledSelectedForegroundBrush), Mode=OneWay}" />
+                                <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.DisabledSelectedBackgroundBrush), Mode=OneWay}" />
                                 <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray7}" />
                             </MultiTrigger.Setters>
                         </MultiTrigger>
@@ -268,6 +257,17 @@
             </Setter.Value>
         </Setter>
         <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="mah:ItemHelper.ActiveSelectionBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="mah:ItemHelper.ActiveSelectionForegroundBrush" Value="{DynamicResource MahApps.Brushes.Selected.Foreground}" />
+        <Setter Property="mah:ItemHelper.DisabledForegroundBrush" Value="{DynamicResource MahApps.Brushes.Gray}" />
+        <Setter Property="mah:ItemHelper.DisabledSelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Gray7}" />
+        <Setter Property="mah:ItemHelper.DisabledSelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.Selected.Foreground}" />
+        <Setter Property="mah:ItemHelper.HoverBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent3}" />
+        <Setter Property="mah:ItemHelper.HoverForegroundBrush" Value="{DynamicResource MahApps.Brushes.Text}" />
+        <Setter Property="mah:ItemHelper.HoverSelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="mah:ItemHelper.HoverSelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.Selected.Foreground}" />
+        <Setter Property="mah:ItemHelper.SelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent2}" />
+        <Setter Property="mah:ItemHelper.SelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.Selected.Foreground}" />
     </Style>
 
     <!--  Gives the impression that items cannot be selected on the ListView  -->
@@ -285,7 +285,7 @@
                     <Border x:Name="Border"
                             Background="{TemplateBinding Background}"
                             BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                            CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                             SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
                         <GridViewRowPresenter VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                     </Border>
@@ -328,7 +328,6 @@
     </Style>
 
     <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}" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
@@ -340,18 +339,18 @@
                     <Grid>
                         <Rectangle Fill="Transparent" IsHitTestVisible="True" />
                         <Border x:Name="HeaderBorder">
-                            <Controls:ContentControlEx x:Name="HeaderContent"
-                                                       Margin="0 0 0 1"
-                                                       Padding="{TemplateBinding Padding}"
-                                                       HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                       VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                       Content="{TemplateBinding Content}"
-                                                       ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
-                                                       ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                                       ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                       ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                       RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
-                                                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            <mah:ContentControlEx x:Name="HeaderContent"
+                                                  Margin="0 0 0 1"
+                                                  Padding="{TemplateBinding Padding}"
+                                                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                  Content="{TemplateBinding Content}"
+                                                  ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
+                                                  ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                  ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                                  RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
+                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Border>
                         <Thumb x:Name="PART_HeaderGripper"
                                Margin="0 0 -9 0"
@@ -371,6 +370,7 @@
             </Setter.Value>
         </Setter>
         <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="mah:ControlsHelper.ContentCharacterCasing" Value="Upper" />
         <Style.Triggers>
             <Trigger Property="Role" Value="Floating">
                 <Setter Property="Opacity" Value="0.7" />
diff --git a/src/MahApps.Metro/Styles/Controls.MenuItem.xaml b/src/MahApps.Metro/Styles/Controls.MenuItem.xaml
index 9d4a981d74..e9f49a48a4 100644
--- a/src/MahApps.Metro/Styles/Controls.MenuItem.xaml
+++ b/src/MahApps.Metro/Styles/Controls.MenuItem.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary 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">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
     <MenuScrollingVisibilityConverter x:Key="MenuScrollingVisibilityConverter" />
 
@@ -62,27 +62,27 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="{x:Static controls:Spelling.SuggestionMenuItemStyleKey}"
+    <Style x:Key="{x:Static mah:Spelling.SuggestionMenuItemStyleKey}"
            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}"
+    <Style x:Key="{x:Static mah:Spelling.IgnoreAllMenuItemStyleKey}"
            BasedOn="{StaticResource MahApps.Styles.MenuItem}"
            TargetType="{x:Type MenuItem}">
         <Setter Property="Header" Value="Ignore All" />
     </Style>
 
-    <Style x:Key="{x:Static controls:Spelling.NoSuggestionsMenuItemStyleKey}"
+    <Style x:Key="{x:Static mah:Spelling.NoSuggestionsMenuItemStyleKey}"
            BasedOn="{StaticResource MahApps.Styles.MenuItem}"
            TargetType="{x:Type MenuItem}">
         <Setter Property="Header" Value="(no spelling suggestions)" />
         <Setter Property="IsEnabled" Value="False" />
     </Style>
 
-    <Style x:Key="{x:Static controls:Spelling.SeparatorStyleKey}"
+    <Style x:Key="{x:Static mah:Spelling.SeparatorStyleKey}"
            BasedOn="{StaticResource {x:Static MenuItem.SeparatorStyleKey}}"
            TargetType="{x:Type Separator}" />
 
diff --git a/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml b/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
index 5ac4c3c30c..f4a74b03c6 100644
--- a/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.PasswordBox.xaml
@@ -1,8 +1,8 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:Behaviors="clr-namespace:MahApps.Metro.Behaviors"
-                    xmlns:Controls="clr-namespace:MahApps.Metro.Controls"
-                    xmlns:Converters="clr-namespace:MahApps.Metro.Converters">
+                    xmlns:behaviors="clr-namespace:MahApps.Metro.Behaviors"
+                    xmlns:converters="clr-namespace:MahApps.Metro.Converters"
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.Shared.xaml" />
@@ -11,7 +11,7 @@
 
     <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
 
-    <Converters:StringToVisibilityConverter x:Key="StringToVisibilityConverter" />
+    <converters:StringToVisibilityConverter x:Key="StringToVisibilityConverter" />
 
     <!--  Button Style for MahApps.Styles.PasswordBox.Win8  -->
     <Style x:Key="MahApps.Styles.Button.Reveal"
@@ -25,7 +25,7 @@
                                           Margin="{TemplateBinding Padding}"
                                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
+                                          RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
                                           SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                     </Grid>
                     <ControlTemplate.Triggers>
@@ -72,23 +72,10 @@
     <!--  PasswordBox Style  -->
     <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>
-                <Behaviors:StylizedBehaviorCollection>
-                    <Behaviors:PasswordBoxBindingBehavior />
-                </Behaviors:StylizedBehaviorCollection>
-            </Setter.Value>
-        </Setter>
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="CaretBrush" Value="{DynamicResource MahApps.Brushes.ThemeForeground}" />
         <Setter Property="ContextMenu" Value="{DynamicResource MahApps.TextBox.ContextMenu}" />
-        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border.Focus}" />
-        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border.MouseOver}" />
-        <Setter Property="Controls:PasswordBoxHelper.CapsLockIcon" Value="{StaticResource MahApps.Controls.CapsLockIcon}" />
-        <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Font.Size.Button.ClearText}" />
-        <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="22" />
-        <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True" />
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Family.Control}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
@@ -106,7 +93,7 @@
                                     Background="{TemplateBinding Background}"
                                     BorderBrush="Transparent"
                                     BorderThickness="{TemplateBinding BorderThickness}"
-                                    CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                                    CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                                     Effect="{DynamicResource MahApps.DropShadowEffect.WaitingForData}"
                                     SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </AdornerDecorator>
@@ -115,7 +102,7 @@
                                 Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                                CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
 
                         <Grid x:Name="PART_InnerGrid" Margin="{TemplateBinding BorderThickness}">
@@ -148,9 +135,9 @@
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
                                        Style="{DynamicResource MahApps.Styles.TextBlock.Watermark}"
-                                       Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
-                                       TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
-                                       TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
+                                       Text="{TemplateBinding mah:TextBoxHelper.Watermark}"
+                                       TextAlignment="{TemplateBinding mah:TextBoxHelper.WatermarkAlignment}"
+                                       TextTrimming="{TemplateBinding mah:TextBoxHelper.WatermarkTrimming}"
                                        Visibility="Collapsed" />
 
                             <ContentControl x:Name="PART_FloatingMessageContainer"
@@ -159,7 +146,7 @@
                                             Margin="4 0"
                                             Style="{DynamicResource MahApps.Styles.ContentControl.FloatingMessageContainer}">
                                 <ContentControl.Height>
-                                    <MultiBinding Converter="{Converters:MathMultiplyConverter}">
+                                    <MultiBinding Converter="{converters:MathMultiplyConverter}">
                                         <Binding ElementName="PART_FloatingMessage"
                                                  Mode="OneWay"
                                                  Path="ActualHeight" />
@@ -173,13 +160,13 @@
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
                                            Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing}"
-                                           Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
-                                           TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
-                                           TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
+                                           Text="{TemplateBinding mah:TextBoxHelper.Watermark}"
+                                           TextAlignment="{TemplateBinding mah:TextBoxHelper.WatermarkAlignment}"
+                                           TextTrimming="{TemplateBinding mah:TextBoxHelper.WatermarkTrimming}">
                                     <TextBlock.RenderTransform>
                                         <TranslateTransform x:Name="FloatingMessageTransform">
                                             <TranslateTransform.Y>
-                                                <MultiBinding Converter="{Converters:MathSubtractConverter}">
+                                                <MultiBinding Converter="{converters:MathSubtractConverter}">
                                                     <Binding ElementName="PART_FloatingMessage"
                                                              Mode="OneWay"
                                                              Path="ActualHeight" />
@@ -200,40 +187,40 @@
                                               Margin="1"
                                               HorizontalAlignment="Right"
                                               VerticalAlignment="Center"
-                                              Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:PasswordBoxHelper.CapsLockIcon), Mode=TwoWay}"
+                                              Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:PasswordBoxHelper.CapsLockIcon), Mode=TwoWay}"
                                               TextBlock.Foreground="{DynamicResource MahApps.Brushes.Control.Validation}"
-                                              ToolTip="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:PasswordBoxHelper.CapsLockWarningToolTip), Mode=OneWay}"
+                                              ToolTip="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:PasswordBoxHelper.CapsLockWarningToolTip), Mode=OneWay}"
                                               Visibility="Collapsed" />
 
                             <Button x:Name="PART_ClearText"
                                     Grid.Row="0"
                                     Grid.RowSpan="2"
                                     Grid.Column="2"
-                                    Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
-                                    Controls:TextBoxHelper.IsClearTextButtonBehaviorEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ClearTextButton), Mode=OneWay}"
-                                    Content="{TemplateBinding Controls:TextBoxHelper.ButtonContent}"
-                                    ContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}"
+                                    Width="{TemplateBinding mah:TextBoxHelper.ButtonWidth}"
+                                    mah:TextBoxHelper.IsClearTextButtonBehaviorEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:TextBoxHelper.ClearTextButton), Mode=OneWay}"
+                                    Content="{TemplateBinding mah:TextBoxHelper.ButtonContent}"
+                                    ContentTemplate="{TemplateBinding mah:TextBoxHelper.ButtonContentTemplate}"
                                     Focusable="False"
-                                    FontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}"
-                                    FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
+                                    FontFamily="{TemplateBinding mah:TextBoxHelper.ButtonFontFamily}"
+                                    FontSize="{TemplateBinding mah:TextBoxHelper.ButtonFontSize}"
                                     Foreground="{TemplateBinding Foreground}"
                                     IsTabStop="False"
                                     Style="{DynamicResource MahApps.Styles.Button.Chromeless}"
-                                    Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ClearTextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                                    Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:TextBoxHelper.ClearTextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
                         </Grid>
 
                         <Border x:Name="DisabledVisualElement"
                                 Background="{DynamicResource MahApps.Brushes.Control.Disabled}"
                                 BorderBrush="{DynamicResource MahApps.Brushes.Control.Disabled}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                                CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                                 IsHitTestVisible="False"
                                 Opacity="0"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.DisabledVisualElementVisibility), Mode=OneWay}" />
+                                Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.DisabledVisualElementVisibility), Mode=OneWay}" />
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.ButtonsAlignment)}" Value="Left">
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(mah:TextBoxHelper.ButtonsAlignment)}" Value="Left">
                             <Setter TargetName="ButtonColumn" Property="Width" Value="*" />
                             <Setter TargetName="PART_ClearText" Property="Grid.Column" Value="0" />
                             <Setter TargetName="PART_ContentHost" Property="Grid.Column" Value="2" />
@@ -249,8 +236,8 @@
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
                                 <Condition Binding="{Binding Path=IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
-                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
-                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(mah:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(mah:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.ShowFloatingMessage}" />
@@ -261,13 +248,13 @@
                         </MultiDataTrigger>
 
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.MouseOverBorderBrush)}" />
+                            <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.MouseOverBorderBrush)}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter TargetName="DisabledVisualElement" Property="Opacity" Value="0.6" />
                         </Trigger>
                         <Trigger Property="IsFocused" Value="True">
-                            <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
+                            <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.FocusBorderBrush)}" />
                             <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource MahApps.Brushes.TextBlock.FloatingMessage}" />
                             <Setter TargetName="PART_FloatingMessage" Property="Opacity" Value="1" />
                         </Trigger>
@@ -282,7 +269,7 @@
 
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="Controls:TextBoxHelper.HasText" Value="False" />
+                                <Condition Property="mah:TextBoxHelper.HasText" Value="False" />
                                 <Condition Property="IsFocused" Value="True" />
                             </MultiTrigger.Conditions>
                             <MultiTrigger.EnterActions>
@@ -293,7 +280,7 @@
                             </MultiTrigger.ExitActions>
                         </MultiTrigger>
 
-                        <Trigger Property="Controls:TextBoxHelper.HasText" Value="True">
+                        <Trigger Property="mah:TextBoxHelper.HasText" Value="True">
                             <Setter TargetName="PART_Message" Property="Visibility" Value="Visible" />
                             <Trigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.EnterHasText}" />
@@ -306,14 +293,14 @@
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsVisible" Value="True" />
-                                <Condition Property="Controls:TextBoxHelper.IsWaitingForData" Value="True" />
+                                <Condition Property="mah:TextBoxHelper.IsWaitingForData" Value="True" />
                             </MultiTrigger.Conditions>
                             <Setter TargetName="PART_WaitingForDataEffectAdornerDecorator" Property="Visibility" Value="Visible" />
                             <MultiTrigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.WaitingForData}" />
                             </MultiTrigger.EnterActions>
                         </MultiTrigger>
-                        <Trigger Property="Controls:TextBoxHelper.IsWaitingForData" Value="False">
+                        <Trigger Property="mah:TextBoxHelper.IsWaitingForData" Value="False">
                             <Setter TargetName="PART_WaitingForDataEffectAdornerDecorator" Property="Visibility" Value="Collapsed" />
                         </Trigger>
                     </ControlTemplate.Triggers>
@@ -321,14 +308,25 @@
             </Setter.Value>
         </Setter>
         <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource MahApps.Templates.ValidationError}" />
+        <Setter Property="behaviors:StylizedBehaviors.Behaviors">
+            <Setter.Value>
+                <behaviors:StylizedBehaviorCollection>
+                    <behaviors:PasswordBoxBindingBehavior />
+                </behaviors:StylizedBehaviorCollection>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="mah:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border.Focus}" />
+        <Setter Property="mah:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border.MouseOver}" />
+        <Setter Property="mah:PasswordBoxHelper.CapsLockIcon" Value="{StaticResource MahApps.Controls.CapsLockIcon}" />
+        <Setter Property="mah:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Font.Size.Button.ClearText}" />
+        <Setter Property="mah:TextBoxHelper.ButtonWidth" Value="22" />
+        <Setter Property="mah:TextBoxHelper.IsMonitoring" Value="True" />
     </Style>
 
     <!--  Button Command PasswordBox Style  -->
     <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.Button.Chromeless}" />
-        <Setter Property="Controls:TextBoxHelper.TextButton" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type PasswordBox}">
@@ -338,7 +336,7 @@
                                     Background="{TemplateBinding Background}"
                                     BorderBrush="Transparent"
                                     BorderThickness="{TemplateBinding BorderThickness}"
-                                    CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                                    CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                                     Effect="{DynamicResource MahApps.DropShadowEffect.WaitingForData}"
                                     SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </AdornerDecorator>
@@ -347,7 +345,7 @@
                                 Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                                CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
 
                         <Grid x:Name="PART_InnerGrid" Margin="{TemplateBinding BorderThickness}">
@@ -380,9 +378,9 @@
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
                                        Style="{DynamicResource MahApps.Styles.TextBlock.Watermark}"
-                                       Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
-                                       TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
-                                       TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
+                                       Text="{TemplateBinding mah:TextBoxHelper.Watermark}"
+                                       TextAlignment="{TemplateBinding mah:TextBoxHelper.WatermarkAlignment}"
+                                       TextTrimming="{TemplateBinding mah:TextBoxHelper.WatermarkTrimming}"
                                        Visibility="Collapsed" />
 
                             <ContentControl x:Name="PART_FloatingMessageContainer"
@@ -391,7 +389,7 @@
                                             Margin="4 0"
                                             Style="{DynamicResource MahApps.Styles.ContentControl.FloatingMessageContainer}">
                                 <ContentControl.Height>
-                                    <MultiBinding Converter="{Converters:MathMultiplyConverter}">
+                                    <MultiBinding Converter="{converters:MathMultiplyConverter}">
                                         <Binding ElementName="PART_FloatingMessage"
                                                  Mode="OneWay"
                                                  Path="ActualHeight" />
@@ -405,13 +403,13 @@
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
                                            Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing}"
-                                           Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
-                                           TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
-                                           TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
+                                           Text="{TemplateBinding mah:TextBoxHelper.Watermark}"
+                                           TextAlignment="{TemplateBinding mah:TextBoxHelper.WatermarkAlignment}"
+                                           TextTrimming="{TemplateBinding mah:TextBoxHelper.WatermarkTrimming}">
                                     <TextBlock.RenderTransform>
                                         <TranslateTransform x:Name="FloatingMessageTransform">
                                             <TranslateTransform.Y>
-                                                <MultiBinding Converter="{Converters:MathSubtractConverter}">
+                                                <MultiBinding Converter="{converters:MathSubtractConverter}">
                                                     <Binding ElementName="PART_FloatingMessage"
                                                              Mode="OneWay"
                                                              Path="ActualHeight" />
@@ -432,41 +430,41 @@
                                               Margin="1"
                                               HorizontalAlignment="Right"
                                               VerticalAlignment="Center"
-                                              Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:PasswordBoxHelper.CapsLockIcon), Mode=TwoWay}"
+                                              Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:PasswordBoxHelper.CapsLockIcon), Mode=TwoWay}"
                                               TextBlock.Foreground="{DynamicResource MahApps.Brushes.Control.Validation}"
-                                              ToolTip="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:PasswordBoxHelper.CapsLockWarningToolTip), Mode=OneWay}"
+                                              ToolTip="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:PasswordBoxHelper.CapsLockWarningToolTip), Mode=OneWay}"
                                               Visibility="Collapsed" />
 
                             <Button x:Name="PART_ClearText"
                                     Grid.Row="0"
                                     Grid.RowSpan="2"
                                     Grid.Column="2"
-                                    Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
-                                    Controls:TextBoxHelper.IsClearTextButtonBehaviorEnabled="True"
-                                    Content="{TemplateBinding Controls:TextBoxHelper.ButtonContent}"
-                                    ContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}"
+                                    Width="{TemplateBinding mah:TextBoxHelper.ButtonWidth}"
+                                    mah:TextBoxHelper.IsClearTextButtonBehaviorEnabled="True"
+                                    Content="{TemplateBinding mah:TextBoxHelper.ButtonContent}"
+                                    ContentTemplate="{TemplateBinding mah:TextBoxHelper.ButtonContentTemplate}"
                                     Focusable="False"
-                                    FontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}"
-                                    FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
+                                    FontFamily="{TemplateBinding mah:TextBoxHelper.ButtonFontFamily}"
+                                    FontSize="{TemplateBinding mah:TextBoxHelper.ButtonFontSize}"
                                     Foreground="{TemplateBinding Foreground}"
                                     IsTabStop="False"
                                     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}}" />
+                                    Template="{TemplateBinding mah:TextBoxHelper.ButtonTemplate}"
+                                    Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:TextBoxHelper.TextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
                         </Grid>
 
                         <Border x:Name="DisabledVisualElement"
                                 Background="{DynamicResource MahApps.Brushes.Control.Disabled}"
                                 BorderBrush="{DynamicResource MahApps.Brushes.Control.Disabled}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                                CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                                 IsHitTestVisible="False"
                                 Opacity="0"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.DisabledVisualElementVisibility), Mode=OneWay}" />
+                                Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.DisabledVisualElementVisibility), Mode=OneWay}" />
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.ButtonsAlignment)}" Value="Left">
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(mah:TextBoxHelper.ButtonsAlignment)}" Value="Left">
                             <Setter TargetName="ButtonColumn" Property="Width" Value="*" />
                             <Setter TargetName="PART_ClearText" Property="Grid.Column" Value="0" />
                             <Setter TargetName="PART_ContentHost" Property="Grid.Column" Value="2" />
@@ -482,8 +480,8 @@
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
                                 <Condition Binding="{Binding Path=IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
-                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
-                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(mah:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(mah:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.ShowFloatingMessage}" />
@@ -494,13 +492,13 @@
                         </MultiDataTrigger>
 
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.MouseOverBorderBrush)}" />
+                            <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.MouseOverBorderBrush)}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter TargetName="DisabledVisualElement" Property="Opacity" Value="0.6" />
                         </Trigger>
                         <Trigger Property="IsFocused" Value="True">
-                            <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
+                            <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.FocusBorderBrush)}" />
                             <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource MahApps.Brushes.TextBlock.FloatingMessage}" />
                             <Setter TargetName="PART_FloatingMessage" Property="Opacity" Value="1" />
                         </Trigger>
@@ -515,7 +513,7 @@
 
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="Controls:TextBoxHelper.HasText" Value="False" />
+                                <Condition Property="mah:TextBoxHelper.HasText" Value="False" />
                                 <Condition Property="IsFocused" Value="True" />
                             </MultiTrigger.Conditions>
                             <MultiTrigger.EnterActions>
@@ -526,7 +524,7 @@
                             </MultiTrigger.ExitActions>
                         </MultiTrigger>
 
-                        <Trigger Property="Controls:TextBoxHelper.HasText" Value="True">
+                        <Trigger Property="mah:TextBoxHelper.HasText" Value="True">
                             <Setter TargetName="PART_Message" Property="Visibility" Value="Visible" />
                             <Trigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.EnterHasText}" />
@@ -539,20 +537,22 @@
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsVisible" Value="True" />
-                                <Condition Property="Controls:TextBoxHelper.IsWaitingForData" Value="True" />
+                                <Condition Property="mah:TextBoxHelper.IsWaitingForData" Value="True" />
                             </MultiTrigger.Conditions>
                             <Setter TargetName="PART_WaitingForDataEffectAdornerDecorator" Property="Visibility" Value="Visible" />
                             <MultiTrigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.WaitingForData}" />
                             </MultiTrigger.EnterActions>
                         </MultiTrigger>
-                        <Trigger Property="Controls:TextBoxHelper.IsWaitingForData" Value="False">
+                        <Trigger Property="mah:TextBoxHelper.IsWaitingForData" Value="False">
                             <Setter TargetName="PART_WaitingForDataEffectAdornerDecorator" Property="Visibility" Value="Collapsed" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
+        <Setter Property="mah:TextBoxHelper.ButtonTemplate" Value="{DynamicResource MahApps.Templates.Button.Chromeless}" />
+        <Setter Property="mah:TextBoxHelper.TextButton" Value="True" />
     </Style>
 
     <Style x:Key="MahApps.Styles.TextBox.PasswordBox.Revealed" TargetType="{x:Type TextBox}">
@@ -577,8 +577,6 @@
     <Style x:Key="MahApps.Styles.PasswordBox.Button.Revealed"
            BasedOn="{StaticResource MahApps.Styles.PasswordBox}"
            TargetType="{x:Type PasswordBox}">
-        <Setter Property="Controls:PasswordBoxHelper.RevealButtonContent" Value="{StaticResource MahApps.Controls.RevealIcon}" />
-        <Setter Property="Controls:TextBoxHelper.ButtonTemplate" Value="{DynamicResource MahApps.Templates.Button.Chromeless}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type PasswordBox}">
@@ -588,7 +586,7 @@
                                     Background="{TemplateBinding Background}"
                                     BorderBrush="Transparent"
                                     BorderThickness="{TemplateBinding BorderThickness}"
-                                    CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                                    CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                                     Effect="{DynamicResource MahApps.DropShadowEffect.WaitingForData}"
                                     SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </AdornerDecorator>
@@ -597,7 +595,7 @@
                                 Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                                CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
 
                         <Grid x:Name="PART_InnerGrid" Margin="{TemplateBinding BorderThickness}">
@@ -639,7 +637,7 @@
                                      SelectionBrush="{TemplateBinding SelectionBrush}"
                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
                                      Style="{DynamicResource MahApps.Styles.TextBox.PasswordBox.Revealed}"
-                                     Text="{TemplateBinding Behaviors:PasswordBoxBindingBehavior.Password}"
+                                     Text="{TemplateBinding behaviors:PasswordBoxBindingBehavior.Password}"
                                      Visibility="Hidden" />
 
                             <TextBlock x:Name="PART_Message"
@@ -651,9 +649,9 @@
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
                                        Style="{DynamicResource MahApps.Styles.TextBlock.Watermark}"
-                                       Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
-                                       TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
-                                       TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
+                                       Text="{TemplateBinding mah:TextBoxHelper.Watermark}"
+                                       TextAlignment="{TemplateBinding mah:TextBoxHelper.WatermarkAlignment}"
+                                       TextTrimming="{TemplateBinding mah:TextBoxHelper.WatermarkTrimming}"
                                        Visibility="Collapsed" />
 
                             <ContentControl x:Name="PART_FloatingMessageContainer"
@@ -662,7 +660,7 @@
                                             Margin="4 0"
                                             Style="{DynamicResource MahApps.Styles.ContentControl.FloatingMessageContainer}">
                                 <ContentControl.Height>
-                                    <MultiBinding Converter="{Converters:MathMultiplyConverter}">
+                                    <MultiBinding Converter="{converters:MathMultiplyConverter}">
                                         <Binding ElementName="PART_FloatingMessage"
                                                  Mode="OneWay"
                                                  Path="ActualHeight" />
@@ -676,13 +674,13 @@
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
                                            Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing}"
-                                           Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
-                                           TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
-                                           TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
+                                           Text="{TemplateBinding mah:TextBoxHelper.Watermark}"
+                                           TextAlignment="{TemplateBinding mah:TextBoxHelper.WatermarkAlignment}"
+                                           TextTrimming="{TemplateBinding mah:TextBoxHelper.WatermarkTrimming}">
                                     <TextBlock.RenderTransform>
                                         <TranslateTransform x:Name="FloatingMessageTransform">
                                             <TranslateTransform.Y>
-                                                <MultiBinding Converter="{Converters:MathSubtractConverter}">
+                                                <MultiBinding Converter="{converters:MathSubtractConverter}">
                                                     <Binding ElementName="PART_FloatingMessage"
                                                              Mode="OneWay"
                                                              Path="ActualHeight" />
@@ -703,18 +701,18 @@
                                               Margin="1"
                                               HorizontalAlignment="Right"
                                               VerticalAlignment="Center"
-                                              Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:PasswordBoxHelper.CapsLockIcon), Mode=TwoWay}"
+                                              Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:PasswordBoxHelper.CapsLockIcon), Mode=TwoWay}"
                                               TextBlock.Foreground="{DynamicResource MahApps.Brushes.Control.Validation}"
-                                              ToolTip="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:PasswordBoxHelper.CapsLockWarningToolTip), Mode=OneWay}"
+                                              ToolTip="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:PasswordBoxHelper.CapsLockWarningToolTip), Mode=OneWay}"
                                               Visibility="Collapsed" />
 
                             <Button x:Name="PART_RevealButton"
                                     Grid.Row="0"
                                     Grid.RowSpan="2"
                                     Grid.Column="2"
-                                    Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
-                                    Content="{TemplateBinding Controls:PasswordBoxHelper.RevealButtonContent}"
-                                    ContentTemplate="{TemplateBinding Controls:PasswordBoxHelper.RevealButtonContentTemplate}"
+                                    Width="{TemplateBinding mah:TextBoxHelper.ButtonWidth}"
+                                    Content="{TemplateBinding mah:PasswordBoxHelper.RevealButtonContent}"
+                                    ContentTemplate="{TemplateBinding mah:PasswordBoxHelper.RevealButtonContentTemplate}"
                                     Focusable="False"
                                     Foreground="{TemplateBinding Foreground}"
                                     IsTabStop="False"
@@ -725,32 +723,32 @@
                                     Grid.Row="0"
                                     Grid.RowSpan="2"
                                     Grid.Column="3"
-                                    Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
-                                    Controls:TextBoxHelper.IsClearTextButtonBehaviorEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ClearTextButton), Mode=OneWay}"
-                                    Content="{TemplateBinding Controls:TextBoxHelper.ButtonContent}"
-                                    ContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}"
+                                    Width="{TemplateBinding mah:TextBoxHelper.ButtonWidth}"
+                                    mah:TextBoxHelper.IsClearTextButtonBehaviorEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:TextBoxHelper.ClearTextButton), Mode=OneWay}"
+                                    Content="{TemplateBinding mah:TextBoxHelper.ButtonContent}"
+                                    ContentTemplate="{TemplateBinding mah:TextBoxHelper.ButtonContentTemplate}"
                                     Focusable="False"
-                                    FontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}"
-                                    FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
+                                    FontFamily="{TemplateBinding mah:TextBoxHelper.ButtonFontFamily}"
+                                    FontSize="{TemplateBinding mah:TextBoxHelper.ButtonFontSize}"
                                     Foreground="{TemplateBinding Foreground}"
                                     IsTabStop="False"
                                     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}}" />
+                                    Template="{TemplateBinding mah:TextBoxHelper.ButtonTemplate}"
+                                    Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:TextBoxHelper.ClearTextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
                         </Grid>
 
                         <Border x:Name="DisabledVisualElement"
                                 Background="{DynamicResource MahApps.Brushes.Control.Disabled}"
                                 BorderBrush="{DynamicResource MahApps.Brushes.Control.Disabled}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                                CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                                 IsHitTestVisible="False"
                                 Opacity="0"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.DisabledVisualElementVisibility), Mode=OneWay}" />
+                                Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.DisabledVisualElementVisibility), Mode=OneWay}" />
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.ButtonsAlignment)}" Value="Left">
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(mah:TextBoxHelper.ButtonsAlignment)}" Value="Left">
                             <Setter TargetName="ButtonColumn" Property="Width" Value="*" />
                             <Setter TargetName="PART_CapsLockIndicator" Property="Grid.Column" Value="2" />
                             <Setter TargetName="PART_ClearText" Property="Grid.Column" Value="0" />
@@ -769,8 +767,8 @@
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
                                 <Condition Binding="{Binding Path=IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
-                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
-                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(mah:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(mah:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.ShowFloatingMessage}" />
@@ -781,13 +779,13 @@
                         </MultiDataTrigger>
 
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.MouseOverBorderBrush)}" />
+                            <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.MouseOverBorderBrush)}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter TargetName="DisabledVisualElement" Property="Opacity" Value="0.6" />
                         </Trigger>
                         <Trigger Property="IsFocused" Value="True">
-                            <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
+                            <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.FocusBorderBrush)}" />
                             <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource MahApps.Brushes.TextBlock.FloatingMessage}" />
                             <Setter TargetName="PART_FloatingMessage" Property="Opacity" Value="1" />
                         </Trigger>
@@ -812,7 +810,7 @@
 
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="Controls:TextBoxHelper.HasText" Value="False" />
+                                <Condition Property="mah:TextBoxHelper.HasText" Value="False" />
                                 <Condition Property="IsFocused" Value="True" />
                             </MultiTrigger.Conditions>
                             <MultiTrigger.EnterActions>
@@ -823,7 +821,7 @@
                             </MultiTrigger.ExitActions>
                         </MultiTrigger>
 
-                        <Trigger Property="Controls:TextBoxHelper.HasText" Value="True">
+                        <Trigger Property="mah:TextBoxHelper.HasText" Value="True">
                             <Setter TargetName="PART_Message" Property="Visibility" Value="Visible" />
                             <Trigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.EnterHasText}" />
@@ -836,20 +834,22 @@
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsVisible" Value="True" />
-                                <Condition Property="Controls:TextBoxHelper.IsWaitingForData" Value="True" />
+                                <Condition Property="mah:TextBoxHelper.IsWaitingForData" Value="True" />
                             </MultiTrigger.Conditions>
                             <Setter TargetName="PART_WaitingForDataEffectAdornerDecorator" Property="Visibility" Value="Visible" />
                             <MultiTrigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.WaitingForData}" />
                             </MultiTrigger.EnterActions>
                         </MultiTrigger>
-                        <Trigger Property="Controls:TextBoxHelper.IsWaitingForData" Value="False">
+                        <Trigger Property="mah:TextBoxHelper.IsWaitingForData" Value="False">
                             <Setter TargetName="PART_WaitingForDataEffectAdornerDecorator" Property="Visibility" Value="Collapsed" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
+        <Setter Property="mah:PasswordBoxHelper.RevealButtonContent" Value="{StaticResource MahApps.Controls.RevealIcon}" />
+        <Setter Property="mah:TextBoxHelper.ButtonTemplate" Value="{DynamicResource MahApps.Templates.Button.Chromeless}" />
     </Style>
 
     <!--  MahApps.Styles.PasswordBox.Win8 Style  -->
diff --git a/src/MahApps.Metro/Styles/Controls.RadioButton.xaml b/src/MahApps.Metro/Styles/Controls.RadioButton.xaml
index 67960b9575..9d7b00560c 100644
--- a/src/MahApps.Metro/Styles/Controls.RadioButton.xaml
+++ b/src/MahApps.Metro/Styles/Controls.RadioButton.xaml
@@ -1,46 +1,12 @@
 <ResourceDictionary 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"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib">
 
     <!--  ********************************** RadioButton Style **********************************  -->
     <Style x:Key="MahApps.Styles.RadioButton" TargetType="RadioButton">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.CheckBox}" />
-        <Setter Property="Controls:RadioButtonHelper.BackgroundDisabled" Value="{DynamicResource MahApps.Brushes.RadioButton.BackgroundDisabled}" />
-        <Setter Property="Controls:RadioButtonHelper.BackgroundPointerOver" Value="{DynamicResource MahApps.Brushes.RadioButton.BackgroundPointerOver}" />
-        <Setter Property="Controls:RadioButtonHelper.BackgroundPressed" Value="{DynamicResource MahApps.Brushes.RadioButton.BackgroundPressed}" />
-        <Setter Property="Controls:RadioButtonHelper.BorderBrushDisabled" Value="{DynamicResource MahApps.Brushes.RadioButton.BorderBrushDisabled}" />
-        <Setter Property="Controls:RadioButtonHelper.BorderBrushPointerOver" Value="{DynamicResource MahApps.Brushes.RadioButton.BorderBrushPointerOver}" />
-        <Setter Property="Controls:RadioButtonHelper.BorderBrushPressed" Value="{DynamicResource MahApps.Brushes.RadioButton.BorderBrushPressed}" />
-        <Setter Property="Controls:RadioButtonHelper.CheckGlyphFill" Value="{DynamicResource MahApps.Brushes.Highlight}" />
-        <Setter Property="Controls:RadioButtonHelper.CheckGlyphFillDisabled" Value="{DynamicResource MahApps.Brushes.Accent2}" />
-        <Setter Property="Controls:RadioButtonHelper.CheckGlyphFillPointerOver" Value="{DynamicResource MahApps.Brushes.Highlight}" />
-        <Setter Property="Controls:RadioButtonHelper.CheckGlyphFillPressed" Value="{DynamicResource MahApps.Brushes.Highlight}" />
-        <Setter Property="Controls:RadioButtonHelper.CheckGlyphStroke" Value="{DynamicResource MahApps.Brushes.Highlight}" />
-        <Setter Property="Controls:RadioButtonHelper.CheckGlyphStrokeDisabled" Value="{DynamicResource MahApps.Brushes.Accent2}" />
-        <Setter Property="Controls:RadioButtonHelper.CheckGlyphStrokePointerOver" Value="{DynamicResource MahApps.Brushes.Highlight}" />
-        <Setter Property="Controls:RadioButtonHelper.CheckGlyphStrokePressed" Value="{DynamicResource MahApps.Brushes.Highlight}" />
-        <Setter Property="Controls:RadioButtonHelper.ForegroundDisabled" Value="{DynamicResource MahApps.Brushes.RadioButton.ForegroundDisabled}" />
-        <Setter Property="Controls:RadioButtonHelper.ForegroundPointerOver" Value="{DynamicResource MahApps.Brushes.RadioButton.ForegroundPointerOver}" />
-        <Setter Property="Controls:RadioButtonHelper.ForegroundPressed" Value="{DynamicResource MahApps.Brushes.RadioButton.ForegroundPressed}" />
-        <Setter Property="Controls:RadioButtonHelper.OuterEllipseCheckedFill" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
-        <Setter Property="Controls:RadioButtonHelper.OuterEllipseCheckedFillDisabled" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
-        <Setter Property="Controls:RadioButtonHelper.OuterEllipseCheckedFillPointerOver" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
-        <Setter Property="Controls:RadioButtonHelper.OuterEllipseCheckedFillPressed" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
-        <Setter Property="Controls:RadioButtonHelper.OuterEllipseCheckedStroke" Value="{DynamicResource MahApps.Brushes.CheckBox}" />
-        <Setter Property="Controls:RadioButtonHelper.OuterEllipseCheckedStrokeDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox}" />
-        <Setter Property="Controls:RadioButtonHelper.OuterEllipseCheckedStrokePointerOver" Value="{DynamicResource MahApps.Brushes.CheckBox.MouseOver}" />
-        <Setter Property="Controls:RadioButtonHelper.OuterEllipseCheckedStrokePressed" Value="{DynamicResource MahApps.Brushes.CheckBox.MouseOver}" />
-        <Setter Property="Controls:RadioButtonHelper.OuterEllipseFill" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
-        <Setter Property="Controls:RadioButtonHelper.OuterEllipseFillDisabled" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
-        <Setter Property="Controls:RadioButtonHelper.OuterEllipseFillPointerOver" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
-        <Setter Property="Controls:RadioButtonHelper.OuterEllipseFillPressed" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
-        <Setter Property="Controls:RadioButtonHelper.OuterEllipseStroke" Value="{DynamicResource MahApps.Brushes.CheckBox}" />
-        <Setter Property="Controls:RadioButtonHelper.OuterEllipseStrokeDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox}" />
-        <Setter Property="Controls:RadioButtonHelper.OuterEllipseStrokePointerOver" Value="{DynamicResource MahApps.Brushes.CheckBox.MouseOver}" />
-        <Setter Property="Controls:RadioButtonHelper.OuterEllipseStrokePressed" Value="{DynamicResource MahApps.Brushes.CheckBox.MouseOver}" />
-        <Setter Property="Controls:RadioButtonHelper.RadioSize" Value="18" />
         <Setter Property="FocusVisualStyle" Value="{DynamicResource {x:Static SystemParameters.FocusVisualStyleKey}}" />
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Family.Control}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Content}" />
@@ -58,7 +24,7 @@
                                 Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                                CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         <Grid Margin="{TemplateBinding BorderThickness}">
                             <Grid.ColumnDefinitions>
@@ -69,26 +35,26 @@
                                   HorizontalAlignment="Center"
                                   VerticalAlignment="Center">
                                 <Ellipse x:Name="OuterEllipse"
-                                         Width="{TemplateBinding Controls:RadioButtonHelper.RadioSize}"
-                                         Height="{TemplateBinding Controls:RadioButtonHelper.RadioSize}"
-                                         Fill="{TemplateBinding Controls:RadioButtonHelper.OuterEllipseFill}"
-                                         Stroke="{TemplateBinding Controls:RadioButtonHelper.OuterEllipseStroke}"
-                                         StrokeThickness="{TemplateBinding Controls:RadioButtonHelper.RadioStrokeThickness}"
+                                         Width="{TemplateBinding mah:RadioButtonHelper.RadioSize}"
+                                         Height="{TemplateBinding mah:RadioButtonHelper.RadioSize}"
+                                         Fill="{TemplateBinding mah:RadioButtonHelper.OuterEllipseFill}"
+                                         Stroke="{TemplateBinding mah:RadioButtonHelper.OuterEllipseStroke}"
+                                         StrokeThickness="{TemplateBinding mah:RadioButtonHelper.RadioStrokeThickness}"
                                          UseLayoutRounding="False" />
                                 <Ellipse x:Name="CheckOuterEllipse"
-                                         Width="{TemplateBinding Controls:RadioButtonHelper.RadioSize}"
-                                         Height="{TemplateBinding Controls:RadioButtonHelper.RadioSize}"
-                                         Fill="{TemplateBinding Controls:RadioButtonHelper.OuterEllipseCheckedFill}"
+                                         Width="{TemplateBinding mah:RadioButtonHelper.RadioSize}"
+                                         Height="{TemplateBinding mah:RadioButtonHelper.RadioSize}"
+                                         Fill="{TemplateBinding mah:RadioButtonHelper.OuterEllipseCheckedFill}"
                                          Opacity="0"
-                                         Stroke="{TemplateBinding Controls:RadioButtonHelper.OuterEllipseCheckedStroke}"
-                                         StrokeThickness="{TemplateBinding Controls:RadioButtonHelper.RadioStrokeThickness}"
+                                         Stroke="{TemplateBinding mah:RadioButtonHelper.OuterEllipseCheckedStroke}"
+                                         StrokeThickness="{TemplateBinding mah:RadioButtonHelper.RadioStrokeThickness}"
                                          UseLayoutRounding="False" />
                                 <Ellipse x:Name="CheckGlyph"
-                                         Width="{TemplateBinding Controls:RadioButtonHelper.RadioCheckSize}"
-                                         Height="{TemplateBinding Controls:RadioButtonHelper.RadioCheckSize}"
-                                         Fill="{TemplateBinding Controls:RadioButtonHelper.CheckGlyphFill}"
+                                         Width="{TemplateBinding mah:RadioButtonHelper.RadioCheckSize}"
+                                         Height="{TemplateBinding mah:RadioButtonHelper.RadioCheckSize}"
+                                         Fill="{TemplateBinding mah:RadioButtonHelper.CheckGlyphFill}"
                                          Opacity="0"
-                                         Stroke="{TemplateBinding Controls:RadioButtonHelper.CheckGlyphStroke}"
+                                         Stroke="{TemplateBinding mah:RadioButtonHelper.CheckGlyphStroke}"
                                          UseLayoutRounding="False" />
                             </Grid>
                             <ContentPresenter x:Name="ContentPresenter"
@@ -97,7 +63,7 @@
                                               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                               Focusable="False"
-                                              RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
+                                              RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
                                               SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
                                               TextElement.Foreground="{TemplateBinding Foreground}" />
                         </Grid>
@@ -126,40 +92,40 @@
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="CheckGlyph" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:RadioButtonHelper.CheckGlyphFillPointerOver)}" />
-                            <Setter TargetName="CheckGlyph" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:RadioButtonHelper.CheckGlyphStrokePointerOver)}" />
-                            <Setter TargetName="CheckOuterEllipse" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:RadioButtonHelper.OuterEllipseCheckedFillPointerOver)}" />
-                            <Setter TargetName="CheckOuterEllipse" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:RadioButtonHelper.OuterEllipseCheckedStrokePointerOver)}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:RadioButtonHelper.ForegroundPointerOver)}" />
-                            <Setter TargetName="OuterEllipse" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:RadioButtonHelper.OuterEllipseFillPointerOver)}" />
-                            <Setter TargetName="OuterEllipse" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:RadioButtonHelper.OuterEllipseStrokePointerOver)}" />
-                            <Setter TargetName="RootBorder" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:RadioButtonHelper.BackgroundPointerOver)}" />
-                            <Setter TargetName="RootBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:RadioButtonHelper.BorderBrushPointerOver)}" />
+                            <Setter TargetName="CheckGlyph" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:RadioButtonHelper.CheckGlyphFillPointerOver)}" />
+                            <Setter TargetName="CheckGlyph" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:RadioButtonHelper.CheckGlyphStrokePointerOver)}" />
+                            <Setter TargetName="CheckOuterEllipse" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:RadioButtonHelper.OuterEllipseCheckedFillPointerOver)}" />
+                            <Setter TargetName="CheckOuterEllipse" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:RadioButtonHelper.OuterEllipseCheckedStrokePointerOver)}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:RadioButtonHelper.ForegroundPointerOver)}" />
+                            <Setter TargetName="OuterEllipse" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:RadioButtonHelper.OuterEllipseFillPointerOver)}" />
+                            <Setter TargetName="OuterEllipse" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:RadioButtonHelper.OuterEllipseStrokePointerOver)}" />
+                            <Setter TargetName="RootBorder" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:RadioButtonHelper.BackgroundPointerOver)}" />
+                            <Setter TargetName="RootBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:RadioButtonHelper.BorderBrushPointerOver)}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter TargetName="CheckGlyph" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:RadioButtonHelper.CheckGlyphFillPressed)}" />
-                            <Setter TargetName="CheckGlyph" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:RadioButtonHelper.CheckGlyphStrokePressed)}" />
-                            <Setter TargetName="CheckOuterEllipse" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:RadioButtonHelper.OuterEllipseCheckedFillPressed)}" />
-                            <Setter TargetName="CheckOuterEllipse" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:RadioButtonHelper.OuterEllipseCheckedStrokePressed)}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:RadioButtonHelper.ForegroundPressed)}" />
-                            <Setter TargetName="OuterEllipse" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:RadioButtonHelper.OuterEllipseFillPressed)}" />
-                            <Setter TargetName="OuterEllipse" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:RadioButtonHelper.OuterEllipseStrokePressed)}" />
-                            <Setter TargetName="RootBorder" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:RadioButtonHelper.BackgroundPressed)}" />
-                            <Setter TargetName="RootBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:RadioButtonHelper.BorderBrushPressed)}" />
+                            <Setter TargetName="CheckGlyph" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:RadioButtonHelper.CheckGlyphFillPressed)}" />
+                            <Setter TargetName="CheckGlyph" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:RadioButtonHelper.CheckGlyphStrokePressed)}" />
+                            <Setter TargetName="CheckOuterEllipse" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:RadioButtonHelper.OuterEllipseCheckedFillPressed)}" />
+                            <Setter TargetName="CheckOuterEllipse" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:RadioButtonHelper.OuterEllipseCheckedStrokePressed)}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:RadioButtonHelper.ForegroundPressed)}" />
+                            <Setter TargetName="OuterEllipse" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:RadioButtonHelper.OuterEllipseFillPressed)}" />
+                            <Setter TargetName="OuterEllipse" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:RadioButtonHelper.OuterEllipseStrokePressed)}" />
+                            <Setter TargetName="RootBorder" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:RadioButtonHelper.BackgroundPressed)}" />
+                            <Setter TargetName="RootBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:RadioButtonHelper.BorderBrushPressed)}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="CheckGlyph" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:RadioButtonHelper.CheckGlyphFillDisabled)}" />
-                            <Setter TargetName="CheckGlyph" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:RadioButtonHelper.CheckGlyphStrokeDisabled)}" />
-                            <Setter TargetName="CheckOuterEllipse" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:RadioButtonHelper.OuterEllipseCheckedFillDisabled)}" />
-                            <Setter TargetName="CheckOuterEllipse" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:RadioButtonHelper.OuterEllipseCheckedStrokeDisabled)}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:RadioButtonHelper.ForegroundDisabled)}" />
-                            <Setter TargetName="OuterEllipse" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:RadioButtonHelper.OuterEllipseFillDisabled)}" />
-                            <Setter TargetName="OuterEllipse" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:RadioButtonHelper.OuterEllipseStrokeDisabled)}" />
-                            <Setter TargetName="RootBorder" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:RadioButtonHelper.BackgroundDisabled)}" />
-                            <Setter TargetName="RootBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:RadioButtonHelper.BorderBrushDisabled)}" />
+                            <Setter TargetName="CheckGlyph" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:RadioButtonHelper.CheckGlyphFillDisabled)}" />
+                            <Setter TargetName="CheckGlyph" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:RadioButtonHelper.CheckGlyphStrokeDisabled)}" />
+                            <Setter TargetName="CheckOuterEllipse" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:RadioButtonHelper.OuterEllipseCheckedFillDisabled)}" />
+                            <Setter TargetName="CheckOuterEllipse" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:RadioButtonHelper.OuterEllipseCheckedStrokeDisabled)}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:RadioButtonHelper.ForegroundDisabled)}" />
+                            <Setter TargetName="OuterEllipse" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:RadioButtonHelper.OuterEllipseFillDisabled)}" />
+                            <Setter TargetName="OuterEllipse" Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:RadioButtonHelper.OuterEllipseStrokeDisabled)}" />
+                            <Setter TargetName="RootBorder" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:RadioButtonHelper.BackgroundDisabled)}" />
+                            <Setter TargetName="RootBorder" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:RadioButtonHelper.BorderBrushDisabled)}" />
                         </Trigger>
 
-                        <Trigger Property="Controls:ToggleButtonHelper.ContentDirection" Value="RightToLeft">
+                        <Trigger Property="mah:ToggleButtonHelper.ContentDirection" Value="RightToLeft">
                             <Setter TargetName="ContentPresenter" Property="Grid.Column" Value="0" />
                             <Setter TargetName="LeftCol" Property="Width" Value="*" />
                             <Setter TargetName="Radio" Property="Grid.Column" Value="1" />
@@ -170,63 +136,97 @@
             </Setter.Value>
         </Setter>
         <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="mah:RadioButtonHelper.BackgroundDisabled" Value="{DynamicResource MahApps.Brushes.RadioButton.BackgroundDisabled}" />
+        <Setter Property="mah:RadioButtonHelper.BackgroundPointerOver" Value="{DynamicResource MahApps.Brushes.RadioButton.BackgroundPointerOver}" />
+        <Setter Property="mah:RadioButtonHelper.BackgroundPressed" Value="{DynamicResource MahApps.Brushes.RadioButton.BackgroundPressed}" />
+        <Setter Property="mah:RadioButtonHelper.BorderBrushDisabled" Value="{DynamicResource MahApps.Brushes.RadioButton.BorderBrushDisabled}" />
+        <Setter Property="mah:RadioButtonHelper.BorderBrushPointerOver" Value="{DynamicResource MahApps.Brushes.RadioButton.BorderBrushPointerOver}" />
+        <Setter Property="mah:RadioButtonHelper.BorderBrushPressed" Value="{DynamicResource MahApps.Brushes.RadioButton.BorderBrushPressed}" />
+        <Setter Property="mah:RadioButtonHelper.CheckGlyphFill" Value="{DynamicResource MahApps.Brushes.Highlight}" />
+        <Setter Property="mah:RadioButtonHelper.CheckGlyphFillDisabled" Value="{DynamicResource MahApps.Brushes.Accent2}" />
+        <Setter Property="mah:RadioButtonHelper.CheckGlyphFillPointerOver" Value="{DynamicResource MahApps.Brushes.Highlight}" />
+        <Setter Property="mah:RadioButtonHelper.CheckGlyphFillPressed" Value="{DynamicResource MahApps.Brushes.Highlight}" />
+        <Setter Property="mah:RadioButtonHelper.CheckGlyphStroke" Value="{DynamicResource MahApps.Brushes.Highlight}" />
+        <Setter Property="mah:RadioButtonHelper.CheckGlyphStrokeDisabled" Value="{DynamicResource MahApps.Brushes.Accent2}" />
+        <Setter Property="mah:RadioButtonHelper.CheckGlyphStrokePointerOver" Value="{DynamicResource MahApps.Brushes.Highlight}" />
+        <Setter Property="mah:RadioButtonHelper.CheckGlyphStrokePressed" Value="{DynamicResource MahApps.Brushes.Highlight}" />
+        <Setter Property="mah:RadioButtonHelper.ForegroundDisabled" Value="{DynamicResource MahApps.Brushes.RadioButton.ForegroundDisabled}" />
+        <Setter Property="mah:RadioButtonHelper.ForegroundPointerOver" Value="{DynamicResource MahApps.Brushes.RadioButton.ForegroundPointerOver}" />
+        <Setter Property="mah:RadioButtonHelper.ForegroundPressed" Value="{DynamicResource MahApps.Brushes.RadioButton.ForegroundPressed}" />
+        <Setter Property="mah:RadioButtonHelper.OuterEllipseCheckedFill" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
+        <Setter Property="mah:RadioButtonHelper.OuterEllipseCheckedFillDisabled" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
+        <Setter Property="mah:RadioButtonHelper.OuterEllipseCheckedFillPointerOver" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
+        <Setter Property="mah:RadioButtonHelper.OuterEllipseCheckedFillPressed" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
+        <Setter Property="mah:RadioButtonHelper.OuterEllipseCheckedStroke" Value="{DynamicResource MahApps.Brushes.CheckBox}" />
+        <Setter Property="mah:RadioButtonHelper.OuterEllipseCheckedStrokeDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox}" />
+        <Setter Property="mah:RadioButtonHelper.OuterEllipseCheckedStrokePointerOver" Value="{DynamicResource MahApps.Brushes.CheckBox.MouseOver}" />
+        <Setter Property="mah:RadioButtonHelper.OuterEllipseCheckedStrokePressed" Value="{DynamicResource MahApps.Brushes.CheckBox.MouseOver}" />
+        <Setter Property="mah:RadioButtonHelper.OuterEllipseFill" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
+        <Setter Property="mah:RadioButtonHelper.OuterEllipseFillDisabled" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
+        <Setter Property="mah:RadioButtonHelper.OuterEllipseFillPointerOver" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
+        <Setter Property="mah:RadioButtonHelper.OuterEllipseFillPressed" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
+        <Setter Property="mah:RadioButtonHelper.OuterEllipseStroke" Value="{DynamicResource MahApps.Brushes.CheckBox}" />
+        <Setter Property="mah:RadioButtonHelper.OuterEllipseStrokeDisabled" Value="{DynamicResource MahApps.Brushes.CheckBox}" />
+        <Setter Property="mah:RadioButtonHelper.OuterEllipseStrokePointerOver" Value="{DynamicResource MahApps.Brushes.CheckBox.MouseOver}" />
+        <Setter Property="mah:RadioButtonHelper.OuterEllipseStrokePressed" Value="{DynamicResource MahApps.Brushes.CheckBox.MouseOver}" />
+        <Setter Property="mah:RadioButtonHelper.RadioSize" Value="18" />
         <Style.Triggers>
-            <Trigger Property="Controls:ToggleButtonHelper.ContentDirection" Value="RightToLeft">
+            <Trigger Property="mah:ToggleButtonHelper.ContentDirection" Value="RightToLeft">
                 <Setter Property="HorizontalContentAlignment" Value="Right" />
                 <Setter Property="Padding" Value="0 0 6 0" />
             </Trigger>
         </Style.Triggers>
     </Style>
 
-    <sys:Double x:Key="RadioButtonBorderThemeThickness">2</sys:Double>
+    <system:Double x:Key="RadioButtonBorderThemeThickness">2</system:Double>
 
     <Style x:Key="MahApps.Styles.RadioButton.Win10"
            BasedOn="{StaticResource MahApps.Styles.RadioButton}"
            TargetType="RadioButton">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.RadioButton.Background}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.RadioButton.BorderBrush}" />
-        <Setter Property="Controls:RadioButtonHelper.BackgroundDisabled" Value="{DynamicResource MahApps.Brushes.RadioButton.BackgroundDisabled}" />
-        <Setter Property="Controls:RadioButtonHelper.BackgroundPointerOver" Value="{DynamicResource MahApps.Brushes.RadioButton.BackgroundPointerOver}" />
-        <Setter Property="Controls:RadioButtonHelper.BackgroundPressed" Value="{DynamicResource MahApps.Brushes.RadioButton.BackgroundPressed}" />
-        <Setter Property="Controls:RadioButtonHelper.BorderBrushDisabled" Value="{DynamicResource MahApps.Brushes.RadioButton.BorderBrushDisabled}" />
-        <Setter Property="Controls:RadioButtonHelper.BorderBrushPointerOver" Value="{DynamicResource MahApps.Brushes.RadioButton.BorderBrushPointerOver}" />
-        <Setter Property="Controls:RadioButtonHelper.BorderBrushPressed" Value="{DynamicResource MahApps.Brushes.RadioButton.BorderBrushPressed}" />
-        <Setter Property="Controls:RadioButtonHelper.CheckGlyphFill" Value="{DynamicResource MahApps.Brushes.RadioButton.CheckGlyphFill}" />
-        <Setter Property="Controls:RadioButtonHelper.CheckGlyphFillDisabled" Value="{DynamicResource MahApps.Brushes.RadioButton.CheckGlyphFillDisabled}" />
-        <Setter Property="Controls:RadioButtonHelper.CheckGlyphFillPointerOver" Value="{DynamicResource MahApps.Brushes.RadioButton.CheckGlyphFillPointerOver}" />
-        <Setter Property="Controls:RadioButtonHelper.CheckGlyphFillPressed" Value="{DynamicResource MahApps.Brushes.RadioButton.CheckGlyphFillPressed}" />
-        <Setter Property="Controls:RadioButtonHelper.CheckGlyphStroke" Value="{DynamicResource MahApps.Brushes.RadioButton.CheckGlyphStroke}" />
-        <Setter Property="Controls:RadioButtonHelper.CheckGlyphStrokeDisabled" Value="{DynamicResource MahApps.Brushes.RadioButton.CheckGlyphStrokeDisabled}" />
-        <Setter Property="Controls:RadioButtonHelper.CheckGlyphStrokePointerOver" Value="{DynamicResource MahApps.Brushes.RadioButton.CheckGlyphStrokePointerOver}" />
-        <Setter Property="Controls:RadioButtonHelper.CheckGlyphStrokePressed" Value="{DynamicResource MahApps.Brushes.RadioButton.CheckGlyphStrokePressed}" />
-        <Setter Property="Controls:RadioButtonHelper.ForegroundDisabled" Value="{DynamicResource MahApps.Brushes.RadioButton.ForegroundDisabled}" />
-        <Setter Property="Controls:RadioButtonHelper.ForegroundPointerOver" Value="{DynamicResource MahApps.Brushes.RadioButton.ForegroundPointerOver}" />
-        <Setter Property="Controls:RadioButtonHelper.ForegroundPressed" Value="{DynamicResource MahApps.Brushes.RadioButton.ForegroundPressed}" />
-        <Setter Property="Controls:RadioButtonHelper.OuterEllipseCheckedFill" Value="{DynamicResource MahApps.Brushes.RadioButton.OuterEllipseCheckedFill}" />
-        <Setter Property="Controls:RadioButtonHelper.OuterEllipseCheckedFillDisabled" Value="{DynamicResource MahApps.Brushes.RadioButton.OuterEllipseCheckedFillDisabled}" />
-        <Setter Property="Controls:RadioButtonHelper.OuterEllipseCheckedFillPointerOver" Value="{DynamicResource MahApps.Brushes.RadioButton.OuterEllipseCheckedFillPointerOver}" />
-        <Setter Property="Controls:RadioButtonHelper.OuterEllipseCheckedFillPressed" Value="{DynamicResource MahApps.Brushes.RadioButton.OuterEllipseCheckedFillPressed}" />
-        <Setter Property="Controls:RadioButtonHelper.OuterEllipseCheckedStroke" Value="{DynamicResource MahApps.Brushes.RadioButton.OuterEllipseCheckedStroke}" />
-        <Setter Property="Controls:RadioButtonHelper.OuterEllipseCheckedStrokeDisabled" Value="{DynamicResource MahApps.Brushes.RadioButton.OuterEllipseCheckedStrokeDisabled}" />
-        <Setter Property="Controls:RadioButtonHelper.OuterEllipseCheckedStrokePointerOver" Value="{DynamicResource MahApps.Brushes.RadioButton.OuterEllipseCheckedStrokePointerOver}" />
-        <Setter Property="Controls:RadioButtonHelper.OuterEllipseCheckedStrokePressed" Value="{DynamicResource MahApps.Brushes.RadioButton.OuterEllipseCheckedStrokePressed}" />
-        <Setter Property="Controls:RadioButtonHelper.OuterEllipseFill" Value="{DynamicResource MahApps.Brushes.RadioButton.OuterEllipseFill}" />
-        <Setter Property="Controls:RadioButtonHelper.OuterEllipseFillDisabled" Value="{DynamicResource MahApps.Brushes.RadioButton.OuterEllipseFillDisabled}" />
-        <Setter Property="Controls:RadioButtonHelper.OuterEllipseFillPointerOver" Value="{DynamicResource MahApps.Brushes.RadioButton.OuterEllipseFillPointerOver}" />
-        <Setter Property="Controls:RadioButtonHelper.OuterEllipseFillPressed" Value="{DynamicResource MahApps.Brushes.RadioButton.OuterEllipseFillPressed}" />
-        <Setter Property="Controls:RadioButtonHelper.OuterEllipseStroke" Value="{DynamicResource MahApps.Brushes.RadioButton.OuterEllipseStroke}" />
-        <Setter Property="Controls:RadioButtonHelper.OuterEllipseStrokeDisabled" Value="{DynamicResource MahApps.Brushes.RadioButton.OuterEllipseStrokeDisabled}" />
-        <Setter Property="Controls:RadioButtonHelper.OuterEllipseStrokePointerOver" Value="{DynamicResource MahApps.Brushes.RadioButton.OuterEllipseStrokePointerOver}" />
-        <Setter Property="Controls:RadioButtonHelper.OuterEllipseStrokePressed" Value="{DynamicResource MahApps.Brushes.RadioButton.OuterEllipseStrokePressed}" />
-        <Setter Property="Controls:RadioButtonHelper.RadioSize" Value="20" />
-        <Setter Property="Controls:RadioButtonHelper.RadioStrokeThickness" Value="{DynamicResource RadioButtonBorderThemeThickness}" />
         <Setter Property="FocusVisualStyle" Value="{DynamicResource {x:Static SystemParameters.FocusVisualStyleKey}}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.RadioButton.Foreground}" />
         <Setter Property="MinHeight" Value="32" />
         <Setter Property="MinWidth" Value="120" />
         <Setter Property="Padding" Value="8 0 0 0" />
+        <Setter Property="mah:RadioButtonHelper.BackgroundDisabled" Value="{DynamicResource MahApps.Brushes.RadioButton.BackgroundDisabled}" />
+        <Setter Property="mah:RadioButtonHelper.BackgroundPointerOver" Value="{DynamicResource MahApps.Brushes.RadioButton.BackgroundPointerOver}" />
+        <Setter Property="mah:RadioButtonHelper.BackgroundPressed" Value="{DynamicResource MahApps.Brushes.RadioButton.BackgroundPressed}" />
+        <Setter Property="mah:RadioButtonHelper.BorderBrushDisabled" Value="{DynamicResource MahApps.Brushes.RadioButton.BorderBrushDisabled}" />
+        <Setter Property="mah:RadioButtonHelper.BorderBrushPointerOver" Value="{DynamicResource MahApps.Brushes.RadioButton.BorderBrushPointerOver}" />
+        <Setter Property="mah:RadioButtonHelper.BorderBrushPressed" Value="{DynamicResource MahApps.Brushes.RadioButton.BorderBrushPressed}" />
+        <Setter Property="mah:RadioButtonHelper.CheckGlyphFill" Value="{DynamicResource MahApps.Brushes.RadioButton.CheckGlyphFill}" />
+        <Setter Property="mah:RadioButtonHelper.CheckGlyphFillDisabled" Value="{DynamicResource MahApps.Brushes.RadioButton.CheckGlyphFillDisabled}" />
+        <Setter Property="mah:RadioButtonHelper.CheckGlyphFillPointerOver" Value="{DynamicResource MahApps.Brushes.RadioButton.CheckGlyphFillPointerOver}" />
+        <Setter Property="mah:RadioButtonHelper.CheckGlyphFillPressed" Value="{DynamicResource MahApps.Brushes.RadioButton.CheckGlyphFillPressed}" />
+        <Setter Property="mah:RadioButtonHelper.CheckGlyphStroke" Value="{DynamicResource MahApps.Brushes.RadioButton.CheckGlyphStroke}" />
+        <Setter Property="mah:RadioButtonHelper.CheckGlyphStrokeDisabled" Value="{DynamicResource MahApps.Brushes.RadioButton.CheckGlyphStrokeDisabled}" />
+        <Setter Property="mah:RadioButtonHelper.CheckGlyphStrokePointerOver" Value="{DynamicResource MahApps.Brushes.RadioButton.CheckGlyphStrokePointerOver}" />
+        <Setter Property="mah:RadioButtonHelper.CheckGlyphStrokePressed" Value="{DynamicResource MahApps.Brushes.RadioButton.CheckGlyphStrokePressed}" />
+        <Setter Property="mah:RadioButtonHelper.ForegroundDisabled" Value="{DynamicResource MahApps.Brushes.RadioButton.ForegroundDisabled}" />
+        <Setter Property="mah:RadioButtonHelper.ForegroundPointerOver" Value="{DynamicResource MahApps.Brushes.RadioButton.ForegroundPointerOver}" />
+        <Setter Property="mah:RadioButtonHelper.ForegroundPressed" Value="{DynamicResource MahApps.Brushes.RadioButton.ForegroundPressed}" />
+        <Setter Property="mah:RadioButtonHelper.OuterEllipseCheckedFill" Value="{DynamicResource MahApps.Brushes.RadioButton.OuterEllipseCheckedFill}" />
+        <Setter Property="mah:RadioButtonHelper.OuterEllipseCheckedFillDisabled" Value="{DynamicResource MahApps.Brushes.RadioButton.OuterEllipseCheckedFillDisabled}" />
+        <Setter Property="mah:RadioButtonHelper.OuterEllipseCheckedFillPointerOver" Value="{DynamicResource MahApps.Brushes.RadioButton.OuterEllipseCheckedFillPointerOver}" />
+        <Setter Property="mah:RadioButtonHelper.OuterEllipseCheckedFillPressed" Value="{DynamicResource MahApps.Brushes.RadioButton.OuterEllipseCheckedFillPressed}" />
+        <Setter Property="mah:RadioButtonHelper.OuterEllipseCheckedStroke" Value="{DynamicResource MahApps.Brushes.RadioButton.OuterEllipseCheckedStroke}" />
+        <Setter Property="mah:RadioButtonHelper.OuterEllipseCheckedStrokeDisabled" Value="{DynamicResource MahApps.Brushes.RadioButton.OuterEllipseCheckedStrokeDisabled}" />
+        <Setter Property="mah:RadioButtonHelper.OuterEllipseCheckedStrokePointerOver" Value="{DynamicResource MahApps.Brushes.RadioButton.OuterEllipseCheckedStrokePointerOver}" />
+        <Setter Property="mah:RadioButtonHelper.OuterEllipseCheckedStrokePressed" Value="{DynamicResource MahApps.Brushes.RadioButton.OuterEllipseCheckedStrokePressed}" />
+        <Setter Property="mah:RadioButtonHelper.OuterEllipseFill" Value="{DynamicResource MahApps.Brushes.RadioButton.OuterEllipseFill}" />
+        <Setter Property="mah:RadioButtonHelper.OuterEllipseFillDisabled" Value="{DynamicResource MahApps.Brushes.RadioButton.OuterEllipseFillDisabled}" />
+        <Setter Property="mah:RadioButtonHelper.OuterEllipseFillPointerOver" Value="{DynamicResource MahApps.Brushes.RadioButton.OuterEllipseFillPointerOver}" />
+        <Setter Property="mah:RadioButtonHelper.OuterEllipseFillPressed" Value="{DynamicResource MahApps.Brushes.RadioButton.OuterEllipseFillPressed}" />
+        <Setter Property="mah:RadioButtonHelper.OuterEllipseStroke" Value="{DynamicResource MahApps.Brushes.RadioButton.OuterEllipseStroke}" />
+        <Setter Property="mah:RadioButtonHelper.OuterEllipseStrokeDisabled" Value="{DynamicResource MahApps.Brushes.RadioButton.OuterEllipseStrokeDisabled}" />
+        <Setter Property="mah:RadioButtonHelper.OuterEllipseStrokePointerOver" Value="{DynamicResource MahApps.Brushes.RadioButton.OuterEllipseStrokePointerOver}" />
+        <Setter Property="mah:RadioButtonHelper.OuterEllipseStrokePressed" Value="{DynamicResource MahApps.Brushes.RadioButton.OuterEllipseStrokePressed}" />
+        <Setter Property="mah:RadioButtonHelper.RadioSize" Value="20" />
+        <Setter Property="mah:RadioButtonHelper.RadioStrokeThickness" Value="{DynamicResource RadioButtonBorderThemeThickness}" />
         <Style.Triggers>
-            <Trigger Property="Controls:ToggleButtonHelper.ContentDirection" Value="RightToLeft">
+            <Trigger Property="mah:ToggleButtonHelper.ContentDirection" Value="RightToLeft">
                 <Setter Property="HorizontalContentAlignment" Value="Right" />
                 <Setter Property="Padding" Value="0 0 8 0" />
             </Trigger>
diff --git a/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml b/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
index 53383ef17d..bf5f0186e4 100644
--- a/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Scrollbars.xaml
@@ -1,13 +1,15 @@
 <ResourceDictionary 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"
-                    xmlns:System="clr-namespace:System;assembly=mscorlib"
-                    xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls"
+                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                    xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib"
+                    mc:Ignorable="po">
 
-    <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>
+    <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>
 
     <Storyboard x:Key="MahApps.Storyboard.ScrollBarThumbMouseOver" po:Freeze="True">
         <DoubleAnimationUsingKeyFrames Storyboard.TargetName="MouseOverRectangle" Storyboard.TargetProperty="(UIElement.Opacity)">
@@ -150,7 +152,7 @@
                                   Style="{DynamicResource MahApps.Styles.RepeatButton.ScrollBarLarge}" />
                 </Track.DecreaseRepeatButton>
                 <Track.Thumb>
-                    <Controls:MetroThumb Margin="0 1 0 1" Style="{DynamicResource MahApps.Styles.Thumb.ScrollBar}" />
+                    <mah:MetroThumb Margin="0 1 0 1" Style="{DynamicResource MahApps.Styles.Thumb.ScrollBar}" />
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
                     <RepeatButton x:Name="HorizontalLargeIncrease"
@@ -187,7 +189,7 @@
                    Grid.Row="1"
                    IsDirectionReversed="True">
                 <Track.Resources>
-                    <System:Double x:Key="{x:Static SystemParameters.VerticalScrollBarButtonHeightKey}">50</System:Double>
+                    <system:Double x:Key="{x:Static SystemParameters.VerticalScrollBarButtonHeightKey}">50</system:Double>
                 </Track.Resources>
                 <Track.DecreaseRepeatButton>
                     <RepeatButton x:Name="VerticalLargeDecrease"
@@ -195,7 +197,7 @@
                                   Style="{DynamicResource MahApps.Styles.RepeatButton.ScrollBarLarge}" />
                 </Track.DecreaseRepeatButton>
                 <Track.Thumb>
-                    <Controls:MetroThumb Margin="1 0 1 0" Style="{DynamicResource MahApps.Styles.Thumb.ScrollBar}" />
+                    <mah:MetroThumb Margin="1 0 1 0" Style="{DynamicResource MahApps.Styles.Thumb.ScrollBar}" />
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
                     <RepeatButton x:Name="VerticalLargeIncrease"
@@ -235,7 +237,6 @@
     </Style>
 
     <Style x:Key="MahApps.Styles.ScrollViewer" TargetType="{x:Type ScrollViewer}">
-        <Setter Property="Controls:ScrollViewerHelper.VerticalScrollBarOnLeftSide" Value="False" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ScrollViewer}">
@@ -278,7 +279,7 @@
                                    Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" />
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="Controls:ScrollViewerHelper.VerticalScrollBarOnLeftSide" Value="True">
+                        <Trigger Property="mah:ScrollViewerHelper.VerticalScrollBarOnLeftSide" Value="True">
                             <Setter TargetName="PART_HorizontalScrollBar" Property="Grid.Column" Value="1" />
                             <Setter TargetName="PART_ScrollContentPresenter" Property="Grid.Column" Value="1" />
                             <Setter TargetName="PART_VerticalScrollBar" Property="Grid.Column" Value="0" />
@@ -289,6 +290,7 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
+        <Setter Property="mah:ScrollViewerHelper.VerticalScrollBarOnLeftSide" Value="False" />
     </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Controls.Shadows.xaml b/src/MahApps.Metro/Styles/Controls.Shadows.xaml
index 645b4b3e1d..fdfd2e8d60 100644
--- a/src/MahApps.Metro/Styles/Controls.Shadows.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Shadows.xaml
@@ -1,6 +1,8 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options">
+                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                    xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
+                    mc:Ignorable="po">
 
     <DropShadowEffect x:Key="MahApps.DropShadowEffect.Menu"
                       BlurRadius="4"
diff --git a/src/MahApps.Metro/Styles/Controls.Shared.xaml b/src/MahApps.Metro/Styles/Controls.Shared.xaml
index 7764d8281f..791afc7933 100644
--- a/src/MahApps.Metro/Styles/Controls.Shared.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Shared.xaml
@@ -1,6 +1,8 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options">
+                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                    xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
+                    mc:Ignorable="po">
 
     <ExponentialEase x:Key="MahApps.ExponentialEase.EaseInOut"
                      EasingMode="EaseInOut"
diff --git a/src/MahApps.Metro/Styles/Controls.Slider.xaml b/src/MahApps.Metro/Styles/Controls.Slider.xaml
index 27a012f6cd..ddcfeb5b83 100644
--- a/src/MahApps.Metro/Styles/Controls.Slider.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Slider.xaml
@@ -1,12 +1,12 @@
 <ResourceDictionary 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"
-                    xmlns:System="clr-namespace:System;assembly=mscorlib">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib">
 
-    <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>
+    <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" />
@@ -109,23 +109,23 @@
                 <Track.DecreaseRepeatButton>
                     <RepeatButton x:Name="HorizontalTrackDecrease"
                                   Command="{x:Static Slider.DecreaseLarge}"
-                                  Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillBrush)}"
+                                  Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillBrush)}"
                                   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)}"
+                                  Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillBrush)}"
                                   Style="{DynamicResource MahApps.Styles.RepeatButton.Slider.HorizontalTrack}" />
                 </Track.IncreaseRepeatButton>
                 <Track.Thumb>
-                    <Controls:MetroThumb x:Name="HorizontalThumb"
-                                         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"
-                                         Style="{DynamicResource MahApps.Styles.Thumb.Slider}" />
+                    <mah:MetroThumb x:Name="HorizontalThumb"
+                                    Width="{DynamicResource MahApps.Sizes.Slider.HorizontalThumb.Width}"
+                                    Height="{DynamicResource MahApps.Sizes.Slider.HorizontalThumb.Height}"
+                                    Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillBrush)}"
+                                    BorderThickness="1 0"
+                                    IsTabStop="True"
+                                    Style="{DynamicResource MahApps.Styles.Thumb.Slider}" />
                 </Track.Thumb>
             </Track>
         </Grid>
@@ -142,29 +142,29 @@
             </Trigger>
 
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter TargetName="HorizontalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillHoverBrush)}" />
-                <Setter TargetName="HorizontalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillHoverBrush)}" />
-                <Setter TargetName="HorizontalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillHoverBrush)}" />
+                <Setter TargetName="HorizontalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillHoverBrush)}" />
+                <Setter TargetName="HorizontalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillHoverBrush)}" />
+                <Setter TargetName="HorizontalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillHoverBrush)}" />
             </Trigger>
             <Trigger SourceName="HorizontalTrackDecrease" Property="IsPressed" Value="True">
-                <Setter TargetName="HorizontalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
-                <Setter TargetName="HorizontalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillPressedBrush)}" />
-                <Setter TargetName="HorizontalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="HorizontalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="HorizontalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillPressedBrush)}" />
+                <Setter TargetName="HorizontalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
             </Trigger>
             <Trigger SourceName="HorizontalTrackIncrease" Property="IsPressed" Value="True">
-                <Setter TargetName="HorizontalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
-                <Setter TargetName="HorizontalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillPressedBrush)}" />
-                <Setter TargetName="HorizontalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="HorizontalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="HorizontalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillPressedBrush)}" />
+                <Setter TargetName="HorizontalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
             </Trigger>
             <Trigger SourceName="HorizontalThumb" Property="IsDragging" Value="True">
-                <Setter TargetName="HorizontalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
-                <Setter TargetName="HorizontalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillPressedBrush)}" />
-                <Setter TargetName="HorizontalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="HorizontalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="HorizontalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillPressedBrush)}" />
+                <Setter TargetName="HorizontalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
-                <Setter TargetName="HorizontalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillDisabledBrush)}" />
-                <Setter TargetName="HorizontalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillDisabledBrush)}" />
-                <Setter TargetName="HorizontalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillDisabledBrush)}" />
+                <Setter TargetName="HorizontalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillDisabledBrush)}" />
+                <Setter TargetName="HorizontalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillDisabledBrush)}" />
+                <Setter TargetName="HorizontalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillDisabledBrush)}" />
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
@@ -195,23 +195,23 @@
                 <Track.DecreaseRepeatButton>
                     <RepeatButton x:Name="VerticalTrackDecrease"
                                   Command="{x:Static Slider.DecreaseLarge}"
-                                  Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillBrush)}"
+                                  Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillBrush)}"
                                   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)}"
+                                  Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillBrush)}"
                                   Style="{DynamicResource MahApps.Styles.RepeatButton.Slider.VerticalTrack}" />
                 </Track.IncreaseRepeatButton>
                 <Track.Thumb>
-                    <Controls:MetroThumb x:Name="VerticalThumb"
-                                         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"
-                                         Style="{DynamicResource MahApps.Styles.Thumb.Slider}" />
+                    <mah:MetroThumb x:Name="VerticalThumb"
+                                    Width="{DynamicResource MahApps.Sizes.Slider.VerticalThumb.Width}"
+                                    Height="{DynamicResource MahApps.Sizes.Slider.VerticalThumb.Height}"
+                                    Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillBrush)}"
+                                    BorderThickness="0 1"
+                                    IsTabStop="True"
+                                    Style="{DynamicResource MahApps.Styles.Thumb.Slider}" />
                 </Track.Thumb>
             </Track>
         </Grid>
@@ -228,29 +228,29 @@
             </Trigger>
 
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter TargetName="VerticalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillHoverBrush)}" />
-                <Setter TargetName="VerticalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillHoverBrush)}" />
-                <Setter TargetName="VerticalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillHoverBrush)}" />
+                <Setter TargetName="VerticalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillHoverBrush)}" />
+                <Setter TargetName="VerticalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillHoverBrush)}" />
+                <Setter TargetName="VerticalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillHoverBrush)}" />
             </Trigger>
             <Trigger SourceName="VerticalTrackDecrease" Property="IsPressed" Value="True">
-                <Setter TargetName="VerticalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
-                <Setter TargetName="VerticalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillPressedBrush)}" />
-                <Setter TargetName="VerticalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="VerticalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="VerticalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillPressedBrush)}" />
+                <Setter TargetName="VerticalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
             </Trigger>
             <Trigger SourceName="VerticalTrackIncrease" Property="IsPressed" Value="True">
-                <Setter TargetName="VerticalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
-                <Setter TargetName="VerticalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillPressedBrush)}" />
-                <Setter TargetName="VerticalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="VerticalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="VerticalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillPressedBrush)}" />
+                <Setter TargetName="VerticalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
             </Trigger>
             <Trigger SourceName="VerticalThumb" Property="IsDragging" Value="True">
-                <Setter TargetName="VerticalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
-                <Setter TargetName="VerticalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillPressedBrush)}" />
-                <Setter TargetName="VerticalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="VerticalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="VerticalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillPressedBrush)}" />
+                <Setter TargetName="VerticalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
-                <Setter TargetName="VerticalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillDisabledBrush)}" />
-                <Setter TargetName="VerticalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillDisabledBrush)}" />
-                <Setter TargetName="VerticalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillDisabledBrush)}" />
+                <Setter TargetName="VerticalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillDisabledBrush)}" />
+                <Setter TargetName="VerticalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillDisabledBrush)}" />
+                <Setter TargetName="VerticalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillDisabledBrush)}" />
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
@@ -259,18 +259,6 @@
     <Style x:Key="MahApps.Styles.Slider" TargetType="{x:Type Slider}">
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Control.Border}" />
         <Setter Property="BorderThickness" Value="2" />
-        <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" />
@@ -278,6 +266,18 @@
         <Setter Property="Template" Value="{DynamicResource MahApps.Templates.Slider.Horizontal}" />
         <Setter Property="Value" Value="0" />
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
+        <Setter Property="mah:SliderHelper.ThumbFillBrush" Value="{DynamicResource MahApps.Brushes.Gray2}" />
+        <Setter Property="mah:SliderHelper.ThumbFillDisabledBrush" Value="{DynamicResource MahApps.Brushes.Gray6}" />
+        <Setter Property="mah:SliderHelper.ThumbFillHoverBrush" Value="{DynamicResource MahApps.Brushes.Gray5}" />
+        <Setter Property="mah:SliderHelper.ThumbFillPressedBrush" Value="{DynamicResource MahApps.Brushes.Gray2}" />
+        <Setter Property="mah:SliderHelper.TrackFillBrush" Value="{DynamicResource MahApps.Brushes.Gray3}" />
+        <Setter Property="mah:SliderHelper.TrackFillDisabledBrush" Value="{DynamicResource MahApps.Brushes.Gray6}" />
+        <Setter Property="mah:SliderHelper.TrackFillHoverBrush" Value="{DynamicResource MahApps.Brushes.Gray3}" />
+        <Setter Property="mah:SliderHelper.TrackFillPressedBrush" Value="{DynamicResource MahApps.Brushes.Gray3}" />
+        <Setter Property="mah:SliderHelper.TrackValueFillBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="mah:SliderHelper.TrackValueFillDisabledBrush" Value="{DynamicResource MahApps.Brushes.Gray6}" />
+        <Setter Property="mah:SliderHelper.TrackValueFillHoverBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="mah:SliderHelper.TrackValueFillPressedBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Style.Triggers>
             <Trigger Property="Orientation" Value="Vertical">
                 <Setter Property="Template" Value="{DynamicResource MahApps.Templates.Slider.Vertical}" />
@@ -362,22 +362,22 @@
                 <Track.DecreaseRepeatButton>
                     <RepeatButton x:Name="HorizontalTrackDecrease"
                                   Command="{x:Static Slider.DecreaseLarge}"
-                                  Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillBrush)}"
+                                  Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillBrush)}"
                                   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)}"
+                                  Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillBrush)}"
                                   Style="{DynamicResource MahApps.Styles.RepeatButton.Slider.HorizontalTrack.Win10}" />
                 </Track.IncreaseRepeatButton>
                 <Track.Thumb>
-                    <Controls:MetroThumb x:Name="HorizontalThumb"
-                                         Width="8"
-                                         Height="24"
-                                         Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillBrush)}"
-                                         IsTabStop="True"
-                                         Style="{DynamicResource MahApps.Styles.Thumb.Slider.Win10}" />
+                    <mah:MetroThumb x:Name="HorizontalThumb"
+                                    Width="8"
+                                    Height="24"
+                                    Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillBrush)}"
+                                    IsTabStop="True"
+                                    Style="{DynamicResource MahApps.Styles.Thumb.Slider.Win10}" />
                 </Track.Thumb>
             </Track>
         </Grid>
@@ -394,29 +394,29 @@
             </Trigger>
 
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter TargetName="HorizontalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillHoverBrush)}" />
-                <Setter TargetName="HorizontalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillHoverBrush)}" />
-                <Setter TargetName="HorizontalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillHoverBrush)}" />
+                <Setter TargetName="HorizontalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillHoverBrush)}" />
+                <Setter TargetName="HorizontalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillHoverBrush)}" />
+                <Setter TargetName="HorizontalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillHoverBrush)}" />
             </Trigger>
             <Trigger SourceName="HorizontalTrackDecrease" Property="IsPressed" Value="True">
-                <Setter TargetName="HorizontalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
-                <Setter TargetName="HorizontalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillPressedBrush)}" />
-                <Setter TargetName="HorizontalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="HorizontalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="HorizontalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillPressedBrush)}" />
+                <Setter TargetName="HorizontalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
             </Trigger>
             <Trigger SourceName="HorizontalTrackIncrease" Property="IsPressed" Value="True">
-                <Setter TargetName="HorizontalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
-                <Setter TargetName="HorizontalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillPressedBrush)}" />
-                <Setter TargetName="HorizontalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="HorizontalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="HorizontalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillPressedBrush)}" />
+                <Setter TargetName="HorizontalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
             </Trigger>
             <Trigger SourceName="HorizontalThumb" Property="IsDragging" Value="True">
-                <Setter TargetName="HorizontalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
-                <Setter TargetName="HorizontalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillPressedBrush)}" />
-                <Setter TargetName="HorizontalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="HorizontalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="HorizontalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillPressedBrush)}" />
+                <Setter TargetName="HorizontalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
-                <Setter TargetName="HorizontalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillDisabledBrush)}" />
-                <Setter TargetName="HorizontalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillDisabledBrush)}" />
-                <Setter TargetName="HorizontalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillDisabledBrush)}" />
+                <Setter TargetName="HorizontalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillDisabledBrush)}" />
+                <Setter TargetName="HorizontalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillDisabledBrush)}" />
+                <Setter TargetName="HorizontalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillDisabledBrush)}" />
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
@@ -449,22 +449,22 @@
                 <Track.DecreaseRepeatButton>
                     <RepeatButton x:Name="VerticalTrackDecrease"
                                   Command="{x:Static Slider.DecreaseLarge}"
-                                  Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillBrush)}"
+                                  Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillBrush)}"
                                   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)}"
+                                  Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillBrush)}"
                                   Style="{DynamicResource MahApps.Styles.RepeatButton.Slider.VerticalTrack.Win10}" />
                 </Track.IncreaseRepeatButton>
                 <Track.Thumb>
-                    <Controls:MetroThumb x:Name="VerticalThumb"
-                                         Width="24"
-                                         Height="8"
-                                         Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillBrush)}"
-                                         IsTabStop="True"
-                                         Style="{DynamicResource MahApps.Styles.Thumb.Slider.Win10}" />
+                    <mah:MetroThumb x:Name="VerticalThumb"
+                                    Width="24"
+                                    Height="8"
+                                    Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillBrush)}"
+                                    IsTabStop="True"
+                                    Style="{DynamicResource MahApps.Styles.Thumb.Slider.Win10}" />
                 </Track.Thumb>
             </Track>
         </Grid>
@@ -481,29 +481,29 @@
             </Trigger>
 
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter TargetName="VerticalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillHoverBrush)}" />
-                <Setter TargetName="VerticalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillHoverBrush)}" />
-                <Setter TargetName="VerticalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillHoverBrush)}" />
+                <Setter TargetName="VerticalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillHoverBrush)}" />
+                <Setter TargetName="VerticalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillHoverBrush)}" />
+                <Setter TargetName="VerticalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillHoverBrush)}" />
             </Trigger>
             <Trigger SourceName="VerticalTrackDecrease" Property="IsPressed" Value="True">
-                <Setter TargetName="VerticalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
-                <Setter TargetName="VerticalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillPressedBrush)}" />
-                <Setter TargetName="VerticalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="VerticalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="VerticalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillPressedBrush)}" />
+                <Setter TargetName="VerticalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
             </Trigger>
             <Trigger SourceName="VerticalTrackIncrease" Property="IsPressed" Value="True">
-                <Setter TargetName="VerticalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
-                <Setter TargetName="VerticalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillPressedBrush)}" />
-                <Setter TargetName="VerticalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="VerticalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="VerticalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillPressedBrush)}" />
+                <Setter TargetName="VerticalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
             </Trigger>
             <Trigger SourceName="VerticalThumb" Property="IsDragging" Value="True">
-                <Setter TargetName="VerticalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
-                <Setter TargetName="VerticalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillPressedBrush)}" />
-                <Setter TargetName="VerticalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="VerticalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="VerticalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillPressedBrush)}" />
+                <Setter TargetName="VerticalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
-                <Setter TargetName="VerticalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillDisabledBrush)}" />
-                <Setter TargetName="VerticalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillDisabledBrush)}" />
-                <Setter TargetName="VerticalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillDisabledBrush)}" />
+                <Setter TargetName="VerticalThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillDisabledBrush)}" />
+                <Setter TargetName="VerticalTrackDecrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillDisabledBrush)}" />
+                <Setter TargetName="VerticalTrackIncrease" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillDisabledBrush)}" />
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
@@ -512,18 +512,6 @@
     <Style x:Key="MahApps.Styles.Slider.Win10" TargetType="{x:Type Slider}">
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Control.Border}" />
         <Setter Property="BorderThickness" Value="2" />
-        <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" />
@@ -532,6 +520,18 @@
         <Setter Property="Template" Value="{DynamicResource MahApps.Templates.Slider.Horizontal.Win10}" />
         <Setter Property="Value" Value="0" />
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
+        <Setter Property="mah:SliderHelper.ThumbFillBrush" Value="{DynamicResource MahApps.Brushes.AccentBase}" />
+        <Setter Property="mah:SliderHelper.ThumbFillDisabledBrush" Value="{DynamicResource MahApps.Brushes.Gray6}" />
+        <Setter Property="mah:SliderHelper.ThumbFillHoverBrush" Value="{DynamicResource MahApps.Brushes.Gray1}" />
+        <Setter Property="mah:SliderHelper.ThumbFillPressedBrush" Value="{DynamicResource MahApps.Brushes.Gray6}" />
+        <Setter Property="mah:SliderHelper.TrackFillBrush" Value="{DynamicResource MahApps.Brushes.Gray3}" />
+        <Setter Property="mah:SliderHelper.TrackFillDisabledBrush" Value="{DynamicResource MahApps.Brushes.Gray6}" />
+        <Setter Property="mah:SliderHelper.TrackFillHoverBrush" Value="{DynamicResource MahApps.Brushes.Gray2}" />
+        <Setter Property="mah:SliderHelper.TrackFillPressedBrush" Value="{DynamicResource MahApps.Brushes.Gray3}" />
+        <Setter Property="mah:SliderHelper.TrackValueFillBrush" Value="{DynamicResource MahApps.Brushes.AccentBase}" />
+        <Setter Property="mah:SliderHelper.TrackValueFillDisabledBrush" Value="{DynamicResource MahApps.Brushes.Gray6}" />
+        <Setter Property="mah:SliderHelper.TrackValueFillHoverBrush" Value="{DynamicResource MahApps.Brushes.AccentBase}" />
+        <Setter Property="mah:SliderHelper.TrackValueFillPressedBrush" Value="{DynamicResource MahApps.Brushes.AccentBase}" />
         <Style.Triggers>
             <Trigger Property="Orientation" Value="Vertical">
                 <Setter Property="Template" Value="{DynamicResource MahApps.Templates.Slider.Vertical.Win10}" />
diff --git a/src/MahApps.Metro/Styles/Controls.StatusBar.xaml b/src/MahApps.Metro/Styles/Controls.StatusBar.xaml
index 56d01d4ad1..2184f13a8a 100644
--- a/src/MahApps.Metro/Styles/Controls.StatusBar.xaml
+++ b/src/MahApps.Metro/Styles/Controls.StatusBar.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary 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">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
     <Style x:Key="MahApps.Styles.StatusBarItem" TargetType="{x:Type StatusBarItem}">
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.IdealForeground}" />
@@ -74,14 +74,14 @@
                     <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsVisible}" Value="True" />
                     <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}, Path=IsActive}" Value="True" />
                 </MultiDataTrigger.Conditions>
-                <Setter Property="Background" Value="{Binding Path=WindowTitleBrush, Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:MetroWindow}}}" />
+                <Setter Property="Background" Value="{Binding Path=WindowTitleBrush, Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:MetroWindow}}}" />
             </MultiDataTrigger>
             <MultiDataTrigger>
                 <MultiDataTrigger.Conditions>
                     <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsVisible}" Value="True" />
                     <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}, Path=IsActive}" Value="False" />
                 </MultiDataTrigger.Conditions>
-                <Setter Property="Background" Value="{Binding Path=NonActiveWindowTitleBrush, Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:MetroWindow}}}" />
+                <Setter Property="Background" Value="{Binding Path=NonActiveWindowTitleBrush, Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:MetroWindow}}}" />
             </MultiDataTrigger>
             <Trigger Property="IsEnabled" Value="False">
                 <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray9}" />
diff --git a/src/MahApps.Metro/Styles/Controls.TabControl.xaml b/src/MahApps.Metro/Styles/Controls.TabControl.xaml
index 6515eee3d5..d21a13acb5 100644
--- a/src/MahApps.Metro/Styles/Controls.TabControl.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TabControl.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:behaviors="clr-namespace:MahApps.Metro.Behaviors"
-                    xmlns:conv="clr-namespace:MahApps.Metro.Converters"
+                    xmlns:converters="clr-namespace:MahApps.Metro.Converters"
                     xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
     <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
@@ -265,7 +265,7 @@
 
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.UnderlinePlacement), Converter={x:Static conv:IsNullConverter.Instance}}" Value="True" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.UnderlinePlacement), Converter={x:Static converters:IsNullConverter.Instance}}" Value="True" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=TabStripPlacement}" Value="Top" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="Underline" Property="Grid.Column" Value="0" />
@@ -276,7 +276,7 @@
                         </MultiDataTrigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.UnderlinePlacement), Converter={x:Static conv:IsNullConverter.Instance}}" Value="True" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.UnderlinePlacement), Converter={x:Static converters:IsNullConverter.Instance}}" Value="True" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=TabStripPlacement}" Value="Bottom" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="Underline" Property="Grid.Column" Value="0" />
@@ -287,7 +287,7 @@
                         </MultiDataTrigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.UnderlinePlacement), Converter={x:Static conv:IsNullConverter.Instance}}" Value="True" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.UnderlinePlacement), Converter={x:Static converters:IsNullConverter.Instance}}" Value="True" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=TabStripPlacement}" Value="Left" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="Underline" Property="Grid.Column" Value="0" />
@@ -298,7 +298,7 @@
                         </MultiDataTrigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.UnderlinePlacement), Converter={x:Static conv:IsNullConverter.Instance}}" Value="True" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.UnderlinePlacement), Converter={x:Static converters:IsNullConverter.Instance}}" Value="True" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=TabStripPlacement}" Value="Right" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="Underline" Property="Grid.Column" Value="0" />
diff --git a/src/MahApps.Metro/Styles/Controls.TextBox.xaml b/src/MahApps.Metro/Styles/Controls.TextBox.xaml
index 3d8e294721..409bfb0ba3 100644
--- a/src/MahApps.Metro/Styles/Controls.TextBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.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"
-                    xmlns:Controls="clr-namespace:MahApps.Metro.Controls"
-                    xmlns:Converters="clr-namespace:MahApps.Metro.Converters">
+                    xmlns:converters="clr-namespace:MahApps.Metro.Converters"
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.Shared.xaml" />
@@ -16,13 +16,6 @@
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="CaretBrush" Value="{DynamicResource MahApps.Brushes.ThemeForeground}" />
         <Setter Property="ContextMenu" Value="{DynamicResource MahApps.TextBox.ContextMenu}" />
-        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border.Focus}" />
-        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border.MouseOver}" />
-        <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Font.Size.Button.ClearText}" />
-        <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 MahApps.Fonts.Family.Control}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
@@ -40,7 +33,7 @@
                                     Background="{TemplateBinding Background}"
                                     BorderBrush="Transparent"
                                     BorderThickness="{TemplateBinding BorderThickness}"
-                                    CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                                    CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                                     Effect="{DynamicResource MahApps.DropShadowEffect.WaitingForData}"
                                     SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </AdornerDecorator>
@@ -49,7 +42,7 @@
                                 Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                                CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
 
                         <Grid x:Name="PART_InnerGrid" Margin="{TemplateBinding BorderThickness}">
@@ -82,10 +75,10 @@
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
                                        Style="{DynamicResource MahApps.Styles.TextBlock.Watermark}"
-                                       Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
-                                       TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
-                                       TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
-                                       TextWrapping="{TemplateBinding Controls:TextBoxHelper.WatermarkWrapping}"
+                                       Text="{TemplateBinding mah:TextBoxHelper.Watermark}"
+                                       TextAlignment="{TemplateBinding mah:TextBoxHelper.WatermarkAlignment}"
+                                       TextTrimming="{TemplateBinding mah:TextBoxHelper.WatermarkTrimming}"
+                                       TextWrapping="{TemplateBinding mah:TextBoxHelper.WatermarkWrapping}"
                                        Visibility="Collapsed" />
 
                             <ContentControl x:Name="PART_FloatingMessageContainer"
@@ -94,7 +87,7 @@
                                             Margin="4 0"
                                             Style="{DynamicResource MahApps.Styles.ContentControl.FloatingMessageContainer}">
                                 <ContentControl.Height>
-                                    <MultiBinding Converter="{Converters:MathMultiplyConverter}">
+                                    <MultiBinding Converter="{converters:MathMultiplyConverter}">
                                         <Binding ElementName="PART_FloatingMessage"
                                                  Mode="OneWay"
                                                  Path="ActualHeight" />
@@ -108,13 +101,13 @@
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
                                            Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing}"
-                                           Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
-                                           TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
-                                           TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
+                                           Text="{TemplateBinding mah:TextBoxHelper.Watermark}"
+                                           TextAlignment="{TemplateBinding mah:TextBoxHelper.WatermarkAlignment}"
+                                           TextTrimming="{TemplateBinding mah:TextBoxHelper.WatermarkTrimming}">
                                     <TextBlock.RenderTransform>
                                         <TranslateTransform x:Name="FloatingMessageTransform">
                                             <TranslateTransform.Y>
-                                                <MultiBinding Converter="{Converters:MathSubtractConverter}">
+                                                <MultiBinding Converter="{converters:MathSubtractConverter}">
                                                     <Binding ElementName="PART_FloatingMessage"
                                                              Mode="OneWay"
                                                              Path="ActualHeight" />
@@ -132,31 +125,31 @@
                                     Grid.Row="0"
                                     Grid.RowSpan="2"
                                     Grid.Column="1"
-                                    Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
-                                    Controls:TextBoxHelper.IsClearTextButtonBehaviorEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ClearTextButton), Mode=OneWay}"
-                                    Content="{TemplateBinding Controls:TextBoxHelper.ButtonContent}"
-                                    ContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}"
+                                    Width="{TemplateBinding mah:TextBoxHelper.ButtonWidth}"
+                                    mah:TextBoxHelper.IsClearTextButtonBehaviorEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:TextBoxHelper.ClearTextButton), Mode=OneWay}"
+                                    Content="{TemplateBinding mah:TextBoxHelper.ButtonContent}"
+                                    ContentTemplate="{TemplateBinding mah:TextBoxHelper.ButtonContentTemplate}"
                                     Focusable="False"
-                                    FontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}"
-                                    FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
+                                    FontFamily="{TemplateBinding mah:TextBoxHelper.ButtonFontFamily}"
+                                    FontSize="{TemplateBinding mah:TextBoxHelper.ButtonFontSize}"
                                     Foreground="{TemplateBinding Foreground}"
                                     IsTabStop="False"
                                     Style="{DynamicResource MahApps.Styles.Button.Chromeless}"
-                                    Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ClearTextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                                    Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:TextBoxHelper.ClearTextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
                         </Grid>
 
                         <Border x:Name="DisabledVisualElement"
                                 Background="{DynamicResource MahApps.Brushes.Control.Disabled}"
                                 BorderBrush="{DynamicResource MahApps.Brushes.Control.Disabled}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                                CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                                 IsHitTestVisible="False"
                                 Opacity="0"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.DisabledVisualElementVisibility), Mode=OneWay}" />
+                                Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.DisabledVisualElementVisibility), Mode=OneWay}" />
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.ButtonsAlignment)}" Value="Left">
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(mah:TextBoxHelper.ButtonsAlignment)}" Value="Left">
                             <Setter TargetName="ButtonColumn" Property="Width" Value="*" />
                             <Setter TargetName="PART_ClearText" Property="Grid.Column" Value="0" />
                             <Setter TargetName="PART_ContentHost" Property="Grid.Column" Value="1" />
@@ -171,8 +164,8 @@
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
                                 <Condition Binding="{Binding Path=IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
-                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
-                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(mah:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(mah:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.ShowFloatingMessage}" />
@@ -184,15 +177,15 @@
 
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.ButtonsAlignment)}" Value="Right" />
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.ClearTextButton)}" Value="False" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(mah:TextBoxHelper.ButtonsAlignment)}" Value="Right" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(mah:TextBoxHelper.ClearTextButton)}" Value="False" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="PART_ContentHost" Property="Grid.ColumnSpan" Value="2" />
                             <Setter TargetName="PART_Message" Property="Grid.ColumnSpan" Value="2" />
                         </MultiDataTrigger>
 
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.MouseOverBorderBrush)}" />
+                            <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.MouseOverBorderBrush)}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter TargetName="DisabledVisualElement" Property="Opacity" Value="0.6" />
@@ -201,7 +194,7 @@
                             <Setter TargetName="PART_ClearText" Property="IsEnabled" Value="False" />
                         </Trigger>
                         <Trigger Property="IsFocused" Value="True">
-                            <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
+                            <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.FocusBorderBrush)}" />
                             <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource MahApps.Brushes.TextBlock.FloatingMessage}" />
                             <Setter TargetName="PART_FloatingMessage" Property="Opacity" Value="1" />
                         </Trigger>
@@ -216,7 +209,7 @@
 
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="Controls:TextBoxHelper.HasText" Value="False" />
+                                <Condition Property="mah:TextBoxHelper.HasText" Value="False" />
                                 <Condition Property="IsFocused" Value="True" />
                             </MultiTrigger.Conditions>
                             <MultiTrigger.EnterActions>
@@ -227,7 +220,7 @@
                             </MultiTrigger.ExitActions>
                         </MultiTrigger>
 
-                        <Trigger Property="Controls:TextBoxHelper.HasText" Value="True">
+                        <Trigger Property="mah:TextBoxHelper.HasText" Value="True">
                             <Trigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.EnterHasText}" />
                             </Trigger.EnterActions>
@@ -239,14 +232,14 @@
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsVisible" Value="True" />
-                                <Condition Property="Controls:TextBoxHelper.IsWaitingForData" Value="True" />
+                                <Condition Property="mah:TextBoxHelper.IsWaitingForData" Value="True" />
                             </MultiTrigger.Conditions>
                             <Setter TargetName="PART_WaitingForDataEffectAdornerDecorator" Property="Visibility" Value="Visible" />
                             <MultiTrigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.WaitingForData}" />
                             </MultiTrigger.EnterActions>
                         </MultiTrigger>
-                        <Trigger Property="Controls:TextBoxHelper.IsWaitingForData" Value="False">
+                        <Trigger Property="mah:TextBoxHelper.IsWaitingForData" Value="False">
                             <Setter TargetName="PART_WaitingForDataEffectAdornerDecorator" Property="Visibility" Value="Collapsed" />
                         </Trigger>
                     </ControlTemplate.Triggers>
@@ -254,13 +247,18 @@
             </Setter.Value>
         </Setter>
         <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource MahApps.Templates.ValidationError}" />
+        <Setter Property="mah:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border.Focus}" />
+        <Setter Property="mah:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border.MouseOver}" />
+        <Setter Property="mah:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Font.Size.Button.ClearText}" />
+        <Setter Property="mah:TextBoxHelper.ButtonWidth" Value="22" />
+        <Setter Property="mah:TextBoxHelper.IsMonitoring" Value="True" />
+        <Setter Property="mah:TextBoxHelper.IsSpellCheckContextMenuEnabled" Value="{Binding RelativeSource={RelativeSource Self}, Path=(SpellCheck.IsEnabled)}" />
+        <Setter Property="mah:TextBoxHelper.WatermarkWrapping" Value="{Binding RelativeSource={RelativeSource Self}, Path=TextWrapping, Mode=OneWay}" />
     </Style>
 
     <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.Button.Chromeless}" />
-        <Setter Property="Controls:TextBoxHelper.TextButton" Value="True" />
         <!--  change SnapsToDevicePixels to True to view a better border and validation error  -->
         <Setter Property="Template">
             <Setter.Value>
@@ -271,7 +269,7 @@
                                     Background="{TemplateBinding Background}"
                                     BorderBrush="Transparent"
                                     BorderThickness="{TemplateBinding BorderThickness}"
-                                    CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                                    CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                                     Effect="{DynamicResource MahApps.DropShadowEffect.WaitingForData}"
                                     SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </AdornerDecorator>
@@ -280,7 +278,7 @@
                                 Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                                CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
 
                         <Grid x:Name="PART_InnerGrid" Margin="{TemplateBinding BorderThickness}">
@@ -312,10 +310,10 @@
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
                                        Style="{DynamicResource MahApps.Styles.TextBlock.Watermark}"
-                                       Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
-                                       TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
-                                       TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
-                                       TextWrapping="{TemplateBinding Controls:TextBoxHelper.WatermarkWrapping}"
+                                       Text="{TemplateBinding mah:TextBoxHelper.Watermark}"
+                                       TextAlignment="{TemplateBinding mah:TextBoxHelper.WatermarkAlignment}"
+                                       TextTrimming="{TemplateBinding mah:TextBoxHelper.WatermarkTrimming}"
+                                       TextWrapping="{TemplateBinding mah:TextBoxHelper.WatermarkWrapping}"
                                        Visibility="Collapsed" />
 
                             <ContentControl x:Name="PART_FloatingMessageContainer"
@@ -324,7 +322,7 @@
                                             Margin="4 0"
                                             Style="{DynamicResource MahApps.Styles.ContentControl.FloatingMessageContainer}">
                                 <ContentControl.Height>
-                                    <MultiBinding Converter="{Converters:MathMultiplyConverter}">
+                                    <MultiBinding Converter="{converters:MathMultiplyConverter}">
                                         <Binding ElementName="PART_FloatingMessage"
                                                  Mode="OneWay"
                                                  Path="ActualHeight" />
@@ -338,13 +336,13 @@
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
                                            Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing}"
-                                           Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
-                                           TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
-                                           TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
+                                           Text="{TemplateBinding mah:TextBoxHelper.Watermark}"
+                                           TextAlignment="{TemplateBinding mah:TextBoxHelper.WatermarkAlignment}"
+                                           TextTrimming="{TemplateBinding mah:TextBoxHelper.WatermarkTrimming}">
                                     <TextBlock.RenderTransform>
                                         <TranslateTransform x:Name="FloatingMessageTransform">
                                             <TranslateTransform.Y>
-                                                <MultiBinding Converter="{Converters:MathSubtractConverter}">
+                                                <MultiBinding Converter="{converters:MathSubtractConverter}">
                                                     <Binding ElementName="PART_FloatingMessage"
                                                              Mode="OneWay"
                                                              Path="ActualHeight" />
@@ -362,32 +360,32 @@
                                     Grid.Row="0"
                                     Grid.RowSpan="2"
                                     Grid.Column="1"
-                                    Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
-                                    Controls:TextBoxHelper.IsClearTextButtonBehaviorEnabled="True"
-                                    Content="{TemplateBinding Controls:TextBoxHelper.ButtonContent}"
-                                    ContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}"
+                                    Width="{TemplateBinding mah:TextBoxHelper.ButtonWidth}"
+                                    mah:TextBoxHelper.IsClearTextButtonBehaviorEnabled="True"
+                                    Content="{TemplateBinding mah:TextBoxHelper.ButtonContent}"
+                                    ContentTemplate="{TemplateBinding mah:TextBoxHelper.ButtonContentTemplate}"
                                     Focusable="False"
-                                    FontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}"
-                                    FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
+                                    FontFamily="{TemplateBinding mah:TextBoxHelper.ButtonFontFamily}"
+                                    FontSize="{TemplateBinding mah:TextBoxHelper.ButtonFontSize}"
                                     Foreground="{TemplateBinding Foreground}"
                                     IsTabStop="False"
                                     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}}" />
+                                    Template="{TemplateBinding mah:TextBoxHelper.ButtonTemplate}"
+                                    Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:TextBoxHelper.TextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
                         </Grid>
 
                         <Border x:Name="DisabledVisualElement"
                                 Background="{DynamicResource MahApps.Brushes.Control.Disabled}"
                                 BorderBrush="{DynamicResource MahApps.Brushes.Control.Disabled}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                                CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                                 IsHitTestVisible="False"
                                 Opacity="0"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.DisabledVisualElementVisibility), Mode=OneWay}" />
+                                Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.DisabledVisualElementVisibility), Mode=OneWay}" />
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.ButtonsAlignment)}" Value="Left">
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(mah:TextBoxHelper.ButtonsAlignment)}" Value="Left">
                             <Setter TargetName="ButtonColumn" Property="Width" Value="*" />
                             <Setter TargetName="PART_ClearText" Property="Grid.Column" Value="0" />
                             <Setter TargetName="PART_ContentHost" Property="Grid.Column" Value="1" />
@@ -402,8 +400,8 @@
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
                                 <Condition Binding="{Binding Path=IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
-                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
-                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(mah:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(mah:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.ShowFloatingMessage}" />
@@ -415,15 +413,15 @@
 
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.ButtonsAlignment)}" Value="Right" />
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.TextButton)}" Value="False" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(mah:TextBoxHelper.ButtonsAlignment)}" Value="Right" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(mah:TextBoxHelper.TextButton)}" Value="False" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="PART_ContentHost" Property="Grid.ColumnSpan" Value="2" />
                             <Setter TargetName="PART_Message" Property="Grid.ColumnSpan" Value="2" />
                         </MultiDataTrigger>
 
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.MouseOverBorderBrush)}" />
+                            <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.MouseOverBorderBrush)}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter TargetName="DisabledVisualElement" Property="Opacity" Value="0.6" />
@@ -431,12 +429,12 @@
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsReadOnly" Value="True" />
-                                <Condition Property="Controls:TextBoxHelper.ButtonCommand" Value="{x:Null}" />
+                                <Condition Property="mah:TextBoxHelper.ButtonCommand" Value="{x:Null}" />
                             </MultiTrigger.Conditions>
                             <Setter TargetName="PART_ClearText" Property="IsEnabled" Value="False" />
                         </MultiTrigger>
                         <Trigger Property="IsFocused" Value="True">
-                            <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
+                            <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.FocusBorderBrush)}" />
                             <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource MahApps.Brushes.TextBlock.FloatingMessage}" />
                             <Setter TargetName="PART_FloatingMessage" Property="Opacity" Value="1" />
                         </Trigger>
@@ -451,7 +449,7 @@
 
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="Controls:TextBoxHelper.HasText" Value="False" />
+                                <Condition Property="mah:TextBoxHelper.HasText" Value="False" />
                                 <Condition Property="IsFocused" Value="True" />
                             </MultiTrigger.Conditions>
                             <MultiTrigger.EnterActions>
@@ -462,7 +460,7 @@
                             </MultiTrigger.ExitActions>
                         </MultiTrigger>
 
-                        <Trigger Property="Controls:TextBoxHelper.HasText" Value="True">
+                        <Trigger Property="mah:TextBoxHelper.HasText" Value="True">
                             <Trigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.EnterHasText}" />
                             </Trigger.EnterActions>
@@ -474,32 +472,34 @@
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsVisible" Value="True" />
-                                <Condition Property="Controls:TextBoxHelper.IsWaitingForData" Value="True" />
+                                <Condition Property="mah:TextBoxHelper.IsWaitingForData" Value="True" />
                             </MultiTrigger.Conditions>
                             <Setter TargetName="PART_WaitingForDataEffectAdornerDecorator" Property="Visibility" Value="Visible" />
                             <MultiTrigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.WaitingForData}" />
                             </MultiTrigger.EnterActions>
                         </MultiTrigger>
-                        <Trigger Property="Controls:TextBoxHelper.IsWaitingForData" Value="False">
+                        <Trigger Property="mah:TextBoxHelper.IsWaitingForData" Value="False">
                             <Setter TargetName="PART_WaitingForDataEffectAdornerDecorator" Property="Visibility" Value="Collapsed" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
+        <Setter Property="mah:TextBoxHelper.ButtonTemplate" Value="{DynamicResource MahApps.Templates.Button.Chromeless}" />
+        <Setter Property="mah:TextBoxHelper.TextButton" Value="True" />
     </Style>
 
     <Style x:Key="MahApps.Styles.TextBox.Search"
            BasedOn="{StaticResource MahApps.Styles.TextBox.Button}"
            TargetType="{x:Type TextBox}">
-        <Setter Property="Controls:TextBoxHelper.ButtonContentTemplate">
+        <Setter Property="mah:TextBoxHelper.ButtonContentTemplate">
             <Setter.Value>
                 <DataTemplate>
                     <!--  Modern - Magnify  -->
                     <ContentControl x:Name="PART_PackIcon"
-                                    Width="{Binding RelativeSource={RelativeSource AncestorType=TextBox}, Path=(Controls:TextBoxHelper.ButtonWidth), Mode=OneWay}"
-                                    Height="{Binding RelativeSource={RelativeSource AncestorType=TextBox}, Path=(Controls:TextBoxHelper.ButtonWidth), Mode=OneWay}"
+                                    Width="{Binding RelativeSource={RelativeSource AncestorType=TextBox}, Path=(mah:TextBoxHelper.ButtonWidth), Mode=OneWay}"
+                                    Height="{Binding RelativeSource={RelativeSource AncestorType=TextBox}, Path=(mah:TextBoxHelper.ButtonWidth), Mode=OneWay}"
                                     Padding="3"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
@@ -545,12 +545,6 @@
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="CaretBrush" Value="{DynamicResource MahApps.Brushes.ThemeForeground}" />
         <Setter Property="ContextMenu" Value="{DynamicResource MahApps.TextBox.ContextMenu}" />
-        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border.Focus}" />
-        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border.MouseOver}" />
-        <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Font.Size.Button.ClearText}" />
-        <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 MahApps.Fonts.Family.Control}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Content}" />
@@ -572,7 +566,7 @@
                                 Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                                CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
 
                         <Grid x:Name="PART_InnerGrid" Margin="{TemplateBinding BorderThickness}">
@@ -605,10 +599,10 @@
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
                                        Style="{DynamicResource MahApps.Styles.TextBlock.Watermark}"
-                                       Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
-                                       TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
-                                       TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
-                                       TextWrapping="{TemplateBinding Controls:TextBoxHelper.WatermarkWrapping}"
+                                       Text="{TemplateBinding mah:TextBoxHelper.Watermark}"
+                                       TextAlignment="{TemplateBinding mah:TextBoxHelper.WatermarkAlignment}"
+                                       TextTrimming="{TemplateBinding mah:TextBoxHelper.WatermarkTrimming}"
+                                       TextWrapping="{TemplateBinding mah:TextBoxHelper.WatermarkWrapping}"
                                        Visibility="Collapsed" />
 
                             <ContentControl x:Name="PART_FloatingMessageContainer"
@@ -617,7 +611,7 @@
                                             Margin="4 0"
                                             Style="{DynamicResource MahApps.Styles.ContentControl.FloatingMessageContainer}">
                                 <ContentControl.Height>
-                                    <MultiBinding Converter="{Converters:MathMultiplyConverter}">
+                                    <MultiBinding Converter="{converters:MathMultiplyConverter}">
                                         <Binding ElementName="PART_FloatingMessage"
                                                  Mode="OneWay"
                                                  Path="ActualHeight" />
@@ -631,13 +625,13 @@
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
                                            Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing}"
-                                           Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
-                                           TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
-                                           TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
+                                           Text="{TemplateBinding mah:TextBoxHelper.Watermark}"
+                                           TextAlignment="{TemplateBinding mah:TextBoxHelper.WatermarkAlignment}"
+                                           TextTrimming="{TemplateBinding mah:TextBoxHelper.WatermarkTrimming}">
                                     <TextBlock.RenderTransform>
                                         <TranslateTransform x:Name="FloatingMessageTransform">
                                             <TranslateTransform.Y>
-                                                <MultiBinding Converter="{Converters:MathSubtractConverter}">
+                                                <MultiBinding Converter="{converters:MathSubtractConverter}">
                                                     <Binding ElementName="PART_FloatingMessage"
                                                              Mode="OneWay"
                                                              Path="ActualHeight" />
@@ -655,31 +649,31 @@
                                     Grid.Row="0"
                                     Grid.RowSpan="2"
                                     Grid.Column="1"
-                                    Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
-                                    Controls:TextBoxHelper.IsClearTextButtonBehaviorEnabled="{TemplateBinding Controls:TextBoxHelper.ClearTextButton}"
-                                    Content="{TemplateBinding Controls:TextBoxHelper.ButtonContent}"
-                                    ContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}"
+                                    Width="{TemplateBinding mah:TextBoxHelper.ButtonWidth}"
+                                    mah:TextBoxHelper.IsClearTextButtonBehaviorEnabled="{TemplateBinding mah:TextBoxHelper.ClearTextButton}"
+                                    Content="{TemplateBinding mah:TextBoxHelper.ButtonContent}"
+                                    ContentTemplate="{TemplateBinding mah:TextBoxHelper.ButtonContentTemplate}"
                                     Focusable="False"
-                                    FontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}"
-                                    FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
+                                    FontFamily="{TemplateBinding mah:TextBoxHelper.ButtonFontFamily}"
+                                    FontSize="{TemplateBinding mah:TextBoxHelper.ButtonFontSize}"
                                     Foreground="{TemplateBinding Foreground}"
                                     IsTabStop="False"
                                     Style="{DynamicResource MahApps.Styles.Button.Chromeless}"
-                                    Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TextBoxHelper.ClearTextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                                    Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:TextBoxHelper.ClearTextButton), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" />
                         </Grid>
 
                         <Border x:Name="DisabledVisualElement"
                                 Background="{DynamicResource MahApps.Brushes.Control.Disabled}"
                                 BorderBrush="{DynamicResource MahApps.Brushes.Control.Disabled}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                                CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                                 IsHitTestVisible="False"
                                 Opacity="0"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.DisabledVisualElementVisibility), Mode=OneWay}" />
+                                Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.DisabledVisualElementVisibility), Mode=OneWay}" />
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.ButtonsAlignment)}" Value="Left">
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(mah:TextBoxHelper.ButtonsAlignment)}" Value="Left">
                             <Setter TargetName="ButtonColumn" Property="Width" Value="*" />
                             <Setter TargetName="PART_ClearText" Property="Grid.Column" Value="0" />
                             <Setter TargetName="PART_ContentHost" Property="Grid.Column" Value="1" />
@@ -687,15 +681,15 @@
                             <Setter TargetName="TextColumn" Property="Width" Value="Auto" />
                         </DataTrigger>
 
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.HasText)}" Value="False">
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(mah:TextBoxHelper.HasText)}" Value="False">
                             <Setter TargetName="PART_Message" Property="Visibility" Value="Visible" />
                         </DataTrigger>
 
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
                                 <Condition Binding="{Binding Path=IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
-                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
-                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(mah:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(mah:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.ShowFloatingMessage}" />
@@ -707,15 +701,15 @@
 
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.ButtonsAlignment)}" Value="Right" />
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.ClearTextButton)}" Value="False" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(mah:TextBoxHelper.ButtonsAlignment)}" Value="Right" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(mah:TextBoxHelper.ClearTextButton)}" Value="False" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="PART_ContentHost" Property="Grid.ColumnSpan" Value="2" />
                             <Setter TargetName="PART_Message" Property="Grid.ColumnSpan" Value="2" />
                         </MultiDataTrigger>
 
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="BorderElement" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.MouseOverBorderBrush)}" />
+                            <Setter TargetName="BorderElement" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.MouseOverBorderBrush)}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter TargetName="DisabledVisualElement" Property="Opacity" Value="0.6" />
@@ -724,7 +718,7 @@
                             <Setter TargetName="PART_ClearText" Property="IsEnabled" Value="False" />
                         </Trigger>
                         <Trigger Property="IsFocused" Value="True">
-                            <Setter TargetName="BorderElement" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
+                            <Setter TargetName="BorderElement" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.FocusBorderBrush)}" />
                             <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource MahApps.Brushes.TextBlock.FloatingMessage}" />
                             <Setter TargetName="PART_FloatingMessage" Property="Opacity" Value="1" />
                         </Trigger>
@@ -739,7 +733,7 @@
 
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="Controls:TextBoxHelper.HasText" Value="False" />
+                                <Condition Property="mah:TextBoxHelper.HasText" Value="False" />
                                 <Condition Property="IsFocused" Value="True" />
                             </MultiTrigger.Conditions>
                             <MultiTrigger.EnterActions>
@@ -750,7 +744,7 @@
                             </MultiTrigger.ExitActions>
                         </MultiTrigger>
 
-                        <Trigger Property="Controls:TextBoxHelper.HasText" Value="True">
+                        <Trigger Property="mah:TextBoxHelper.HasText" Value="True">
                             <Trigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.EnterHasText}" />
                             </Trigger.EnterActions>
@@ -763,13 +757,17 @@
             </Setter.Value>
         </Setter>
         <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource MahApps.Templates.ValidationError}" />
+        <Setter Property="mah:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border.Focus}" />
+        <Setter Property="mah:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border.MouseOver}" />
+        <Setter Property="mah:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Font.Size.Button.ClearText}" />
+        <Setter Property="mah:TextBoxHelper.ButtonWidth" Value="22" />
+        <Setter Property="mah:TextBoxHelper.IsMonitoring" Value="True" />
+        <Setter Property="mah:TextBoxHelper.IsSpellCheckContextMenuEnabled" Value="{Binding RelativeSource={RelativeSource Self}, Path=(SpellCheck.IsEnabled)}" />
     </Style>
 
     <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.Button.Chromeless}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TextBoxBase}">
@@ -778,7 +776,7 @@
                                 Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                                CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
 
                         <Grid x:Name="PART_InnerGrid" Margin="{TemplateBinding BorderThickness}">
@@ -811,10 +809,10 @@
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        Foreground="{TemplateBinding Foreground}"
                                        Style="{DynamicResource MahApps.Styles.TextBlock.Watermark}"
-                                       Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
-                                       TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
-                                       TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
-                                       TextWrapping="{TemplateBinding Controls:TextBoxHelper.WatermarkWrapping}"
+                                       Text="{TemplateBinding mah:TextBoxHelper.Watermark}"
+                                       TextAlignment="{TemplateBinding mah:TextBoxHelper.WatermarkAlignment}"
+                                       TextTrimming="{TemplateBinding mah:TextBoxHelper.WatermarkTrimming}"
+                                       TextWrapping="{TemplateBinding mah:TextBoxHelper.WatermarkWrapping}"
                                        Visibility="Collapsed" />
 
                             <ContentControl x:Name="PART_FloatingMessageContainer"
@@ -823,7 +821,7 @@
                                             Margin="6 0"
                                             Style="{DynamicResource MahApps.Styles.ContentControl.FloatingMessageContainer}">
                                 <ContentControl.Height>
-                                    <MultiBinding Converter="{Converters:MathMultiplyConverter}">
+                                    <MultiBinding Converter="{converters:MathMultiplyConverter}">
                                         <Binding ElementName="PART_FloatingMessage"
                                                  Mode="OneWay"
                                                  Path="ActualHeight" />
@@ -837,13 +835,13 @@
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
                                            Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing}"
-                                           Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
-                                           TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
-                                           TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
+                                           Text="{TemplateBinding mah:TextBoxHelper.Watermark}"
+                                           TextAlignment="{TemplateBinding mah:TextBoxHelper.WatermarkAlignment}"
+                                           TextTrimming="{TemplateBinding mah:TextBoxHelper.WatermarkTrimming}">
                                     <TextBlock.RenderTransform>
                                         <TranslateTransform x:Name="FloatingMessageTransform">
                                             <TranslateTransform.Y>
-                                                <MultiBinding Converter="{Converters:MathSubtractConverter}">
+                                                <MultiBinding Converter="{converters:MathSubtractConverter}">
                                                     <Binding ElementName="PART_FloatingMessage"
                                                              Mode="OneWay"
                                                              Path="ActualHeight" />
@@ -861,19 +859,19 @@
                                     Grid.Row="0"
                                     Grid.RowSpan="2"
                                     Grid.Column="1"
-                                    Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
-                                    Controls:TextBoxHelper.IsClearTextButtonBehaviorEnabled="False"
-                                    Command="{TemplateBinding Controls:TextBoxHelper.ButtonCommand}"
-                                    CommandParameter="{TemplateBinding Controls:TextBoxHelper.ButtonCommandParameter}"
-                                    Content="{TemplateBinding Controls:TextBoxHelper.ButtonContent}"
-                                    ContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}"
+                                    Width="{TemplateBinding mah:TextBoxHelper.ButtonWidth}"
+                                    mah:TextBoxHelper.IsClearTextButtonBehaviorEnabled="False"
+                                    Command="{TemplateBinding mah:TextBoxHelper.ButtonCommand}"
+                                    CommandParameter="{TemplateBinding mah:TextBoxHelper.ButtonCommandParameter}"
+                                    Content="{TemplateBinding mah:TextBoxHelper.ButtonContent}"
+                                    ContentTemplate="{TemplateBinding mah:TextBoxHelper.ButtonContentTemplate}"
                                     Focusable="False"
-                                    FontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}"
-                                    FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
+                                    FontFamily="{TemplateBinding mah:TextBoxHelper.ButtonFontFamily}"
+                                    FontSize="{TemplateBinding mah:TextBoxHelper.ButtonFontSize}"
                                     Foreground="{TemplateBinding Foreground}"
                                     IsTabStop="False"
                                     Style="{DynamicResource MahApps.Styles.Button.Chromeless}"
-                                    Template="{TemplateBinding Controls:TextBoxHelper.ButtonTemplate}"
+                                    Template="{TemplateBinding mah:TextBoxHelper.ButtonTemplate}"
                                     Visibility="Visible" />
                         </Grid>
 
@@ -881,14 +879,14 @@
                                 Background="{DynamicResource MahApps.Brushes.Control.Disabled}"
                                 BorderBrush="{DynamicResource MahApps.Brushes.Control.Disabled}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                                CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                                 IsHitTestVisible="False"
                                 Opacity="0"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.DisabledVisualElementVisibility), Mode=OneWay}" />
+                                Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.DisabledVisualElementVisibility), Mode=OneWay}" />
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.ButtonsAlignment)}" Value="Left">
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(mah:TextBoxHelper.ButtonsAlignment)}" Value="Left">
                             <Setter TargetName="ButtonColumn" Property="Width" Value="*" />
                             <Setter TargetName="PART_ClearText" Property="Grid.Column" Value="0" />
                             <Setter TargetName="PART_ContentHost" Property="Grid.Column" Value="1" />
@@ -896,15 +894,15 @@
                             <Setter TargetName="TextColumn" Property="Width" Value="Auto" />
                         </DataTrigger>
 
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.HasText)}" Value="False">
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(mah:TextBoxHelper.HasText)}" Value="False">
                             <Setter TargetName="PART_Message" Property="Visibility" Value="Visible" />
                         </DataTrigger>
 
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
                                 <Condition Binding="{Binding Path=IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
-                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
-                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(mah:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(mah:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.ShowFloatingMessage}" />
@@ -915,7 +913,7 @@
                         </MultiDataTrigger>
 
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="BorderElement" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.MouseOverBorderBrush)}" />
+                            <Setter TargetName="BorderElement" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.MouseOverBorderBrush)}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter TargetName="DisabledVisualElement" Property="Opacity" Value="0.6" />
@@ -923,12 +921,12 @@
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsReadOnly" Value="True" />
-                                <Condition Property="Controls:TextBoxHelper.ButtonCommand" Value="{x:Null}" />
+                                <Condition Property="mah:TextBoxHelper.ButtonCommand" Value="{x:Null}" />
                             </MultiTrigger.Conditions>
                             <Setter TargetName="PART_ClearText" Property="IsEnabled" Value="False" />
                         </MultiTrigger>
                         <Trigger Property="IsFocused" Value="True">
-                            <Setter TargetName="BorderElement" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
+                            <Setter TargetName="BorderElement" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.FocusBorderBrush)}" />
                             <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource MahApps.Brushes.TextBlock.FloatingMessage}" />
                             <Setter TargetName="PART_FloatingMessage" Property="Opacity" Value="1" />
                         </Trigger>
@@ -943,7 +941,7 @@
 
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="Controls:TextBoxHelper.HasText" Value="False" />
+                                <Condition Property="mah:TextBoxHelper.HasText" Value="False" />
                                 <Condition Property="IsFocused" Value="True" />
                             </MultiTrigger.Conditions>
                             <MultiTrigger.EnterActions>
@@ -954,7 +952,7 @@
                             </MultiTrigger.ExitActions>
                         </MultiTrigger>
 
-                        <Trigger Property="Controls:TextBoxHelper.HasText" Value="True">
+                        <Trigger Property="mah:TextBoxHelper.HasText" Value="True">
                             <Trigger.EnterActions>
                                 <BeginStoryboard Storyboard="{StaticResource MahApps.Storyboard.EnterHasText}" />
                             </Trigger.EnterActions>
@@ -966,6 +964,8 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
+        <Setter Property="mah:TextBoxHelper.ButtonCommandParameter" Value="{Binding RelativeSource={RelativeSource Self}}" />
+        <Setter Property="mah:TextBoxHelper.ButtonTemplate" Value="{DynamicResource MahApps.Templates.Button.Chromeless}" />
     </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/Controls.Toolbar.xaml b/src/MahApps.Metro/Styles/Controls.Toolbar.xaml
index e820e6ac08..d9a6efb3ec 100644
--- a/src/MahApps.Metro/Styles/Controls.Toolbar.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Toolbar.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary 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">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.TextBox.xaml" />
@@ -37,19 +37,19 @@
                             Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding controls:ControlsHelper.CornerRadius}"
+                            CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                             SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                        <controls:ContentControlEx x:Name="PART_ContentPresenter"
-                                                   Padding="{TemplateBinding Padding}"
-                                                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                   Content="{TemplateBinding Content}"
-                                                   ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:ControlsHelper.ContentCharacterCasing)}"
-                                                   ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                                   ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                   ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                   RecognizesAccessKey="{TemplateBinding controls:ControlsHelper.RecognizesAccessKey}"
-                                                   SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <mah:ContentControlEx x:Name="PART_ContentPresenter"
+                                              Padding="{TemplateBinding Padding}"
+                                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                              Content="{TemplateBinding Content}"
+                                              ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
+                                              ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                                              ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                              RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
+                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
@@ -103,19 +103,19 @@
                             Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding controls:ControlsHelper.CornerRadius}"
+                            CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                             SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                        <controls:ContentControlEx x:Name="PART_ContentPresenter"
-                                                   Padding="{TemplateBinding Padding}"
-                                                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                   Content="{TemplateBinding Content}"
-                                                   ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:ControlsHelper.ContentCharacterCasing)}"
-                                                   ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                                   ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                   ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                   RecognizesAccessKey="{TemplateBinding controls:ControlsHelper.RecognizesAccessKey}"
-                                                   SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <mah:ContentControlEx x:Name="PART_ContentPresenter"
+                                              Padding="{TemplateBinding Padding}"
+                                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                              Content="{TemplateBinding Content}"
+                                              ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
+                                              ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                                              ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                              RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
+                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/src/MahApps.Metro/Styles/Controls.Tooltip.xaml b/src/MahApps.Metro/Styles/Controls.Tooltip.xaml
index 8242c6244c..84c677ef8d 100644
--- a/src/MahApps.Metro/Styles/Controls.Tooltip.xaml
+++ b/src/MahApps.Metro/Styles/Controls.Tooltip.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary 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">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
     <!--  Tooltip Style  -->
     <Style x:Key="MahApps.Styles.ToolTip" TargetType="ToolTip">
@@ -24,16 +24,16 @@
                             <Storyboard x:Key="Visible State" />
                             <Storyboard x:Key="Normal State" />
                         </Border.Resources>
-                        <controls:ContentControlEx x:Name="PART_ContentPresenter"
-                                                   Margin="{TemplateBinding Padding}"
-                                                   Content="{TemplateBinding Content}"
-                                                   ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(controls:ControlsHelper.ContentCharacterCasing)}"
-                                                   ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                                   ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                   ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                   FontSize="{TemplateBinding FontSize}"
-                                                   Foreground="{TemplateBinding Foreground}"
-                                                   SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <mah:ContentControlEx x:Name="PART_ContentPresenter"
+                                              Margin="{TemplateBinding Padding}"
+                                              Content="{TemplateBinding Content}"
+                                              ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
+                                              ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                                              ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                              FontSize="{TemplateBinding FontSize}"
+                                              Foreground="{TemplateBinding Foreground}"
+                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="OpenStates">
                                 <VisualStateGroup.Transitions>
diff --git a/src/MahApps.Metro/Styles/Controls.TreeView.xaml b/src/MahApps.Metro/Styles/Controls.TreeView.xaml
index 27ef0a385f..902306ad42 100644
--- a/src/MahApps.Metro/Styles/Controls.TreeView.xaml
+++ b/src/MahApps.Metro/Styles/Controls.TreeView.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary 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"
-                    xmlns:Converters="clr-namespace:MahApps.Metro.Converters">
+                    xmlns:converters="clr-namespace:MahApps.Metro.Converters"
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
     <!--  ===============================================================================  -->
     <!--  Metro styled TreeView  -->
@@ -65,22 +65,10 @@
         <Setter Property="Width" Value="16" />
     </Style>
 
-    <Converters:TreeViewMarginConverter x:Key="LengthConverter" Length="12" />
+    <converters:TreeViewMarginConverter x:Key="LengthConverter" Length="12" />
 
     <Style x:Key="MahApps.Styles.TreeViewItem" TargetType="{x:Type TreeViewItem}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
-        <Setter Property="Controls:ItemHelper.ActiveSelectionBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
-        <Setter Property="Controls:ItemHelper.ActiveSelectionForegroundBrush" Value="{DynamicResource MahApps.Brushes.Selected.Foreground}" />
-        <Setter Property="Controls:ItemHelper.DisabledForegroundBrush" Value="{DynamicResource MahApps.Brushes.Gray}" />
-        <Setter Property="Controls:ItemHelper.DisabledSelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Gray7}" />
-        <Setter Property="Controls:ItemHelper.DisabledSelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.Selected.Foreground}" />
-        <Setter Property="Controls:ItemHelper.HoverBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent3}" />
-        <Setter Property="Controls:ItemHelper.HoverForegroundBrush" Value="{DynamicResource MahApps.Brushes.Text}" />
-        <Setter Property="Controls:ItemHelper.HoverSelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
-        <Setter Property="Controls:ItemHelper.HoverSelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.Selected.Foreground}" />
-        <Setter Property="Controls:ItemHelper.SelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent2}" />
-        <Setter Property="Controls:ItemHelper.SelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.Selected.Foreground}" />
-        <Setter Property="Controls:TreeViewItemHelper.ToggleButtonStyle" Value="{StaticResource MahApps.Styles.ToggleButton.TreeViewItem.ExpandCollapse}" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
         <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, Mode=OneWay, FallbackValue=Stretch, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
@@ -108,7 +96,7 @@
                                               Grid.Column="0"
                                               ClickMode="Press"
                                               IsChecked="{Binding Path=IsExpanded, RelativeSource={x:Static RelativeSource.TemplatedParent}, Mode=TwoWay}"
-                                              Style="{TemplateBinding Controls:TreeViewItemHelper.ToggleButtonStyle}" />
+                                              Style="{TemplateBinding mah:TreeViewItemHelper.ToggleButtonStyle}" />
                                 <ContentPresenter x:Name="PART_Header"
                                                   Grid.Column="1"
                                                   HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -128,16 +116,16 @@
                         </Trigger>
 
                         <Trigger Property="IsSelected" Value="True">
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.SelectedBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="PART_Header" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.SelectedForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.SelectedBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="PART_Header" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.SelectedForegroundBrush), Mode=OneWay}" />
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsSelected" Value="True" />
                                 <Condition Property="Selector.IsSelectionActive" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.ActiveSelectionBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="PART_Header" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.ActiveSelectionForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.ActiveSelectionBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="PART_Header" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.ActiveSelectionForegroundBrush), Mode=OneWay}" />
                         </MultiTrigger>
 
                         <MultiTrigger>
@@ -145,38 +133,38 @@
                                 <Condition SourceName="Border" Property="IsMouseOver" Value="True" />
                                 <Condition Property="IsSelected" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.HoverSelectedBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="PART_Header" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.HoverSelectedForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.HoverSelectedBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="PART_Header" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.HoverSelectedForegroundBrush), Mode=OneWay}" />
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition SourceName="Border" Property="IsMouseOver" Value="True" />
                                 <Condition Property="IsSelected" Value="False" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.HoverBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="PART_Header" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.HoverForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.HoverBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="PART_Header" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.HoverForegroundBrush), Mode=OneWay}" />
                         </MultiTrigger>
 
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition SourceName="Border" Property="IsMouseOver" Value="True" />
-                                <Condition Property="Controls:ItemHelper.IsMouseLeftButtonPressed" Value="True" />
+                                <Condition Property="mah:ItemHelper.IsMouseLeftButtonPressed" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.MouseLeftButtonPressedBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="PART_Header" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.MouseLeftButtonPressedForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.MouseLeftButtonPressedBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="PART_Header" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.MouseLeftButtonPressedForegroundBrush), Mode=OneWay}" />
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition SourceName="Border" Property="IsMouseOver" Value="True" />
-                                <Condition Property="Controls:ItemHelper.IsMouseRightButtonPressed" Value="True" />
+                                <Condition Property="mah:ItemHelper.IsMouseRightButtonPressed" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.MouseRightButtonPressedBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="PART_Header" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.MouseRightButtonPressedForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.MouseRightButtonPressedBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="PART_Header" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.MouseRightButtonPressedForegroundBrush), Mode=OneWay}" />
                         </MultiTrigger>
 
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.DisabledBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="PART_Header" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.DisabledForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.DisabledBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="PART_Header" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.DisabledForegroundBrush), Mode=OneWay}" />
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
@@ -184,8 +172,8 @@
                                 <Condition Property="IsSelected" Value="True" />
                             </MultiTrigger.Conditions>
                             <MultiTrigger.Setters>
-                                <Setter TargetName="PART_Header" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.DisabledSelectedForegroundBrush), Mode=OneWay}" />
-                                <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.DisabledSelectedBackgroundBrush), Mode=OneWay}" />
+                                <Setter TargetName="PART_Header" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.DisabledSelectedForegroundBrush), Mode=OneWay}" />
+                                <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.DisabledSelectedBackgroundBrush), Mode=OneWay}" />
                             </MultiTrigger.Setters>
                         </MultiTrigger>
                     </ControlTemplate.Triggers>
@@ -193,6 +181,18 @@
             </Setter.Value>
         </Setter>
         <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, Mode=OneWay, FallbackValue=Center, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
+        <Setter Property="mah:ItemHelper.ActiveSelectionBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="mah:ItemHelper.ActiveSelectionForegroundBrush" Value="{DynamicResource MahApps.Brushes.Selected.Foreground}" />
+        <Setter Property="mah:ItemHelper.DisabledForegroundBrush" Value="{DynamicResource MahApps.Brushes.Gray}" />
+        <Setter Property="mah:ItemHelper.DisabledSelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Gray7}" />
+        <Setter Property="mah:ItemHelper.DisabledSelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.Selected.Foreground}" />
+        <Setter Property="mah:ItemHelper.HoverBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent3}" />
+        <Setter Property="mah:ItemHelper.HoverForegroundBrush" Value="{DynamicResource MahApps.Brushes.Text}" />
+        <Setter Property="mah:ItemHelper.HoverSelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="mah:ItemHelper.HoverSelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.Selected.Foreground}" />
+        <Setter Property="mah:ItemHelper.SelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent2}" />
+        <Setter Property="mah:ItemHelper.SelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.Selected.Foreground}" />
+        <Setter Property="mah:TreeViewItemHelper.ToggleButtonStyle" Value="{StaticResource MahApps.Styles.ToggleButton.TreeViewItem.ExpandCollapse}" />
         <Style.Triggers>
             <Trigger Property="VirtualizingStackPanel.IsVirtualizing" Value="True">
                 <Setter Property="ItemsPanel">
@@ -221,7 +221,7 @@
                             Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                            CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                             SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
                         <ScrollViewer x:Name="TreeViewScrollViewer"
                                       Padding="{TemplateBinding Padding}"
diff --git a/src/MahApps.Metro/Styles/Controls.ValidationError.xaml b/src/MahApps.Metro/Styles/Controls.ValidationError.xaml
index a04e7c3be9..c2ca7665fb 100644
--- a/src/MahApps.Metro/Styles/Controls.ValidationError.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ValidationError.xaml
@@ -1,9 +1,9 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:Converters="clr-namespace:MahApps.Metro.Converters"
+                    xmlns:converters="clr-namespace:MahApps.Metro.Converters"
                     xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
-    <Converters:CornerRadiusBindingConverter x:Key="CornerRadiusBindingConverter" />
+    <converters:CornerRadiusBindingConverter x:Key="CornerRadiusBindingConverter" />
 
     <Style x:Key="MahApps.Styles.CustomValidationPopup" TargetType="{x:Type mah:CustomValidationPopup}">
         <Setter Property="HorizontalAlignment" Value="Right" />
@@ -23,7 +23,7 @@
                 <Border x:Name="ValidationErrorElement"
                         BorderBrush="{DynamicResource MahApps.Brushes.Control.Validation}"
                         BorderThickness="{Binding ElementName=placeholder, Path=AdornedElement.BorderThickness, FallbackValue=1, TargetNullValue=1}"
-                        CornerRadius="{Binding ElementName=placeholder, Path=(mah:ControlsHelper.CornerRadius), Converter={StaticResource CornerRadiusBindingConverter}, ConverterParameter={x:Static Converters:RadiusType.TopRight}}"
+                        CornerRadius="{Binding ElementName=placeholder, Path=(mah:ControlsHelper.CornerRadius), Converter={StaticResource CornerRadiusBindingConverter}, ConverterParameter={x:Static converters:RadiusType.TopRight}}"
                         DataContext="{Binding ElementName=placeholder}"
                         SnapsToDevicePixels="{Binding ElementName=placeholder, Path=AdornedElement.SnapsToDevicePixels, FallbackValue=true, TargetNullValue=true}">
 
diff --git a/src/MahApps.Metro/Styles/Fonts.xaml b/src/MahApps.Metro/Styles/Fonts.xaml
index 4e560fd63d..f44de69042 100644
--- a/src/MahApps.Metro/Styles/Fonts.xaml
+++ b/src/MahApps.Metro/Styles/Fonts.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:System="clr-namespace:System;assembly=mscorlib">
+                    xmlns:system="clr-namespace:System;assembly=mscorlib">
 
     <FontFamily x:Key="MahApps.Fonts.Family.SymbolTheme">Segoe MDL2 Assets,/MahApps.Metro;component/Assets/#Segoe MDL2 Assets</FontFamily>
     <FontFamily x:Key="MahApps.Fonts.Family.Button">Segoe UI, Lucida Sans Unicode, Verdana</FontFamily>
@@ -10,28 +10,28 @@
     <FontFamily x:Key="MahApps.Fonts.Family.ToggleSwitch">Segoe UI, Lucida Sans Unicode, Verdana</FontFamily>
     <FontFamily x:Key="MahApps.Fonts.Family.ToggleSwitch.Header">Segoe UI, Lucida Sans Unicode, Verdana</FontFamily>
 
-    <System:Double x:Key="MahApps.Font.Size.Header">40</System:Double>
-    <System:Double x:Key="MahApps.Font.Size.SubHeader">29.333</System:Double>
-    <System:Double x:Key="MahApps.Font.Size.Window.Title">16</System:Double>
-    <System:Double x:Key="MahApps.Font.Size.Default">14</System:Double>
-    <System:Double x:Key="MahApps.Font.Size.Content">12</System:Double>
-    <System:Double x:Key="MahApps.Font.Size.Button.Flat">14</System:Double>
-    <System:Double x:Key="MahApps.Font.Size.TabItem">26.67</System:Double>
-    <System:Double x:Key="MahApps.Font.Size.Button">10</System:Double>
-    <System:Double x:Key="MahApps.Font.Size.FloatingWatermark">10</System:Double>
-    <System:Double x:Key="MahApps.Font.Size.Button.ClearText">16</System:Double>
-    <System:Double x:Key="MahApps.Font.Size.Tooltip">12</System:Double>
-    <System:Double x:Key="MahApps.Font.Size.Menu">14</System:Double>
-    <System:Double x:Key="MahApps.Font.Size.ContextMenu">14</System:Double>
-    <System:Double x:Key="MahApps.Font.Size.StatusBar">12</System:Double>
+    <system:Double x:Key="MahApps.Font.Size.Header">40</system:Double>
+    <system:Double x:Key="MahApps.Font.Size.SubHeader">29.333</system:Double>
+    <system:Double x:Key="MahApps.Font.Size.Window.Title">16</system:Double>
+    <system:Double x:Key="MahApps.Font.Size.Default">14</system:Double>
+    <system:Double x:Key="MahApps.Font.Size.Content">12</system:Double>
+    <system:Double x:Key="MahApps.Font.Size.Button.Flat">14</system:Double>
+    <system:Double x:Key="MahApps.Font.Size.TabItem">26.67</system:Double>
+    <system:Double x:Key="MahApps.Font.Size.Button">10</system:Double>
+    <system:Double x:Key="MahApps.Font.Size.FloatingWatermark">10</system:Double>
+    <system:Double x:Key="MahApps.Font.Size.Button.ClearText">16</system:Double>
+    <system:Double x:Key="MahApps.Font.Size.Tooltip">12</system:Double>
+    <system:Double x:Key="MahApps.Font.Size.Menu">14</system:Double>
+    <system:Double x:Key="MahApps.Font.Size.ContextMenu">14</system:Double>
+    <system:Double x:Key="MahApps.Font.Size.StatusBar">12</system:Double>
 
-    <System:Double x:Key="MahApps.Font.Size.Dialog.Title">26</System:Double>
-    <System:Double x:Key="MahApps.Font.Size.Dialog.Message">15</System:Double>
-    <System:Double x:Key="MahApps.Font.Size.Dialog.Button">12</System:Double>
+    <system:Double x:Key="MahApps.Font.Size.Dialog.Title">26</system:Double>
+    <system:Double x:Key="MahApps.Font.Size.Dialog.Message">15</system:Double>
+    <system:Double x:Key="MahApps.Font.Size.Dialog.Button">12</system:Double>
 
-    <System:Double x:Key="MahApps.Font.Size.Flyout.Header">20</System:Double>
+    <system:Double x:Key="MahApps.Font.Size.Flyout.Header">20</system:Double>
 
-    <System:Double x:Key="MahApps.Font.Size.ToggleSwitch">14</System:Double>
-    <System:Double x:Key="MahApps.Font.Size.ToggleSwitch.Header">14</System:Double>
+    <system:Double x:Key="MahApps.Font.Size.ToggleSwitch">14</system:Double>
+    <system:Double x:Key="MahApps.Font.Size.ToggleSwitch.Header">14</system:Double>
 
 </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 93ab36675c..997ad63178 100644
--- a/src/MahApps.Metro/Styles/VS/Button.xaml
+++ b/src/MahApps.Metro/Styles/VS/Button.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary 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">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
     <Style x:Key="MahApps.Styles.Button.VisualStudio" TargetType="Button">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Background.Normal}" />
@@ -12,15 +12,15 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Button">
-                    <Controls:ClipBorder Background="{TemplateBinding Background}"
-                                         BorderBrush="{TemplateBinding BorderBrush}"
-                                         BorderThickness="1"
-                                         CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
-                                         SnapsToDevicePixels="True">
+                    <mah:ClipBorder Background="{TemplateBinding Background}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="1"
+                                    CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
+                                    SnapsToDevicePixels="True">
                         <ContentPresenter Margin="{TemplateBinding Padding}"
                                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-                    </Controls:ClipBorder>
+                    </mah:ClipBorder>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
                             <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.BackgroundHighlighted}" />
diff --git a/src/MahApps.Metro/Styles/VS/Colors.xaml b/src/MahApps.Metro/Styles/VS/Colors.xaml
index 10b6d3dfe5..7411928227 100644
--- a/src/MahApps.Metro/Styles/VS/Colors.xaml
+++ b/src/MahApps.Metro/Styles/VS/Colors.xaml
@@ -1,13 +1,13 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:System="clr-namespace:System;assembly=mscorlib"
                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                    xmlns:options="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
-                    mc:Ignorable="options">
+                    xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib"
+                    mc:Ignorable="po">
 
     <!--  Background  -->
-    <SolidColorBrush x:Key="MahApps.Brushes.Background" Color="#1C1C1C" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Brushes.LightBackground" Color="#2D2D30" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Background" Color="#1C1C1C" po:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.LightBackground" Color="#2D2D30" po:Freeze="True" />
 
     <Color x:Key="MahApps.Colors.Accent">#2D2D30</Color>
     <Color x:Key="MahApps.Colors.ThemeForeground">#FFFFFFFF</Color>
@@ -15,77 +15,77 @@
     <Color x:Key="MahApps.Colors.MenuShadow">#FF000000</Color>
 
     <!--  re-set brushes too  -->
-    <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.Highlight" Color="{StaticResource MahApps.Colors.Highlight}" po:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Accent" Color="{StaticResource MahApps.Colors.Accent}" po:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Accent2" Color="{StaticResource MahApps.Colors.Accent2}" po:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Accent3" Color="{StaticResource MahApps.Colors.Accent3}" po:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Accent4" Color="{StaticResource MahApps.Colors.Accent4}" po: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.WindowTitle" Color="{StaticResource MahApps.Colors.Accent}" po:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.WindowTitle.NonActive" Color="#808080" po:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Border.NonActive" Color="#808080" po:Freeze="True" />
 
-    <SolidColorBrush x:Key="MahApps.Brushes.ThemeForeground" Color="{StaticResource MahApps.Colors.ThemeForeground}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Brushes.Text" Color="{StaticResource MahApps.Colors.ThemeForeground}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Brushes.TextBox.Border.Focus" Color="{StaticResource MahApps.Colors.ThemeForeground}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Brushes.Button.Border.MouseOver" Color="{StaticResource MahApps.Colors.ThemeForeground}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Brushes.ComboBox.Border.MouseOver" Color="{StaticResource MahApps.Colors.ThemeForeground}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ThemeForeground" Color="{StaticResource MahApps.Colors.ThemeForeground}" po:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Text" Color="{StaticResource MahApps.Colors.ThemeForeground}" po:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.TextBox.Border.Focus" Color="{StaticResource MahApps.Colors.ThemeForeground}" po:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Button.Border.MouseOver" Color="{StaticResource MahApps.Colors.ThemeForeground}" po:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ComboBox.Border.MouseOver" Color="{StaticResource MahApps.Colors.ThemeForeground}" po:Freeze="True" />
 
-    <SolidColorBrush x:Key="MahApps.Brushes.Control.Background" Color="{StaticResource MahApps.Colors.ThemeBackground}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Brushes.ThemeBackground" Color="{StaticResource MahApps.Colors.ThemeBackground}" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Brushes.Window.Background" Color="{StaticResource MahApps.Colors.ThemeBackground}" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Control.Background" Color="{StaticResource MahApps.Colors.ThemeBackground}" po:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ThemeBackground" Color="{StaticResource MahApps.Colors.ThemeBackground}" po:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Window.Background" Color="{StaticResource MahApps.Colors.ThemeBackground}" po:Freeze="True" />
 
-    <SolidColorBrush x:Key="{x:Static SystemColors.WindowBrushKey}" Color="{StaticResource MahApps.Colors.ThemeBackground}" options:Freeze="True" />
-    <SolidColorBrush x:Key="{x:Static SystemColors.ControlTextBrushKey}" Color="{StaticResource MahApps.Colors.ThemeForeground}" options:Freeze="True" />
+    <SolidColorBrush x:Key="{x:Static SystemColors.WindowBrushKey}" Color="{StaticResource MahApps.Colors.ThemeBackground}" po:Freeze="True" />
+    <SolidColorBrush x:Key="{x:Static SystemColors.ControlTextBrushKey}" Color="{StaticResource MahApps.Colors.ThemeForeground}" po:Freeze="True" />
 
-    <SolidColorBrush x:Key="MahApps.Brushes.WindowButtonCommands.Background.MouseOver" Color="#40808080" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.WindowButtonCommands.Background.MouseOver" Color="#40808080" po:Freeze="True" />
 
     <!--  Foreground  -->
-    <SolidColorBrush x:Key="MahApps.Brushes.Foreground" Color="#FFFFFF" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Brushes.WindowTitle.Foreground" Color="#999988" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Foreground" Color="#FFFFFF" po:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.WindowTitle.Foreground" Color="#999988" po:Freeze="True" />
 
     <!--  General  -->
-    <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" />
+    <SolidColorBrush x:Key="MahApps.Brushes.BackgroundHighlighted" Color="#54545C" po:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Border.Highlighted" Color="#6A6A75" po:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.BackgroundSelected" Color="#007ACC" po:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Border.Selected" Color="#1C97EA" po:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Background.Normal" Color="#3F3F46" po:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Border.Normal" Color="#54545C" po:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Window.Glow" Color="#017ACC" po:Freeze="True" />
 
     <!--  Text Box  -->
-    <SolidColorBrush x:Key="MahApps.Brushes.TextBox.Background" Color="#333337" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Brushes.TextBox.BackgroundSelected" Color="#3F3F46" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.TextBox.Background" Color="#333337" po:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.TextBox.BackgroundSelected" Color="#3F3F46" po:Freeze="True" />
 
     <!--  Search Text Box  -->
-    <SolidColorBrush x:Key="MahApps.Brushes.SearchTextBox.Foreground" Color="#999999" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SearchTextBox.Foreground" Color="#999999" po:Freeze="True" />
 
     <!--  Link Button  -->
-    <SolidColorBrush x:Key="MahApps.Brushes.LinkButton.Foreground" Color="#1297FB" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Brushes.LinkButton.ForegroundHighlighted" Color="#55AAFF" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.LinkButton.Foreground" Color="#1297FB" po:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.LinkButton.ForegroundHighlighted" Color="#55AAFF" po:Freeze="True" />
 
     <!--  Close Button  -->
-    <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" />
+    <SolidColorBrush x:Key="MahApps.Brushes.CloseButton.BackgroundHighlighted" Color="#39ADFB" po:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.CloseButton.BackgroundPressed" Color="#084E7D" po:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.CloseButton.Stroke" Color="#AAFFFFFF" po:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.CloseButton.StrokeHighlighted" Color="#FFFFFF" po:Freeze="True" />
 
     <!--  Menu  -->
-    <SolidColorBrush x:Key="MahApps.Brushes.Menu.Checkmark.Fill" Color="#FF999999" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Brushes.Menu.Checkmark.Background" Color="#FF2D2D30" 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" />
-    <SolidColorBrush x:Key="MahApps.Brushes.ContextMenu.Background" Color="#1B1B1C" options:Freeze="True" />
-    <SolidColorBrush x:Key="MahApps.Brushes.ContextMenu.Border" Color="#333337" options:Freeze="True" />
-    <SolidColorBrush x:Key="{x:Static SystemColors.MenuTextBrushKey}" Color="#FFFFFF" options:Freeze="True" />
-
-    <System:Double x:Key="MahApps.Font.Size.ContextMenu">12</System:Double>
+    <SolidColorBrush x:Key="MahApps.Brushes.Menu.Checkmark.Fill" Color="#FF999999" po:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Menu.Checkmark.Background" Color="#FF2D2D30" po:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.MenuSeparator.Border" Color="#333337" po:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.MenuItem.BackgroundHighlighted" Color="#3E3E40" po:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SubmenuItem.Background" Color="#1B1B1C" po:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.SubmenuItem.BackgroundHighlighted" Color="#333334" po:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.Menu.ForegroundDisabled" Color="#656565" po:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ContextMenu.Background" Color="#1B1B1C" po:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ContextMenu.Border" Color="#333337" po:Freeze="True" />
+    <SolidColorBrush x:Key="{x:Static SystemColors.MenuTextBrushKey}" Color="#FFFFFF" po:Freeze="True" />
+
+    <system:Double x:Key="MahApps.Font.Size.ContextMenu">12</system:Double>
 
     <!--  Scroll Bar  -->
-    <SolidColorBrush x:Key="MahApps.Brushes.ScrollBar.PageButtonBackgroundHighlighted" Color="#05FFFFFF" options:Freeze="True" />
+    <SolidColorBrush x:Key="MahApps.Brushes.ScrollBar.PageButtonBackgroundHighlighted" Color="#05FFFFFF" po:Freeze="True" />
 
     <!--  Notification Button  -->
     <SolidColorBrush x:Key="MahApps.Brushes.NotificationButton.Foreground" Color="#000000" />
diff --git a/src/MahApps.Metro/Styles/VS/Expander.xaml b/src/MahApps.Metro/Styles/VS/Expander.xaml
index 12f0f15cf5..aea3fd50b5 100644
--- a/src/MahApps.Metro/Styles/VS/Expander.xaml
+++ b/src/MahApps.Metro/Styles/VS/Expander.xaml
@@ -1,14 +1,14 @@
 <ResourceDictionary 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"
-                    xmlns:Converters="clr-namespace:MahApps.Metro.Converters"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
+                    xmlns:converters="clr-namespace:MahApps.Metro.Converters"
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib">
 
-    <Converters:ThicknessBindingConverter x:Key="ThicknessBindingConverter" />
+    <converters:ThicknessBindingConverter x:Key="ThicknessBindingConverter" />
 
     <Thickness x:Key="ExpanderHeaderThemePadding">2</Thickness>
-    <sys:Double x:Key="ExpanderHeaderThemeFontSize">16</sys:Double>
-    <sys:Double x:Key="ExpanderToggleButtonThemeSize">18</sys:Double>
+    <system:Double x:Key="ExpanderHeaderThemeFontSize">16</system:Double>
+    <system:Double x:Key="ExpanderToggleButtonThemeSize">18</system:Double>
 
     <Style x:Key="MahApps.Styles.ToggleButton.ExpanderHeader.Base.VisualStudio" TargetType="{x:Type ToggleButton}">
         <Setter Property="Background" Value="Transparent" />
@@ -64,17 +64,17 @@
                                       Stroke="{DynamicResource MahApps.Brushes.Border.Normal}"
                                       StrokeThickness="2" />
                             </Grid>
-                            <Controls:ContentControlEx Grid.Row="1"
-                                                       Margin="0 4 0 0"
-                                                       HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                       VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                       Content="{TemplateBinding Content}"
-                                                       ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
-                                                       ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                                       ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                       ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                       RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
-                                                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            <mah:ContentControlEx Grid.Row="1"
+                                                  Margin="0 4 0 0"
+                                                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                  Content="{TemplateBinding Content}"
+                                                  ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
+                                                  ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                  ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                                  RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
+                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
@@ -113,17 +113,17 @@
                                 <ColumnDefinition Width="*" />
                                 <ColumnDefinition Width="Auto" />
                             </Grid.ColumnDefinitions>
-                            <Controls:ContentControlEx Grid.Column="0"
-                                                       Margin="0 0 4 0"
-                                                       HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                       VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                       Content="{TemplateBinding Content}"
-                                                       ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
-                                                       ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                                       ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                       ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                       RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
-                                                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            <mah:ContentControlEx Grid.Column="0"
+                                                  Margin="0 0 4 0"
+                                                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                  Content="{TemplateBinding Content}"
+                                                  ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
+                                                  ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                  ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                                  RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
+                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                             <Grid x:Name="ArrowGrid"
                                   Grid.Column="1"
                                   Width="{DynamicResource ExpanderToggleButtonThemeSize}"
@@ -210,17 +210,17 @@
                                       Stroke="{DynamicResource MahApps.Brushes.Border.Normal}"
                                       StrokeThickness="2" />
                             </Grid>
-                            <Controls:ContentControlEx Grid.Row="1"
-                                                       Margin="0 4 0 0"
-                                                       HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                       VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                       Content="{TemplateBinding Content}"
-                                                       ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
-                                                       ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                                       ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                       ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                       RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
-                                                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            <mah:ContentControlEx Grid.Row="1"
+                                                  Margin="0 4 0 0"
+                                                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                  Content="{TemplateBinding Content}"
+                                                  ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
+                                                  ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                  ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                                  RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
+                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
@@ -257,17 +257,17 @@
                                 <ColumnDefinition Width="*" />
                                 <ColumnDefinition Width="Auto" />
                             </Grid.ColumnDefinitions>
-                            <Controls:ContentControlEx Grid.Column="0"
-                                                       Margin="0 0 4 0"
-                                                       HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                       VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                       Content="{TemplateBinding Content}"
-                                                       ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
-                                                       ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                                       ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                       ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                       RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
-                                                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            <mah:ContentControlEx Grid.Column="0"
+                                                  Margin="0 0 4 0"
+                                                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                  Content="{TemplateBinding Content}"
+                                                  ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
+                                                  ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                  ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                                  RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
+                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                             <Grid x:Name="ArrowGrid"
                                   Grid.Column="1"
                                   Width="{DynamicResource ExpanderToggleButtonThemeSize}"
@@ -330,16 +330,6 @@
         <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:ExpanderHelper.CollapseStoryboard" Value="{StaticResource MahApps.Storyboard.Expander.Collapse.VS}" />
-        <Setter Property="Controls:ExpanderHelper.ExpandStoryboard" Value="{StaticResource MahApps.Storyboard.Expander.Expand.VS}" />
-        <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:HeaderedControlHelper.HeaderBackground" Value="{x:Null}" />
-        <Setter Property="Controls:HeaderedControlHelper.HeaderFontSize" Value="{DynamicResource ExpanderHeaderThemeFontSize}" />
-        <Setter Property="Controls:HeaderedControlHelper.HeaderForeground" Value="{DynamicResource MahApps.Brushes.Foreground}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Foreground}" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
@@ -352,28 +342,28 @@
                                    Opacity="0" />
                         <DockPanel x:Name="ExpanderRoot">
                             <ToggleButton x:Name="ToggleSite"
-                                          Controls:ControlsHelper.ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
-                                          Background="{TemplateBinding Controls:HeaderedControlHelper.HeaderBackground}"
+                                          mah:ControlsHelper.ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
+                                          Background="{TemplateBinding mah:HeaderedControlHelper.HeaderBackground}"
                                           BorderBrush="{TemplateBinding BorderBrush}"
                                           Content="{TemplateBinding Header}"
                                           ContentStringFormat="{TemplateBinding HeaderStringFormat}"
                                           ContentTemplate="{TemplateBinding HeaderTemplate}"
                                           ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
                                           DockPanel.Dock="Top"
-                                          FontFamily="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontFamily}"
-                                          FontSize="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontSize}"
-                                          FontStretch="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontStretch}"
-                                          FontWeight="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontWeight}"
-                                          Foreground="{TemplateBinding Controls:HeaderedControlHelper.HeaderForeground}"
+                                          FontFamily="{TemplateBinding mah:HeaderedControlHelper.HeaderFontFamily}"
+                                          FontSize="{TemplateBinding mah:HeaderedControlHelper.HeaderFontSize}"
+                                          FontStretch="{TemplateBinding mah:HeaderedControlHelper.HeaderFontStretch}"
+                                          FontWeight="{TemplateBinding mah:HeaderedControlHelper.HeaderFontWeight}"
+                                          Foreground="{TemplateBinding mah:HeaderedControlHelper.HeaderForeground}"
                                           IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
                                           SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                          Style="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ExpanderHelper.HeaderDownStyle)}" />
+                                          Style="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ExpanderHelper.HeaderDownStyle)}" />
                             <Border x:Name="ExpandSite"
                                     HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                     VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                     Background="{TemplateBinding Background}"
                                     BorderBrush="{TemplateBinding BorderBrush}"
-                                    BorderThickness="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={StaticResource ThicknessBindingConverter}, ConverterParameter={x:Static Converters:ThicknessSideType.Top}}"
+                                    BorderThickness="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={StaticResource ThicknessBindingConverter}, ConverterParameter={x:Static converters:ThicknessSideType.Top}}"
                                     DockPanel.Dock="Bottom"
                                     Focusable="False"
                                     Opacity="0"
@@ -408,7 +398,7 @@
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
                                 <Condition Binding="{Binding IsExpanded, RelativeSource={RelativeSource Self}}" Value="True" />
-                                <Condition Binding="{Binding Path=(Controls:ExpanderHelper.ExpandStoryboard), RelativeSource={RelativeSource Self}}" Value="{x:Null}" />
+                                <Condition Binding="{Binding Path=(mah:ExpanderHelper.ExpandStoryboard), RelativeSource={RelativeSource Self}}" Value="{x:Null}" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="ExpandSite" Property="Opacity" Value="1" />
                             <Setter TargetName="ExpandSite" Property="Visibility" Value="Visible" />
@@ -416,29 +406,29 @@
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
                                 <Condition Binding="{Binding IsExpanded, RelativeSource={RelativeSource Self}}" Value="False" />
-                                <Condition Binding="{Binding Path=(Controls:ExpanderHelper.CollapseStoryboard), RelativeSource={RelativeSource Self}}" Value="{x:Null}" />
+                                <Condition Binding="{Binding Path=(mah:ExpanderHelper.CollapseStoryboard), RelativeSource={RelativeSource Self}}" Value="{x:Null}" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="ExpandSite" Property="Opacity" Value="0" />
                             <Setter TargetName="ExpandSite" Property="Visibility" Value="Collapsed" />
                         </MultiDataTrigger>
 
                         <Trigger Property="ExpandDirection" Value="Right">
-                            <Setter TargetName="ExpandSite" Property="BorderThickness" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={StaticResource ThicknessBindingConverter}, ConverterParameter={x:Static Converters:ThicknessSideType.Left}}" />
+                            <Setter TargetName="ExpandSite" Property="BorderThickness" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={StaticResource ThicknessBindingConverter}, ConverterParameter={x:Static converters:ThicknessSideType.Left}}" />
                             <Setter TargetName="ExpandSite" Property="DockPanel.Dock" Value="Right" />
                             <Setter TargetName="ToggleSite" Property="DockPanel.Dock" Value="Left" />
-                            <Setter TargetName="ToggleSite" Property="Style" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ExpanderHelper.HeaderRightStyle)}" />
+                            <Setter TargetName="ToggleSite" Property="Style" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ExpanderHelper.HeaderRightStyle)}" />
                         </Trigger>
                         <Trigger Property="ExpandDirection" Value="Up">
-                            <Setter TargetName="ExpandSite" Property="BorderThickness" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={StaticResource ThicknessBindingConverter}, ConverterParameter={x:Static Converters:ThicknessSideType.Bottom}}" />
+                            <Setter TargetName="ExpandSite" Property="BorderThickness" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={StaticResource ThicknessBindingConverter}, ConverterParameter={x:Static converters:ThicknessSideType.Bottom}}" />
                             <Setter TargetName="ExpandSite" Property="DockPanel.Dock" Value="Top" />
                             <Setter TargetName="ToggleSite" Property="DockPanel.Dock" Value="Bottom" />
-                            <Setter TargetName="ToggleSite" Property="Style" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ExpanderHelper.HeaderUpStyle)}" />
+                            <Setter TargetName="ToggleSite" Property="Style" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ExpanderHelper.HeaderUpStyle)}" />
                         </Trigger>
                         <Trigger Property="ExpandDirection" Value="Left">
-                            <Setter TargetName="ExpandSite" Property="BorderThickness" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={StaticResource ThicknessBindingConverter}, ConverterParameter={x:Static Converters:ThicknessSideType.Right}}" />
+                            <Setter TargetName="ExpandSite" Property="BorderThickness" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=BorderThickness, Converter={StaticResource ThicknessBindingConverter}, ConverterParameter={x:Static converters:ThicknessSideType.Right}}" />
                             <Setter TargetName="ExpandSite" Property="DockPanel.Dock" Value="Left" />
                             <Setter TargetName="ToggleSite" Property="DockPanel.Dock" Value="Right" />
-                            <Setter TargetName="ToggleSite" Property="Style" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ExpanderHelper.HeaderLeftStyle)}" />
+                            <Setter TargetName="ToggleSite" Property="Style" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ExpanderHelper.HeaderLeftStyle)}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
@@ -447,5 +437,15 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
+        <Setter Property="mah:ControlsHelper.ContentCharacterCasing" Value="Normal" />
+        <Setter Property="mah:ExpanderHelper.CollapseStoryboard" Value="{StaticResource MahApps.Storyboard.Expander.Collapse.VS}" />
+        <Setter Property="mah:ExpanderHelper.ExpandStoryboard" Value="{StaticResource MahApps.Storyboard.Expander.Expand.VS}" />
+        <Setter Property="mah:ExpanderHelper.HeaderDownStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderHeader.Down.VisualStudio}" />
+        <Setter Property="mah:ExpanderHelper.HeaderLeftStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderHeader.Left.VisualStudio}" />
+        <Setter Property="mah:ExpanderHelper.HeaderRightStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderHeader.Right.VisualStudio}" />
+        <Setter Property="mah:ExpanderHelper.HeaderUpStyle" Value="{StaticResource MahApps.Styles.ToggleButton.ExpanderHeader.Up.VisualStudio}" />
+        <Setter Property="mah:HeaderedControlHelper.HeaderBackground" Value="{x:Null}" />
+        <Setter Property="mah:HeaderedControlHelper.HeaderFontSize" Value="{DynamicResource ExpanderHeaderThemeFontSize}" />
+        <Setter Property="mah:HeaderedControlHelper.HeaderForeground" Value="{DynamicResource MahApps.Brushes.Foreground}" />
     </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/VS/GroupBox.xaml b/src/MahApps.Metro/Styles/VS/GroupBox.xaml
index 6c8d03b03e..986e03446f 100644
--- a/src/MahApps.Metro/Styles/VS/GroupBox.xaml
+++ b/src/MahApps.Metro/Styles/VS/GroupBox.xaml
@@ -1,19 +1,15 @@
 <ResourceDictionary 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"
-                    xmlns:System="clr-namespace:System;assembly=mscorlib">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib">
 
     <Thickness x:Key="GroupBoxHeaderThemePadding">2</Thickness>
-    <System:Double x:Key="MahApps.Sizes.GroupBox.HeaderThemeFont">16</System:Double>
+    <system:Double x:Key="MahApps.Sizes.GroupBox.HeaderThemeFont">16</system:Double>
 
     <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" />
-        <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Normal" />
-        <Setter Property="Controls:HeaderedControlHelper.HeaderBackground" Value="{x:Null}" />
-        <Setter Property="Controls:HeaderedControlHelper.HeaderFontSize" Value="{DynamicResource MahApps.Sizes.GroupBox.HeaderThemeFont}" />
-        <Setter Property="Controls:HeaderedControlHelper.HeaderForeground" Value="{DynamicResource MahApps.Brushes.Foreground}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Foreground}" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
@@ -24,23 +20,23 @@
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="*" />
                         </Grid.RowDefinitions>
-                        <Grid Grid.Row="0" Background="{TemplateBinding Controls:HeaderedControlHelper.HeaderBackground}">
-                            <Controls:ContentControlEx x:Name="HeaderContent"
-                                                       Margin="{DynamicResource GroupBoxHeaderThemePadding}"
-                                                       HorizontalAlignment="{TemplateBinding Controls:HeaderedControlHelper.HeaderHorizontalContentAlignment}"
-                                                       VerticalAlignment="{TemplateBinding Controls:HeaderedControlHelper.HeaderVerticalContentAlignment}"
-                                                       Content="{TemplateBinding Header}"
-                                                       ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
-                                                       ContentStringFormat="{TemplateBinding HeaderStringFormat}"
-                                                       ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                                       ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
-                                                       FontFamily="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontFamily}"
-                                                       FontSize="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontSize}"
-                                                       FontStretch="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontStretch}"
-                                                       FontWeight="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontWeight}"
-                                                       Foreground="{TemplateBinding Controls:HeaderedControlHelper.HeaderForeground}"
-                                                       RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
-                                                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <Grid Grid.Row="0" Background="{TemplateBinding mah:HeaderedControlHelper.HeaderBackground}">
+                            <mah:ContentControlEx x:Name="HeaderContent"
+                                                  Margin="{DynamicResource GroupBoxHeaderThemePadding}"
+                                                  HorizontalAlignment="{TemplateBinding mah:HeaderedControlHelper.HeaderHorizontalContentAlignment}"
+                                                  VerticalAlignment="{TemplateBinding mah:HeaderedControlHelper.HeaderVerticalContentAlignment}"
+                                                  Content="{TemplateBinding Header}"
+                                                  ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
+                                                  ContentStringFormat="{TemplateBinding HeaderStringFormat}"
+                                                  ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                                  ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
+                                                  FontFamily="{TemplateBinding mah:HeaderedControlHelper.HeaderFontFamily}"
+                                                  FontSize="{TemplateBinding mah:HeaderedControlHelper.HeaderFontSize}"
+                                                  FontStretch="{TemplateBinding mah:HeaderedControlHelper.HeaderFontStretch}"
+                                                  FontWeight="{TemplateBinding mah:HeaderedControlHelper.HeaderFontWeight}"
+                                                  Foreground="{TemplateBinding mah:HeaderedControlHelper.HeaderForeground}"
+                                                  RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
+                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Grid>
                         <Border Grid.Row="1"
                                 Background="{TemplateBinding Background}"
@@ -58,6 +54,10 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
+        <Setter Property="mah:ControlsHelper.ContentCharacterCasing" Value="Normal" />
+        <Setter Property="mah:HeaderedControlHelper.HeaderBackground" Value="{x:Null}" />
+        <Setter Property="mah:HeaderedControlHelper.HeaderFontSize" Value="{DynamicResource MahApps.Sizes.GroupBox.HeaderThemeFont}" />
+        <Setter Property="mah:HeaderedControlHelper.HeaderForeground" Value="{DynamicResource MahApps.Brushes.Foreground}" />
     </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Styles/VS/MetroWindow.xaml b/src/MahApps.Metro/Styles/VS/MetroWindow.xaml
index 75b48cba0e..20e4d6f37c 100644
--- a/src/MahApps.Metro/Styles/VS/MetroWindow.xaml
+++ b/src/MahApps.Metro/Styles/VS/MetroWindow.xaml
@@ -1,13 +1,13 @@
 <ResourceDictionary 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">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
     <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}">
+    <Style x:Key="MahApps.Styles.MetroWindow.VisualStudio" TargetType="{x:Type mah:MetroWindow}">
         <Setter Property="GlowBrush" Value="{DynamicResource MahApps.Brushes.Window.Glow}" />
         <Setter Property="NonActiveWindowTitleBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="ShowTitleBar" Value="True" />
@@ -25,7 +25,7 @@
         </Style.Triggers>
     </Style>
 
-    <Style TargetType="{x:Type Controls:WindowButtonCommands}">
+    <Style TargetType="{x:Type mah:WindowButtonCommands}">
         <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}" />
@@ -56,11 +56,11 @@
            BasedOn="{StaticResource MahApps.Styles.TextBox.Button}"
            TargetType="{x:Type TextBox}">
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.QuickLaunchTextBox.Border}" />
-        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.QuickLaunchTextBox.FocusedBorder}" />
         <Setter Property="FontSize" Value="12" />
         <Setter Property="MaxWidth" Value="300" />
         <Setter Property="MinWidth" Value="200" />
         <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="mah:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.QuickLaunchTextBox.FocusedBorder}" />
         <Style.Triggers>
             <Trigger Property="IsFocused" Value="True">
                 <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.QuickLaunchTextBox.Border}" />
diff --git a/src/MahApps.Metro/Styles/VS/ScrollBar.xaml b/src/MahApps.Metro/Styles/VS/ScrollBar.xaml
index 4800d05bbf..ed666c0a8e 100644
--- a/src/MahApps.Metro/Styles/VS/ScrollBar.xaml
+++ b/src/MahApps.Metro/Styles/VS/ScrollBar.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary 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">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
     <Style x:Key="MahApps.Styles.RepeatButton.ScrollBarLine.VisualStudio" TargetType="{x:Type RepeatButton}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Background.Normal}" />
@@ -93,7 +93,7 @@
                     <RepeatButton Command="ScrollBar.PageLeftCommand" Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBarPage.VisualStudio}" />
                 </Track.DecreaseRepeatButton>
                 <Track.Thumb>
-                    <Controls:MetroThumb Style="{StaticResource MahApps.Styles.Thumb.ScrollBar.VisualStudio}" />
+                    <mah:MetroThumb Style="{StaticResource MahApps.Styles.Thumb.ScrollBar.VisualStudio}" />
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
                     <RepeatButton Command="ScrollBar.PageRightCommand" Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBarPage.VisualStudio}" />
@@ -124,7 +124,7 @@
                     <RepeatButton Command="ScrollBar.PageUpCommand" Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBarPage.VisualStudio}" />
                 </Track.DecreaseRepeatButton>
                 <Track.Thumb>
-                    <Controls:MetroThumb Style="{StaticResource MahApps.Styles.Thumb.ScrollBar.VisualStudio}" />
+                    <mah:MetroThumb Style="{StaticResource MahApps.Styles.Thumb.ScrollBar.VisualStudio}" />
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
                     <RepeatButton Command="ScrollBar.PageDownCommand" Style="{StaticResource MahApps.Styles.RepeatButton.ScrollBarPage.VisualStudio}" />
diff --git a/src/MahApps.Metro/Styles/VS/Shadows.xaml b/src/MahApps.Metro/Styles/VS/Shadows.xaml
index 1f44c7a42f..f3645b1def 100644
--- a/src/MahApps.Metro/Styles/VS/Shadows.xaml
+++ b/src/MahApps.Metro/Styles/VS/Shadows.xaml
@@ -1,6 +1,8 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options">
+                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                    xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
+                    mc:Ignorable="po">
 
     <DropShadowEffect x:Key="MahApps.DropShadowEffect.Menu.VisualStudio"
                       ShadowDepth="2"
diff --git a/src/MahApps.Metro/Styles/VS/TabControl.xaml b/src/MahApps.Metro/Styles/VS/TabControl.xaml
index a47af24535..f8c17ad03b 100644
--- a/src/MahApps.Metro/Styles/VS/TabControl.xaml
+++ b/src/MahApps.Metro/Styles/VS/TabControl.xaml
@@ -1,15 +1,15 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:Actions="clr-namespace:MahApps.Metro.Actions"
-                    xmlns:Controls="clr-namespace:MahApps.Metro.Controls"
-                    xmlns:System="clr-namespace:System;assembly=mscorlib"
-                    xmlns:i="http://schemas.microsoft.com/xaml/behaviors">
+                    xmlns:actions="clr-namespace:MahApps.Metro.Actions"
+                    xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.TabControl.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <System:Double x:Key="MahApps.Font.Size.TabItem">12</System:Double>
+    <system:Double x:Key="MahApps.Font.Size.TabItem">12</system:Double>
 
     <Style x:Key="MahApps.Styles.TabControl.VisualStudio"
            BasedOn="{StaticResource MahApps.Styles.TabControl}"
@@ -143,7 +143,6 @@
            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" />
         <Setter Property="Padding" Value="12 5 12 5" />
         <Setter Property="Template">
             <Setter.Value>
@@ -158,29 +157,29 @@
                                     HorizontalAlignment="Stretch"
                                     VerticalAlignment="Stretch"
                                     Orientation="Horizontal">
-                            <Controls:ContentControlEx x:Name="ContentSite"
-                                                       Padding="{TemplateBinding Padding}"
-                                                       Content="{TemplateBinding Header}"
-                                                       ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
-                                                       ContentStringFormat="{TemplateBinding HeaderStringFormat}"
-                                                       ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                                       ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
-                                                       FontFamily="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontFamily}"
-                                                       FontSize="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontSize}"
-                                                       FontStretch="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontStretch}"
-                                                       FontStyle="{TemplateBinding FontStyle}"
-                                                       FontWeight="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontWeight}"
-                                                       Foreground="{TemplateBinding Foreground}"
-                                                       RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
-                                                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            <mah:ContentControlEx x:Name="ContentSite"
+                                                  Padding="{TemplateBinding Padding}"
+                                                  Content="{TemplateBinding Header}"
+                                                  ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
+                                                  ContentStringFormat="{TemplateBinding HeaderStringFormat}"
+                                                  ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                                  ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
+                                                  FontFamily="{TemplateBinding mah:HeaderedControlHelper.HeaderFontFamily}"
+                                                  FontSize="{TemplateBinding mah:HeaderedControlHelper.HeaderFontSize}"
+                                                  FontStretch="{TemplateBinding mah:HeaderedControlHelper.HeaderFontStretch}"
+                                                  FontStyle="{TemplateBinding FontStyle}"
+                                                  FontWeight="{TemplateBinding mah:HeaderedControlHelper.HeaderFontWeight}"
+                                                  Foreground="{TemplateBinding Foreground}"
+                                                  RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
+                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                             <Button x:Name="PART_CloseButton"
                                     VerticalAlignment="Center"
                                     IsTabStop="False"
                                     Style="{DynamicResource MahApps.Styles.Button.TabItemClose.VisualStudio}"
-                                    Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TabControlHelper.CloseButtonEnabled), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                    Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:TabControlHelper.CloseButtonEnabled), Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}">
                                 <i:Interaction.Triggers>
                                     <i:EventTrigger EventName="Click">
-                                        <Actions:CloseTabItemAction Command="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TabControlHelper.CloseTabCommand), Mode=OneWay}" CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TabControlHelper.CloseTabCommandParameter), Mode=OneWay}" />
+                                        <actions:CloseTabItemAction Command="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:TabControlHelper.CloseTabCommand), Mode=OneWay}" CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:TabControlHelper.CloseTabCommandParameter), Mode=OneWay}" />
                                     </i:EventTrigger>
                                 </i:Interaction.Triggers>
                             </Button>
@@ -223,7 +222,7 @@
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsMouseOver" Value="False" />
                                 <Condition Property="IsSelected" Value="False" />
-                                <Condition Property="Controls:TabControlHelper.CloseButtonEnabled" Value="True" />
+                                <Condition Property="mah:TabControlHelper.CloseButtonEnabled" Value="True" />
                             </MultiTrigger.Conditions>
                             <Setter TargetName="PART_CloseButton" Property="Visibility" Value="Hidden" />
                         </MultiTrigger>
@@ -239,6 +238,7 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
+        <Setter Property="mah:TabControlHelper.CloseButtonEnabled" Value="True" />
     </Style>
 
     <DataTemplate x:Key="MahApps.Templates.TabItem.Closable.VisualStudio">
diff --git a/src/MahApps.Metro/Themes/Badged.xaml b/src/MahApps.Metro/Themes/Badged.xaml
index abb4cadec8..eb92ba733a 100644
--- a/src/MahApps.Metro/Themes/Badged.xaml
+++ b/src/MahApps.Metro/Themes/Badged.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary 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"
-                    xmlns:converters="clr-namespace:MahApps.Metro.Converters">
+                    xmlns:converters="clr-namespace:MahApps.Metro.Converters"
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
     <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
     <SineEase x:Key="BadgeEase" EasingMode="EaseOut" />
@@ -20,7 +20,7 @@
         </DoubleAnimationUsingKeyFrames>
     </Storyboard>
 
-    <Style TargetType="{x:Type controls:Badged}">
+    <Style TargetType="{x:Type mah:Badged}">
         <Setter Property="BadgeBackground" Value="{DynamicResource MahApps.Brushes.Badged.Background}" />
         <Setter Property="BadgeChangedStoryboard" Value="{StaticResource BadgeChangedStoryboard}" />
         <Setter Property="BadgeFontSize" Value="11" />
@@ -32,7 +32,7 @@
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:Badged}">
+                <ControlTemplate TargetType="{x:Type mah:Badged}">
                     <Grid>
                         <Border Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
diff --git a/src/MahApps.Metro/Themes/ContentControlEx.xaml b/src/MahApps.Metro/Themes/ContentControlEx.xaml
index f33e3343ac..3ed7956708 100644
--- a/src/MahApps.Metro/Themes/ContentControlEx.xaml
+++ b/src/MahApps.Metro/Themes/ContentControlEx.xaml
@@ -1,9 +1,9 @@
 <ResourceDictionary 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"
-                    xmlns:converters="clr-namespace:MahApps.Metro.Converters">
+                    xmlns:converters="clr-namespace:MahApps.Metro.Converters"
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
-    <Style x:Key="MahApps.Styles.ContentControlEx" TargetType="{x:Type controls:ContentControlEx}">
+    <Style x:Key="MahApps.Styles.ContentControlEx" TargetType="{x:Type mah:ContentControlEx}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
@@ -11,7 +11,7 @@
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:ContentControlEx}">
+                <ControlTemplate TargetType="{x:Type mah:ContentControlEx}">
                     <Grid Background="{TemplateBinding Background}">
                         <ContentPresenter x:Name="PART_ContentPresenter"
                                           Margin="{TemplateBinding Padding}"
@@ -45,6 +45,6 @@
 
     <Style x:Key="MahApps.Styles.MetroThumbContentControl"
            BasedOn="{StaticResource MahApps.Styles.ContentControlEx}"
-           TargetType="{x:Type controls:MetroThumbContentControl}" />
+           TargetType="{x:Type mah: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 d73dcfb476..8c86d0542d 100644
--- a/src/MahApps.Metro/Themes/DateTimePicker.xaml
+++ b/src/MahApps.Metro/Themes/DateTimePicker.xaml
@@ -1,19 +1,19 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:Behaviors="clr-namespace:MahApps.Metro.Behaviors"
-                    xmlns:Controls="clr-namespace:MahApps.Metro.Controls"
-                    xmlns:Converters="clr-namespace:MahApps.Metro.Converters"
+                    xmlns:behaviors="clr-namespace:MahApps.Metro.Behaviors"
                     xmlns:controlzex="urn:controlzex"
+                    xmlns:converters="clr-namespace:MahApps.Metro.Converters"
                     xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls"
                     xmlns:system="clr-namespace:System;assembly=mscorlib">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.Shared.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <Converters:ClockDegreeConverter x:Key="ClockDegreeConverter" TotalParts="60" />
-    <Converters:ClockDegreeConverter x:Key="HourDegreeConverter" TotalParts="12" />
-    <Converters:TimeSpanToStringConverter x:Key="TimeSpanToStringConverter" />
+    <converters:ClockDegreeConverter x:Key="ClockDegreeConverter" TotalParts="60" />
+    <converters:ClockDegreeConverter x:Key="HourDegreeConverter" TotalParts="12" />
+    <converters:TimeSpanToStringConverter x:Key="TimeSpanToStringConverter" />
 
     <DataTemplate x:Key="MahApps.Templates.DateTimePicker.FiveMinuteIndicator">
         <StackPanel Height="57"
@@ -109,33 +109,11 @@
         <system:Int32>59</system:Int32>
     </x:Array>
 
-    <Style x:Key="MahApps.Styles.TimePickerBase" TargetType="{x:Type Controls:TimePickerBase}">
+    <Style x:Key="MahApps.Styles.TimePickerBase" TargetType="{x:Type mah: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 MahApps.TextBox.ContextMenu}" />
-        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border.Focus}" />
-        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border.MouseOver}" />
-        <Setter Property="Controls:DatePickerHelper.DropDownButtonContent" Value="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" />
-        <Setter Property="Controls:DatePickerHelper.DropDownButtonContentTemplate">
-            <Setter.Value>
-                <DataTemplate>
-                    <!--  Modern - Calendar14  -->
-                    <ContentControl x:Name="PART_PackIcon"
-                                    Width="{Binding RelativeSource={RelativeSource AncestorType={x:Type Controls:TimePickerBase}}, Path=(Controls:TextBoxHelper.ButtonWidth), Mode=OneWay}"
-                                    Height="{Binding RelativeSource={RelativeSource AncestorType={x:Type Controls:TimePickerBase}}, Path=(Controls:TextBoxHelper.ButtonWidth), Mode=OneWay}"
-                                    Padding="3"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Content="{Binding Mode=OneWay}"
-                                    Style="{DynamicResource MahApps.Styles.ContentControl.PathIcon}" />
-                </DataTemplate>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Font.Size.Button.ClearText}" />
-        <Setter Property="Controls:TextBoxHelper.ButtonTemplate" Value="{DynamicResource MahApps.Templates.Button.Chromeless}" />
-        <Setter Property="Controls:TextBoxHelper.ButtonWidth" Value="22" />
-        <Setter Property="Controls:TextBoxHelper.IsMonitoring" Value="True" />
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Family.Control}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
@@ -146,13 +124,13 @@
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Controls:TimePickerBase}">
+                <ControlTemplate TargetType="{x:Type mah:TimePickerBase}">
                     <Grid x:Name="PART_Root">
                         <Border x:Name="Base"
                                 Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                                CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
 
                         <Grid x:Name="PART_InnerGrid" Margin="{TemplateBinding BorderThickness}">
@@ -173,9 +151,9 @@
                                                Padding="{TemplateBinding Padding}"
                                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                               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}"
+                                               mah:TextBoxHelper.Watermark="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:TextBoxHelper.Watermark), Mode=OneWay}"
+                                               mah:TextBoxHelper.WatermarkAlignment="{TemplateBinding mah:TextBoxHelper.WatermarkAlignment}"
+                                               mah:TextBoxHelper.WatermarkTrimming="{TemplateBinding mah:TextBoxHelper.WatermarkTrimming}"
                                                CaretBrush="{DynamicResource MahApps.Brushes.ThemeForeground}"
                                                ContextMenu="{TemplateBinding ContextMenu}"
                                                Focusable="{TemplateBinding Focusable}"
@@ -186,7 +164,7 @@
                                                SelectionBrush="{DynamicResource MahApps.Brushes.Highlight}"
                                                Style="{DynamicResource MahApps.Styles.DatePickerTextBox.TimePickerBase}">
                                 <i:Interaction.Behaviors>
-                                    <Behaviors:DatePickerTextBoxBehavior />
+                                    <behaviors:DatePickerTextBoxBehavior />
                                 </i:Interaction.Behaviors>
                             </DatePickerTextBox>
 
@@ -196,7 +174,7 @@
                                             Margin="4 0"
                                             Style="{DynamicResource MahApps.Styles.ContentControl.FloatingMessageContainer}">
                                 <ContentControl.Height>
-                                    <MultiBinding Converter="{Converters:MathMultiplyConverter}">
+                                    <MultiBinding Converter="{converters:MathMultiplyConverter}">
                                         <Binding ElementName="PART_FloatingMessage"
                                                  Mode="OneWay"
                                                  Path="ActualHeight" />
@@ -210,13 +188,13 @@
                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                            Foreground="{TemplateBinding Foreground}"
                                            Style="{DynamicResource MahApps.Styles.TextBlock.AutoCollapsing}"
-                                           Text="{TemplateBinding Controls:TextBoxHelper.Watermark}"
-                                           TextAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
-                                           TextTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}">
+                                           Text="{TemplateBinding mah:TextBoxHelper.Watermark}"
+                                           TextAlignment="{TemplateBinding mah:TextBoxHelper.WatermarkAlignment}"
+                                           TextTrimming="{TemplateBinding mah:TextBoxHelper.WatermarkTrimming}">
                                     <TextBlock.RenderTransform>
                                         <TranslateTransform x:Name="FloatingMessageTransform">
                                             <TranslateTransform.Y>
-                                                <MultiBinding Converter="{Converters:MathSubtractConverter}">
+                                                <MultiBinding Converter="{converters:MathSubtractConverter}">
                                                     <Binding ElementName="PART_FloatingMessage"
                                                              Mode="OneWay"
                                                              Path="ActualHeight" />
@@ -234,31 +212,31 @@
                                     Grid.Row="0"
                                     Grid.RowSpan="2"
                                     Grid.Column="1"
-                                    Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
-                                    Command="{TemplateBinding Controls:TextBoxHelper.ButtonCommand}"
-                                    CommandParameter="{TemplateBinding Controls:TextBoxHelper.ButtonCommandParameter}"
-                                    CommandTarget="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:TimePickerBase}}, Mode=OneWay}"
-                                    Content="{TemplateBinding Controls:TextBoxHelper.ButtonContent}"
-                                    ContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}"
+                                    Width="{TemplateBinding mah:TextBoxHelper.ButtonWidth}"
+                                    Command="{TemplateBinding mah:TextBoxHelper.ButtonCommand}"
+                                    CommandParameter="{TemplateBinding mah:TextBoxHelper.ButtonCommandParameter}"
+                                    CommandTarget="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:TimePickerBase}}, Mode=OneWay}"
+                                    Content="{TemplateBinding mah:TextBoxHelper.ButtonContent}"
+                                    ContentTemplate="{TemplateBinding mah:TextBoxHelper.ButtonContentTemplate}"
                                     Focusable="False"
-                                    FontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}"
-                                    FontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
+                                    FontFamily="{TemplateBinding mah:TextBoxHelper.ButtonFontFamily}"
+                                    FontSize="{TemplateBinding mah:TextBoxHelper.ButtonFontSize}"
                                     Foreground="{TemplateBinding Foreground}"
                                     IsTabStop="False"
                                     Style="{DynamicResource MahApps.Styles.Button.Chromeless}"
-                                    Template="{TemplateBinding Controls:TextBoxHelper.ButtonTemplate}"
+                                    Template="{TemplateBinding mah:TextBoxHelper.ButtonTemplate}"
                                     Visibility="Visible" />
 
                             <Button x:Name="PART_Button"
                                     Grid.Row="0"
                                     Grid.RowSpan="2"
                                     Grid.Column="2"
-                                    Width="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
-                                    Content="{TemplateBinding Controls:DatePickerHelper.DropDownButtonContent}"
-                                    ContentTemplate="{TemplateBinding Controls:DatePickerHelper.DropDownButtonContentTemplate}"
+                                    Width="{TemplateBinding mah:TextBoxHelper.ButtonWidth}"
+                                    Content="{TemplateBinding mah:DatePickerHelper.DropDownButtonContent}"
+                                    ContentTemplate="{TemplateBinding mah:DatePickerHelper.DropDownButtonContentTemplate}"
                                     Focusable="False"
-                                    FontFamily="{TemplateBinding Controls:DatePickerHelper.DropDownButtonFontFamily}"
-                                    FontSize="{TemplateBinding Controls:DatePickerHelper.DropDownButtonFontSize}"
+                                    FontFamily="{TemplateBinding mah:DatePickerHelper.DropDownButtonFontFamily}"
+                                    FontSize="{TemplateBinding mah:DatePickerHelper.DropDownButtonFontSize}"
                                     Foreground="{TemplateBinding Foreground}"
                                     IsTabStop="False"
                                     Style="{DynamicResource MahApps.Styles.Button.Chromeless}" />
@@ -412,18 +390,18 @@
                                 Background="{DynamicResource MahApps.Brushes.Control.Disabled}"
                                 BorderBrush="{DynamicResource MahApps.Brushes.Control.Disabled}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                                CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                                 IsHitTestVisible="False"
                                 Opacity="0"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
 
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="Controls:TextBoxHelper.ClearTextButton" Value="True">
-                            <Setter Property="Controls:TextBoxHelper.ButtonCommand" Value="{x:Static Controls:MahAppsCommands.ClearControlCommand}" />
+                        <Trigger Property="mah:TextBoxHelper.ClearTextButton" Value="True">
+                            <Setter Property="mah:TextBoxHelper.ButtonCommand" Value="{x:Static mah:MahAppsCommands.ClearControlCommand}" />
                         </Trigger>
 
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.ButtonsAlignment)}" Value="Left">
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(mah:TextBoxHelper.ButtonsAlignment)}" Value="Left">
                             <Setter TargetName="ButtonColumn" Property="Width" Value="*" />
                             <Setter TargetName="PART_Button" Property="Grid.Column" Value="0" />
                             <Setter TargetName="PART_ClearText" Property="Grid.Column" Value="1" />
@@ -433,15 +411,15 @@
                         </DataTrigger>
 
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.MouseOverBorderBrush)}" />
+                            <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.MouseOverBorderBrush)}" />
                         </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="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.FocusBorderBrush)}" />
                             <Setter TargetName="PART_FloatingMessage" Property="Foreground" Value="{DynamicResource MahApps.Brushes.TextBlock.FloatingMessage}" />
                             <Setter TargetName="PART_FloatingMessage" Property="Opacity" Value="1" />
                         </Trigger>
                         <Trigger Property="IsKeyboardFocusWithin" Value="True">
-                            <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.FocusBorderBrush)}" />
+                            <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.FocusBorderBrush)}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter TargetName="DisabledVisualElement" Property="Opacity" Value="0.6" />
@@ -469,14 +447,14 @@
                             <Setter TargetName="PART_Calendar" Property="Visibility" Value="Visible" />
                         </Trigger>
 
-                        <Trigger Property="Controls:TextBoxHelper.ButtonCommand" Value="{x:Null}">
+                        <Trigger Property="mah:TextBoxHelper.ButtonCommand" Value="{x:Null}">
                             <Setter TargetName="PART_ClearText" Property="Visibility" Value="Collapsed" />
                         </Trigger>
 
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsReadOnly" Value="True" />
-                                <Condition Property="Controls:TextBoxHelper.ButtonCommand" Value="{x:Null}" />
+                                <Condition Property="mah:TextBoxHelper.ButtonCommand" Value="{x:Null}" />
                             </MultiTrigger.Conditions>
                             <Setter TargetName="PART_ClearText" Property="IsEnabled" Value="False" />
                         </MultiTrigger>
@@ -492,8 +470,8 @@
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
                                 <Condition Binding="{Binding Path=IsVisible, RelativeSource={RelativeSource Self}}" Value="True" />
-                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
-                                <Condition Binding="{Binding Path=(Controls:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(mah:TextBoxHelper.UseFloatingWatermark), RelativeSource={RelativeSource Self}}" Value="True" />
+                                <Condition Binding="{Binding Path=(mah:TextBoxHelper.HasText), RelativeSource={RelativeSource Self}}" Value="True" />
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.EnterActions>
                                 <BeginStoryboard Storyboard="{DynamicResource MahApps.Storyboard.ShowFloatingMessage}" />
@@ -508,16 +486,38 @@
             </Setter.Value>
         </Setter>
         <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource MahApps.Templates.ValidationError}" />
+        <Setter Property="mah:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border.Focus}" />
+        <Setter Property="mah:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border.MouseOver}" />
+        <Setter Property="mah:DatePickerHelper.DropDownButtonContent" Value="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" />
+        <Setter Property="mah:DatePickerHelper.DropDownButtonContentTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <!--  Modern - Calendar14  -->
+                    <ContentControl x:Name="PART_PackIcon"
+                                    Width="{Binding RelativeSource={RelativeSource AncestorType={x:Type mah:TimePickerBase}}, Path=(mah:TextBoxHelper.ButtonWidth), Mode=OneWay}"
+                                    Height="{Binding RelativeSource={RelativeSource AncestorType={x:Type mah:TimePickerBase}}, Path=(mah:TextBoxHelper.ButtonWidth), Mode=OneWay}"
+                                    Padding="3"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Content="{Binding Mode=OneWay}"
+                                    Style="{DynamicResource MahApps.Styles.ContentControl.PathIcon}" />
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="mah:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Font.Size.Button.ClearText}" />
+        <Setter Property="mah:TextBoxHelper.ButtonTemplate" Value="{DynamicResource MahApps.Templates.Button.Chromeless}" />
+        <Setter Property="mah:TextBoxHelper.ButtonWidth" Value="22" />
+        <Setter Property="mah:TextBoxHelper.IsMonitoring" Value="True" />
     </Style>
 
-    <Style BasedOn="{StaticResource MahApps.Styles.TimePickerBase}" TargetType="{x:Type Controls:DateTimePicker}">
+    <Style BasedOn="{StaticResource MahApps.Styles.TimePickerBase}" TargetType="{x:Type mah:DateTimePicker}">
         <Setter Property="CalendarStyle" Value="{DynamicResource MahApps.Styles.Calendar.DateTimePicker}" />
-        <Setter Property="Controls:TextBoxHelper.Watermark" Value="Select a date" />
         <Setter Property="IsTodayHighlighted" Value="True" />
+        <Setter Property="mah:TextBoxHelper.Watermark" Value="Select a date" />
     </Style>
 
-    <Style BasedOn="{StaticResource MahApps.Styles.TimePickerBase}" TargetType="{x:Type Controls:TimePicker}">
-        <Setter Property="Controls:DatePickerHelper.DropDownButtonContent" Value="M12,20A8,8 0 0,0 20,12A8,8 0 0,0 12,4A8,8 0 0,0 4,12A8,8 0 0,0 12,20M12,2A10,10 0 0,1 22,12A10,10 0 0,1 12,22C6.47,22 2,17.5 2,12A10,10 0 0,1 12,2M12.5,7V12.25L17,14.92L16.25,16.15L11,13V7H12.5Z" />
-        <Setter Property="Controls:TextBoxHelper.Watermark" Value="Select a time" />
+    <Style BasedOn="{StaticResource MahApps.Styles.TimePickerBase}" TargetType="{x:Type mah:TimePicker}">
+        <Setter Property="mah:DatePickerHelper.DropDownButtonContent" Value="M12,20A8,8 0 0,0 20,12A8,8 0 0,0 12,4A8,8 0 0,0 4,12A8,8 0 0,0 12,20M12,2A10,10 0 0,1 22,12A10,10 0 0,1 12,22C6.47,22 2,17.5 2,12A10,10 0 0,1 12,2M12.5,7V12.25L17,14.92L16.25,16.15L11,13V7H12.5Z" />
+        <Setter Property="mah: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 024b95ab50..dd3166e455 100644
--- a/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml
+++ b/src/MahApps.Metro/Themes/Dialogs/BaseMetroDialog.xaml
@@ -1,8 +1,10 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs"
                     xmlns:mah="clr-namespace:MahApps.Metro.Controls"
-                    xmlns:mahDialogs="clr-namespace:MahApps.Metro.Controls.Dialogs"
-                    xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options">
+                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                    xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
+                    mc:Ignorable="po">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.Buttons.xaml" />
@@ -51,7 +53,7 @@
                          Duration="0:0:0.2" />
     </Storyboard>
 
-    <ControlTemplate x:Key="MahApps.Templates.BaseMetroDialog" TargetType="{x:Type mahDialogs:BaseMetroDialog}">
+    <ControlTemplate x:Key="MahApps.Templates.BaseMetroDialog" TargetType="{x:Type dialogs:BaseMetroDialog}">
         <Grid Background="{TemplateBinding Background}">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
@@ -112,7 +114,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style x:Key="MahApps.Styles.BaseMetroDialog" TargetType="{x:Type mahDialogs:BaseMetroDialog}">
+    <Style x:Key="MahApps.Styles.BaseMetroDialog" TargetType="{x:Type dialogs:BaseMetroDialog}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
         <Setter Property="DialogButtonFontSize" Value="{DynamicResource MahApps.Font.Size.Dialog.Button}" />
         <Setter Property="DialogMessageFontSize" Value="{DynamicResource MahApps.Font.Size.Dialog.Message}" />
diff --git a/src/MahApps.Metro/Themes/DropDownButton.xaml b/src/MahApps.Metro/Themes/DropDownButton.xaml
index 7f9d0a32da..4d60a116ab 100644
--- a/src/MahApps.Metro/Themes/DropDownButton.xaml
+++ b/src/MahApps.Metro/Themes/DropDownButton.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary 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">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
     <Style x:Key="MahApps.Styles.DropDownButton.FocusVisualStyle">
         <Setter Property="Control.Template">
@@ -16,7 +16,7 @@
         </Setter>
     </Style>
 
-    <Style TargetType="{x:Type Controls:DropDownButton}">
+    <Style TargetType="{x:Type mah:DropDownButton}">
         <Setter Property="ArrowBrush" Value="{DynamicResource MahApps.Brushes.ThemeForeground}" />
         <Setter Property="ArrowMouseOverBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="ArrowPressedBrush" Value="{DynamicResource MahApps.Brushes.ThemeForeground}" />
@@ -36,17 +36,17 @@
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Controls:DropDownButton}">
+                <ControlTemplate TargetType="{x:Type mah:DropDownButton}">
                     <Border x:Name="PART_Border"
                             Background="Transparent"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                            CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                             SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
                             UseLayoutRounding="True">
-                        <Controls:ClipBorder x:Name="PART_ClipBorder"
-                                             CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
-                                             SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                        <mah:ClipBorder x:Name="PART_ClipBorder"
+                                        CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
+                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
                             <Button x:Name="PART_Button"
                                     HorizontalAlignment="Stretch"
                                     VerticalAlignment="Stretch"
@@ -86,20 +86,20 @@
                                                           Focusable="False"
                                                           RecognizesAccessKey="True"
                                                           UseLayoutRounding="False" />
-                                        <Controls:ContentControlEx x:Name="PART_ButtonContent"
-                                                                   Padding="{TemplateBinding Padding}"
-                                                                   HorizontalAlignment="Center"
-                                                                   VerticalAlignment="Center"
-                                                                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                                   Content="{Binding Content, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                                                                   ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
-                                                                   ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                                                   ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                                   ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                                   RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
-                                                                   SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                                                   UseLayoutRounding="False" />
+                                        <mah:ContentControlEx x:Name="PART_ButtonContent"
+                                                              Padding="{TemplateBinding Padding}"
+                                                              HorizontalAlignment="Center"
+                                                              VerticalAlignment="Center"
+                                                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                              Content="{Binding Content, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                                              ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
+                                                              ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                              ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                                              RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
+                                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                                              UseLayoutRounding="False" />
                                     </StackPanel>
                                 </DockPanel>
                                 <Button.ContextMenu>
@@ -121,7 +121,7 @@
                                                  UseLayoutRounding="False" />
                                 </Button.ContextMenu>
                             </Button>
-                        </Controls:ClipBorder>
+                        </mah:ClipBorder>
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="Content" Value="{x:Null}">
diff --git a/src/MahApps.Metro/Themes/Flyout.xaml b/src/MahApps.Metro/Themes/Flyout.xaml
index dfa1bd096c..f37fe368aa 100644
--- a/src/MahApps.Metro/Themes/Flyout.xaml
+++ b/src/MahApps.Metro/Themes/Flyout.xaml
@@ -1,8 +1,8 @@
 <ResourceDictionary 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"
                     xmlns:actions="clr-namespace:MahApps.Metro.Actions"
-                    xmlns:i="http://schemas.microsoft.com/xaml/behaviors">
+                    xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
     <DataTemplate x:Key="MahApps.Templates.Flyout.Header" x:Shared="False">
         <DockPanel x:Name="dpHeader"
@@ -14,19 +14,19 @@
                     Margin="2 4 2 2"
                     VerticalAlignment="Bottom"
                     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}"
+                    Foreground="{Binding RelativeSource={RelativeSource AncestorType={x:Type mah:Flyout}}, Path=Foreground}"
+                    IsCancel="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:Flyout}}, Path=CloseButtonIsCancel}"
                     Style="{DynamicResource MahApps.Styles.Button.Circle}"
-                    Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:Flyout}}, Path=CloseButtonVisibility}">
+                    Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:Flyout}}, Path=CloseButtonVisibility}">
                 <i:Interaction.Triggers>
                     <i:EventTrigger EventName="Click">
-                        <actions:CloseFlyoutAction Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type Controls:Flyout}}, Path=CloseCommand, Mode=OneWay}" CommandParameter="{Binding RelativeSource={RelativeSource AncestorType={x:Type Controls:Flyout}}, Path=CloseCommandParameter, Mode=OneWay}" />
+                        <actions:CloseFlyoutAction Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type mah:Flyout}}, Path=CloseCommand, Mode=OneWay}" CommandParameter="{Binding RelativeSource={RelativeSource AncestorType={x:Type mah:Flyout}}, Path=CloseCommandParameter, Mode=OneWay}" />
                     </i:EventTrigger>
                 </i:Interaction.Triggers>
                 <ContentControl Width="20"
                                 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}"
+                                FlowDirection="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:Flyout}}, Path=FlowDirection}"
                                 Style="{DynamicResource MahApps.Styles.ContentControl.PathIcon}" />
             </Button>
             <ContentControl x:Name="PART_BackHeaderText"
@@ -35,10 +35,10 @@
                             Content="{Binding}"
                             Focusable="False"
                             IsTabStop="False"
-                            Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:Flyout}}, Path=TitleVisibility}" />
+                            Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:Flyout}}, Path=TitleVisibility}" />
         </DockPanel>
         <DataTemplate.Triggers>
-            <DataTrigger Binding="{Binding Position, RelativeSource={RelativeSource AncestorType={x:Type Controls:Flyout}}}" Value="Left">
+            <DataTrigger Binding="{Binding Position, RelativeSource={RelativeSource AncestorType={x:Type mah:Flyout}}}" Value="Left">
                 <Setter TargetName="PART_BackButton" Property="DockPanel.Dock" Value="Right" />
                 <Setter TargetName="PART_BackButton" Property="LayoutTransform">
                     <Setter.Value>
@@ -48,14 +48,14 @@
                 <Setter TargetName="PART_BackHeaderText" Property="HorizontalAlignment" Value="Right" />
                 <Setter TargetName="PART_BackHeaderText" Property="Margin" Value="0 0 15 0" />
             </DataTrigger>
-            <DataTrigger Binding="{Binding Position, RelativeSource={RelativeSource AncestorType={x:Type Controls:Flyout}}}" Value="Top">
+            <DataTrigger Binding="{Binding Position, RelativeSource={RelativeSource AncestorType={x:Type mah:Flyout}}}" Value="Top">
                 <Setter TargetName="PART_BackButton" Property="LayoutTransform">
                     <Setter.Value>
                         <RotateTransform Angle="-90" />
                     </Setter.Value>
                 </Setter>
             </DataTrigger>
-            <DataTrigger Binding="{Binding Position, RelativeSource={RelativeSource AncestorType={x:Type Controls:Flyout}}}" Value="Bottom">
+            <DataTrigger Binding="{Binding Position, RelativeSource={RelativeSource AncestorType={x:Type mah:Flyout}}}" Value="Bottom">
                 <Setter TargetName="PART_BackButton" Property="LayoutTransform">
                     <Setter.Value>
                         <RotateTransform Angle="90" />
@@ -65,7 +65,7 @@
         </DataTemplate.Triggers>
     </DataTemplate>
 
-    <ControlTemplate x:Key="MahApps.Templates.Flyout" TargetType="{x:Type Controls:Flyout}">
+    <ControlTemplate x:Key="MahApps.Templates.Flyout" TargetType="{x:Type mah:Flyout}">
         <Border x:Name="PART_Root"
                 Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
@@ -75,19 +75,19 @@
             </Border.RenderTransform>
             <AdornerDecorator>
                 <DockPanel FocusVisualStyle="{x:Null}" Focusable="False">
-                    <Controls:MetroThumbContentControl x:Name="PART_Header"
-                                                       Padding="{TemplateBinding Controls:HeaderedControlHelper.HeaderMargin}"
-                                                       Content="{TemplateBinding Header}"
-                                                       ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
-                                                       ContentStringFormat="{TemplateBinding HeaderStringFormat}"
-                                                       ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                                       ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
-                                                       DockPanel.Dock="Top"
-                                                       FontFamily="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontFamily}"
-                                                       FontSize="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontSize}"
-                                                       FontStretch="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontStretch}"
-                                                       FontWeight="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontWeight}"
-                                                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                    <mah:MetroThumbContentControl x:Name="PART_Header"
+                                                  Padding="{TemplateBinding mah:HeaderedControlHelper.HeaderMargin}"
+                                                  Content="{TemplateBinding Header}"
+                                                  ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
+                                                  ContentStringFormat="{TemplateBinding HeaderStringFormat}"
+                                                  ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                                  ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
+                                                  DockPanel.Dock="Top"
+                                                  FontFamily="{TemplateBinding mah:HeaderedControlHelper.HeaderFontFamily}"
+                                                  FontSize="{TemplateBinding mah:HeaderedControlHelper.HeaderFontSize}"
+                                                  FontStretch="{TemplateBinding mah:HeaderedControlHelper.HeaderFontStretch}"
+                                                  FontWeight="{TemplateBinding mah:HeaderedControlHelper.HeaderFontWeight}"
+                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                     <ContentPresenter x:Name="PART_Content"
                                       ContentSource="Content"
                                       DockPanel.Dock="Bottom" />
@@ -218,11 +218,9 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style x:Key="MahApps.Styles.Flyout" TargetType="{x:Type Controls:Flyout}">
+    <Style x:Key="MahApps.Styles.Flyout" TargetType="{x:Type mah:Flyout}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Flyout.Background}" />
         <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Controls:HeaderedControlHelper.HeaderFontSize" Value="{DynamicResource MahApps.Font.Size.Flyout.Header}" />
-        <Setter Property="Controls:HeaderedControlHelper.HeaderMargin" Value="10" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Flyout.Foreground}" />
         <Setter Property="HeaderTemplate" Value="{StaticResource MahApps.Templates.Flyout.Header}" />
@@ -233,12 +231,14 @@
         <Setter Property="Template" Value="{StaticResource MahApps.Templates.Flyout}" />
         <Setter Property="VerticalAlignment" Value="Stretch" />
         <Setter Property="Visibility" Value="Hidden" />
+        <Setter Property="mah:HeaderedControlHelper.HeaderFontSize" Value="{DynamicResource MahApps.Font.Size.Flyout.Header}" />
+        <Setter Property="mah:HeaderedControlHelper.HeaderMargin" Value="10" />
         <Style.Triggers>
             <Trigger Property="Position" Value="Right">
-                <Setter Property="Controls:HeaderedControlHelper.HeaderMargin" Value="10 25 10 10" />
+                <Setter Property="mah:HeaderedControlHelper.HeaderMargin" Value="10 25 10 10" />
             </Trigger>
             <Trigger Property="Position" Value="Left">
-                <Setter Property="Controls:HeaderedControlHelper.HeaderMargin" Value="10 25 10 10" />
+                <Setter Property="mah:HeaderedControlHelper.HeaderMargin" Value="10 25 10 10" />
             </Trigger>
         </Style.Triggers>
     </Style>
diff --git a/src/MahApps.Metro/Themes/FlyoutsControl.xaml b/src/MahApps.Metro/Themes/FlyoutsControl.xaml
index e7dc8c9cb0..284ecb3795 100644
--- a/src/MahApps.Metro/Themes/FlyoutsControl.xaml
+++ b/src/MahApps.Metro/Themes/FlyoutsControl.xaml
@@ -1,8 +1,8 @@
 <ResourceDictionary 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">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
-    <Style TargetType="{x:Type Controls:FlyoutsControl}">
+    <Style TargetType="{x:Type mah:FlyoutsControl}">
         <Setter Property="Focusable" Value="False" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="ItemsPanel">
diff --git a/src/MahApps.Metro/Themes/FontIcon.xaml b/src/MahApps.Metro/Themes/FontIcon.xaml
index b9bd66afc0..be7407b10a 100644
--- a/src/MahApps.Metro/Themes/FontIcon.xaml
+++ b/src/MahApps.Metro/Themes/FontIcon.xaml
@@ -1,8 +1,8 @@
 <ResourceDictionary 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">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
-    <Style TargetType="{x:Type controls:FontIcon}">
+    <Style TargetType="{x:Type mah:FontIcon}">
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Family.SymbolTheme}" />
@@ -14,7 +14,7 @@
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:FontIcon}">
+                <ControlTemplate TargetType="{x:Type mah:FontIcon}">
                     <Grid SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
                         <TextBlock HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
diff --git a/src/MahApps.Metro/Themes/HamburgerMenu.xaml b/src/MahApps.Metro/Themes/HamburgerMenu.xaml
index ab269863c8..4e9c58f99d 100644
--- a/src/MahApps.Metro/Themes/HamburgerMenu.xaml
+++ b/src/MahApps.Metro/Themes/HamburgerMenu.xaml
@@ -1,12 +1,12 @@
 <ResourceDictionary 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">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Themes/HamburgerMenuTemplate.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <Style x:Key="MahApps.Styles.HamburgerMenu" TargetType="{x:Type Controls:HamburgerMenu}">
+    <Style x:Key="MahApps.Styles.HamburgerMenu" TargetType="{x:Type mah:HamburgerMenu}">
         <Setter Property="CanResizeOpenPane" Value="False" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="Focusable" Value="False" />
@@ -44,7 +44,7 @@
 
     <Style x:Key="MahApps.Styles.HamburgerMenu.CreatorsUpdate"
            BasedOn="{StaticResource MahApps.Styles.HamburgerMenu}"
-           TargetType="{x:Type Controls:HamburgerMenu}">
+           TargetType="{x:Type mah:HamburgerMenu}">
         <Setter Property="ItemContainerStyle" Value="{StaticResource MahApps.Styles.ListBoxItem.HamburgerMenuItem.CreatorsUpdate}" />
         <Setter Property="OptionsItemContainerStyle" Value="{StaticResource MahApps.Styles.ListBoxItem.HamburgerMenuItem.CreatorsUpdate}" />
         <Setter Property="PaneBackground" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
diff --git a/src/MahApps.Metro/Themes/HamburgerMenuTemplate.xaml b/src/MahApps.Metro/Themes/HamburgerMenuTemplate.xaml
index 0112082f48..5c76092d1a 100644
--- a/src/MahApps.Metro/Themes/HamburgerMenuTemplate.xaml
+++ b/src/MahApps.Metro/Themes/HamburgerMenuTemplate.xaml
@@ -1,10 +1,10 @@
 <ResourceDictionary 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"
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls"
                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                    xmlns:options="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
+                    xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
                     xmlns:system="clr-namespace:System;assembly=mscorlib"
-                    mc:Ignorable="options">
+                    mc:Ignorable="po">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.Buttons.xaml" />
@@ -18,8 +18,8 @@
     <system:Double x:Key="HamburgerMenuSelectionIndicatorThemeHeight">24</system:Double>
 
     <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-    <Controls:HamburgerMenuItemStyleSelector x:Key="HamburgerMenuItemStyleSelector" />
-    <Controls:HamburgerMenuItemStyleSelector x:Key="HamburgerMenuItemOptionsStyleSelector" IsItemOptions="True" />
+    <mah:HamburgerMenuItemStyleSelector x:Key="HamburgerMenuItemStyleSelector" />
+    <mah:HamburgerMenuItemStyleSelector x:Key="HamburgerMenuItemOptionsStyleSelector" IsItemOptions="True" />
 
     <Style x:Key="MahApps.Styles.Button.Hamburger"
            BasedOn="{StaticResource MahApps.Styles.Button.Chromeless}"
@@ -40,7 +40,7 @@
                                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                           Opacity="0.75"
-                                          RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
+                                          RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
                                           SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                     </Grid>
                     <ControlTemplate.Triggers>
@@ -64,7 +64,7 @@
 
     <QuinticEase x:Key="ScrollBarEaseInOut"
                  EasingMode="EaseInOut"
-                 options:Freeze="true" />
+                 po:Freeze="true" />
 
     <Style x:Key="MahApps.Styles.ScrollViewer.Hamburger"
            BasedOn="{StaticResource MahApps.Styles.ScrollViewer}"
@@ -119,7 +119,7 @@
                                    Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" />
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="Controls:ScrollViewerHelper.VerticalScrollBarOnLeftSide" Value="True">
+                        <Trigger Property="mah:ScrollViewerHelper.VerticalScrollBarOnLeftSide" Value="True">
                             <Setter TargetName="PART_HorizontalScrollBar" Property="Grid.Column" Value="1" />
                             <Setter TargetName="PART_ScrollContentPresenter" Property="Grid.Column" Value="1" />
                             <Setter TargetName="PART_VerticalScrollBar" Property="HorizontalAlignment" Value="Left" />
@@ -131,7 +131,7 @@
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsVisible}" Value="True" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}" Value="True" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=ComputedVerticalScrollBarVisibility}" Value="Visible" />
-                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:SplitView}}, Path=IsPaneOpen}" Value="True" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:SplitView}}, Path=IsPaneOpen}" Value="True" />
                             </MultiDataTrigger.Conditions>
                             <TriggerBase.EnterActions>
                                 <BeginStoryboard>
@@ -197,10 +197,8 @@
     <Style x:Key="MahApps.Styles.ListBoxItem.HamburgerMenuItem"
            BasedOn="{StaticResource MahApps.Styles.ListBoxItem.HamburgerBase}"
            TargetType="{x:Type ListBoxItem}">
-        <Setter Property="Controls:ItemHelper.HoverForegroundBrush" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ItemsControl}}, Path=Foreground, Mode=OneWay}" />
-        <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="IsTabStop" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:HamburgerMenu}}, Path=IsTabStop, Mode=OneWay, FallbackValue=True}" />
+        <Setter Property="FocusVisualStyle" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:HamburgerMenu}}, Path=ItemFocusVisualStyle, Mode=OneWay, FallbackValue={x:Null}}" />
+        <Setter Property="IsTabStop" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:HamburgerMenu}}, Path=IsTabStop, Mode=OneWay, FallbackValue=True}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ListBoxItem}">
@@ -215,7 +213,7 @@
                         <Grid Margin="{TemplateBinding BorderThickness}">
                             <Grid HorizontalAlignment="Left"
                                   VerticalAlignment="Center"
-                                  Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:HamburgerMenu}}, Path=ShowSelectionIndicator, Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                  Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:HamburgerMenu}}, Path=ShowSelectionIndicator, Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}">
                                 <Rectangle x:Name="SelectionIndicator"
                                            Width="{DynamicResource HamburgerMenuSelectionIndicatorThemeWidth}"
                                            Height="{DynamicResource HamburgerMenuSelectionIndicatorThemeHeight}"
@@ -232,9 +230,9 @@
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsSelected" Value="True">
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.SelectedBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.SelectedForegroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="SelectionIndicator" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.SelectedForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.SelectedBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.SelectedForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="SelectionIndicator" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.SelectedForegroundBrush), Mode=OneWay}" />
                             <Setter TargetName="SelectionIndicator" Property="Opacity" Value="1.0" />
                         </Trigger>
                         <MultiTrigger>
@@ -242,9 +240,9 @@
                                 <Condition Property="IsSelected" Value="True" />
                                 <Condition Property="Selector.IsSelectionActive" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.ActiveSelectionBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.ActiveSelectionForegroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="SelectionIndicator" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.ActiveSelectionForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.ActiveSelectionBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.ActiveSelectionForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="SelectionIndicator" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.ActiveSelectionForegroundBrush), Mode=OneWay}" />
                         </MultiTrigger>
 
                         <MultiTrigger>
@@ -252,65 +250,67 @@
                                 <Condition Property="IsMouseOver" Value="True" />
                                 <Condition Property="IsSelected" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.HoverSelectedBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.HoverSelectedForegroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="SelectionIndicator" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.HoverSelectedForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.HoverSelectedBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.HoverSelectedForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="SelectionIndicator" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.HoverSelectedForegroundBrush), Mode=OneWay}" />
                         </MultiTrigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsMouseOver" Value="True" />
                                 <Condition Property="IsSelected" Value="False" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.HoverBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.HoverForegroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="SelectionIndicator" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.HoverForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.HoverBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.HoverForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="SelectionIndicator" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.HoverForegroundBrush), Mode=OneWay}" />
                         </MultiTrigger>
 
-                        <Trigger Property="Controls:ItemHelper.IsMouseLeftButtonPressed" Value="True">
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.MouseLeftButtonPressedBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.MouseLeftButtonPressedForegroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="SelectionIndicator" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.MouseLeftButtonPressedForegroundBrush), Mode=OneWay}" />
+                        <Trigger Property="mah:ItemHelper.IsMouseLeftButtonPressed" Value="True">
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.MouseLeftButtonPressedBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.MouseLeftButtonPressedForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="SelectionIndicator" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.MouseLeftButtonPressedForegroundBrush), Mode=OneWay}" />
                         </Trigger>
-                        <Trigger Property="Controls:ItemHelper.IsMouseRightButtonPressed" Value="True">
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.MouseRightButtonPressedBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.MouseRightButtonPressedForegroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="SelectionIndicator" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.MouseRightButtonPressedForegroundBrush), Mode=OneWay}" />
+                        <Trigger Property="mah:ItemHelper.IsMouseRightButtonPressed" Value="True">
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.MouseRightButtonPressedBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.MouseRightButtonPressedForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="SelectionIndicator" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.MouseRightButtonPressedForegroundBrush), Mode=OneWay}" />
                         </Trigger>
 
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:ItemHelper.DisabledBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.DisabledForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource Self}, Path=(mah:ItemHelper.DisabledBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.DisabledForegroundBrush), Mode=OneWay}" />
                             <Setter TargetName="RootGrid" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Background, Mode=OneWay}" />
-                            <Setter TargetName="SelectionIndicator" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.DisabledForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="SelectionIndicator" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.DisabledForegroundBrush), Mode=OneWay}" />
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsEnabled" Value="False" />
                                 <Condition Property="IsSelected" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:ItemHelper.DisabledSelectedBackgroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.DisabledSelectedForegroundBrush), Mode=OneWay}" />
-                            <Setter TargetName="SelectionIndicator" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ItemHelper.DisabledSelectedForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="Border" Property="Background" Value="{Binding RelativeSource={RelativeSource Self}, Path=(mah:ItemHelper.DisabledSelectedBackgroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.DisabledSelectedForegroundBrush), Mode=OneWay}" />
+                            <Setter TargetName="SelectionIndicator" Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ItemHelper.DisabledSelectedForegroundBrush), Mode=OneWay}" />
                         </MultiTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
+        <Setter Property="mah:ItemHelper.HoverForegroundBrush" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ItemsControl}}, Path=Foreground, Mode=OneWay}" />
+        <Setter Property="mah:ItemHelper.SelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
     </Style>
 
     <Style x:Key="MahApps.Styles.ListBoxItem.HamburgerMenuItem.CreatorsUpdate"
            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}" />
-        <Setter Property="Controls:ItemHelper.DisabledForegroundBrush" Value="{DynamicResource MahApps.Brushes.Gray}" />
-        <Setter Property="Controls:ItemHelper.DisabledSelectedBackgroundBrush" Value="Transparent" />
-        <Setter Property="Controls:ItemHelper.DisabledSelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.Gray}" />
-        <Setter Property="Controls:ItemHelper.HoverBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Gray9}" />
-        <Setter Property="Controls:ItemHelper.HoverSelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Gray9}" />
-        <Setter Property="Controls:ItemHelper.HoverSelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.AccentBase}" />
-        <Setter Property="Controls:ItemHelper.SelectedBackgroundBrush" Value="Transparent" />
-        <Setter Property="Controls:ItemHelper.SelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.AccentBase}" />
+        <Setter Property="mah:ItemHelper.ActiveSelectionBackgroundBrush" Value="Transparent" />
+        <Setter Property="mah:ItemHelper.ActiveSelectionForegroundBrush" Value="{DynamicResource MahApps.Brushes.AccentBase}" />
+        <Setter Property="mah:ItemHelper.DisabledForegroundBrush" Value="{DynamicResource MahApps.Brushes.Gray}" />
+        <Setter Property="mah:ItemHelper.DisabledSelectedBackgroundBrush" Value="Transparent" />
+        <Setter Property="mah:ItemHelper.DisabledSelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.Gray}" />
+        <Setter Property="mah:ItemHelper.HoverBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Gray9}" />
+        <Setter Property="mah:ItemHelper.HoverSelectedBackgroundBrush" Value="{DynamicResource MahApps.Brushes.Gray9}" />
+        <Setter Property="mah:ItemHelper.HoverSelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.AccentBase}" />
+        <Setter Property="mah:ItemHelper.SelectedBackgroundBrush" Value="Transparent" />
+        <Setter Property="mah:ItemHelper.SelectedForegroundBrush" Value="{DynamicResource MahApps.Brushes.AccentBase}" />
     </Style>
 
     <Style x:Key="MahApps.Styles.TextBlock.HamburgerMenuHeader"
@@ -342,7 +342,7 @@
                                    Text="{Binding Label}" />
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding IsPaneOpen, RelativeSource={RelativeSource AncestorType=Controls:HamburgerMenu}}" Value="False">
+                        <DataTrigger Binding="{Binding IsPaneOpen, RelativeSource={RelativeSource AncestorType=mah:HamburgerMenu}}" Value="False">
                             <Setter TargetName="PART_HeaderText" Property="Visibility" Value="Collapsed" />
                         </DataTrigger>
                     </ControlTemplate.Triggers>
@@ -390,7 +390,7 @@
                             BorderThickness="{TemplateBinding BorderThickness}"
                             SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
                         <ScrollViewer Padding="{TemplateBinding Padding}"
-                                      Controls:ScrollViewerHelper.VerticalScrollBarOnLeftSide="{TemplateBinding Controls:ScrollViewerHelper.VerticalScrollBarOnLeftSide}"
+                                      mah:ScrollViewerHelper.VerticalScrollBarOnLeftSide="{TemplateBinding mah:ScrollViewerHelper.VerticalScrollBarOnLeftSide}"
                                       CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
                                       Focusable="False"
                                       HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
@@ -417,24 +417,24 @@
 
     <Style x:Key="MahApps.Styles.HamburgerMenuListBox"
            BasedOn="{StaticResource MahApps.Styles.ListBox.HamburgerMenu}"
-           TargetType="{x:Type Controls:HamburgerMenuListBox}" />
+           TargetType="{x:Type mah:HamburgerMenuListBox}" />
 
-    <ControlTemplate x:Key="MahApps.Templates.HamburgerMenu" TargetType="{x:Type Controls:HamburgerMenu}">
+    <ControlTemplate x:Key="MahApps.Templates.HamburgerMenu" TargetType="{x:Type mah:HamburgerMenu}">
         <Grid>
-            <Controls:SplitView x:Name="MainSplitView"
-                                CanResizeOpenPane="{TemplateBinding CanResizeOpenPane}"
-                                CompactPaneLength="{TemplateBinding CompactPaneLength}"
-                                DisplayMode="{TemplateBinding DisplayMode}"
-                                IsPaneOpen="{Binding IsPaneOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                                IsTabStop="False"
-                                MaximumOpenPaneLength="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=MaximumOpenPaneLength}"
-                                MinimumOpenPaneLength="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=MinimumOpenPaneLength}"
-                                OpenPaneLength="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=OpenPaneLength, Mode=TwoWay}"
-                                PaneBackground="{TemplateBinding PaneBackground}"
-                                PaneForeground="{TemplateBinding PaneForeground}"
-                                PanePlacement="{TemplateBinding PanePlacement}"
-                                ResizeThumbStyle="{TemplateBinding ResizeThumbStyle}">
-                <Controls:SplitView.Pane>
+            <mah:SplitView x:Name="MainSplitView"
+                           CanResizeOpenPane="{TemplateBinding CanResizeOpenPane}"
+                           CompactPaneLength="{TemplateBinding CompactPaneLength}"
+                           DisplayMode="{TemplateBinding DisplayMode}"
+                           IsPaneOpen="{Binding IsPaneOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                           IsTabStop="False"
+                           MaximumOpenPaneLength="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=MaximumOpenPaneLength}"
+                           MinimumOpenPaneLength="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=MinimumOpenPaneLength}"
+                           OpenPaneLength="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=OpenPaneLength, Mode=TwoWay}"
+                           PaneBackground="{TemplateBinding PaneBackground}"
+                           PaneForeground="{TemplateBinding PaneForeground}"
+                           PanePlacement="{TemplateBinding PanePlacement}"
+                           ResizeThumbStyle="{TemplateBinding ResizeThumbStyle}">
+                <mah:SplitView.Pane>
                     <Grid x:Name="PaneGrid" Margin="{TemplateBinding PaneMargin}">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
@@ -463,54 +463,54 @@
                                             ContentTemplate="{TemplateBinding HamburgerMenuHeaderTemplate}"
                                             IsTabStop="False" />
                         </DockPanel>
-                        <Controls:HamburgerMenuListBox x:Name="ButtonsListView"
-                                                       Grid.Row="1"
-                                                       Width="{TemplateBinding OpenPaneLength}"
-                                                       Controls:ScrollViewerHelper.VerticalScrollBarOnLeftSide="{TemplateBinding VerticalScrollBarOnLeftSide}"
-                                                       AutomationProperties.Name="Menu items"
-                                                       Foreground="{TemplateBinding PaneForeground}"
-                                                       IsTextSearchEnabled="False"
-                                                       ItemContainerStyleSelector="{StaticResource HamburgerMenuItemStyleSelector}"
-                                                       ItemTemplate="{TemplateBinding ItemTemplate}"
-                                                       ItemTemplateSelector="{TemplateBinding ItemTemplateSelector}"
-                                                       ItemsSource="{TemplateBinding ItemsSource}"
-                                                       ScrollViewer.VerticalScrollBarVisibility="Auto"
-                                                       SelectedIndex="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedIndex, Mode=TwoWay}"
-                                                       SelectedItem="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedItem, Mode=TwoWay}"
-                                                       SelectionMode="Single"
-                                                       TabIndex="1" />
-                        <Controls:HamburgerMenuListBox x:Name="OptionsListView"
-                                                       Grid.Row="2"
-                                                       Width="{TemplateBinding OpenPaneLength}"
-                                                       Margin="0 20 0 0"
-                                                       VerticalAlignment="Bottom"
-                                                       AutomationProperties.Name="Option items"
-                                                       Foreground="{TemplateBinding PaneForeground}"
-                                                       IsTextSearchEnabled="False"
-                                                       ItemContainerStyleSelector="{StaticResource HamburgerMenuItemOptionsStyleSelector}"
-                                                       ItemTemplate="{TemplateBinding OptionsItemTemplate}"
-                                                       ItemTemplateSelector="{TemplateBinding OptionsItemTemplateSelector}"
-                                                       ItemsSource="{TemplateBinding OptionsItemsSource}"
-                                                       ScrollViewer.VerticalScrollBarVisibility="Disabled"
-                                                       SelectedIndex="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedOptionsIndex, Mode=TwoWay}"
-                                                       SelectedItem="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedOptionsItem, Mode=TwoWay}"
-                                                       SelectionMode="Single"
-                                                       TabIndex="2" />
+                        <mah:HamburgerMenuListBox x:Name="ButtonsListView"
+                                                  Grid.Row="1"
+                                                  Width="{TemplateBinding OpenPaneLength}"
+                                                  mah:ScrollViewerHelper.VerticalScrollBarOnLeftSide="{TemplateBinding VerticalScrollBarOnLeftSide}"
+                                                  AutomationProperties.Name="Menu items"
+                                                  Foreground="{TemplateBinding PaneForeground}"
+                                                  IsTextSearchEnabled="False"
+                                                  ItemContainerStyleSelector="{StaticResource HamburgerMenuItemStyleSelector}"
+                                                  ItemTemplate="{TemplateBinding ItemTemplate}"
+                                                  ItemTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                                                  ItemsSource="{TemplateBinding ItemsSource}"
+                                                  ScrollViewer.VerticalScrollBarVisibility="Auto"
+                                                  SelectedIndex="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedIndex, Mode=TwoWay}"
+                                                  SelectedItem="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedItem, Mode=TwoWay}"
+                                                  SelectionMode="Single"
+                                                  TabIndex="1" />
+                        <mah:HamburgerMenuListBox x:Name="OptionsListView"
+                                                  Grid.Row="2"
+                                                  Width="{TemplateBinding OpenPaneLength}"
+                                                  Margin="0 20 0 0"
+                                                  VerticalAlignment="Bottom"
+                                                  AutomationProperties.Name="Option items"
+                                                  Foreground="{TemplateBinding PaneForeground}"
+                                                  IsTextSearchEnabled="False"
+                                                  ItemContainerStyleSelector="{StaticResource HamburgerMenuItemOptionsStyleSelector}"
+                                                  ItemTemplate="{TemplateBinding OptionsItemTemplate}"
+                                                  ItemTemplateSelector="{TemplateBinding OptionsItemTemplateSelector}"
+                                                  ItemsSource="{TemplateBinding OptionsItemsSource}"
+                                                  ScrollViewer.VerticalScrollBarVisibility="Disabled"
+                                                  SelectedIndex="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedOptionsIndex, Mode=TwoWay}"
+                                                  SelectedItem="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedOptionsItem, Mode=TwoWay}"
+                                                  SelectionMode="Single"
+                                                  TabIndex="2" />
                     </Grid>
-                </Controls:SplitView.Pane>
-                <Controls:TransitioningContentControl x:Name="ContentPart"
-                                                      Padding="{TemplateBinding Padding}"
-                                                      HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                      VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                      AutomationProperties.Name="Content"
-                                                      Content="{TemplateBinding Content}"
-                                                      ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                                      ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                      ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                      RestartTransitionOnContentChange="True"
-                                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                                      Transition="{TemplateBinding ContentTransition}" />
-            </Controls:SplitView>
+                </mah:SplitView.Pane>
+                <mah:TransitioningContentControl x:Name="ContentPart"
+                                                 Padding="{TemplateBinding Padding}"
+                                                 HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                 VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                 AutomationProperties.Name="Content"
+                                                 Content="{TemplateBinding Content}"
+                                                 ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                                 ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                 ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                                 RestartTransitionOnContentChange="True"
+                                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                                 Transition="{TemplateBinding ContentTransition}" />
+            </mah:SplitView>
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="PanePlacement" Value="Right">
diff --git a/src/MahApps.Metro/Themes/HotKeyBox.xaml b/src/MahApps.Metro/Themes/HotKeyBox.xaml
index b3a923e085..8590a22abf 100644
--- a/src/MahApps.Metro/Themes/HotKeyBox.xaml
+++ b/src/MahApps.Metro/Themes/HotKeyBox.xaml
@@ -1,17 +1,13 @@
 <ResourceDictionary 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"
-                    xmlns:Converters="clr-namespace:MahApps.Metro.Converters">
+                    xmlns:converters="clr-namespace:MahApps.Metro.Converters"
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
-    <Style TargetType="{x:Type Controls:HotKeyBox}">
+    <Style TargetType="{x:Type mah:HotKeyBox}">
         <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 MahApps.TextBox.ContextMenu}" />
-        <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Upper" />
-        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border.Focus}" />
-        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border.MouseOver}" />
-        <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Font.Size.Button.ClearText}" />
         <Setter Property="FontFamily" Value="{DynamicResource MahApps.Fonts.Family.Control}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Content}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Text}" />
@@ -22,28 +18,28 @@
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Controls:HotKeyBox}">
+                <ControlTemplate TargetType="{x:Type mah:HotKeyBox}">
                     <TextBox x:Name="PART_TextBox"
                              MinHeight="{TemplateBinding MinHeight}"
                              Margin="0"
                              Padding="{TemplateBinding Padding}"
                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                             Controls:ControlsHelper.FocusBorderBrush="{TemplateBinding Controls:ControlsHelper.FocusBorderBrush}"
-                             Controls:ControlsHelper.MouseOverBorderBrush="{TemplateBinding Controls:ControlsHelper.MouseOverBorderBrush}"
-                             Controls:TextBoxHelper.ButtonContent="{TemplateBinding Controls:TextBoxHelper.ButtonContent}"
-                             Controls:TextBoxHelper.ButtonContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}"
-                             Controls:TextBoxHelper.ButtonFontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}"
-                             Controls:TextBoxHelper.ButtonFontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
-                             Controls:TextBoxHelper.ButtonWidth="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
-                             Controls:TextBoxHelper.ButtonsAlignment="{TemplateBinding Controls:TextBoxHelper.ButtonsAlignment}"
-                             Controls:TextBoxHelper.ClearTextButton="{TemplateBinding Controls:TextBoxHelper.ClearTextButton}"
-                             Controls:TextBoxHelper.IsWaitingForData="{TemplateBinding Controls:TextBoxHelper.IsWaitingForData}"
-                             Controls:TextBoxHelper.SelectAllOnFocus="{TemplateBinding Controls:TextBoxHelper.SelectAllOnFocus}"
-                             Controls:TextBoxHelper.UseFloatingWatermark="{TemplateBinding Controls:TextBoxHelper.UseFloatingWatermark}"
-                             Controls:TextBoxHelper.Watermark="{TemplateBinding Controls:TextBoxHelper.Watermark}"
-                             Controls:TextBoxHelper.WatermarkAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
-                             Controls:TextBoxHelper.WatermarkTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
+                             mah:ControlsHelper.FocusBorderBrush="{TemplateBinding mah:ControlsHelper.FocusBorderBrush}"
+                             mah:ControlsHelper.MouseOverBorderBrush="{TemplateBinding mah:ControlsHelper.MouseOverBorderBrush}"
+                             mah:TextBoxHelper.ButtonContent="{TemplateBinding mah:TextBoxHelper.ButtonContent}"
+                             mah:TextBoxHelper.ButtonContentTemplate="{TemplateBinding mah:TextBoxHelper.ButtonContentTemplate}"
+                             mah:TextBoxHelper.ButtonFontFamily="{TemplateBinding mah:TextBoxHelper.ButtonFontFamily}"
+                             mah:TextBoxHelper.ButtonFontSize="{TemplateBinding mah:TextBoxHelper.ButtonFontSize}"
+                             mah:TextBoxHelper.ButtonWidth="{TemplateBinding mah:TextBoxHelper.ButtonWidth}"
+                             mah:TextBoxHelper.ButtonsAlignment="{TemplateBinding mah:TextBoxHelper.ButtonsAlignment}"
+                             mah:TextBoxHelper.ClearTextButton="{TemplateBinding mah:TextBoxHelper.ClearTextButton}"
+                             mah:TextBoxHelper.IsWaitingForData="{TemplateBinding mah:TextBoxHelper.IsWaitingForData}"
+                             mah:TextBoxHelper.SelectAllOnFocus="{TemplateBinding mah:TextBoxHelper.SelectAllOnFocus}"
+                             mah:TextBoxHelper.UseFloatingWatermark="{TemplateBinding mah:TextBoxHelper.UseFloatingWatermark}"
+                             mah:TextBoxHelper.Watermark="{TemplateBinding mah:TextBoxHelper.Watermark}"
+                             mah:TextBoxHelper.WatermarkAlignment="{TemplateBinding mah:TextBoxHelper.WatermarkAlignment}"
+                             mah:TextBoxHelper.WatermarkTrimming="{TemplateBinding mah:TextBoxHelper.WatermarkTrimming}"
                              Background="{TemplateBinding Background}"
                              BorderBrush="{TemplateBinding BorderBrush}"
                              BorderThickness="{TemplateBinding BorderThickness}"
@@ -59,19 +55,23 @@
                              Validation.ErrorTemplate="{TemplateBinding Validation.ErrorTemplate}"
                              VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" />
                     <ControlTemplate.Triggers>
-                        <Trigger Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Normal">
+                        <Trigger Property="mah:ControlsHelper.ContentCharacterCasing" Value="Normal">
                             <Setter TargetName="PART_TextBox" Property="Text" Value="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=Text, Mode=OneWay}" />
                         </Trigger>
-                        <Trigger Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Upper">
-                            <Setter TargetName="PART_TextBox" Property="Text" Value="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=Text, Converter={Converters:ToUpperConverter}, Mode=OneWay}" />
+                        <Trigger Property="mah:ControlsHelper.ContentCharacterCasing" Value="Upper">
+                            <Setter TargetName="PART_TextBox" Property="Text" Value="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=Text, Converter={converters:ToUpperConverter}, Mode=OneWay}" />
                         </Trigger>
-                        <Trigger Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Lower">
-                            <Setter TargetName="PART_TextBox" Property="Text" Value="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=Text, Converter={Converters:ToLowerConverter}, Mode=OneWay}" />
+                        <Trigger Property="mah:ControlsHelper.ContentCharacterCasing" Value="Lower">
+                            <Setter TargetName="PART_TextBox" Property="Text" Value="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=Text, Converter={converters:ToLowerConverter}, Mode=OneWay}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
         <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource MahApps.Templates.ValidationError}" />
+        <Setter Property="mah:ControlsHelper.ContentCharacterCasing" Value="Upper" />
+        <Setter Property="mah:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border.Focus}" />
+        <Setter Property="mah:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border.MouseOver}" />
+        <Setter Property="mah:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Font.Size.Button.ClearText}" />
     </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Themes/MetroAnimatedTabControl.xaml b/src/MahApps.Metro/Themes/MetroAnimatedTabControl.xaml
index 141489d4a6..b619ca5c7a 100644
--- a/src/MahApps.Metro/Themes/MetroAnimatedTabControl.xaml
+++ b/src/MahApps.Metro/Themes/MetroAnimatedTabControl.xaml
@@ -1,17 +1,16 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:Behaviors="clr-namespace:MahApps.Metro.Behaviors"
-                    xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
+                    xmlns:behaviors="clr-namespace:MahApps.Metro.Behaviors"
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.TabControl.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <Style BasedOn="{StaticResource MahApps.Styles.TabControl}" TargetType="{x:Type Controls:MetroAnimatedTabControl}">
-        <Setter Property="Controls:TabControlHelper.Transition" Value="Left" />
+    <Style BasedOn="{StaticResource MahApps.Styles.TabControl}" TargetType="{x:Type mah:MetroAnimatedTabControl}">
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Controls:MetroAnimatedTabControl}">
+                <ControlTemplate TargetType="{x:Type mah:MetroAnimatedTabControl}">
                     <Grid>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition x:Name="ColumnDefinition0" />
@@ -26,13 +25,13 @@
                               Grid.Column="0"
                               Margin="{TemplateBinding TabStripMargin}"
                               Panel.ZIndex="1">
-                            <Controls:Underline x:Name="Underline"
-                                                Background="Transparent"
-                                                BorderBrush="{TemplateBinding Controls:TabControlHelper.UnderlineBrush}"
-                                                LineThickness="1"
-                                                Placement="Bottom"
-                                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                                Visibility="Collapsed" />
+                            <mah:Underline x:Name="Underline"
+                                           Background="Transparent"
+                                           BorderBrush="{TemplateBinding mah:TabControlHelper.UnderlineBrush}"
+                                           LineThickness="1"
+                                           Placement="Bottom"
+                                           SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                           Visibility="Collapsed" />
                             <TabPanel x:Name="HeaderPanel"
                                       IsItemsHost="true"
                                       KeyboardNavigation.TabIndex="1" />
@@ -48,20 +47,20 @@
                                 KeyboardNavigation.TabIndex="2"
                                 KeyboardNavigation.TabNavigation="Local"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                            <Controls:TransitioningContentControl Behaviors:ReloadBehavior.OnSelectedTabChanged="True"
-                                                                  RestartTransitionOnContentChange="True"
-                                                                  Transition="{TemplateBinding Controls:TabControlHelper.Transition}"
-                                                                  UseLayoutRounding="True">
+                            <mah:TransitioningContentControl behaviors:ReloadBehavior.OnSelectedTabChanged="True"
+                                                             RestartTransitionOnContentChange="True"
+                                                             Transition="{TemplateBinding mah:TabControlHelper.Transition}"
+                                                             UseLayoutRounding="True">
                                 <ContentPresenter x:Name="PART_SelectedContentHost"
                                                   Margin="{TemplateBinding Padding}"
                                                   ContentSource="SelectedContent"
                                                   SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
                                                   UseLayoutRounding="False" />
-                            </Controls:TransitioningContentControl>
+                            </mah:TransitioningContentControl>
                         </Border>
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="Controls:TabControlHelper.Underlined" Value="TabPanel">
+                        <Trigger Property="mah:TabControlHelper.Underlined" Value="TabPanel">
                             <Setter TargetName="Underline" Property="Visibility" Value="Visible" />
                         </Trigger>
                         <Trigger Property="TabStripPlacement" Value="Bottom">
@@ -100,6 +99,7 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
+        <Setter Property="mah:TabControlHelper.Transition" Value="Left" />
     </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Themes/MetroContentControl.xaml b/src/MahApps.Metro/Themes/MetroContentControl.xaml
index e81678f84e..90caf450bb 100644
--- a/src/MahApps.Metro/Themes/MetroContentControl.xaml
+++ b/src/MahApps.Metro/Themes/MetroContentControl.xaml
@@ -1,15 +1,15 @@
 <ResourceDictionary 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">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
-    <Style TargetType="{x:Type Controls:MetroContentControl}">
+    <Style TargetType="{x:Type mah:MetroContentControl}">
         <Setter Property="Focusable" Value="False" />
         <Setter Property="Foreground" Value="#FF000000" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="Controls:MetroContentControl">
+                <ControlTemplate TargetType="mah:MetroContentControl">
                     <Grid x:Name="RootGrid"
                           Opacity="0"
                           RenderTransformOrigin="0.5,0.5">
diff --git a/src/MahApps.Metro/Themes/MetroHeader.xaml b/src/MahApps.Metro/Themes/MetroHeader.xaml
index ee8ae796bc..461e504432 100644
--- a/src/MahApps.Metro/Themes/MetroHeader.xaml
+++ b/src/MahApps.Metro/Themes/MetroHeader.xaml
@@ -1,41 +1,37 @@
 <ResourceDictionary 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">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
-    <Style x:Key="MahApps.Styles.MetroHeader" TargetType="{x:Type Controls:MetroHeader}">
-        <Setter Property="Controls:HeaderedControlHelper.HeaderBackground" Value="{Binding RelativeSource={RelativeSource Self}, Path=Background, Mode=OneWay}" />
-        <Setter Property="Controls:HeaderedControlHelper.HeaderFontSize" Value="{DynamicResource MahApps.Font.Size.Default}" />
-        <Setter Property="Controls:HeaderedControlHelper.HeaderForeground" Value="{Binding RelativeSource={RelativeSource Self}, Path=Foreground, Mode=OneWay}" />
-        <Setter Property="Controls:HeaderedControlHelper.HeaderMargin" Value="0 0 0 2" />
+    <Style x:Key="MahApps.Styles.MetroHeader" TargetType="{x:Type mah:MetroHeader}">
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Controls:MetroHeader}">
+                <ControlTemplate TargetType="{x:Type mah:MetroHeader}">
                     <Grid Background="Transparent" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="*" />
                         </Grid.RowDefinitions>
-                        <Grid Grid.Row="0" Background="{TemplateBinding Controls:HeaderedControlHelper.HeaderBackground}">
-                            <Controls:ContentControlEx x:Name="PART_Header"
-                                                       Margin="{TemplateBinding Controls:HeaderedControlHelper.HeaderMargin}"
-                                                       HorizontalAlignment="{TemplateBinding Controls:HeaderedControlHelper.HeaderHorizontalContentAlignment}"
-                                                       VerticalAlignment="{TemplateBinding Controls:HeaderedControlHelper.HeaderVerticalContentAlignment}"
-                                                       Content="{TemplateBinding Header}"
-                                                       ContentCharacterCasing="{TemplateBinding Controls:ControlsHelper.ContentCharacterCasing}"
-                                                       ContentStringFormat="{TemplateBinding HeaderStringFormat}"
-                                                       ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                                       ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
-                                                       FontFamily="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontFamily}"
-                                                       FontSize="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontSize}"
-                                                       FontStretch="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontStretch}"
-                                                       FontWeight="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontWeight}"
-                                                       Foreground="{TemplateBinding Controls:HeaderedControlHelper.HeaderForeground}"
-                                                       IsTabStop="False"
-                                                       RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
-                                                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <Grid Grid.Row="0" Background="{TemplateBinding mah:HeaderedControlHelper.HeaderBackground}">
+                            <mah:ContentControlEx x:Name="PART_Header"
+                                                  Margin="{TemplateBinding mah:HeaderedControlHelper.HeaderMargin}"
+                                                  HorizontalAlignment="{TemplateBinding mah:HeaderedControlHelper.HeaderHorizontalContentAlignment}"
+                                                  VerticalAlignment="{TemplateBinding mah:HeaderedControlHelper.HeaderVerticalContentAlignment}"
+                                                  Content="{TemplateBinding Header}"
+                                                  ContentCharacterCasing="{TemplateBinding mah:ControlsHelper.ContentCharacterCasing}"
+                                                  ContentStringFormat="{TemplateBinding HeaderStringFormat}"
+                                                  ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                                  ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
+                                                  FontFamily="{TemplateBinding mah:HeaderedControlHelper.HeaderFontFamily}"
+                                                  FontSize="{TemplateBinding mah:HeaderedControlHelper.HeaderFontSize}"
+                                                  FontStretch="{TemplateBinding mah:HeaderedControlHelper.HeaderFontStretch}"
+                                                  FontWeight="{TemplateBinding mah:HeaderedControlHelper.HeaderFontWeight}"
+                                                  Foreground="{TemplateBinding mah:HeaderedControlHelper.HeaderForeground}"
+                                                  IsTabStop="False"
+                                                  RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
+                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Grid>
                         <Grid Grid.Row="1" Background="{TemplateBinding Background}">
                             <ContentPresenter x:Name="PART_Content"
@@ -50,6 +46,10 @@
             </Setter.Value>
         </Setter>
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
+        <Setter Property="mah:HeaderedControlHelper.HeaderBackground" Value="{Binding RelativeSource={RelativeSource Self}, Path=Background, Mode=OneWay}" />
+        <Setter Property="mah:HeaderedControlHelper.HeaderFontSize" Value="{DynamicResource MahApps.Font.Size.Default}" />
+        <Setter Property="mah:HeaderedControlHelper.HeaderForeground" Value="{Binding RelativeSource={RelativeSource Self}, Path=Foreground, Mode=OneWay}" />
+        <Setter Property="mah:HeaderedControlHelper.HeaderMargin" Value="0 0 0 2" />
     </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Themes/MetroProgressBar.xaml b/src/MahApps.Metro/Themes/MetroProgressBar.xaml
index 138f57f157..8a404173d9 100644
--- a/src/MahApps.Metro/Themes/MetroProgressBar.xaml
+++ b/src/MahApps.Metro/Themes/MetroProgressBar.xaml
@@ -1,11 +1,11 @@
 <ResourceDictionary 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"
-                    xmlns:System="clr-namespace:System;assembly=mscorlib">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib">
 
-    <System:Double x:Key="MahApps.Sizes.ProgressBar.MinHeight">6</System:Double>
+    <system:Double x:Key="MahApps.Sizes.ProgressBar.MinHeight">6</system:Double>
 
-    <Style x:Key="MahApps.Styles.MetroProgressBar" TargetType="{x:Type Controls:MetroProgressBar}">
+    <Style x:Key="MahApps.Styles.MetroProgressBar" TargetType="{x:Type mah:MetroProgressBar}">
         <Setter Property="Background" Value="#1FFFFFFF" />
         <Setter Property="BorderBrush" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />
@@ -15,7 +15,7 @@
         <Setter Property="MinHeight" Value="{StaticResource MahApps.Sizes.ProgressBar.MinHeight}" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Controls:MetroProgressBar}">
+                <ControlTemplate TargetType="{x:Type mah:MetroProgressBar}">
                     <ControlTemplate.Resources>
                         <Storyboard x:Key="IndeterminateStoryboard" RepeatBehavior="Forever">
                             <DoubleAnimation x:Name="MainDoubleAnim"
diff --git a/src/MahApps.Metro/Themes/MetroTabControl.xaml b/src/MahApps.Metro/Themes/MetroTabControl.xaml
index ff757f7375..cca40a5f90 100644
--- a/src/MahApps.Metro/Themes/MetroTabControl.xaml
+++ b/src/MahApps.Metro/Themes/MetroTabControl.xaml
@@ -1,13 +1,13 @@
 <ResourceDictionary 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">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.TabControl.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
     <!--  Keep the VisualTree in Memory when changing tabs  -->
-    <ControlTemplate x:Key="MahApps.Templates.MetroTabControl.KeepVisualTreeInMemory" TargetType="{x:Type Controls:MetroTabControl}">
+    <ControlTemplate x:Key="MahApps.Templates.MetroTabControl.KeepVisualTreeInMemory" TargetType="{x:Type mah:MetroTabControl}">
         <Grid>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition x:Name="ColumnDefinition0" />
@@ -22,13 +22,13 @@
                   Grid.Column="0"
                   Margin="{TemplateBinding TabStripMargin}"
                   Panel.ZIndex="1">
-                <Controls:Underline x:Name="Underline"
-                                    Background="Transparent"
-                                    BorderBrush="{TemplateBinding Controls:TabControlHelper.UnderlineBrush}"
-                                    LineThickness="1"
-                                    Placement="Bottom"
-                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                    Visibility="Collapsed" />
+                <mah:Underline x:Name="Underline"
+                               Background="Transparent"
+                               BorderBrush="{TemplateBinding mah:TabControlHelper.UnderlineBrush}"
+                               LineThickness="1"
+                               Placement="Bottom"
+                               SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                               Visibility="Collapsed" />
                 <TabPanel x:Name="HeaderPanel"
                           IsItemsHost="true"
                           KeyboardNavigation.TabIndex="1" />
@@ -48,7 +48,7 @@
             </Border>
         </Grid>
         <ControlTemplate.Triggers>
-            <Trigger Property="Controls:TabControlHelper.Underlined" Value="TabPanel">
+            <Trigger Property="mah:TabControlHelper.Underlined" Value="TabPanel">
                 <Setter TargetName="Underline" Property="Visibility" Value="Visible" />
             </Trigger>
             <Trigger Property="TabStripPlacement" Value="Bottom">
@@ -84,7 +84,7 @@
     </ControlTemplate>
 
     <!--  Do not keep the VisualTree in Memory when changing tabs  -->
-    <ControlTemplate x:Key="MahApps.Templates.MetroTabControl.DoNotKeepVisualTreeInMemory" TargetType="{x:Type Controls:MetroTabControl}">
+    <ControlTemplate x:Key="MahApps.Templates.MetroTabControl.DoNotKeepVisualTreeInMemory" TargetType="{x:Type mah:MetroTabControl}">
         <Grid>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition x:Name="ColumnDefinition0" />
@@ -99,13 +99,13 @@
                   Grid.Column="0"
                   Margin="{TemplateBinding TabStripMargin}"
                   Panel.ZIndex="1">
-                <Controls:Underline x:Name="Underline"
-                                    Background="Transparent"
-                                    BorderBrush="{TemplateBinding Controls:TabControlHelper.UnderlineBrush}"
-                                    LineThickness="1"
-                                    Placement="Bottom"
-                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                    Visibility="Collapsed" />
+                <mah:Underline x:Name="Underline"
+                               Background="Transparent"
+                               BorderBrush="{TemplateBinding mah:TabControlHelper.UnderlineBrush}"
+                               LineThickness="1"
+                               Placement="Bottom"
+                               SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                               Visibility="Collapsed" />
                 <TabPanel x:Name="HeaderPanel"
                           IsItemsHost="true"
                           KeyboardNavigation.TabIndex="1" />
@@ -126,7 +126,7 @@
             </Border>
         </Grid>
         <ControlTemplate.Triggers>
-            <Trigger Property="Controls:TabControlHelper.Underlined" Value="TabPanel">
+            <Trigger Property="mah:TabControlHelper.Underlined" Value="TabPanel">
                 <Setter TargetName="Underline" Property="Visibility" Value="Visible" />
             </Trigger>
             <Trigger Property="TabStripPlacement" Value="Bottom">
@@ -161,9 +161,9 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style x:Key="{x:Type Controls:MetroTabControl}"
+    <Style x:Key="{x:Type mah:MetroTabControl}"
            BasedOn="{StaticResource MahApps.Styles.TabControl}"
-           TargetType="{x:Type Controls:MetroTabControl}">
+           TargetType="{x:Type mah:MetroTabControl}">
         <Setter Property="Template" Value="{StaticResource MahApps.Templates.MetroTabControl.DoNotKeepVisualTreeInMemory}" />
         <Style.Triggers>
             <Trigger Property="KeepVisualTreeInMemoryWhenChangingTabs" Value="True">
diff --git a/src/MahApps.Metro/Themes/MetroTabItem.xaml b/src/MahApps.Metro/Themes/MetroTabItem.xaml
index f6f6fcc320..9d0d9884ae 100644
--- a/src/MahApps.Metro/Themes/MetroTabItem.xaml
+++ b/src/MahApps.Metro/Themes/MetroTabItem.xaml
@@ -1,20 +1,20 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:Actions="clr-namespace:MahApps.Metro.Actions"
-                    xmlns:Controls="clr-namespace:MahApps.Metro.Controls"
-                    xmlns:Converters="clr-namespace:MahApps.Metro.Converters"
-                    xmlns:i="http://schemas.microsoft.com/xaml/behaviors">
+                    xmlns:actions="clr-namespace:MahApps.Metro.Actions"
+                    xmlns:converters="clr-namespace:MahApps.Metro.Converters"
+                    xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.TabControl.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <Converters:MetroTabItemCloseButtonWidthConverter x:Key="MetroTabItemCloseButtonWidthConverter" />
+    <converters:MetroTabItemCloseButtonWidthConverter x:Key="MetroTabItemCloseButtonWidthConverter" />
 
-    <Style BasedOn="{StaticResource MahApps.Styles.TabItem}" TargetType="{x:Type Controls:MetroTabItem}">
+    <Style BasedOn="{StaticResource MahApps.Styles.TabItem}" TargetType="{x:Type mah:MetroTabItem}">
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Controls:MetroTabItem}">
+                <ControlTemplate TargetType="{x:Type mah:MetroTabItem}">
                     <Border x:Name="Border"
                             HorizontalAlignment="Stretch"
                             Background="{TemplateBinding Background}"
@@ -40,25 +40,25 @@
                                     <ColumnDefinition Width="*" />
                                     <ColumnDefinition Width="Auto" />
                                 </Grid.ColumnDefinitions>
-                                <Controls:ContentControlEx x:Name="ContentSite"
-                                                           Grid.Column="0"
-                                                           Padding="{TemplateBinding Padding}"
-                                                           Content="{TemplateBinding Header}"
-                                                           ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
-                                                           ContentStringFormat="{TemplateBinding HeaderStringFormat}"
-                                                           ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                                           ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
-                                                           FontFamily="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontFamily}"
-                                                           FontSize="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontSize}"
-                                                           FontStretch="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontStretch}"
-                                                           FontStyle="{TemplateBinding FontStyle}"
-                                                           FontWeight="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontWeight}"
-                                                           Foreground="{TemplateBinding Foreground}"
-                                                           RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
-                                                           SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                <mah:ContentControlEx x:Name="ContentSite"
+                                                      Grid.Column="0"
+                                                      Padding="{TemplateBinding Padding}"
+                                                      Content="{TemplateBinding Header}"
+                                                      ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
+                                                      ContentStringFormat="{TemplateBinding HeaderStringFormat}"
+                                                      ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                                      ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
+                                                      FontFamily="{TemplateBinding mah:HeaderedControlHelper.HeaderFontFamily}"
+                                                      FontSize="{TemplateBinding mah:HeaderedControlHelper.HeaderFontSize}"
+                                                      FontStretch="{TemplateBinding mah:HeaderedControlHelper.HeaderFontStretch}"
+                                                      FontStyle="{TemplateBinding FontStyle}"
+                                                      FontWeight="{TemplateBinding mah:HeaderedControlHelper.HeaderFontWeight}"
+                                                      Foreground="{TemplateBinding Foreground}"
+                                                      RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
+                                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                                 <Button x:Name="PART_CloseButton"
                                         Grid.Column="1"
-                                        Width="{TemplateBinding Controls:HeaderedControlHelper.HeaderFontSize, Converter={StaticResource MetroTabItemCloseButtonWidthConverter}}"
+                                        Width="{TemplateBinding mah:HeaderedControlHelper.HeaderFontSize, Converter={StaticResource MetroTabItemCloseButtonWidthConverter}}"
                                         Height="{Binding RelativeSource={RelativeSource Self}, Path=Width, Mode=OneWay}"
                                         Margin="{TemplateBinding CloseButtonMargin}"
                                         VerticalAlignment="Top"
@@ -68,7 +68,7 @@
                                         Visibility="Collapsed">
                                     <i:Interaction.Triggers>
                                         <i:EventTrigger EventName="Click">
-                                            <Actions:CloseTabItemAction Command="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CloseTabCommand}" CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CloseTabCommandParameter}" />
+                                            <actions:CloseTabItemAction Command="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CloseTabCommand}" CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CloseTabCommandParameter}" />
                                         </i:EventTrigger>
                                     </i:Interaction.Triggers>
                                     <Button.Resources>
@@ -90,17 +90,17 @@
                                     </Button.OpacityMask>
                                 </Button>
                             </Grid>
-                            <Controls:Underline x:Name="Underline"
-                                                Grid.Row="1"
-                                                Grid.Column="0"
-                                                HorizontalAlignment="Stretch"
-                                                VerticalAlignment="Stretch"
-                                                Background="{TemplateBinding Background}"
-                                                BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TabControlHelper.UnderlineBrush), Mode=OneWay}"
-                                                LineExtent="3"
-                                                LineThickness="2"
-                                                Placement="Bottom"
-                                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            <mah:Underline x:Name="Underline"
+                                           Grid.Row="1"
+                                           Grid.Column="0"
+                                           HorizontalAlignment="Stretch"
+                                           VerticalAlignment="Stretch"
+                                           Background="{TemplateBinding Background}"
+                                           BorderBrush="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:TabControlHelper.UnderlineBrush), Mode=OneWay}"
+                                           LineExtent="3"
+                                           LineThickness="2"
+                                           Placement="Bottom"
+                                           SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
@@ -141,13 +141,13 @@
                             <Setter TargetName="PART_ContentTopRow" Property="Height" Value="Auto" />
                         </Trigger>
 
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.Underlined)}" Value="None">
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.Underlined)}" Value="None">
                             <Setter TargetName="Underline" Property="Visibility" Value="Collapsed" />
                         </DataTrigger>
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.Underlined)}" Value="SelectedTabItem">
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.Underlined)}" Value="SelectedTabItem">
                             <Setter TargetName="Underline" Property="LineThickness" Value="0" />
                         </DataTrigger>
-                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.Underlined)}" Value="TabPanel">
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.Underlined)}" Value="TabPanel">
                             <Setter TargetName="Underline" Property="LineExtent" Value="4" />
                             <Setter TargetName="Underline" Property="LineThickness" Value="1" />
                         </DataTrigger>
@@ -169,7 +169,7 @@
 
                         <Trigger Property="IsSelected" Value="true">
                             <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}" />
+                            <Setter TargetName="Underline" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:TabControlHelper.UnderlineSelectedBrush), Mode=OneWay}" />
                         </Trigger>
                         <Trigger Property="IsSelected" Value="false">
                             <Setter TargetName="ContentSite" Property="TextElement.Foreground" Value="{DynamicResource MahApps.Brushes.Gray}" />
@@ -177,14 +177,14 @@
 
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.Underlined)}" Value="TabPanel" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.Underlined)}" Value="TabPanel" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsSelected}" Value="True" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="Underline" Property="LineThickness" Value="3" />
                         </MultiDataTrigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.Underlined)}" Value="SelectedTabItem" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.Underlined)}" Value="SelectedTabItem" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsSelected}" Value="True" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="Underline" Property="LineThickness" Value="2" />
@@ -192,7 +192,7 @@
 
                         <Trigger SourceName="Border" Property="IsMouseOver" Value="True">
                             <Setter TargetName="ContentSite" Property="TextElement.Foreground" Value="{DynamicResource MahApps.Brushes.Gray.MouseOver}" />
-                            <Setter TargetName="Underline" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:TabControlHelper.UnderlineMouseOverBrush), Mode=OneWay}" />
+                            <Setter TargetName="Underline" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:TabControlHelper.UnderlineMouseOverBrush), Mode=OneWay}" />
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
@@ -207,7 +207,7 @@
 
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.Underlined)}" Value="TabPanel" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.Underlined)}" Value="TabPanel" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsSelected}" Value="False" />
                                 <Condition Binding="{Binding ElementName=Border, Path=IsMouseOver}" Value="True" />
                             </MultiDataTrigger.Conditions>
@@ -215,7 +215,7 @@
                         </MultiDataTrigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.Underlined)}" Value="SelectedTabItem" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.Underlined)}" Value="SelectedTabItem" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsSelected}" Value="False" />
                                 <Condition Binding="{Binding ElementName=Border, Path=IsMouseOver}" Value="True" />
                             </MultiDataTrigger.Conditions>
@@ -228,19 +228,19 @@
                                 <Condition Property="IsSelected" Value="True" />
                             </MultiTrigger.Conditions>
                             <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}" />
+                            <Setter TargetName="Underline" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:TabControlHelper.UnderlineMouseOverSelectedBrush), Mode=OneWay}" />
                         </MultiTrigger>
 
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.Underlined)}" Value="TabPanel" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.Underlined)}" Value="TabPanel" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsSelected}" Value="True" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="Underline" Property="LineThickness" Value="3" />
                         </MultiDataTrigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.Underlined)}" Value="SelectedTabItem" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.Underlined)}" Value="SelectedTabItem" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsSelected}" Value="True" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="Underline" Property="LineThickness" Value="2" />
@@ -248,12 +248,12 @@
 
                         <Trigger SourceName="Border" Property="IsMouseOver" Value="True">
                             <Setter TargetName="ContentSite" Property="TextElement.Foreground" Value="{DynamicResource MahApps.Brushes.Gray.MouseOver}" />
-                            <Setter TargetName="Underline" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.UnderlineMouseOverBrush), Mode=OneWay}" />
+                            <Setter TargetName="Underline" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.UnderlineMouseOverBrush), Mode=OneWay}" />
                         </Trigger>
 
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.Underlined)}" Value="TabPanel" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.Underlined)}" Value="TabPanel" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsSelected}" Value="False" />
                                 <Condition Binding="{Binding ElementName=Border, Path=IsMouseOver}" Value="True" />
                             </MultiDataTrigger.Conditions>
@@ -261,7 +261,7 @@
                         </MultiDataTrigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.Underlined)}" Value="SelectedTabItem" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.Underlined)}" Value="SelectedTabItem" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsSelected}" Value="False" />
                                 <Condition Binding="{Binding ElementName=Border, Path=IsMouseOver}" Value="True" />
                             </MultiDataTrigger.Conditions>
@@ -274,12 +274,12 @@
                                 <Condition Property="IsSelected" Value="True" />
                             </MultiTrigger.Conditions>
                             <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}" />
+                            <Setter TargetName="Underline" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.UnderlineMouseOverSelectedBrush), Mode=OneWay}" />
                         </MultiTrigger>
 
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.UnderlinePlacement), Converter={x:Static Converters:IsNullConverter.Instance}}" Value="True" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.UnderlinePlacement), Converter={x:Static converters:IsNullConverter.Instance}}" Value="True" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=TabStripPlacement}" Value="Top" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="Underline" Property="Grid.Column" Value="0" />
@@ -290,7 +290,7 @@
                         </MultiDataTrigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.UnderlinePlacement), Converter={x:Static Converters:IsNullConverter.Instance}}" Value="True" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.UnderlinePlacement), Converter={x:Static converters:IsNullConverter.Instance}}" Value="True" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=TabStripPlacement}" Value="Bottom" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="Underline" Property="Grid.Column" Value="0" />
@@ -301,7 +301,7 @@
                         </MultiDataTrigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.UnderlinePlacement), Converter={x:Static Converters:IsNullConverter.Instance}}" Value="True" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.UnderlinePlacement), Converter={x:Static converters:IsNullConverter.Instance}}" Value="True" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=TabStripPlacement}" Value="Left" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="Underline" Property="Grid.Column" Value="0" />
@@ -312,7 +312,7 @@
                         </MultiDataTrigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.UnderlinePlacement), Converter={x:Static Converters:IsNullConverter.Instance}}" Value="True" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.UnderlinePlacement), Converter={x:Static converters:IsNullConverter.Instance}}" Value="True" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=TabStripPlacement}" Value="Right" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="Underline" Property="Grid.Column" Value="0" />
@@ -324,7 +324,7 @@
 
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.UnderlinePlacement)}" Value="Top" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.UnderlinePlacement)}" Value="Top" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=TabStripPlacement}" Value="Top" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="Underline" Property="Grid.Column" Value="0" />
@@ -335,7 +335,7 @@
                         </MultiDataTrigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.UnderlinePlacement)}" Value="Top" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.UnderlinePlacement)}" Value="Top" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=TabStripPlacement}" Value="Bottom" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="Underline" Property="Grid.Column" Value="0" />
@@ -346,7 +346,7 @@
                         </MultiDataTrigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.UnderlinePlacement)}" Value="Top" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.UnderlinePlacement)}" Value="Top" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=TabStripPlacement}" Value="Left" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="Underline" Property="Grid.Column" Value="0" />
@@ -357,7 +357,7 @@
                         </MultiDataTrigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.UnderlinePlacement)}" Value="Top" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.UnderlinePlacement)}" Value="Top" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=TabStripPlacement}" Value="Right" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="Underline" Property="Grid.Column" Value="1" />
@@ -369,7 +369,7 @@
 
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.UnderlinePlacement)}" Value="Bottom" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.UnderlinePlacement)}" Value="Bottom" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=TabStripPlacement}" Value="Top" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="Underline" Property="Grid.Column" Value="0" />
@@ -380,7 +380,7 @@
                         </MultiDataTrigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.UnderlinePlacement)}" Value="Bottom" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.UnderlinePlacement)}" Value="Bottom" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=TabStripPlacement}" Value="Bottom" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="Underline" Property="Grid.Column" Value="0" />
@@ -391,7 +391,7 @@
                         </MultiDataTrigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.UnderlinePlacement)}" Value="Bottom" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.UnderlinePlacement)}" Value="Bottom" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=TabStripPlacement}" Value="Left" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="Underline" Property="Grid.Column" Value="0" />
@@ -402,7 +402,7 @@
                         </MultiDataTrigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.UnderlinePlacement)}" Value="Bottom" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.UnderlinePlacement)}" Value="Bottom" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=TabStripPlacement}" Value="Right" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="Underline" Property="Grid.Column" Value="1" />
@@ -414,7 +414,7 @@
 
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.UnderlinePlacement)}" Value="Left" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.UnderlinePlacement)}" Value="Left" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=TabStripPlacement}" Value="Top" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="Underline" Property="Grid.Column" Value="0" />
@@ -425,7 +425,7 @@
                         </MultiDataTrigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.UnderlinePlacement)}" Value="Left" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.UnderlinePlacement)}" Value="Left" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=TabStripPlacement}" Value="Bottom" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="Underline" Property="Grid.Column" Value="0" />
@@ -436,7 +436,7 @@
                         </MultiDataTrigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.UnderlinePlacement)}" Value="Left" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.UnderlinePlacement)}" Value="Left" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=TabStripPlacement}" Value="Left" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="Underline" Property="Grid.Column" Value="0" />
@@ -447,7 +447,7 @@
                         </MultiDataTrigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.UnderlinePlacement)}" Value="Left" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.UnderlinePlacement)}" Value="Left" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=TabStripPlacement}" Value="Right" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="Underline" Property="Grid.Column" Value="0" />
@@ -459,7 +459,7 @@
 
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.UnderlinePlacement)}" Value="Right" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.UnderlinePlacement)}" Value="Right" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=TabStripPlacement}" Value="Top" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="Underline" Property="Grid.Column" Value="0" />
@@ -470,7 +470,7 @@
                         </MultiDataTrigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.UnderlinePlacement)}" Value="Right" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.UnderlinePlacement)}" Value="Right" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=TabStripPlacement}" Value="Bottom" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="Underline" Property="Grid.Column" Value="1" />
@@ -481,7 +481,7 @@
                         </MultiDataTrigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.UnderlinePlacement)}" Value="Right" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.UnderlinePlacement)}" Value="Right" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=TabStripPlacement}" Value="Left" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="Underline" Property="Grid.Column" Value="0" />
@@ -492,7 +492,7 @@
                         </MultiDataTrigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(Controls:TabControlHelper.UnderlinePlacement)}" Value="Right" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}, Path=(mah:TabControlHelper.UnderlinePlacement)}" Value="Right" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=TabStripPlacement}" Value="Right" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="Underline" Property="Grid.Column" Value="1" />
diff --git a/src/MahApps.Metro/Themes/MetroWindow.xaml b/src/MahApps.Metro/Themes/MetroWindow.xaml
index c859022c6e..6557d6abc6 100644
--- a/src/MahApps.Metro/Themes/MetroWindow.xaml
+++ b/src/MahApps.Metro/Themes/MetroWindow.xaml
@@ -1,6 +1,5 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:behaviors="clr-namespace:MahApps.Metro.Behaviors"
                     xmlns:controlzEx="urn:controlzex"
                     xmlns:converters="clr-namespace:MahApps.Metro.Converters"
                     xmlns:mah="clr-namespace:MahApps.Metro.Controls">
diff --git a/src/MahApps.Metro/Themes/NumericUpDown.xaml b/src/MahApps.Metro/Themes/NumericUpDown.xaml
index 042621cfaa..e0de1c0bae 100644
--- a/src/MahApps.Metro/Themes/NumericUpDown.xaml
+++ b/src/MahApps.Metro/Themes/NumericUpDown.xaml
@@ -1,22 +1,16 @@
 <ResourceDictionary 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"
-                    xmlns:Converters="clr-namespace:MahApps.Metro.Converters">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.Shared.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <Style TargetType="{x:Type Controls:NumericUpDown}">
+    <Style TargetType="{x:Type mah:NumericUpDown}">
         <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 MahApps.TextBox.ContextMenu}" />
-        <Setter Property="Controls:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border.Focus}" />
-        <Setter Property="Controls:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border.MouseOver}" />
-        <Setter Property="Controls:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Font.Size.Button.ClearText}" />
-        <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 MahApps.Fonts.Family.Control}" />
         <Setter Property="FontSize" Value="{DynamicResource MahApps.Font.Size.Content}" />
@@ -30,13 +24,13 @@
         <Setter Property="SnapsToDevicePixels" Value="true" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Controls:NumericUpDown}">
+                <ControlTemplate TargetType="{x:Type mah:NumericUpDown}">
                     <Grid SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
                         <Border x:Name="Base"
                                 Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                                CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         <Grid Margin="{TemplateBinding BorderThickness}">
                             <Grid.ColumnDefinitions>
@@ -53,20 +47,20 @@
                                      HorizontalAlignment="Stretch"
                                      HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                      VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                     Controls:ControlsHelper.DisabledVisualElementVisibility="Collapsed"
-                                     Controls:TextBoxHelper.ButtonContent="{TemplateBinding Controls:TextBoxHelper.ButtonContent}"
-                                     Controls:TextBoxHelper.ButtonContentTemplate="{TemplateBinding Controls:TextBoxHelper.ButtonContentTemplate}"
-                                     Controls:TextBoxHelper.ButtonFontFamily="{TemplateBinding Controls:TextBoxHelper.ButtonFontFamily}"
-                                     Controls:TextBoxHelper.ButtonFontSize="{TemplateBinding Controls:TextBoxHelper.ButtonFontSize}"
-                                     Controls:TextBoxHelper.ButtonWidth="{TemplateBinding Controls:TextBoxHelper.ButtonWidth}"
-                                     Controls:TextBoxHelper.ButtonsAlignment="{TemplateBinding ButtonsAlignment}"
-                                     Controls:TextBoxHelper.ClearTextButton="{TemplateBinding Controls:TextBoxHelper.ClearTextButton}"
-                                     Controls:TextBoxHelper.HasText="{TemplateBinding Controls:TextBoxHelper.HasText}"
-                                     Controls:TextBoxHelper.SelectAllOnFocus="{TemplateBinding Controls:TextBoxHelper.SelectAllOnFocus}"
-                                     Controls:TextBoxHelper.UseFloatingWatermark="{TemplateBinding Controls:TextBoxHelper.UseFloatingWatermark}"
-                                     Controls:TextBoxHelper.Watermark="{TemplateBinding Controls:TextBoxHelper.Watermark}"
-                                     Controls:TextBoxHelper.WatermarkAlignment="{TemplateBinding Controls:TextBoxHelper.WatermarkAlignment}"
-                                     Controls:TextBoxHelper.WatermarkTrimming="{TemplateBinding Controls:TextBoxHelper.WatermarkTrimming}"
+                                     mah:ControlsHelper.DisabledVisualElementVisibility="Collapsed"
+                                     mah:TextBoxHelper.ButtonContent="{TemplateBinding mah:TextBoxHelper.ButtonContent}"
+                                     mah:TextBoxHelper.ButtonContentTemplate="{TemplateBinding mah:TextBoxHelper.ButtonContentTemplate}"
+                                     mah:TextBoxHelper.ButtonFontFamily="{TemplateBinding mah:TextBoxHelper.ButtonFontFamily}"
+                                     mah:TextBoxHelper.ButtonFontSize="{TemplateBinding mah:TextBoxHelper.ButtonFontSize}"
+                                     mah:TextBoxHelper.ButtonWidth="{TemplateBinding mah:TextBoxHelper.ButtonWidth}"
+                                     mah:TextBoxHelper.ButtonsAlignment="{TemplateBinding ButtonsAlignment}"
+                                     mah:TextBoxHelper.ClearTextButton="{TemplateBinding mah:TextBoxHelper.ClearTextButton}"
+                                     mah:TextBoxHelper.HasText="{TemplateBinding mah:TextBoxHelper.HasText}"
+                                     mah:TextBoxHelper.SelectAllOnFocus="{TemplateBinding mah:TextBoxHelper.SelectAllOnFocus}"
+                                     mah:TextBoxHelper.UseFloatingWatermark="{TemplateBinding mah:TextBoxHelper.UseFloatingWatermark}"
+                                     mah:TextBoxHelper.Watermark="{TemplateBinding mah:TextBoxHelper.Watermark}"
+                                     mah:TextBoxHelper.WatermarkAlignment="{TemplateBinding mah:TextBoxHelper.WatermarkAlignment}"
+                                     mah:TextBoxHelper.WatermarkTrimming="{TemplateBinding mah:TextBoxHelper.WatermarkTrimming}"
                                      Background="{x:Null}"
                                      BorderThickness="0"
                                      ContextMenu="{TemplateBinding ContextMenu}"
@@ -119,11 +113,11 @@
                                 Background="{DynamicResource MahApps.Brushes.Control.Disabled}"
                                 BorderBrush="{DynamicResource MahApps.Brushes.Control.Disabled}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                                CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                                 IsHitTestVisible="False"
                                 Opacity="0"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.DisabledVisualElementVisibility), Mode=OneWay}" />
+                                Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.DisabledVisualElementVisibility), Mode=OneWay}" />
                     </Grid>
                     <ControlTemplate.Triggers>
                         <MultiTrigger>
@@ -223,10 +217,10 @@
                             <Setter TargetName="PolygonDown" Property="Fill" Value="{DynamicResource MahApps.Brushes.ThemeBackground}" />
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="true">
-                            <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.MouseOverBorderBrush)}" />
+                            <Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.MouseOverBorderBrush)}" />
                         </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="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.FocusBorderBrush)}" />
                         </Trigger>
                         <Trigger Property="HideUpDownButtons" Value="True">
                             <Setter TargetName="PART_NumericDown" Property="Visibility" Value="Collapsed" />
@@ -239,5 +233,10 @@
         <Setter Property="TextAlignment" Value="Right" />
         <Setter Property="UpDownButtonsWidth" Value="22" />
         <Setter Property="Validation.ErrorTemplate" Value="{DynamicResource MahApps.Templates.ValidationError}" />
+        <Setter Property="mah:ControlsHelper.FocusBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border.Focus}" />
+        <Setter Property="mah:ControlsHelper.MouseOverBorderBrush" Value="{DynamicResource MahApps.Brushes.TextBox.Border.MouseOver}" />
+        <Setter Property="mah:TextBoxHelper.ButtonFontSize" Value="{DynamicResource MahApps.Font.Size.Button.ClearText}" />
+        <Setter Property="mah:TextBoxHelper.ButtonWidth" Value="22" />
+        <Setter Property="mah:TextBoxHelper.IsMonitoring" Value="True" />
     </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Themes/Pivot.xaml b/src/MahApps.Metro/Themes/Pivot.xaml
index 77fe70644d..f2d78b378e 100644
--- a/src/MahApps.Metro/Themes/Pivot.xaml
+++ b/src/MahApps.Metro/Themes/Pivot.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary 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">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
     <DataTemplate x:Key="MahApps.Templates.PivotHeader">
         <TextBlock FontFamily="{DynamicResource MahApps.Fonts.Family.Header}"
@@ -42,11 +42,11 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
-    <Style TargetType="{x:Type Controls:Pivot}">
+    <Style TargetType="{x:Type mah:Pivot}">
         <Setter Property="HeaderTemplate" Value="{StaticResource MahApps.Templates.PivotHeader}" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Controls:Pivot}">
+                <ControlTemplate TargetType="{x:Type mah:Pivot}">
                     <Grid x:Name="root">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
@@ -54,14 +54,14 @@
                             <RowDefinition Height="*" />
                         </Grid.RowDefinitions>
                         <ContentPresenter Grid.Row="0"
-                                          Content="{Binding Header, RelativeSource={RelativeSource AncestorType={x:Type Controls:Pivot}}}"
+                                          Content="{Binding Header, RelativeSource={RelativeSource AncestorType={x:Type mah:Pivot}}}"
                                           ContentTemplate="{TemplateBinding HeaderTemplate}" />
                         <ListView x:Name="PART_Headers"
                                   Grid.Row="1"
                                   Background="{x:Null}"
                                   BorderBrush="{x:Null}"
                                   ItemContainerStyle="{StaticResource MahApps.Styles.ListViewItem.Pivot}"
-                                  ItemsSource="{Binding Items, RelativeSource={RelativeSource AncestorType={x:Type Controls:Pivot}}}"
+                                  ItemsSource="{Binding Items, RelativeSource={RelativeSource AncestorType={x:Type mah:Pivot}}}"
                                   ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                                   ScrollViewer.VerticalScrollBarVisibility="Disabled"
                                   Style="{x:Null}">
@@ -71,7 +71,7 @@
                                 </ItemsPanelTemplate>
                             </ItemsControl.ItemsPanel>
                             <ItemsControl.ItemTemplate>
-                                <DataTemplate DataType="{x:Type Controls:PivotItem}">
+                                <DataTemplate DataType="{x:Type mah:PivotItem}">
                                     <TextBlock Margin="0 0 25 0"
                                                FontFamily="{DynamicResource MahApps.Fonts.Family.Header}"
                                                FontSize="{DynamicResource SubMahApps.Sizes.HeaderFont}"
@@ -87,7 +87,7 @@
                                       VerticalScrollBarVisibility="Disabled">
                             <ItemsControl x:Name="itemscontrol"
                                           Margin="0 0 250 0"
-                                          ItemsSource="{Binding Items, RelativeSource={RelativeSource AncestorType={x:Type Controls:Pivot}}}">
+                                          ItemsSource="{Binding Items, RelativeSource={RelativeSource AncestorType={x:Type mah:Pivot}}}">
                                 <ItemsControl.ItemsPanel>
                                     <ItemsPanelTemplate>
                                         <StackPanel Orientation="Horizontal" />
@@ -96,8 +96,8 @@
                             </ItemsControl>
                         </ScrollViewer>
 
-                        <Controls:ScrollViewerOffsetMediator x:Name="PART_Mediator" ScrollViewer="{Binding ElementName=PART_Scroll}">
-                            <Controls:ScrollViewerOffsetMediator.Resources>
+                        <mah:ScrollViewerOffsetMediator x:Name="PART_Mediator" ScrollViewer="{Binding ElementName=PART_Scroll}">
+                            <mah:ScrollViewerOffsetMediator.Resources>
                                 <Storyboard x:Key="Storyboard1">
                                     <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_Mediator" Storyboard.TargetProperty="HorizontalOffset">
                                         <EasingDoubleKeyFrame x:Name="edkf"
@@ -110,18 +110,18 @@
                                     </DoubleAnimationUsingKeyFrames>
                                 </Storyboard>
 
-                            </Controls:ScrollViewerOffsetMediator.Resources>
-                        </Controls:ScrollViewerOffsetMediator>
+                            </mah:ScrollViewerOffsetMediator.Resources>
+                        </mah:ScrollViewerOffsetMediator>
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style TargetType="{x:Type Controls:PivotItem}">
+    <Style TargetType="{x:Type mah:PivotItem}">
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Controls:PivotItem}">
+                <ControlTemplate TargetType="{x:Type mah:PivotItem}">
                     <ContentPresenter />
                 </ControlTemplate>
             </Setter.Value>
diff --git a/src/MahApps.Metro/Themes/ProgressRing.xaml b/src/MahApps.Metro/Themes/ProgressRing.xaml
index 48700975e6..b6e510401b 100644
--- a/src/MahApps.Metro/Themes/ProgressRing.xaml
+++ b/src/MahApps.Metro/Themes/ProgressRing.xaml
@@ -1,8 +1,8 @@
 <ResourceDictionary 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">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
-    <Style TargetType="Controls:ProgressRing">
+    <Style TargetType="mah:ProgressRing">
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="Height" Value="60" />
         <Setter Property="HorizontalAlignment" Value="Center" />
@@ -11,7 +11,7 @@
         <Setter Property="MinWidth" Value="20" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="Controls:ProgressRing">
+                <ControlTemplate TargetType="mah:ProgressRing">
                     <Border Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}">
diff --git a/src/MahApps.Metro/Themes/RangeSlider.xaml b/src/MahApps.Metro/Themes/RangeSlider.xaml
index 5d2c6d1720..a99c6aa2a0 100644
--- a/src/MahApps.Metro/Themes/RangeSlider.xaml
+++ b/src/MahApps.Metro/Themes/RangeSlider.xaml
@@ -1,15 +1,15 @@
 <ResourceDictionary 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">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
-    <Style x:Key="MahApps.Styles.MetroThumb.RangeSlider.Horizontal.Middle" TargetType="{x:Type Controls:MetroThumb}">
+    <Style x:Key="MahApps.Styles.MetroThumb.RangeSlider.Horizontal.Middle" TargetType="{x:Type mah:MetroThumb}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="IsTabStop" Value="True" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Controls:MetroThumb}">
+                <ControlTemplate TargetType="{x:Type mah:MetroThumb}">
                     <Grid Background="{TemplateBinding Background}">
                         <Rectangle Height="5" Fill="{TemplateBinding Foreground}" />
                     </Grid>
@@ -20,10 +20,10 @@
 
     <Style x:Key="MahApps.Styles.MetroThumb.RangeSlider.Vertical.Middle"
            BasedOn="{StaticResource MahApps.Styles.MetroThumb.RangeSlider.Horizontal.Middle}"
-           TargetType="{x:Type Controls:MetroThumb}">
+           TargetType="{x:Type mah:MetroThumb}">
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Controls:MetroThumb}">
+                <ControlTemplate TargetType="{x:Type mah:MetroThumb}">
                     <Grid Background="{TemplateBinding Background}">
                         <Rectangle Width="5" Fill="{TemplateBinding Foreground}" />
                     </Grid>
@@ -32,13 +32,13 @@
         </Setter>
     </Style>
 
-    <ControlTemplate x:Key="MahApps.Templates.RangeSlider.Horizontal" TargetType="{x:Type Controls:RangeSlider}">
+    <ControlTemplate x:Key="MahApps.Templates.RangeSlider.Horizontal" TargetType="{x:Type mah:RangeSlider}">
         <Grid x:Name="PART_Container"
               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
               Background="{TemplateBinding Background}">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" MinHeight="{TemplateBinding Controls:RangeSlider.MinHeight}" />
+                <RowDefinition Height="*" MinHeight="{TemplateBinding mah:RangeSlider.MinHeight}" />
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <TickBar x:Name="PART_TopTick"
@@ -74,31 +74,31 @@
                         Background="Transparent"
                         Orientation="Horizontal">
                 <RepeatButton x:Name="PART_LeftEdge"
-                              Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillBrush)}"
+                              Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillBrush)}"
                               Style="{DynamicResource MahApps.Styles.RepeatButton.Slider.HorizontalTrack}" />
 
-                <Controls:MetroThumb x:Name="PART_LeftThumb"
-                                     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"
-                                     Cursor="Arrow"
-                                     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.Styles.MetroThumb.RangeSlider.Horizontal.Middle}" />
-                <Controls:MetroThumb x:Name="PART_RightThumb"
-                                     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"
-                                     Cursor="Arrow"
-                                     Style="{DynamicResource MahApps.Styles.Thumb.Slider}" />
+                <mah:MetroThumb x:Name="PART_LeftThumb"
+                                Width="{DynamicResource MahApps.Sizes.Slider.HorizontalThumb.Width}"
+                                Height="{DynamicResource MahApps.Sizes.Slider.HorizontalThumb.Height}"
+                                Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillBrush)}"
+                                BorderThickness="1 0"
+                                Cursor="Arrow"
+                                Style="{DynamicResource MahApps.Styles.Thumb.Slider}" />
+                <mah:MetroThumb x:Name="PART_MiddleThumb"
+                                MinWidth="{TemplateBinding MinRangeWidth}"
+                                Cursor="Hand"
+                                Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillBrush)}"
+                                Style="{DynamicResource MahApps.Styles.MetroThumb.RangeSlider.Horizontal.Middle}" />
+                <mah:MetroThumb x:Name="PART_RightThumb"
+                                Width="{DynamicResource MahApps.Sizes.Slider.HorizontalThumb.Width}"
+                                Height="{DynamicResource MahApps.Sizes.Slider.HorizontalThumb.Height}"
+                                Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillBrush)}"
+                                BorderThickness="1 0"
+                                Cursor="Arrow"
+                                Style="{DynamicResource MahApps.Styles.Thumb.Slider}" />
 
                 <RepeatButton x:Name="PART_RightEdge"
-                              Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillBrush)}"
+                              Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillBrush)}"
                               Style="{DynamicResource MahApps.Styles.RepeatButton.Slider.HorizontalTrack}" />
             </StackPanel>
         </Grid>
@@ -115,50 +115,50 @@
             </Trigger>
 
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillHoverBrush)}" />
-                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillHoverBrush)}" />
-                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillHoverBrush)}" />
-                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillHoverBrush)}" />
-                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillHoverBrush)}" />
+                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillHoverBrush)}" />
+                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillHoverBrush)}" />
+                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillHoverBrush)}" />
+                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillHoverBrush)}" />
+                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillHoverBrush)}" />
             </Trigger>
             <Trigger SourceName="PART_LeftEdge" Property="IsPressed" Value="True">
-                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
-                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
-                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillPressedBrush)}" />
-                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
-                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillPressedBrush)}" />
+                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
             </Trigger>
             <Trigger SourceName="PART_RightEdge" Property="IsPressed" Value="True">
-                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
-                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
-                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillPressedBrush)}" />
-                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
-                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillPressedBrush)}" />
+                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
             </Trigger>
             <Trigger SourceName="PART_MiddleThumb" Property="IsDragging" Value="True">
-                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
-                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
-                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillPressedBrush)}" />
-                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
-                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillPressedBrush)}" />
+                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
-                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillDisabledBrush)}" />
-                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillDisabledBrush)}" />
-                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillDisabledBrush)}" />
-                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillDisabledBrush)}" />
-                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillDisabledBrush)}" />
+                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillDisabledBrush)}" />
+                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillDisabledBrush)}" />
+                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillDisabledBrush)}" />
+                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillDisabledBrush)}" />
+                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillDisabledBrush)}" />
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <ControlTemplate x:Key="MahApps.Templates.RangeSlider.Vertical" TargetType="{x:Type Controls:RangeSlider}">
+    <ControlTemplate x:Key="MahApps.Templates.RangeSlider.Vertical" TargetType="{x:Type mah:RangeSlider}">
         <Grid x:Name="PART_Container"
               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
               Background="{TemplateBinding Background}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" MinWidth="{TemplateBinding Controls:RangeSlider.MinWidth}" />
+                <ColumnDefinition Width="*" MinWidth="{TemplateBinding mah:RangeSlider.MinWidth}" />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
             <TickBar x:Name="PART_TopTick"
@@ -194,31 +194,31 @@
                         Background="Transparent"
                         Orientation="Vertical">
                 <RepeatButton x:Name="PART_RightEdge"
-                              Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillBrush)}"
+                              Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillBrush)}"
                               Style="{DynamicResource MahApps.Styles.RepeatButton.Slider.VerticalTrack}" />
 
-                <Controls:MetroThumb x:Name="PART_RightThumb"
-                                     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"
-                                     Cursor="Arrow"
-                                     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="{DynamicResource MahApps.Styles.MetroThumb.RangeSlider.Vertical.Middle}" />
-                <Controls:MetroThumb x:Name="PART_LeftThumb"
-                                     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"
-                                     Cursor="Arrow"
-                                     Style="{DynamicResource MahApps.Styles.Thumb.Slider}" />
+                <mah:MetroThumb x:Name="PART_RightThumb"
+                                Width="{DynamicResource MahApps.Sizes.Slider.VerticalThumb.Width}"
+                                Height="{DynamicResource MahApps.Sizes.Slider.VerticalThumb.Height}"
+                                Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillBrush)}"
+                                BorderThickness="0 1"
+                                Cursor="Arrow"
+                                Style="{DynamicResource MahApps.Styles.Thumb.Slider}" />
+                <mah:MetroThumb x:Name="PART_MiddleThumb"
+                                MinHeight="{TemplateBinding MinRangeWidth}"
+                                Cursor="Hand"
+                                Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillBrush)}"
+                                Style="{DynamicResource MahApps.Styles.MetroThumb.RangeSlider.Vertical.Middle}" />
+                <mah:MetroThumb x:Name="PART_LeftThumb"
+                                Width="{DynamicResource MahApps.Sizes.Slider.VerticalThumb.Width}"
+                                Height="{DynamicResource MahApps.Sizes.Slider.VerticalThumb.Height}"
+                                Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillBrush)}"
+                                BorderThickness="0 1"
+                                Cursor="Arrow"
+                                Style="{DynamicResource MahApps.Styles.Thumb.Slider}" />
 
                 <RepeatButton x:Name="PART_LeftEdge"
-                              Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillBrush)}"
+                              Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillBrush)}"
                               Style="{DynamicResource MahApps.Styles.RepeatButton.Slider.VerticalTrack}" />
             </StackPanel>
         </Grid>
@@ -235,61 +235,61 @@
             </Trigger>
 
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillHoverBrush)}" />
-                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillHoverBrush)}" />
-                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillHoverBrush)}" />
-                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillHoverBrush)}" />
-                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillHoverBrush)}" />
+                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillHoverBrush)}" />
+                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillHoverBrush)}" />
+                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillHoverBrush)}" />
+                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillHoverBrush)}" />
+                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillHoverBrush)}" />
             </Trigger>
             <Trigger SourceName="PART_LeftEdge" Property="IsPressed" Value="True">
-                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
-                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
-                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillPressedBrush)}" />
-                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
-                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillPressedBrush)}" />
+                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
             </Trigger>
             <Trigger SourceName="PART_RightEdge" Property="IsPressed" Value="True">
-                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
-                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
-                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillPressedBrush)}" />
-                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
-                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillPressedBrush)}" />
+                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
             </Trigger>
             <Trigger SourceName="PART_MiddleThumb" Property="IsDragging" Value="True">
-                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
-                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
-                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillPressedBrush)}" />
-                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
-                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillPressedBrush)}" />
+                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
-                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillDisabledBrush)}" />
-                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillDisabledBrush)}" />
-                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillDisabledBrush)}" />
-                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillDisabledBrush)}" />
-                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillDisabledBrush)}" />
+                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillDisabledBrush)}" />
+                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillDisabledBrush)}" />
+                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillDisabledBrush)}" />
+                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillDisabledBrush)}" />
+                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillDisabledBrush)}" />
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style x:Key="MahApps.Styles.RangeSlider" TargetType="{x:Type Controls:RangeSlider}">
+    <Style x:Key="MahApps.Styles.RangeSlider" TargetType="{x:Type mah: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}" />
-        <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.Templates.RangeSlider.Horizontal}" />
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
+        <Setter Property="mah:SliderHelper.ThumbFillBrush" Value="{DynamicResource MahApps.Brushes.Gray2}" />
+        <Setter Property="mah:SliderHelper.ThumbFillDisabledBrush" Value="{DynamicResource MahApps.Brushes.Gray6}" />
+        <Setter Property="mah:SliderHelper.ThumbFillHoverBrush" Value="{DynamicResource MahApps.Brushes.Gray5}" />
+        <Setter Property="mah:SliderHelper.ThumbFillPressedBrush" Value="{DynamicResource MahApps.Brushes.Gray2}" />
+        <Setter Property="mah:SliderHelper.TrackFillBrush" Value="{DynamicResource MahApps.Brushes.Gray3}" />
+        <Setter Property="mah:SliderHelper.TrackFillDisabledBrush" Value="{DynamicResource MahApps.Brushes.Gray6}" />
+        <Setter Property="mah:SliderHelper.TrackFillHoverBrush" Value="{DynamicResource MahApps.Brushes.Gray3}" />
+        <Setter Property="mah:SliderHelper.TrackFillPressedBrush" Value="{DynamicResource MahApps.Brushes.Gray3}" />
+        <Setter Property="mah:SliderHelper.TrackValueFillBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="mah:SliderHelper.TrackValueFillDisabledBrush" Value="{DynamicResource MahApps.Brushes.Gray6}" />
+        <Setter Property="mah:SliderHelper.TrackValueFillHoverBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
+        <Setter Property="mah:SliderHelper.TrackValueFillPressedBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Style.Triggers>
             <Trigger Property="Orientation" Value="Vertical">
                 <Setter Property="Template" Value="{StaticResource MahApps.Templates.RangeSlider.Vertical}" />
@@ -299,14 +299,14 @@
 
     <!--  Win10 RangeSlider style  -->
 
-    <Style x:Key="MahApps.Styles.MetroThumb.RangeSlider.Horizontal.Middle.Win10" TargetType="{x:Type Controls:MetroThumb}">
+    <Style x:Key="MahApps.Styles.MetroThumb.RangeSlider.Horizontal.Middle.Win10" TargetType="{x:Type mah:MetroThumb}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="IsTabStop" Value="True" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Controls:MetroThumb}">
+                <ControlTemplate TargetType="{x:Type mah:MetroThumb}">
                     <Grid Background="{TemplateBinding Background}">
                         <Rectangle Height="2" Fill="{TemplateBinding Foreground}" />
                     </Grid>
@@ -317,10 +317,10 @@
 
     <Style x:Key="MahApps.Styles.MetroThumb.RangeSlider.Vertical.Middle.Win10"
            BasedOn="{StaticResource MahApps.Styles.MetroThumb.RangeSlider.Horizontal.Middle.Win10}"
-           TargetType="{x:Type Controls:MetroThumb}">
+           TargetType="{x:Type mah:MetroThumb}">
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Controls:MetroThumb}">
+                <ControlTemplate TargetType="{x:Type mah:MetroThumb}">
                     <Grid Background="{TemplateBinding Background}">
                         <Rectangle Width="2" Fill="{TemplateBinding Foreground}" />
                     </Grid>
@@ -329,13 +329,13 @@
         </Setter>
     </Style>
 
-    <ControlTemplate x:Key="MahApps.Templates.RangeSlider.Horizontal.Win10" TargetType="{x:Type Controls:RangeSlider}">
+    <ControlTemplate x:Key="MahApps.Templates.RangeSlider.Horizontal.Win10" TargetType="{x:Type mah:RangeSlider}">
         <Grid x:Name="PART_Container"
               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
               Background="{TemplateBinding Background}">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" MinHeight="{TemplateBinding Controls:RangeSlider.MinHeight}" />
+                <RowDefinition Height="*" MinHeight="{TemplateBinding mah:RangeSlider.MinHeight}" />
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <TickBar x:Name="PART_TopTick"
@@ -372,29 +372,29 @@
                         Background="Transparent"
                         Orientation="Horizontal">
                 <RepeatButton x:Name="PART_LeftEdge"
-                              Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillBrush)}"
+                              Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillBrush)}"
                               Style="{DynamicResource MahApps.Styles.RepeatButton.Slider.HorizontalTrack.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.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.Styles.MetroThumb.RangeSlider.Horizontal.Middle.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.Styles.Thumb.Slider.Win10}" />
+                <mah:MetroThumb x:Name="PART_LeftThumb"
+                                Width="8"
+                                Height="24"
+                                Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillBrush)}"
+                                Cursor="Arrow"
+                                Style="{DynamicResource MahApps.Styles.Thumb.Slider.Win10}" />
+                <mah:MetroThumb x:Name="PART_MiddleThumb"
+                                MinWidth="{TemplateBinding MinRangeWidth}"
+                                Cursor="Hand"
+                                Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillBrush)}"
+                                Style="{DynamicResource MahApps.Styles.MetroThumb.RangeSlider.Horizontal.Middle.Win10}" />
+                <mah:MetroThumb x:Name="PART_RightThumb"
+                                Width="8"
+                                Height="24"
+                                Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillBrush)}"
+                                Cursor="Arrow"
+                                Style="{DynamicResource MahApps.Styles.Thumb.Slider.Win10}" />
 
                 <RepeatButton x:Name="PART_RightEdge"
-                              Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillBrush)}"
+                              Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillBrush)}"
                               Style="{DynamicResource MahApps.Styles.RepeatButton.Slider.HorizontalTrack.Win10}" />
             </StackPanel>
         </Grid>
@@ -411,66 +411,66 @@
             </Trigger>
 
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillHoverBrush)}" />
-                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillHoverBrush)}" />
-                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillHoverBrush)}" />
-                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillHoverBrush)}" />
-                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillHoverBrush)}" />
+                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillHoverBrush)}" />
+                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillHoverBrush)}" />
+                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillHoverBrush)}" />
+                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillHoverBrush)}" />
+                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillHoverBrush)}" />
             </Trigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
                     <Condition SourceName="PART_LeftEdge" Property="IsPressed" Value="True" />
                     <Condition Property="IsMoveToPointEnabled" Value="False" />
                 </MultiTrigger.Conditions>
-                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
-                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
-                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillPressedBrush)}" />
+                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillPressedBrush)}" />
             </MultiTrigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
                     <Condition SourceName="PART_RightEdge" Property="IsPressed" Value="True" />
                     <Condition Property="IsMoveToPointEnabled" Value="False" />
                 </MultiTrigger.Conditions>
-                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillPressedBrush)}" />
-                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
-                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillPressedBrush)}" />
+                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
             </MultiTrigger>
             <Trigger SourceName="PART_LeftThumb" Property="IsDragging" Value="True">
-                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
-                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
-                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillPressedBrush)}" />
-                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillPressedBrush)}" />
+                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
             </Trigger>
             <Trigger SourceName="PART_MiddleThumb" Property="IsDragging" Value="True">
-                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
-                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
-                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillPressedBrush)}" />
-                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
-                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillPressedBrush)}" />
+                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
             </Trigger>
             <Trigger SourceName="PART_RightThumb" Property="IsDragging" Value="True">
-                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
-                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillPressedBrush)}" />
-                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
-                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillPressedBrush)}" />
+                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
-                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillDisabledBrush)}" />
-                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillDisabledBrush)}" />
-                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillDisabledBrush)}" />
-                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillDisabledBrush)}" />
-                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillDisabledBrush)}" />
+                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillDisabledBrush)}" />
+                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillDisabledBrush)}" />
+                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillDisabledBrush)}" />
+                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillDisabledBrush)}" />
+                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillDisabledBrush)}" />
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <ControlTemplate x:Key="MahApps.Templates.RangeSlider.Vertical.Win10" TargetType="{x:Type Controls:RangeSlider}">
+    <ControlTemplate x:Key="MahApps.Templates.RangeSlider.Vertical.Win10" TargetType="{x:Type mah:RangeSlider}">
         <Grid x:Name="PART_Container"
               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
               Background="{TemplateBinding Background}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" MinWidth="{TemplateBinding Controls:RangeSlider.MinWidth}" />
+                <ColumnDefinition Width="*" MinWidth="{TemplateBinding mah:RangeSlider.MinWidth}" />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
             <TickBar x:Name="PART_TopTick"
@@ -507,29 +507,29 @@
                         Background="Transparent"
                         Orientation="Vertical">
                 <RepeatButton x:Name="PART_RightEdge"
-                              Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillBrush)}"
+                              Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillBrush)}"
                               Style="{DynamicResource MahApps.Styles.RepeatButton.Slider.VerticalTrack.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.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="{DynamicResource MahApps.Styles.MetroThumb.RangeSlider.Vertical.Middle.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.Styles.Thumb.Slider.Win10}" />
+                <mah:MetroThumb x:Name="PART_RightThumb"
+                                Width="24"
+                                Height="8"
+                                Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillBrush)}"
+                                Cursor="Arrow"
+                                Style="{DynamicResource MahApps.Styles.Thumb.Slider.Win10}" />
+                <mah:MetroThumb x:Name="PART_MiddleThumb"
+                                MinHeight="{TemplateBinding MinRangeWidth}"
+                                Cursor="Hand"
+                                Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillBrush)}"
+                                Style="{DynamicResource MahApps.Styles.MetroThumb.RangeSlider.Vertical.Middle.Win10}" />
+                <mah:MetroThumb x:Name="PART_LeftThumb"
+                                Width="24"
+                                Height="8"
+                                Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillBrush)}"
+                                Cursor="Arrow"
+                                Style="{DynamicResource MahApps.Styles.Thumb.Slider.Win10}" />
 
                 <RepeatButton x:Name="PART_LeftEdge"
-                              Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillBrush)}"
+                              Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillBrush)}"
                               Style="{DynamicResource MahApps.Styles.RepeatButton.Slider.VerticalTrack.Win10}" />
             </StackPanel>
         </Grid>
@@ -546,78 +546,78 @@
             </Trigger>
 
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillHoverBrush)}" />
-                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillHoverBrush)}" />
-                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillHoverBrush)}" />
-                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillHoverBrush)}" />
-                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillHoverBrush)}" />
+                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillHoverBrush)}" />
+                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillHoverBrush)}" />
+                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillHoverBrush)}" />
+                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillHoverBrush)}" />
+                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillHoverBrush)}" />
             </Trigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
                     <Condition SourceName="PART_LeftEdge" Property="IsPressed" Value="True" />
                     <Condition Property="IsMoveToPointEnabled" Value="False" />
                 </MultiTrigger.Conditions>
-                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
-                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
-                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillPressedBrush)}" />
+                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillPressedBrush)}" />
             </MultiTrigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
                     <Condition SourceName="PART_RightEdge" Property="IsPressed" Value="True" />
                     <Condition Property="IsMoveToPointEnabled" Value="False" />
                 </MultiTrigger.Conditions>
-                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillPressedBrush)}" />
-                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
-                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillPressedBrush)}" />
+                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
             </MultiTrigger>
             <Trigger SourceName="PART_RightThumb" Property="IsDragging" Value="True">
-                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
-                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillPressedBrush)}" />
-                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
-                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillPressedBrush)}" />
+                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
             </Trigger>
             <Trigger SourceName="PART_MiddleThumb" Property="IsDragging" Value="True">
-                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
-                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
-                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillPressedBrush)}" />
-                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
-                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillPressedBrush)}" />
+                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
             </Trigger>
             <Trigger SourceName="PART_LeftThumb" Property="IsDragging" Value="True">
-                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
-                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillPressedBrush)}" />
-                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillPressedBrush)}" />
-                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
+                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillPressedBrush)}" />
+                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillPressedBrush)}" />
+                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillPressedBrush)}" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
-                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillDisabledBrush)}" />
-                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillDisabledBrush)}" />
-                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackValueFillDisabledBrush)}" />
-                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.TrackFillDisabledBrush)}" />
-                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:SliderHelper.ThumbFillDisabledBrush)}" />
+                <Setter TargetName="PART_LeftEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillDisabledBrush)}" />
+                <Setter TargetName="PART_LeftThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillDisabledBrush)}" />
+                <Setter TargetName="PART_MiddleThumb" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackValueFillDisabledBrush)}" />
+                <Setter TargetName="PART_RightEdge" Property="Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.TrackFillDisabledBrush)}" />
+                <Setter TargetName="PART_RightThumb" Property="Background" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:SliderHelper.ThumbFillDisabledBrush)}" />
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style x:Key="MahApps.Styles.RangeSlider.Win10" TargetType="{x:Type Controls:RangeSlider}">
+    <Style x:Key="MahApps.Styles.RangeSlider.Win10" TargetType="{x:Type mah: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}" />
-        <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.Templates.RangeSlider.Horizontal.Win10}" />
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
+        <Setter Property="mah:SliderHelper.ThumbFillBrush" Value="{DynamicResource MahApps.Brushes.AccentBase}" />
+        <Setter Property="mah:SliderHelper.ThumbFillDisabledBrush" Value="{DynamicResource MahApps.Brushes.Gray6}" />
+        <Setter Property="mah:SliderHelper.ThumbFillHoverBrush" Value="{DynamicResource MahApps.Brushes.Gray1}" />
+        <Setter Property="mah:SliderHelper.ThumbFillPressedBrush" Value="{DynamicResource MahApps.Brushes.Gray6}" />
+        <Setter Property="mah:SliderHelper.TrackFillBrush" Value="{DynamicResource MahApps.Brushes.Gray3}" />
+        <Setter Property="mah:SliderHelper.TrackFillDisabledBrush" Value="{DynamicResource MahApps.Brushes.Gray6}" />
+        <Setter Property="mah:SliderHelper.TrackFillHoverBrush" Value="{DynamicResource MahApps.Brushes.Gray2}" />
+        <Setter Property="mah:SliderHelper.TrackFillPressedBrush" Value="{DynamicResource MahApps.Brushes.Gray3}" />
+        <Setter Property="mah:SliderHelper.TrackValueFillBrush" Value="{DynamicResource MahApps.Brushes.AccentBase}" />
+        <Setter Property="mah:SliderHelper.TrackValueFillDisabledBrush" Value="{DynamicResource MahApps.Brushes.Gray6}" />
+        <Setter Property="mah:SliderHelper.TrackValueFillHoverBrush" Value="{DynamicResource MahApps.Brushes.AccentBase}" />
+        <Setter Property="mah:SliderHelper.TrackValueFillPressedBrush" Value="{DynamicResource MahApps.Brushes.AccentBase}" />
         <Style.Triggers>
             <Trigger Property="Orientation" Value="Vertical">
                 <Setter Property="Template" Value="{StaticResource MahApps.Templates.RangeSlider.Vertical.Win10}" />
diff --git a/src/MahApps.Metro/Themes/SplitButton.xaml b/src/MahApps.Metro/Themes/SplitButton.xaml
index bcbb635289..c7007c8ed4 100644
--- a/src/MahApps.Metro/Themes/SplitButton.xaml
+++ b/src/MahApps.Metro/Themes/SplitButton.xaml
@@ -1,18 +1,18 @@
 <ResourceDictionary 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">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
-    <ControlTemplate x:Key="MahApps.Templates.SplitButton.Horizontal" TargetType="{x:Type Controls:SplitButton}">
+    <ControlTemplate x:Key="MahApps.Templates.SplitButton.Horizontal" TargetType="{x:Type mah:SplitButton}">
         <Grid UseLayoutRounding="True">
             <Border x:Name="PART_Border"
                     Background="Transparent"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
-                    CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                    CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                     SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                <Controls:ClipBorder x:Name="PART_ClipBorder"
-                                     CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
-                                     SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                <mah:ClipBorder x:Name="PART_ClipBorder"
+                                CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
                     <Grid x:Name="PART_Container"
                           HorizontalAlignment="Stretch"
                           VerticalAlignment="Stretch">
@@ -42,21 +42,21 @@
                                                   Focusable="False"
                                                   RecognizesAccessKey="True"
                                                   UseLayoutRounding="False" />
-                                <Controls:ContentControlEx x:Name="PART_ButtonContent"
-                                                           Padding="{TemplateBinding Padding}"
-                                                           HorizontalAlignment="Center"
-                                                           VerticalAlignment="Center"
-                                                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                           Content="{TemplateBinding SelectionBoxItem}"
-                                                           ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
-                                                           ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}"
-                                                           ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
-                                                           ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
-                                                           IsHitTestVisible="False"
-                                                           RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
-                                                           SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                                           UseLayoutRounding="False" />
+                                <mah:ContentControlEx x:Name="PART_ButtonContent"
+                                                      Padding="{TemplateBinding Padding}"
+                                                      HorizontalAlignment="Center"
+                                                      VerticalAlignment="Center"
+                                                      HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                      VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                      Content="{TemplateBinding SelectionBoxItem}"
+                                                      ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
+                                                      ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}"
+                                                      ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
+                                                      ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                                                      IsHitTestVisible="False"
+                                                      RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
+                                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                                      UseLayoutRounding="False" />
                             </StackPanel>
                         </Button>
                         <Button x:Name="PART_Expander"
@@ -75,7 +75,7 @@
                                             Style="{DynamicResource MahApps.Styles.ContentControl.PathIcon}" />
                         </Button>
                     </Grid>
-                </Controls:ClipBorder>
+                </mah:ClipBorder>
             </Border>
             <Popup x:Name="PART_Popup"
                    AllowsTransparency="True"
@@ -127,17 +127,17 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <ControlTemplate x:Key="MahApps.Templates.SplitButton.Vertical" TargetType="{x:Type Controls:SplitButton}">
+    <ControlTemplate x:Key="MahApps.Templates.SplitButton.Vertical" TargetType="{x:Type mah:SplitButton}">
         <Grid UseLayoutRounding="True">
             <Border x:Name="PART_Border"
                     Background="Transparent"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
-                    CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
+                    CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
                     SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                <Controls:ClipBorder x:Name="PART_ClipBorder"
-                                     CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}"
-                                     SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                <mah:ClipBorder x:Name="PART_ClipBorder"
+                                CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
                     <Grid x:Name="PART_Container"
                           HorizontalAlignment="Stretch"
                           VerticalAlignment="Stretch">
@@ -167,21 +167,21 @@
                                                   Focusable="False"
                                                   RecognizesAccessKey="True"
                                                   UseLayoutRounding="False" />
-                                <Controls:ContentControlEx x:Name="PART_ButtonContent"
-                                                           Padding="{TemplateBinding Padding}"
-                                                           HorizontalAlignment="Center"
-                                                           VerticalAlignment="Center"
-                                                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                           Content="{TemplateBinding SelectionBoxItem}"
-                                                           ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
-                                                           ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}"
-                                                           ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
-                                                           ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
-                                                           IsHitTestVisible="False"
-                                                           RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
-                                                           SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                                           UseLayoutRounding="False" />
+                                <mah:ContentControlEx x:Name="PART_ButtonContent"
+                                                      Padding="{TemplateBinding Padding}"
+                                                      HorizontalAlignment="Center"
+                                                      VerticalAlignment="Center"
+                                                      HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                      VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                      Content="{TemplateBinding SelectionBoxItem}"
+                                                      ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
+                                                      ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}"
+                                                      ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
+                                                      ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                                                      IsHitTestVisible="False"
+                                                      RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
+                                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                                      UseLayoutRounding="False" />
                             </StackPanel>
                         </Button>
                         <Button x:Name="PART_Expander"
@@ -200,7 +200,7 @@
                                             Style="{DynamicResource MahApps.Styles.ContentControl.PathIcon}" />
                         </Button>
                     </Grid>
-                </Controls:ClipBorder>
+                </mah:ClipBorder>
             </Border>
             <Popup x:Name="PART_Popup"
                    AllowsTransparency="True"
@@ -266,7 +266,7 @@
         </Setter>
     </Style>
 
-    <Style TargetType="{x:Type Controls:SplitButton}">
+    <Style TargetType="{x:Type mah:SplitButton}">
         <Setter Property="ArrowBrush" Value="{DynamicResource MahApps.Brushes.ThemeForeground}" />
         <Setter Property="ArrowMouseOverBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="ArrowPressedBrush" Value="{DynamicResource MahApps.Brushes.ThemeForeground}" />
diff --git a/src/MahApps.Metro/Themes/SplitView.xaml b/src/MahApps.Metro/Themes/SplitView.xaml
index 0c84b8bfc5..0e8320a181 100644
--- a/src/MahApps.Metro/Themes/SplitView.xaml
+++ b/src/MahApps.Metro/Themes/SplitView.xaml
@@ -1,11 +1,10 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:converter="clr-namespace:MahApps.Metro.Converters"
-                    xmlns:local="clr-namespace:MahApps.Metro.Controls">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
     <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
 
-    <Style x:Key="MahApps.Styles.MetroThumb.SplitView.Resize" TargetType="local:MetroThumb">
+    <Style x:Key="MahApps.Styles.MetroThumb.SplitView.Resize" TargetType="mah:MetroThumb">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Cursor" Value="SizeWE" />
         <Setter Property="Template">
@@ -21,7 +20,7 @@
         <Setter Property="Width" Value="3" />
     </Style>
 
-    <Style TargetType="{x:Type local:SplitView}">
+    <Style TargetType="{x:Type mah:SplitView}">
         <Setter Property="CanResizeOpenPane" Value="False" />
         <Setter Property="CompactPaneLength" Value="48" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
@@ -33,7 +32,7 @@
         <Setter Property="ResizeThumbStyle" Value="{StaticResource MahApps.Styles.MetroThumb.SplitView.Resize}" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:SplitView}">
+                <ControlTemplate TargetType="{x:Type mah:SplitView}">
                     <Grid x:Name="root"
                           Background="{TemplateBinding Background}"
                           Tag="{TemplateBinding TemplateSettings}">
@@ -95,10 +94,10 @@
                             </Storyboard>
 
                             <Storyboard x:Key="ClosedCompactLeftToOpenCompactOverlayLeftStoryboard">
-                                <local:GridLengthAnimation BeginTime="0:0:0"
-                                                           Storyboard.TargetName="ColumnDefinition1"
-                                                           Storyboard.TargetProperty="(ColumnDefinition.Width)"
-                                                           To="{Binding ElementName=ProxyElement, Path=DataContext.CompactPaneGridLength}" />
+                                <mah:GridLengthAnimation BeginTime="0:0:0"
+                                                         Storyboard.TargetName="ColumnDefinition1"
+                                                         Storyboard.TargetProperty="(ColumnDefinition.Width)"
+                                                         To="{Binding ElementName=ProxyElement, Path=DataContext.CompactPaneGridLength}" />
                                 <Int32AnimationUsingKeyFrames Storyboard.TargetName="ContentRoot" Storyboard.TargetProperty="(Grid.Column)">
                                     <DiscreteInt32KeyFrame KeyTime="0:0:0" Value="1" />
                                 </Int32AnimationUsingKeyFrames>
@@ -123,14 +122,14 @@
                             </Storyboard>
 
                             <Storyboard x:Key="ClosedCompactRightToOpenCompactOverlayRightStoryboard">
-                                <local:GridLengthAnimation BeginTime="0:0:0"
-                                                           Storyboard.TargetName="ColumnDefinition1"
-                                                           Storyboard.TargetProperty="(ColumnDefinition.Width)"
-                                                           To="*" />
-                                <local:GridLengthAnimation BeginTime="0:0:0"
-                                                           Storyboard.TargetName="ColumnDefinition2"
-                                                           Storyboard.TargetProperty="(ColumnDefinition.Width)"
-                                                           To="{Binding ElementName=ProxyElement, Path=DataContext.CompactPaneGridLength}" />
+                                <mah:GridLengthAnimation BeginTime="0:0:0"
+                                                         Storyboard.TargetName="ColumnDefinition1"
+                                                         Storyboard.TargetProperty="(ColumnDefinition.Width)"
+                                                         To="*" />
+                                <mah:GridLengthAnimation BeginTime="0:0:0"
+                                                         Storyboard.TargetName="ColumnDefinition2"
+                                                         Storyboard.TargetProperty="(ColumnDefinition.Width)"
+                                                         To="{Binding ElementName=ProxyElement, Path=DataContext.CompactPaneGridLength}" />
                                 <Int32AnimationUsingKeyFrames Storyboard.TargetName="ContentRoot" Storyboard.TargetProperty="(Grid.ColumnSpan)">
                                     <DiscreteInt32KeyFrame KeyTime="0:0:0" Value="1" />
                                 </Int32AnimationUsingKeyFrames>
@@ -204,10 +203,10 @@
                             </Storyboard>
 
                             <Storyboard x:Key="OpenCompactOverlayLeftToClosedCompactLeftStoryboard">
-                                <local:GridLengthAnimation BeginTime="0:0:0"
-                                                           Storyboard.TargetName="ColumnDefinition1"
-                                                           Storyboard.TargetProperty="(ColumnDefinition.Width)"
-                                                           To="{Binding ElementName=ProxyElement, Path=DataContext.CompactPaneGridLength}" />
+                                <mah:GridLengthAnimation BeginTime="0:0:0"
+                                                         Storyboard.TargetName="ColumnDefinition1"
+                                                         Storyboard.TargetProperty="(ColumnDefinition.Width)"
+                                                         To="{Binding ElementName=ProxyElement, Path=DataContext.CompactPaneGridLength}" />
                                 <Int32AnimationUsingKeyFrames Storyboard.TargetName="ContentRoot" Storyboard.TargetProperty="(Grid.Column)">
                                     <DiscreteInt32KeyFrame KeyTime="0:0:0" Value="1" />
                                 </Int32AnimationUsingKeyFrames>
@@ -229,14 +228,14 @@
                             </Storyboard>
 
                             <Storyboard x:Key="OpenCompactOverlayRightToClosedCompactRightStoryboard">
-                                <local:GridLengthAnimation BeginTime="0:0:0"
-                                                           Storyboard.TargetName="ColumnDefinition1"
-                                                           Storyboard.TargetProperty="(ColumnDefinition.Width)"
-                                                           To="*" />
-                                <local:GridLengthAnimation BeginTime="0:0:0"
-                                                           Storyboard.TargetName="ColumnDefinition2"
-                                                           Storyboard.TargetProperty="(ColumnDefinition.Width)"
-                                                           To="{Binding ElementName=ProxyElement, Path=DataContext.CompactPaneGridLength}" />
+                                <mah:GridLengthAnimation BeginTime="0:0:0"
+                                                         Storyboard.TargetName="ColumnDefinition1"
+                                                         Storyboard.TargetProperty="(ColumnDefinition.Width)"
+                                                         To="*" />
+                                <mah:GridLengthAnimation BeginTime="0:0:0"
+                                                         Storyboard.TargetName="ColumnDefinition2"
+                                                         Storyboard.TargetProperty="(ColumnDefinition.Width)"
+                                                         To="{Binding ElementName=ProxyElement, Path=DataContext.CompactPaneGridLength}" />
                                 <Int32AnimationUsingKeyFrames Storyboard.TargetName="ContentRoot" Storyboard.TargetProperty="(Grid.ColumnSpan)">
                                     <DiscreteInt32KeyFrame KeyTime="0:0:0" Value="1" />
                                 </Int32AnimationUsingKeyFrames>
@@ -261,10 +260,10 @@
                             </Storyboard>
 
                             <Storyboard x:Key="ClosedCompactLeftStoryboard">
-                                <local:GridLengthAnimation BeginTime="0:0:0"
-                                                           Storyboard.TargetName="ColumnDefinition1"
-                                                           Storyboard.TargetProperty="(ColumnDefinition.Width)"
-                                                           To="{Binding ElementName=ProxyElement, Path=DataContext.CompactPaneGridLength}" />
+                                <mah:GridLengthAnimation BeginTime="0:0:0"
+                                                         Storyboard.TargetName="ColumnDefinition1"
+                                                         Storyboard.TargetProperty="(ColumnDefinition.Width)"
+                                                         To="{Binding ElementName=ProxyElement, Path=DataContext.CompactPaneGridLength}" />
                                 <Int32AnimationUsingKeyFrames Storyboard.TargetName="ContentRoot" Storyboard.TargetProperty="(Grid.Column)">
                                     <DiscreteInt32KeyFrame KeyTime="0:0:0" Value="1" />
                                 </Int32AnimationUsingKeyFrames>
@@ -281,14 +280,14 @@
                             </Storyboard>
 
                             <Storyboard x:Key="ClosedCompactRightStoryboard">
-                                <local:GridLengthAnimation BeginTime="0:0:0"
-                                                           Storyboard.TargetName="ColumnDefinition1"
-                                                           Storyboard.TargetProperty="(ColumnDefinition.Width)"
-                                                           To="*" />
-                                <local:GridLengthAnimation BeginTime="0:0:0"
-                                                           Storyboard.TargetName="ColumnDefinition2"
-                                                           Storyboard.TargetProperty="(ColumnDefinition.Width)"
-                                                           To="{Binding ElementName=ProxyElement, Path=DataContext.CompactPaneGridLength}" />
+                                <mah:GridLengthAnimation BeginTime="0:0:0"
+                                                         Storyboard.TargetName="ColumnDefinition1"
+                                                         Storyboard.TargetProperty="(ColumnDefinition.Width)"
+                                                         To="*" />
+                                <mah:GridLengthAnimation BeginTime="0:0:0"
+                                                         Storyboard.TargetName="ColumnDefinition2"
+                                                         Storyboard.TargetProperty="(ColumnDefinition.Width)"
+                                                         To="{Binding ElementName=ProxyElement, Path=DataContext.CompactPaneGridLength}" />
                                 <Int32AnimationUsingKeyFrames Storyboard.TargetName="ContentRoot" Storyboard.TargetProperty="(Grid.ColumnSpan)">
                                     <DiscreteInt32KeyFrame KeyTime="0:0:0" Value="1" />
                                 </Int32AnimationUsingKeyFrames>
@@ -356,14 +355,14 @@
                             </Storyboard>
 
                             <Storyboard x:Key="OpenInlineRightStoryboard">
-                                <local:GridLengthAnimation BeginTime="0:0:0"
-                                                           Storyboard.TargetName="ColumnDefinition1"
-                                                           Storyboard.TargetProperty="(ColumnDefinition.Width)"
-                                                           To="*" />
-                                <local:GridLengthAnimation BeginTime="0:0:0"
-                                                           Storyboard.TargetName="ColumnDefinition2"
-                                                           Storyboard.TargetProperty="(ColumnDefinition.Width)"
-                                                           To="{Binding ElementName=ProxyElement, Path=DataContext.OpenPaneGridLength}" />
+                                <mah:GridLengthAnimation BeginTime="0:0:0"
+                                                         Storyboard.TargetName="ColumnDefinition1"
+                                                         Storyboard.TargetProperty="(ColumnDefinition.Width)"
+                                                         To="*" />
+                                <mah:GridLengthAnimation BeginTime="0:0:0"
+                                                         Storyboard.TargetName="ColumnDefinition2"
+                                                         Storyboard.TargetProperty="(ColumnDefinition.Width)"
+                                                         To="{Binding ElementName=ProxyElement, Path=DataContext.OpenPaneGridLength}" />
                                 <Int32AnimationUsingKeyFrames Storyboard.TargetName="ContentRoot" Storyboard.TargetProperty="(Grid.ColumnSpan)">
                                     <DiscreteInt32KeyFrame KeyTime="0:0:0" Value="1" />
                                 </Int32AnimationUsingKeyFrames>
@@ -385,10 +384,10 @@
                             </Storyboard>
 
                             <Storyboard x:Key="OpenCompactOverlayLeftStoryboard">
-                                <local:GridLengthAnimation BeginTime="0:0:0"
-                                                           Storyboard.TargetName="ColumnDefinition1"
-                                                           Storyboard.TargetProperty="(ColumnDefinition.Width)"
-                                                           To="{Binding ElementName=ProxyElement, Path=DataContext.CompactPaneGridLength}" />
+                                <mah:GridLengthAnimation BeginTime="0:0:0"
+                                                         Storyboard.TargetName="ColumnDefinition1"
+                                                         Storyboard.TargetProperty="(ColumnDefinition.Width)"
+                                                         To="{Binding ElementName=ProxyElement, Path=DataContext.CompactPaneGridLength}" />
                                 <Int32AnimationUsingKeyFrames Storyboard.TargetName="ContentRoot" Storyboard.TargetProperty="(Grid.Column)">
                                     <DiscreteInt32KeyFrame KeyTime="0:0:0" Value="1" />
                                 </Int32AnimationUsingKeyFrames>
@@ -407,14 +406,14 @@
                             </Storyboard>
 
                             <Storyboard x:Key="OpenCompactOverlayRightStoryboard">
-                                <local:GridLengthAnimation BeginTime="0:0:0"
-                                                           Storyboard.TargetName="ColumnDefinition1"
-                                                           Storyboard.TargetProperty="(ColumnDefinition.Width)"
-                                                           To="*" />
-                                <local:GridLengthAnimation BeginTime="0:0:0"
-                                                           Storyboard.TargetName="ColumnDefinition2"
-                                                           Storyboard.TargetProperty="(ColumnDefinition.Width)"
-                                                           To="{Binding ElementName=ProxyElement, Path=DataContext.CompactPaneGridLength}" />
+                                <mah:GridLengthAnimation BeginTime="0:0:0"
+                                                         Storyboard.TargetName="ColumnDefinition1"
+                                                         Storyboard.TargetProperty="(ColumnDefinition.Width)"
+                                                         To="*" />
+                                <mah:GridLengthAnimation BeginTime="0:0:0"
+                                                         Storyboard.TargetName="ColumnDefinition2"
+                                                         Storyboard.TargetProperty="(ColumnDefinition.Width)"
+                                                         To="{Binding ElementName=ProxyElement, Path=DataContext.CompactPaneGridLength}" />
                                 <Int32AnimationUsingKeyFrames Storyboard.TargetName="ContentRoot" Storyboard.TargetProperty="(Grid.ColumnSpan)">
                                     <DiscreteInt32KeyFrame KeyTime="0:0:0" Value="1" />
                                 </Int32AnimationUsingKeyFrames>
@@ -492,10 +491,10 @@
                                        HorizontalAlignment="Right"
                                        Fill="Transparent"
                                        Visibility="Collapsed" />
-                            <local:MetroThumb x:Name="PART_ResizingThumb"
-                                              HorizontalAlignment="Right"
-                                              Style="{TemplateBinding ResizeThumbStyle}"
-                                              Visibility="{TemplateBinding CanResizeOpenPane, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                            <mah:MetroThumb x:Name="PART_ResizingThumb"
+                                            HorizontalAlignment="Right"
+                                            Style="{TemplateBinding ResizeThumbStyle}"
+                                            Visibility="{TemplateBinding CanResizeOpenPane, Converter={StaticResource BooleanToVisibilityConverter}}" />
                         </Grid>
 
                         <VisualStateManager.VisualStateGroups>
diff --git a/src/MahApps.Metro/Themes/Tile.xaml b/src/MahApps.Metro/Themes/Tile.xaml
index a919d5cd1d..0702c60679 100644
--- a/src/MahApps.Metro/Themes/Tile.xaml
+++ b/src/MahApps.Metro/Themes/Tile.xaml
@@ -1,11 +1,10 @@
 <ResourceDictionary 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"
-                    xmlns:converters="clr-namespace:MahApps.Metro.Converters">
+                    xmlns:converters="clr-namespace:MahApps.Metro.Converters"
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
-    <Style TargetType="Controls:Tile">
+    <Style TargetType="mah:Tile">
         <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 MahApps.Brushes.IdealForeground}" />
         <Setter Property="Height" Value="140" />
@@ -14,7 +13,7 @@
         <Setter Property="RenderTransformOrigin" Value="0.5,0.5" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="Controls:Tile">
+                <ControlTemplate TargetType="mah:Tile">
                     <Grid>
                         <Border x:Name="PART_Border"
                                 Background="{TemplateBinding Background}"
@@ -42,7 +41,7 @@
                             </Grid>
                         </Border>
                         <Border x:Name="PART_HoverBorder"
-                                BorderBrush="{TemplateBinding Controls:ControlsHelper.MouseOverBorderBrush}"
+                                BorderBrush="{TemplateBinding mah:ControlsHelper.MouseOverBorderBrush}"
                                 BorderThickness="2"
                                 Opacity="0"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
@@ -50,7 +49,7 @@
                     <ControlTemplate.Triggers>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:ControlsHelper.MouseOverBorderBrush), Mode=OneWay, Converter={x:Static converters:IsNullConverter.Instance}}" Value="False" />
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(mah:ControlsHelper.MouseOverBorderBrush), Mode=OneWay, Converter={x:Static converters:IsNullConverter.Instance}}" Value="False" />
                                 <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver, Mode=OneWay}" Value="True" />
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="PART_HoverBorder" Property="Opacity" Value="0.6" />
@@ -72,6 +71,7 @@
         <Setter Property="TitleFontSize" Value="16" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="Width" Value="140" />
+        <Setter Property="mah:ControlsHelper.MouseOverBorderBrush" Value="{x:Null}" />
     </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/MahApps.Metro/Themes/TransitioningContentControl.xaml b/src/MahApps.Metro/Themes/TransitioningContentControl.xaml
index 6e8526be48..2f60b82df4 100644
--- a/src/MahApps.Metro/Themes/TransitioningContentControl.xaml
+++ b/src/MahApps.Metro/Themes/TransitioningContentControl.xaml
@@ -1,18 +1,18 @@
 <ResourceDictionary 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">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
-    <Style TargetType="Controls:TransitioningContentControl">
+    <Style TargetType="mah:TransitioningContentControl">
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="Controls:TransitioningContentControl">
+                <ControlTemplate TargetType="mah:TransitioningContentControl">
                     <Border Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding Controls:ControlsHelper.CornerRadius}">
+                            CornerRadius="{TemplateBinding mah:ControlsHelper.CornerRadius}">
                         <Grid>
                             <ContentPresenter x:Name="PreviousContentPresentationSite"
                                               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
diff --git a/src/MahApps.Metro/Themes/Underline.xaml b/src/MahApps.Metro/Themes/Underline.xaml
index 0c7547a1dd..850b48b3ae 100644
--- a/src/MahApps.Metro/Themes/Underline.xaml
+++ b/src/MahApps.Metro/Themes/Underline.xaml
@@ -1,8 +1,8 @@
 <ResourceDictionary 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">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
-    <Style TargetType="{x:Type controls:Underline}">
+    <Style TargetType="{x:Type mah:Underline}">
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Gray}" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
@@ -12,7 +12,7 @@
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:Underline}">
+                <ControlTemplate TargetType="{x:Type mah:Underline}">
                     <Border x:Name="PART_UnderlineBorder"
                             HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                             VerticalAlignment="{TemplateBinding VerticalAlignment}"
@@ -20,13 +20,13 @@
                             BorderBrush="{TemplateBinding BorderBrush}"
                             SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
                             UseLayoutRounding="{TemplateBinding UseLayoutRounding}">
-                        <controls:ClipBorder Background="{TemplateBinding Background}"
-                                             BorderThickness="0"
-                                             SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                        <mah:ClipBorder Background="{TemplateBinding Background}"
+                                        BorderThickness="0"
+                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
                             <ContentPresenter Margin="{TemplateBinding Padding}"
                                               SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
                                               UseLayoutRounding="False" />
-                        </controls:ClipBorder>
+                        </mah:ClipBorder>
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/src/MahApps.Metro/Themes/WindowButtonCommands.xaml b/src/MahApps.Metro/Themes/WindowButtonCommands.xaml
index b89ad5632b..ebaeef6ad1 100644
--- a/src/MahApps.Metro/Themes/WindowButtonCommands.xaml
+++ b/src/MahApps.Metro/Themes/WindowButtonCommands.xaml
@@ -1,30 +1,30 @@
 <ResourceDictionary 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"
-                    xmlns:Converters="clr-namespace:MahApps.Metro.Converters">
+                    xmlns:converters="clr-namespace:MahApps.Metro.Converters"
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
     <!--  WindowButtonCommands control templates  -->
 
-    <ControlTemplate x:Key="MahApps.Templates.WindowButtonCommands" TargetType="{x:Type Controls:WindowButtonCommands}">
+    <ControlTemplate x:Key="MahApps.Templates.WindowButtonCommands" TargetType="{x:Type mah:WindowButtonCommands}">
         <StackPanel Orientation="Horizontal">
             <Button x:Name="PART_Min"
                     AutomationProperties.AutomationId="Minimize"
                     AutomationProperties.Name="Minimize"
                     Command="{x:Static SystemCommands.MinimizeWindowCommand}"
                     Focusable="False"
-                    IsEnabled="{Binding IsMinButtonEnabled, RelativeSource={RelativeSource AncestorType={x:Type Controls:MetroWindow}}}"
+                    IsEnabled="{Binding IsMinButtonEnabled, RelativeSource={RelativeSource AncestorType={x:Type mah:MetroWindow}}}"
                     ToolTip="{Binding Minimize, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
                 <Button.Visibility>
-                    <MultiBinding Converter="{x:Static Converters:ResizeModeMinMaxButtonVisibilityConverter.Instance}" ConverterParameter="MIN">
+                    <MultiBinding Converter="{x:Static converters:ResizeModeMinMaxButtonVisibilityConverter.Instance}" ConverterParameter="MIN">
                         <Binding Mode="OneWay"
                                  Path="ShowMinButton"
-                                 RelativeSource="{RelativeSource AncestorType={x:Type Controls:MetroWindow}}" />
+                                 RelativeSource="{RelativeSource AncestorType={x:Type mah:MetroWindow}}" />
                         <Binding Mode="OneWay"
                                  Path="UseNoneWindowStyle"
-                                 RelativeSource="{RelativeSource AncestorType={x:Type Controls:MetroWindow}}" />
+                                 RelativeSource="{RelativeSource AncestorType={x:Type mah:MetroWindow}}" />
                         <Binding Mode="OneWay"
                                  Path="ResizeMode"
-                                 RelativeSource="{RelativeSource AncestorType={x:Type Controls:MetroWindow}}" />
+                                 RelativeSource="{RelativeSource AncestorType={x:Type mah:MetroWindow}}" />
                     </MultiBinding>
                 </Button.Visibility>
                 <Path Data="F1M0,6L0,9 9,9 9,6 0,6z"
@@ -36,19 +36,19 @@
                     AutomationProperties.Name="Maximize"
                     Command="{x:Static SystemCommands.MaximizeWindowCommand}"
                     Focusable="False"
-                    IsEnabled="{Binding IsMaxRestoreButtonEnabled, RelativeSource={RelativeSource AncestorType={x:Type Controls:MetroWindow}}}"
+                    IsEnabled="{Binding IsMaxRestoreButtonEnabled, RelativeSource={RelativeSource AncestorType={x:Type mah:MetroWindow}}}"
                     ToolTip="{Binding Maximize, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
                 <Button.Visibility>
-                    <MultiBinding Converter="{x:Static Converters:ResizeModeMinMaxButtonVisibilityConverter.Instance}" ConverterParameter="MAX">
+                    <MultiBinding Converter="{x:Static converters:ResizeModeMinMaxButtonVisibilityConverter.Instance}" ConverterParameter="MAX">
                         <Binding Mode="OneWay"
                                  Path="ShowMaxRestoreButton"
-                                 RelativeSource="{RelativeSource AncestorType={x:Type Controls:MetroWindow}}" />
+                                 RelativeSource="{RelativeSource AncestorType={x:Type mah:MetroWindow}}" />
                         <Binding Mode="OneWay"
                                  Path="UseNoneWindowStyle"
-                                 RelativeSource="{RelativeSource AncestorType={x:Type Controls:MetroWindow}}" />
+                                 RelativeSource="{RelativeSource AncestorType={x:Type mah:MetroWindow}}" />
                         <Binding Mode="OneWay"
                                  Path="ResizeMode"
-                                 RelativeSource="{RelativeSource AncestorType={x:Type Controls:MetroWindow}}" />
+                                 RelativeSource="{RelativeSource AncestorType={x:Type mah:MetroWindow}}" />
                     </MultiBinding>
                 </Button.Visibility>
                 <!--  normal state  -->
@@ -64,17 +64,17 @@
                     AutomationProperties.Name="Close"
                     Command="{x:Static SystemCommands.CloseWindowCommand}"
                     Focusable="False"
-                    IsEnabled="{Binding RelativeSource={RelativeSource AncestorType={x:Type Controls:MetroWindow}}, Path=IsCloseButtonEnabled, Mode=OneWay}"
+                    IsEnabled="{Binding RelativeSource={RelativeSource AncestorType={x:Type mah:MetroWindow}}, Path=IsCloseButtonEnabled, Mode=OneWay}"
                     RenderOptions.EdgeMode="Aliased"
                     ToolTip="{Binding Close, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
                 <Button.Visibility>
-                    <MultiBinding Converter="{x:Static Converters:ResizeModeMinMaxButtonVisibilityConverter.Instance}" ConverterParameter="CLOSE">
+                    <MultiBinding Converter="{x:Static converters:ResizeModeMinMaxButtonVisibilityConverter.Instance}" ConverterParameter="CLOSE">
                         <Binding Mode="OneWay"
                                  Path="ShowCloseButton"
-                                 RelativeSource="{RelativeSource AncestorType={x:Type Controls:MetroWindow}}" />
+                                 RelativeSource="{RelativeSource AncestorType={x:Type mah:MetroWindow}}" />
                         <Binding Mode="OneWay"
                                  Path="UseNoneWindowStyle"
-                                 RelativeSource="{RelativeSource AncestorType={x:Type Controls:MetroWindow}}" />
+                                 RelativeSource="{RelativeSource AncestorType={x:Type mah:MetroWindow}}" />
                     </MultiBinding>
                 </Button.Visibility>
                 <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
@@ -98,13 +98,13 @@
         <ControlTemplate.Triggers>
             <MultiDataTrigger>
                 <MultiDataTrigger.Conditions>
-                    <Condition Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type Controls:MetroWindow}}, Path=IsCloseButtonEnabled}" Value="True" />
-                    <Condition Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type Controls:MetroWindow}}, Path=IsAnyDialogOpen}" Value="True" />
-                    <Condition Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type Controls:MetroWindow}}, Path=IsCloseButtonEnabledWithDialog}" Value="False" />
+                    <Condition Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type mah:MetroWindow}}, Path=IsCloseButtonEnabled}" Value="True" />
+                    <Condition Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type mah:MetroWindow}}, Path=IsAnyDialogOpen}" Value="True" />
+                    <Condition Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type mah:MetroWindow}}, Path=IsCloseButtonEnabledWithDialog}" Value="False" />
                 </MultiDataTrigger.Conditions>
                 <Setter TargetName="PART_Close" Property="IsEnabled" Value="False" />
             </MultiDataTrigger>
-            <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type Controls:MetroWindow}}, Path=WindowState}" Value="Maximized">
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type mah:MetroWindow}}, Path=WindowState}" Value="Maximized">
                 <Setter TargetName="PART_Max" Property="AutomationProperties.Name" Value="Restore" />
                 <Setter TargetName="PART_Max" Property="Command" Value="{x:Static SystemCommands.RestoreWindowCommand}" />
                 <Setter TargetName="PART_Max" Property="ToolTip" Value="{Binding Restore, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
@@ -123,7 +123,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <ControlTemplate x:Key="MahApps.Templates.WindowButtonCommands.Win10" TargetType="{x:Type Controls:WindowButtonCommands}">
+    <ControlTemplate x:Key="MahApps.Templates.WindowButtonCommands.Win10" TargetType="{x:Type mah:WindowButtonCommands}">
         <StackPanel Orientation="Horizontal">
             <Button x:Name="PART_Min"
                     Width="46"
@@ -131,20 +131,20 @@
                     AutomationProperties.Name="Minimize"
                     Command="{x:Static SystemCommands.MinimizeWindowCommand}"
                     Focusable="False"
-                    IsEnabled="{Binding IsMinButtonEnabled, RelativeSource={RelativeSource AncestorType={x:Type Controls:MetroWindow}}}"
+                    IsEnabled="{Binding IsMinButtonEnabled, RelativeSource={RelativeSource AncestorType={x:Type mah:MetroWindow}}}"
                     ToolTip="{Binding Minimize, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                     UseLayoutRounding="True">
                 <Button.Visibility>
-                    <MultiBinding Converter="{x:Static Converters:ResizeModeMinMaxButtonVisibilityConverter.Instance}" ConverterParameter="MIN">
+                    <MultiBinding Converter="{x:Static converters:ResizeModeMinMaxButtonVisibilityConverter.Instance}" ConverterParameter="MIN">
                         <Binding Mode="OneWay"
                                  Path="ShowMinButton"
-                                 RelativeSource="{RelativeSource AncestorType={x:Type Controls:MetroWindow}}" />
+                                 RelativeSource="{RelativeSource AncestorType={x:Type mah:MetroWindow}}" />
                         <Binding Mode="OneWay"
                                  Path="UseNoneWindowStyle"
-                                 RelativeSource="{RelativeSource AncestorType={x:Type Controls:MetroWindow}}" />
+                                 RelativeSource="{RelativeSource AncestorType={x:Type mah:MetroWindow}}" />
                         <Binding Mode="OneWay"
                                  Path="ResizeMode"
-                                 RelativeSource="{RelativeSource AncestorType={x:Type Controls:MetroWindow}}" />
+                                 RelativeSource="{RelativeSource AncestorType={x:Type mah:MetroWindow}}" />
                     </MultiBinding>
                 </Button.Visibility>
                 <Path Width="10"
@@ -163,20 +163,20 @@
                     AutomationProperties.Name="Maximize"
                     Command="{x:Static SystemCommands.MaximizeWindowCommand}"
                     Focusable="False"
-                    IsEnabled="{Binding IsMaxRestoreButtonEnabled, RelativeSource={RelativeSource AncestorType={x:Type Controls:MetroWindow}}}"
+                    IsEnabled="{Binding IsMaxRestoreButtonEnabled, RelativeSource={RelativeSource AncestorType={x:Type mah:MetroWindow}}}"
                     ToolTip="{Binding Maximize, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                     UseLayoutRounding="True">
                 <Button.Visibility>
-                    <MultiBinding Converter="{x:Static Converters:ResizeModeMinMaxButtonVisibilityConverter.Instance}" ConverterParameter="MAX">
+                    <MultiBinding Converter="{x:Static converters:ResizeModeMinMaxButtonVisibilityConverter.Instance}" ConverterParameter="MAX">
                         <Binding Mode="OneWay"
                                  Path="ShowMaxRestoreButton"
-                                 RelativeSource="{RelativeSource AncestorType={x:Type Controls:MetroWindow}}" />
+                                 RelativeSource="{RelativeSource AncestorType={x:Type mah:MetroWindow}}" />
                         <Binding Mode="OneWay"
                                  Path="UseNoneWindowStyle"
-                                 RelativeSource="{RelativeSource AncestorType={x:Type Controls:MetroWindow}}" />
+                                 RelativeSource="{RelativeSource AncestorType={x:Type mah:MetroWindow}}" />
                         <Binding Mode="OneWay"
                                  Path="ResizeMode"
-                                 RelativeSource="{RelativeSource AncestorType={x:Type Controls:MetroWindow}}" />
+                                 RelativeSource="{RelativeSource AncestorType={x:Type mah:MetroWindow}}" />
                     </MultiBinding>
                 </Button.Visibility>
                 <!--  normal state  -->
@@ -197,17 +197,17 @@
                     AutomationProperties.Name="Close"
                     Command="{x:Static SystemCommands.CloseWindowCommand}"
                     Focusable="False"
-                    IsEnabled="{Binding RelativeSource={RelativeSource AncestorType={x:Type Controls:MetroWindow}}, Path=IsCloseButtonEnabled, Mode=OneWay}"
+                    IsEnabled="{Binding RelativeSource={RelativeSource AncestorType={x:Type mah:MetroWindow}}, Path=IsCloseButtonEnabled, Mode=OneWay}"
                     ToolTip="{Binding Close, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                     UseLayoutRounding="True">
                 <Button.Visibility>
-                    <MultiBinding Converter="{x:Static Converters:ResizeModeMinMaxButtonVisibilityConverter.Instance}" ConverterParameter="CLOSE">
+                    <MultiBinding Converter="{x:Static converters:ResizeModeMinMaxButtonVisibilityConverter.Instance}" ConverterParameter="CLOSE">
                         <Binding Mode="OneWay"
                                  Path="ShowCloseButton"
-                                 RelativeSource="{RelativeSource AncestorType={x:Type Controls:MetroWindow}}" />
+                                 RelativeSource="{RelativeSource AncestorType={x:Type mah:MetroWindow}}" />
                         <Binding Mode="OneWay"
                                  Path="UseNoneWindowStyle"
-                                 RelativeSource="{RelativeSource AncestorType={x:Type Controls:MetroWindow}}" />
+                                 RelativeSource="{RelativeSource AncestorType={x:Type mah:MetroWindow}}" />
                     </MultiBinding>
                 </Button.Visibility>
                 <Path Width="10"
@@ -224,13 +224,13 @@
         <ControlTemplate.Triggers>
             <MultiDataTrigger>
                 <MultiDataTrigger.Conditions>
-                    <Condition Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type Controls:MetroWindow}}, Path=IsCloseButtonEnabled}" Value="True" />
-                    <Condition Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type Controls:MetroWindow}}, Path=IsAnyDialogOpen}" Value="True" />
-                    <Condition Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type Controls:MetroWindow}}, Path=IsCloseButtonEnabledWithDialog}" Value="False" />
+                    <Condition Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type mah:MetroWindow}}, Path=IsCloseButtonEnabled}" Value="True" />
+                    <Condition Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type mah:MetroWindow}}, Path=IsAnyDialogOpen}" Value="True" />
+                    <Condition Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type mah:MetroWindow}}, Path=IsCloseButtonEnabledWithDialog}" Value="False" />
                 </MultiDataTrigger.Conditions>
                 <Setter TargetName="PART_Close" Property="IsEnabled" Value="False" />
             </MultiDataTrigger>
-            <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type Controls:MetroWindow}}, Path=WindowState}" Value="Maximized">
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type mah:MetroWindow}}, Path=WindowState}" Value="Maximized">
                 <Setter TargetName="PART_Max" Property="AutomationProperties.Name" Value="Restore" />
                 <Setter TargetName="PART_Max" Property="Command" Value="{x:Static SystemCommands.RestoreWindowCommand}" />
                 <Setter TargetName="PART_Max" Property="ToolTip" Value="{Binding Restore, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
@@ -249,7 +249,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style x:Key="MahApps.Styles.WindowButtonCommands.Base" TargetType="{x:Type Controls:WindowButtonCommands}">
+    <Style x:Key="MahApps.Styles.WindowButtonCommands.Base" TargetType="{x:Type mah:WindowButtonCommands}">
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Transparent}" />
         <Setter Property="DarkCloseButtonStyle" Value="{DynamicResource MahApps.Styles.Button.MetroWindow.Dark}" />
         <Setter Property="DarkMaxButtonStyle" Value="{DynamicResource MahApps.Styles.Button.MetroWindow.Dark}" />
@@ -266,7 +266,7 @@
 
     <Style x:Key="MahApps.Styles.WindowButtonCommands"
            BasedOn="{StaticResource MahApps.Styles.WindowButtonCommands.Base}"
-           TargetType="{x:Type Controls:WindowButtonCommands}">
+           TargetType="{x:Type mah:WindowButtonCommands}">
         <Style.Triggers>
             <DataTrigger Binding="{Binding ParentWindow.ShowTitleBar, RelativeSource={RelativeSource Self}}" Value="True">
                 <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.IdealForeground}" />
@@ -276,7 +276,7 @@
 
     <Style x:Key="MahApps.Styles.WindowButtonCommands.Win10"
            BasedOn="{StaticResource MahApps.Styles.WindowButtonCommands}"
-           TargetType="{x:Type Controls:WindowButtonCommands}">
+           TargetType="{x:Type mah:WindowButtonCommands}">
         <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}" />
diff --git a/src/MahApps.Metro/Themes/WindowCommands.xaml b/src/MahApps.Metro/Themes/WindowCommands.xaml
index 2dacb5e38e..b072102c40 100644
--- a/src/MahApps.Metro/Themes/WindowCommands.xaml
+++ b/src/MahApps.Metro/Themes/WindowCommands.xaml
@@ -1,36 +1,36 @@
 <ResourceDictionary 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">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
     <ControlTemplate x:Key="MahApps.Templates.Button.WindowCommands" TargetType="{x:Type Button}">
         <Grid Background="{TemplateBinding Background}">
-            <Controls:ContentControlEx x:Name="PART_ContentControlEx"
-                                       Padding="{TemplateBinding Padding}"
-                                       HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                       VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                       Content="{TemplateBinding Content}"
-                                       ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
-                                       ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                       ContentTemplate="{TemplateBinding ContentTemplate}"
-                                       ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                       RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
-                                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+            <mah:ContentControlEx x:Name="PART_ContentControlEx"
+                                  Padding="{TemplateBinding Padding}"
+                                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                  Content="{TemplateBinding Content}"
+                                  ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
+                                  ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                                  ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                  RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
+                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
         </Grid>
     </ControlTemplate>
 
     <ControlTemplate x:Key="MahApps.Templates.ToggleButton.WindowCommands" TargetType="{x:Type ToggleButton}">
         <Grid Background="{TemplateBinding Background}">
-            <Controls:ContentControlEx x:Name="PART_ContentControlEx"
-                                       Padding="{TemplateBinding Padding}"
-                                       HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                       VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                       Content="{TemplateBinding Content}"
-                                       ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.ContentCharacterCasing)}"
-                                       ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                       ContentTemplate="{TemplateBinding ContentTemplate}"
-                                       ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                       RecognizesAccessKey="{TemplateBinding Controls:ControlsHelper.RecognizesAccessKey}"
-                                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+            <mah:ContentControlEx x:Name="PART_ContentControlEx"
+                                  Padding="{TemplateBinding Padding}"
+                                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                  Content="{TemplateBinding Content}"
+                                  ContentCharacterCasing="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(mah:ControlsHelper.ContentCharacterCasing)}"
+                                  ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                                  ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                  RecognizesAccessKey="{TemplateBinding mah:ControlsHelper.RecognizesAccessKey}"
+                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
         </Grid>
     </ControlTemplate>
 
@@ -94,7 +94,7 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.SplitButton.WindowCommands" TargetType="{x:Type Controls:SplitButton}">
+    <Style x:Key="MahApps.Styles.SplitButton.WindowCommands" TargetType="{x:Type mah:SplitButton}">
         <Setter Property="ArrowBrush" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground), Mode=OneWay}" />
         <Setter Property="ArrowMouseOverBrush" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground), Mode=OneWay}" />
         <Setter Property="ArrowPressedBrush" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground), Mode=OneWay}" />
@@ -122,7 +122,7 @@
         <Setter Property="Padding" Value="4 0 4 0" />
     </Style>
 
-    <Style x:Key="MahApps.Styles.DropDownButton.WindowCommands" TargetType="{x:Type Controls:DropDownButton}">
+    <Style x:Key="MahApps.Styles.DropDownButton.WindowCommands" TargetType="{x:Type mah:DropDownButton}">
         <Setter Property="ArrowBrush" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground), Mode=OneWay}" />
         <Setter Property="ArrowMouseOverBrush" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground), Mode=OneWay}" />
         <Setter Property="ArrowPressedBrush" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground), Mode=OneWay}" />
@@ -182,7 +182,7 @@
         </Setter>
     </Style>
 
-    <ControlTemplate x:Key="MahApps.Templates.WindowCommands" TargetType="Controls:WindowCommands">
+    <ControlTemplate x:Key="MahApps.Templates.WindowCommands" TargetType="mah:WindowCommands">
         <DockPanel>
             <ToggleButton x:Name="PART_ToggleButton"
                           AutomationProperties.Name="OverflowToggleButton"
@@ -200,11 +200,11 @@
                        Placement="Bottom"
                        PopupAnimation="Slide"
                        StaysOpen="false">
-                    <Grid x:Name="DropDownBorder" Background="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:MetroWindow}}, Path=Background, Mode=OneWay}">
+                    <Grid x:Name="DropDownBorder" Background="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:MetroWindow}}, Path=Background, Mode=OneWay}">
                         <ToolBarOverflowPanel x:Name="PART_ToolBarOverflowPanel"
                                               HorizontalAlignment="Stretch"
                                               VerticalAlignment="Stretch"
-                                              Background="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:MetroWindow}}, Path=WindowTitleBrush, Mode=OneWay}"
+                                              Background="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:MetroWindow}}, Path=WindowTitleBrush, Mode=OneWay}"
                                               FocusVisualStyle="{x:Null}"
                                               Focusable="true"
                                               KeyboardNavigation.DirectionalNavigation="Cycle"
@@ -225,16 +225,16 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <Style x:Key="MahApps.Styles.WindowCommandsItem" TargetType="{x:Type Controls:WindowCommandsItem}">
+    <Style x:Key="MahApps.Styles.WindowCommandsItem" TargetType="{x:Type mah: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}" />
         <Setter Property="Padding" Value="1 0" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Controls:WindowCommandsItem}">
-                    <StackPanel HorizontalAlignment="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:WindowCommandsItem}}, Path=ParentWindowCommands.HorizontalContentAlignment, Mode=OneWay}"
-                                VerticalAlignment="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:WindowCommandsItem}}, Path=ParentWindowCommands.VerticalContentAlignment, Mode=OneWay}"
+                <ControlTemplate TargetType="{x:Type mah:WindowCommandsItem}">
+                    <StackPanel HorizontalAlignment="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:WindowCommandsItem}}, Path=ParentWindowCommands.HorizontalContentAlignment, Mode=OneWay}"
+                                VerticalAlignment="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:WindowCommandsItem}}, Path=ParentWindowCommands.VerticalContentAlignment, Mode=OneWay}"
                                 Orientation="Horizontal">
                         <ContentPresenter x:Name="PART_ContentPresenter"
                                           Margin="{TemplateBinding Padding}"
@@ -245,8 +245,8 @@
                                           SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         <Rectangle x:Name="PART_Separator"
                                    Width="1"
-                                   Height="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:WindowCommandsItem}}, Path=ParentWindowCommands.SeparatorHeight, Mode=OneWay}"
-                                   Fill="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:WindowCommandsItem}}, Path=ParentWindowCommands.Foreground, Mode=OneWay}"
+                                   Height="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:WindowCommandsItem}}, Path=ParentWindowCommands.SeparatorHeight, Mode=OneWay}"
+                                   Fill="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:WindowCommandsItem}}, Path=ParentWindowCommands.Foreground, Mode=OneWay}"
                                    IsHitTestVisible="False"
                                    Opacity="0.25"
                                    SnapsToDevicePixels="True"
@@ -262,17 +262,16 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MahApps.Styles.WindowCommands.Base" TargetType="{x:Type Controls:WindowCommands}">
+    <Style x:Key="MahApps.Styles.WindowCommands.Base" TargetType="{x:Type mah:WindowCommands}">
         <Style.Resources>
             <ResourceDictionary>
                 <Style BasedOn="{StaticResource MahApps.Styles.Button.WindowCommands}" TargetType="{x:Type Button}" />
                 <Style BasedOn="{StaticResource MahApps.Styles.ToggleButton.WindowCommands}" TargetType="{x:Type ToggleButton}" />
-                <Style BasedOn="{StaticResource MahApps.Styles.SplitButton.WindowCommands}" TargetType="{x:Type Controls:SplitButton}" />
-                <Style BasedOn="{StaticResource MahApps.Styles.DropDownButton.WindowCommands}" TargetType="{x:Type Controls:DropDownButton}" />
+                <Style BasedOn="{StaticResource MahApps.Styles.SplitButton.WindowCommands}" TargetType="{x:Type mah:SplitButton}" />
+                <Style BasedOn="{StaticResource MahApps.Styles.DropDownButton.WindowCommands}" TargetType="{x:Type mah:DropDownButton}" />
             </ResourceDictionary>
         </Style.Resources>
         <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.Transparent}" />
-        <Setter Property="Controls:ControlsHelper.ContentCharacterCasing" Value="Normal" />
         <Setter Property="DarkTemplate" Value="{StaticResource MahApps.Templates.WindowCommands}" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.ThemeForeground}" />
@@ -284,11 +283,12 @@
         <Setter Property="LightTemplate" Value="{StaticResource MahApps.Templates.WindowCommands}" />
         <Setter Property="Template" Value="{StaticResource MahApps.Templates.WindowCommands}" />
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
+        <Setter Property="mah:ControlsHelper.ContentCharacterCasing" Value="Normal" />
     </Style>
 
     <Style x:Key="MahApps.Styles.WindowCommands"
            BasedOn="{StaticResource MahApps.Styles.WindowCommands.Base}"
-           TargetType="{x:Type Controls:WindowCommands}">
+           TargetType="{x:Type mah:WindowCommands}">
         <Style.Triggers>
             <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentWindow.ShowTitleBar}" Value="True">
                 <Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.IdealForeground}" />
diff --git a/src/Mahapps.Metro.Tests/Views/AnimatedTabControlWindow.xaml b/src/Mahapps.Metro.Tests/Views/AnimatedTabControlWindow.xaml
index c4d6015ee8..ab45027cce 100644
--- a/src/Mahapps.Metro.Tests/Views/AnimatedTabControlWindow.xaml
+++ b/src/Mahapps.Metro.Tests/Views/AnimatedTabControlWindow.xaml
@@ -1,17 +1,17 @@
-<controls:MetroWindow x:Class="MahApps.Metro.Tests.AnimatedTabControlWindow"
-                      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                      xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
-                      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                      xmlns:tests="clr-namespace:MahApps.Metro.Tests"
-                      Width="300"
-                      Height="600"
-                      d:DesignHeight="300"
-                      d:DesignWidth="300"
-                      mc:Ignorable="d">
+<mah:MetroWindow x:Class="MahApps.Metro.Tests.AnimatedTabControlWindow"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                 xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
+                 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                 xmlns:tests="clr-namespace:MahApps.Metro.Tests"
+                 Width="300"
+                 Height="600"
+                 d:DesignHeight="300"
+                 d:DesignWidth="300"
+                 mc:Ignorable="d">
 
-    <controls:MetroWindow.Resources>
+    <mah:MetroWindow.Resources>
         <tests:TabControlContentTemplateSelector x:Key="TabControlContentTemplateSelector">
             <tests:TabControlContentTemplateSelector.FirstTemplate>
                 <DataTemplate DataType="{x:Type tests:FirstViewModel}">
@@ -24,24 +24,24 @@
                 </DataTemplate>
             </tests:TabControlContentTemplateSelector.SecondTemplate>
         </tests:TabControlContentTemplateSelector>
-    </controls:MetroWindow.Resources>
+    </mah:MetroWindow.Resources>
 
     <UniformGrid Rows="4">
-        <controls:MetroAnimatedSingleRowTabControl x:Name="MetroTabControl"
-                                                   ContentTemplateSelector="{StaticResource TabControlContentTemplateSelector}"
-                                                   ItemsSource="{Binding Data.TestViewModels}" />
+        <mah:MetroAnimatedSingleRowTabControl x:Name="MetroTabControl"
+                                              ContentTemplateSelector="{StaticResource TabControlContentTemplateSelector}"
+                                              ItemsSource="{Binding Data.TestViewModels}" />
         <TabControl x:Name="NormalTabControl"
                     ContentTemplateSelector="{StaticResource TabControlContentTemplateSelector}"
                     ItemsSource="{Binding Data.TestViewModels}"
                     Style="{DynamicResource MahApps.Styles.TabControl.AnimatedSingleRow}" />
 
-        <controls:MetroAnimatedTabControl x:Name="MetroTabControl2"
-                                          ContentTemplateSelector="{StaticResource TabControlContentTemplateSelector}"
-                                          ItemsSource="{Binding Data.TestViewModels}" />
+        <mah:MetroAnimatedTabControl x:Name="MetroTabControl2"
+                                     ContentTemplateSelector="{StaticResource TabControlContentTemplateSelector}"
+                                     ItemsSource="{Binding Data.TestViewModels}" />
         <TabControl x:Name="NormalTabControl2"
                     ContentTemplateSelector="{StaticResource TabControlContentTemplateSelector}"
                     ItemsSource="{Binding Data.TestViewModels}"
                     Style="{DynamicResource MahApps.Styles.TabControl.Animated}" />
     </UniformGrid>
 
-</controls:MetroWindow>
\ No newline at end of file
+</mah:MetroWindow>
\ No newline at end of file
diff --git a/src/Mahapps.Metro.Tests/Views/AutoWatermarkTestWindow.xaml b/src/Mahapps.Metro.Tests/Views/AutoWatermarkTestWindow.xaml
index 697a47cf87..2c54d91401 100644
--- a/src/Mahapps.Metro.Tests/Views/AutoWatermarkTestWindow.xaml
+++ b/src/Mahapps.Metro.Tests/Views/AutoWatermarkTestWindow.xaml
@@ -1,35 +1,35 @@
-<controls:MetroWindow x:Class="MahApps.Metro.Tests.AutoWatermarkTestWindow"
-                      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                      xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
-                      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                      xmlns:tests="clr-namespace:MahApps.Metro.Tests"
-                      d:DataContext="{d:DesignInstance tests:AutoWatermarkTestModel}"
-                      d:DesignHeight="300"
-                      d:DesignWidth="300"
-                      mc:Ignorable="d">
-    <controls:MetroWindow.DataContext>
+<mah:MetroWindow x:Class="MahApps.Metro.Tests.AutoWatermarkTestWindow"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                 xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
+                 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                 xmlns:tests="clr-namespace:MahApps.Metro.Tests"
+                 d:DataContext="{d:DesignInstance tests:AutoWatermarkTestModel}"
+                 d:DesignHeight="300"
+                 d:DesignWidth="300"
+                 mc:Ignorable="d">
+    <mah:MetroWindow.DataContext>
         <tests:AutoWatermarkTestModel />
-    </controls:MetroWindow.DataContext>
+    </mah:MetroWindow.DataContext>
     <StackPanel>
         <TextBox x:Name="TestTextBox"
-                 controls:TextBoxHelper.AutoWatermark="True"
+                 mah:TextBoxHelper.AutoWatermark="True"
                  Text="{Binding TextBoxText}" />
         <TextBox x:Name="TestTextBoxSubModel"
-                 controls:TextBoxHelper.AutoWatermark="True"
+                 mah:TextBoxHelper.AutoWatermark="True"
                  Text="{Binding SubModel.TextBoxText}" />
         <ComboBox x:Name="TestComboBox"
-                  controls:TextBoxHelper.AutoWatermark="True"
+                  mah:TextBoxHelper.AutoWatermark="True"
                   SelectedItem="{Binding ComboBoxSelectedObject}" />
-        <controls:NumericUpDown x:Name="TestNumericUpDown"
-                                controls:TextBoxHelper.AutoWatermark="True"
-                                Value="{Binding NumericUpDownValue}" />
+        <mah:NumericUpDown x:Name="TestNumericUpDown"
+                           mah:TextBoxHelper.AutoWatermark="True"
+                           Value="{Binding NumericUpDownValue}" />
         <DatePicker x:Name="TestDatePicker"
-                    controls:TextBoxHelper.AutoWatermark="True"
+                    mah:TextBoxHelper.AutoWatermark="True"
                     SelectedDate="{Binding DatePickerDate}" />
-        <controls:HotKeyBox x:Name="TestHotKeyBox"
-                            controls:TextBoxHelper.AutoWatermark="True"
-                            HotKey="{Binding HotKey}" />
+        <mah:HotKeyBox x:Name="TestHotKeyBox"
+                       mah:TextBoxHelper.AutoWatermark="True"
+                       HotKey="{Binding HotKey}" />
     </StackPanel>
-</controls:MetroWindow>
\ No newline at end of file
+</mah:MetroWindow>
\ No newline at end of file
diff --git a/src/Mahapps.Metro.Tests/Views/ButtonWindow.xaml b/src/Mahapps.Metro.Tests/Views/ButtonWindow.xaml
index 5948ac2989..6e504823ff 100644
--- a/src/Mahapps.Metro.Tests/Views/ButtonWindow.xaml
+++ b/src/Mahapps.Metro.Tests/Views/ButtonWindow.xaml
@@ -1,12 +1,12 @@
-<controls:MetroWindow x:Class="MahApps.Metro.Tests.ButtonWindow"
-                      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                      xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
-                      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                      d:DesignHeight="300"
-                      d:DesignWidth="300"
-                      mc:Ignorable="d">
+<mah:MetroWindow x:Class="MahApps.Metro.Tests.ButtonWindow"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                 xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
+                 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                 d:DesignHeight="300"
+                 d:DesignWidth="300"
+                 mc:Ignorable="d">
     <StackPanel x:Name="TheStackPanel">
         <StackPanel.Resources>
             <ObjectDataProvider x:Key="HorizontalAlignmentEnumValues"
@@ -21,11 +21,11 @@
         <Button Name="SquareButton"
                 Content="SomeText"
                 Style="{DynamicResource MahApps.Styles.Button.Square}" />
-        <controls:DropDownButton x:Name="TheDropDownButton"
-                                 Content="DropDownButton"
-                                 ItemsSource="{Binding Source={StaticResource HorizontalAlignmentEnumValues}}" />
-        <controls:SplitButton x:Name="TheSplitButton"
-                              ItemsSource="{Binding Source={StaticResource HorizontalAlignmentEnumValues}}"
-                              SelectedIndex="0" />
+        <mah:DropDownButton x:Name="TheDropDownButton"
+                            Content="DropDownButton"
+                            ItemsSource="{Binding Source={StaticResource HorizontalAlignmentEnumValues}}" />
+        <mah:SplitButton x:Name="TheSplitButton"
+                         ItemsSource="{Binding Source={StaticResource HorizontalAlignmentEnumValues}}"
+                         SelectedIndex="0" />
     </StackPanel>
-</controls:MetroWindow>
\ No newline at end of file
+</mah: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 1f421358a9..7dd9d9ed6e 100644
--- a/src/Mahapps.Metro.Tests/Views/CleanWindow.xaml
+++ b/src/Mahapps.Metro.Tests/Views/CleanWindow.xaml
@@ -1,14 +1,14 @@
-<controls:MetroWindow x:Class="MahApps.Metro.Tests.CleanWindow"
-                      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                      xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
-                      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                      d:DesignHeight="300"
-                      d:DesignWidth="300"
-                      ResizeMode="CanResizeWithGrip"
-                      Style="{DynamicResource MahApps.Styles.MetroWindow.Clean}"
-                      mc:Ignorable="d">
+<mah:MetroWindow x:Class="MahApps.Metro.Tests.CleanWindow"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                 xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
+                 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                 d:DesignHeight="300"
+                 d:DesignWidth="300"
+                 ResizeMode="CanResizeWithGrip"
+                 Style="{DynamicResource MahApps.Styles.MetroWindow.Clean}"
+                 mc:Ignorable="d">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -16,9 +16,9 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Window.Resources>
-    <controls:MetroWindow.RightWindowCommands>
-        <controls:WindowCommands>
+    <mah:MetroWindow.RightWindowCommands>
+        <mah:WindowCommands>
             <Button Content="Test" />
-        </controls:WindowCommands>
-    </controls:MetroWindow.RightWindowCommands>
-</controls:MetroWindow>
\ No newline at end of file
+        </mah:WindowCommands>
+    </mah:MetroWindow.RightWindowCommands>
+</mah:MetroWindow>
\ No newline at end of file
diff --git a/src/Mahapps.Metro.Tests/Views/DateAndTimePickerWindow.xaml b/src/Mahapps.Metro.Tests/Views/DateAndTimePickerWindow.xaml
index b1dee3fec0..e739d8df37 100644
--- a/src/Mahapps.Metro.Tests/Views/DateAndTimePickerWindow.xaml
+++ b/src/Mahapps.Metro.Tests/Views/DateAndTimePickerWindow.xaml
@@ -1,28 +1,28 @@
-<controls:MetroWindow x:Class="MahApps.Metro.Tests.DateAndTimePickerWindow"
-                      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                      xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
-                      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                      d:DesignHeight="300"
-                      d:DesignWidth="300"
-                      mc:Ignorable="d">
+<mah:MetroWindow x:Class="MahApps.Metro.Tests.DateAndTimePickerWindow"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                 xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
+                 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                 d:DesignHeight="300"
+                 d:DesignWidth="300"
+                 mc:Ignorable="d">
     <StackPanel>
-        <controls:DateTimePicker x:Name="TheDateTimePicker"
-                                 Culture="pt-BR"
-                                 SelectedDateTime="08/31/2016 14:00:01" />
-        <controls:DateTimePicker x:Name="TheDateTimeFormatPicker"
-                                 Culture="it-IT"
-                                 SelectedDateTime="08/31/2016 14:00:01" />
-        <controls:TimePicker x:Name="TheTimePickerDe"
-                             Culture="de-DE"
-                             SelectedDateTime="14:00:01" />
-        <controls:TimePicker x:Name="TheTimePickerUs"
-                             Culture="en-US"
-                             SelectedDateTime="14:00:01" />
-        <controls:TimePicker x:Name="TheTimePickerCsCz"
-                             Culture="cs-CZ"
-                             SelectedDateTime="22:23:24" />
-        <controls:TimePicker x:Name="EmptyTimePicker" />
+        <mah:DateTimePicker x:Name="TheDateTimePicker"
+                            Culture="pt-BR"
+                            SelectedDateTime="08/31/2016 14:00:01" />
+        <mah:DateTimePicker x:Name="TheDateTimeFormatPicker"
+                            Culture="it-IT"
+                            SelectedDateTime="08/31/2016 14:00:01" />
+        <mah:TimePicker x:Name="TheTimePickerDe"
+                        Culture="de-DE"
+                        SelectedDateTime="14:00:01" />
+        <mah:TimePicker x:Name="TheTimePickerUs"
+                        Culture="en-US"
+                        SelectedDateTime="14:00:01" />
+        <mah:TimePicker x:Name="TheTimePickerCsCz"
+                        Culture="cs-CZ"
+                        SelectedDateTime="22:23:24" />
+        <mah:TimePicker x:Name="EmptyTimePicker" />
     </StackPanel>
-</controls:MetroWindow>
\ No newline at end of file
+</mah:MetroWindow>
\ No newline at end of file
diff --git a/src/Mahapps.Metro.Tests/Views/DialogWindow.xaml b/src/Mahapps.Metro.Tests/Views/DialogWindow.xaml
index 6ee8e7e30b..6d39658560 100644
--- a/src/Mahapps.Metro.Tests/Views/DialogWindow.xaml
+++ b/src/Mahapps.Metro.Tests/Views/DialogWindow.xaml
@@ -1,16 +1,15 @@
-<controls:MetroWindow x:Class="MahApps.Metro.Tests.DialogWindow"
-                      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                      xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
-                      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                      xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
-                      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                      d:DesignHeight="300"
-                      d:DesignWidth="300"
-                      mc:Ignorable="d">
-    <controls:MetroWindow.Resources>
-        <dialogs:CustomDialog x:Key="CustomDialog">
+<mah:MetroWindow x:Class="MahApps.Metro.Tests.DialogWindow"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                 xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
+                 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                 d:DesignHeight="300"
+                 d:DesignWidth="300"
+                 mc:Ignorable="d">
+    <mah:MetroWindow.Resources>
+        <mah:CustomDialog x:Key="CustomDialog">
             <TextBlock x:Name="TheDialogBody" Text="{Binding Path=Text}" />
-        </dialogs:CustomDialog>
-    </controls:MetroWindow.Resources>
-</controls:MetroWindow>
\ No newline at end of file
+        </mah:CustomDialog>
+    </mah:MetroWindow.Resources>
+</mah:MetroWindow>
\ No newline at end of file
diff --git a/src/Mahapps.Metro.Tests/Views/FlyoutWindow.xaml b/src/Mahapps.Metro.Tests/Views/FlyoutWindow.xaml
index a6c0140276..35ffc6898e 100644
--- a/src/Mahapps.Metro.Tests/Views/FlyoutWindow.xaml
+++ b/src/Mahapps.Metro.Tests/Views/FlyoutWindow.xaml
@@ -1,34 +1,34 @@
-<controls:MetroWindow x:Class="MahApps.Metro.Tests.FlyoutWindow"
-                      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                      xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
-                      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                      d:DesignHeight="300"
-                      d:DesignWidth="300"
-                      mc:Ignorable="d">
-    <controls:MetroWindow.RightWindowCommands>
-        <controls:WindowCommands>
+<mah:MetroWindow x:Class="MahApps.Metro.Tests.FlyoutWindow"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                 xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
+                 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                 d:DesignHeight="300"
+                 d:DesignWidth="300"
+                 mc:Ignorable="d">
+    <mah:MetroWindow.RightWindowCommands>
+        <mah:WindowCommands>
             <Button Content="Test" />
-        </controls:WindowCommands>
-    </controls:MetroWindow.RightWindowCommands>
-    <controls:MetroWindow.Flyouts>
-        <controls:FlyoutsControl>
-            <controls:Flyout x:Name="DefaultFlyout" />
-            <controls:Flyout x:Name="LeftFlyout"
-                             Width="500"
-                             Header="Flyout"
-                             Position="Left" />
-            <controls:Flyout x:Name="RightFlyout"
-                             Width="500"
-                             Header="Flyout"
-                             Position="Right" />
-            <controls:Flyout x:Name="RightFlyout2"
-                             Width="500"
-                             Header="Flyout"
-                             Position="Right" />
-        </controls:FlyoutsControl>
-    </controls:MetroWindow.Flyouts>
+        </mah:WindowCommands>
+    </mah:MetroWindow.RightWindowCommands>
+    <mah:MetroWindow.Flyouts>
+        <mah:FlyoutsControl>
+            <mah:Flyout x:Name="DefaultFlyout" />
+            <mah:Flyout x:Name="LeftFlyout"
+                        Width="500"
+                        Header="Flyout"
+                        Position="Left" />
+            <mah:Flyout x:Name="RightFlyout"
+                        Width="500"
+                        Header="Flyout"
+                        Position="Right" />
+            <mah:Flyout x:Name="RightFlyout2"
+                        Width="500"
+                        Header="Flyout"
+                        Position="Right" />
+        </mah:FlyoutsControl>
+    </mah:MetroWindow.Flyouts>
     <Grid>
         <Image Width="200">
             <Image.Source>
@@ -36,9 +36,9 @@
             </Image.Source>
         </Image>
 
-        <controls:Flyout x:Name="FlyoutOnGrid"
-                         Width="200"
-                         Header="FlyoutOnGrid"
-                         Position="Right" />
+        <mah:Flyout x:Name="FlyoutOnGrid"
+                    Width="200"
+                    Header="FlyoutOnGrid"
+                    Position="Right" />
     </Grid>
-</controls:MetroWindow>
\ No newline at end of file
+</mah:MetroWindow>
\ No newline at end of file
diff --git a/src/Mahapps.Metro.Tests/Views/HiddenMinMaxCloseButtonsWindow.xaml b/src/Mahapps.Metro.Tests/Views/HiddenMinMaxCloseButtonsWindow.xaml
index b583690257..44263b3ae9 100644
--- a/src/Mahapps.Metro.Tests/Views/HiddenMinMaxCloseButtonsWindow.xaml
+++ b/src/Mahapps.Metro.Tests/Views/HiddenMinMaxCloseButtonsWindow.xaml
@@ -1,12 +1,14 @@
-<controls:MetroWindow x:Class="MahApps.Metro.Tests.HiddenMinMaxCloseButtonsWindow"
-                      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                      xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
-                      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                      d:DesignHeight="300"
-                      d:DesignWidth="300"
-                      ShowCloseButton="False"
-                      ShowMaxRestoreButton="False"
-                      ShowMinButton="False"
-                      mc:Ignorable="d" />
\ No newline at end of file
+<mah:MetroWindow x:Class="MahApps.Metro.Tests.HiddenMinMaxCloseButtonsWindow"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                 xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
+                 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                 d:DesignHeight="300"
+                 d:DesignWidth="300"
+                 ShowCloseButton="False"
+                 ShowMaxRestoreButton="False"
+                 ShowMinButton="False"
+                 mc:Ignorable="d">
+    <Grid />
+</mah:MetroWindow>
\ No newline at end of file
diff --git a/src/Mahapps.Metro.Tests/Views/NumericUpDownWindow.xaml b/src/Mahapps.Metro.Tests/Views/NumericUpDownWindow.xaml
index 8eaa06a442..3395acb970 100644
--- a/src/Mahapps.Metro.Tests/Views/NumericUpDownWindow.xaml
+++ b/src/Mahapps.Metro.Tests/Views/NumericUpDownWindow.xaml
@@ -1,13 +1,13 @@
-<controls:MetroWindow x:Class="MahApps.Metro.Tests.NumericUpDownWindow"
-                      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                      xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
-                      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                      d:DesignHeight="300"
-                      d:DesignWidth="300"
-                      mc:Ignorable="d">
+<mah:MetroWindow x:Class="MahApps.Metro.Tests.NumericUpDownWindow"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                 xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
+                 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                 d:DesignHeight="300"
+                 d:DesignWidth="300"
+                 mc:Ignorable="d">
     <StackPanel>
-        <controls:NumericUpDown x:Name="TheNUD" Culture="en-GB" />
+        <mah:NumericUpDown x:Name="TheNUD" Culture="en-GB" />
     </StackPanel>
-</controls:MetroWindow>
\ No newline at end of file
+</mah:MetroWindow>
\ No newline at end of file
diff --git a/src/Mahapps.Metro.Tests/Views/TextBoxHelperTestWindow.xaml b/src/Mahapps.Metro.Tests/Views/TextBoxHelperTestWindow.xaml
index f5f0b3490a..0c847cf6c1 100644
--- a/src/Mahapps.Metro.Tests/Views/TextBoxHelperTestWindow.xaml
+++ b/src/Mahapps.Metro.Tests/Views/TextBoxHelperTestWindow.xaml
@@ -1,12 +1,12 @@
-<controls:MetroWindow x:Class="MahApps.Metro.Tests.TextBoxHelperTestWindow"
-                      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                      xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
-                      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                      d:DesignHeight="300"
-                      d:DesignWidth="300"
-                      mc:Ignorable="d">
+<mah:MetroWindow x:Class="MahApps.Metro.Tests.TextBoxHelperTestWindow"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                 xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
+                 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                 d:DesignHeight="300"
+                 d:DesignWidth="300"
+                 mc:Ignorable="d">
     <StackPanel>
         <TextBox x:Name="TestTextBox" />
         <TextBox x:Name="TestButtonTextBox" Style="{DynamicResource MahApps.Styles.TextBox.Button}" />
@@ -15,7 +15,7 @@
         <PasswordBox x:Name="TestButtonRevealedPasswordBox" Style="{DynamicResource MahApps.Styles.PasswordBox.Button.Revealed}" />
         <ComboBox x:Name="TestComboBox" />
         <ComboBox x:Name="TestEditableComboBox" IsEditable="True" />
-        <controls:NumericUpDown x:Name="TestNumericUpDown" />
-        <controls:HotKeyBox x:Name="TestHotKeyBox" />
+        <mah:NumericUpDown x:Name="TestNumericUpDown" />
+        <mah:HotKeyBox x:Name="TestHotKeyBox" />
     </StackPanel>
-</controls:MetroWindow>
\ No newline at end of file
+</mah:MetroWindow>
\ No newline at end of file